From f131261ce7e14add97f0c58f9263cfaa157fd181 Mon Sep 17 00:00:00 2001 From: andreao Date: Mon, 20 Apr 2009 15:56:03 +0000 Subject: merge from trunk revisions 127002-132392, 5/N git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/st/cli-be@146436 138bc75d-0d04-0410-961f-82ee72b054a4 --- libcpp/ChangeLog | 168 ++++++++- libcpp/Makefile.in | 12 +- libcpp/charset.c | 25 +- libcpp/config.in | 3 + libcpp/configure | 66 ++++ libcpp/configure.ac | 1 + libcpp/directives-only.c | 240 ++++++++++++ libcpp/directives.c | 56 ++- libcpp/expr.c | 63 +++- libcpp/files.c | 98 ++++- libcpp/include/cpplib.h | 27 +- libcpp/include/line-map.h | 19 +- libcpp/include/symtab.h | 4 +- libcpp/init.c | 37 +- libcpp/internal.h | 24 +- libcpp/line-map.c | 11 +- libcpp/macro.c | 165 +++++++-- libcpp/po/ChangeLog | 52 +++ libcpp/po/be.po | 365 ++++++++++--------- libcpp/po/ca.po | 371 ++++++++++--------- libcpp/po/cpplib.pot | 412 +++++++++++---------- libcpp/po/da.po | 371 ++++++++++--------- libcpp/po/de.po | 373 ++++++++++--------- libcpp/po/el.po | 377 ++++++++++--------- libcpp/po/es.po | 375 ++++++++++--------- libcpp/po/fr.po | 373 ++++++++++--------- libcpp/po/ja.po | 383 ++++++++++--------- libcpp/po/nl.po | 368 ++++++++++--------- libcpp/po/sv.po | 396 ++++++++++---------- libcpp/po/tr.po | 371 ++++++++++--------- libcpp/po/uk.po | 911 ++++++++++++++++++++++++++++++++++++++++++++++ libcpp/po/vi.po | 370 ++++++++++--------- libcpp/po/zh_CN.po | 371 ++++++++++--------- libcpp/po/zh_TW.po | 371 ++++++++++--------- libcpp/traditional.c | 69 +++- 35 files changed, 5007 insertions(+), 2691 deletions(-) create mode 100644 libcpp/directives-only.c create mode 100644 libcpp/po/uk.po diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog index 65b199dfa69..a14c38ef9a9 100644 --- a/libcpp/ChangeLog +++ b/libcpp/ChangeLog @@ -1,3 +1,159 @@ +2008-01-25 Jakub Jelinek + + PR preprocessor/34692 + * macro.c (collect_args): Add pragma_buff argument. Push + CPP_PRAGMA ... CPP_PRAGMA_EOL tokens to *pragma_buff, rather + than into arguments. Reset prevent_expansion and parsing_args + state at CPP_PRAGMA_EOL/CPP_EOF. + (funlike_invocation_p): Add pragma_buff argument, pass it through + to collect_args. + (enter_macro_context): Add result argument. Adjust + funlike_invocation_p caller. Emit all deferred pragma tokens + gathered during collect_args before the expansion, add a padding + token. Return 2 instead of 1 if any pragma tokens were prepended. + (cpp_get_token): If enter_macro_context returns 2, don't return + a padding token, instead cycle to grab CPP_PRAGMA token. + * directives.c (_cpp_handle_directive): If was_parsing_args + in deferred pragma, leave parsing_args and prevent_expansion as is. + +2008-01-22 Tom Tromey + + PR c++/34859 + * macro.c (_cpp_create_definition): Handle __STDC_LIMIT_MACROS and + __STDC_CONSTANT_MACROS. + +2008-01-07 Fred Fish + + PR preprocessor/30363 + * traditional.c (replace_args_and_push): Add local variable + cxtquote, calculate the replacement text size assuming a + worst case of every input character quoted with backslash, + and properly handle output quoting of quote characters in + actual arguments used in function-like macros. + +2008-01-03 Tom Tromey + + PR preprocessor/34602 + * directives.c (do_line): Don't try to spell EOF token. + (do_linemarker): Add comment. + +2007-12-11 DJ Delorie + + * charset.c (convert_using_iconv): Close out any shift states, + returning to the initial state. + +2007-12-06 Tom Tromey + + PR c/29172 + * internal.h (struct cpp_reader) : Changed + type. + : Removed. + * files.c (FILE_HASH_POOL_SIZE): New macro. + (struct file_hash_entry_pool): New. + (destroy_all_cpp_files): New function. + (allocate_file_hash_entries): Allocate a file_hash_entry_pool. + (new_file_hash_entry): Update. + (free_file_hash_entries): New function. + (_cpp_cleanup_files): Call free_file_hash_entries and + destroy_all_cpp_files. + (cpp_clear_file_cache): New function. + * include/cpplib.h (cpp_clear_file_cache): Declare. + +2007-12-03 Tom Tromey + + PR preprocessor/34288 + * configure.ac, config.in: Rebuilt. + * configure.ac: Check for ssize_t. + +2007-11-30 Tom Tromey + + PR preprocessor/32868 + * macro.c (_cpp_create_definition): Special case + __STDC_FORMAT_MACROS. + +2007-11-16 Michael Matz + + * files.c (search_path_head): Fix check for absolute paths. + +2007-11-11 Tom Tromey + + PR c++/17557 + * include/cpplib.h (cpp_included_before): Declare. + * files.c (struct file_hash_entry) : New field. + (_cpp_find_file): Initialize new field. + (make_cpp_dir): Likewise. + (cpp_included_before): New function. + +2007-11-01 Tom Tromey + + PR preprocessor/30805 + * macro.c (paste_tokens): Handle padding token. + (paste_tokens): Don't abort unless padding has PASTE_LEFT flag. + +2007-10-31 Tom Tromey + + PR preprocessor/30786 + * macro.c (builtin_macro): Return result of _cpp_do__Pragma. + * directives.c (_cpp_do__Pragma): Return error status. + * internal.h (_cpp_do__Pragma): Update. + * directives.c (get__Pragma_string): Back up if EOF seen. + +2007-09-06 Tom Tromey + + * internal.h (struct cpp_reader) : New + field. + (struct cpp_reader) : Likewise. + * init.c (cpp_set_line_map): New function. + * line-map.c (linemap_add): Use linemap's allocator. + * include/line-map.h (GTY): Define. + (line_map_realloc): New typedef. + (struct line_map): Mark with GTY. + (struct line_maps): Likewise. + (struct line_maps) : Likewise. + (struct line_maps) : New field. + * include/symtab.h (GTY): Conditionally define. + * include/cpplib.h (cpp_set_line_map): Declare. + (cpp_get_token_with_location): Declare. + * macro.c (cpp_get_token): Set invocation_location on the reader. + (cpp_get_token_with_location): New function. + +2007-08-30 Chao-ying Fu + + * expr.c (interpret_float_suffix): Support hr, r, lr, llr, uhr, ur, + ulr, ullr, hk, k, lk, llk, uhk, uk, ulk, ullk. + (cpp_classify_number): Support decimal fixed-point constants without + exponents. + Warn about fixed-point constants when -pedantic. + * include/cpplib.h (CPP_N_SMALL, CPP_N_MEDIUM, CPP_N_LARGE): Change + comments to support fixed-point values. + (CPP_N_FRACT, CPP_N_ACCUM): Define. + +2007-08-18 Tom Tromey + + PR preprocessor/32974 + * directives.c (parse_include): Don't check for EOL when + processing #pragma dependency. + +2007-07-30 Ollie Wild + + * directives-only.c: New file. + * internal.h (struct _cpp_dir_only_callbacks): New. + (_cpp_preprocess_dir_only): New function. + * directives.c (_cpp_handle_directive): Check directives_only before + disabling execution of indented directives. + * files.c (_cpp_stack_file): Add directives_only check. + * include/cpplib.h (struct cpp_options): Add directives_only. + (cpp_init_special_builtins): New function. + * init.c (cpp_init_special_builtins): New function. + (cpp_init_builtins): Move builtin_array initialization to + cpp_init_special_builtins. + (post_options): Check directives_only before setting + pfile->state.prevent_expansion = 1. + * macro.c (_cpp_builtin_macro_text): Print an error if __COUNTER__ + is expanded inside a directive while -fdirectives-only is enabled. + * Makefile.in (libcpp_a_OBJS): Add directives-only.o. + (libcpp_a_SOURCES): Add directives-only.c. + 2007-07-04 Uros Bizjak * traditional.c (_cpp_scan_out_logical_line): Initialize @@ -89,7 +245,7 @@ 2007-05-02 Tom Tromey - PR preprocessor/28709: + PR preprocessor/28709 * macro.c (paste_tokens): Remove PASTE_LEFT from the old lhs. 2007-03-30 Michael Meissner @@ -109,13 +265,13 @@ 2007-01-30 Tom Tromey - PR preprocessor/30468: + PR preprocessor/30468 * mkdeps.c (apply_vpath): Strip successive '/'s if we stripped './'. 2007-01-30 Tom Tromey - PR preprocessor/29966: + PR preprocessor/29966 * macro.c (lex_expansion_token): Save and restore cpp_reader's cur_token. (_cpp_create_definition): Don't restore cur_token here. @@ -127,7 +283,7 @@ 2007-01-12 Tom Tromey - PR preprocessor/28227: + PR preprocessor/28227 * directives.c (lex_macro_node): Added 'is_def_or_undef' argument. (do_define): Update. @@ -145,7 +301,7 @@ 2007-01-04 Tom Tromey - PR preprocessor/28165: + PR preprocessor/28165 * internal.h (cpp_in_primary_file): New function. * directives.c (do_include_next): Use cpp_in_primary_file. (do_pragma_once): Likewise. @@ -164,7 +320,7 @@ 2006-12-28 Tom Tromey - PR preprocessor/30001: + PR preprocessor/30001 * charset.c (_cpp_convert_input): Check that to.len is greater than zero. diff --git a/libcpp/Makefile.in b/libcpp/Makefile.in index 166f1faaee0..960a42d56e3 100644 --- a/libcpp/Makefile.in +++ b/libcpp/Makefile.in @@ -69,14 +69,14 @@ INCLUDES = -I$(srcdir) -I. -I$(srcdir)/../include @INCINTL@ \ ALL_CFLAGS = $(CFLAGS) $(WARN_CFLAGS) $(INCLUDES) $(CPPFLAGS) -libcpp_a_OBJS = charset.o directives.o errors.o expr.o files.o \ - identifiers.o init.o lex.o line-map.o macro.o mkdeps.o \ - pch.o symtab.o traditional.o +libcpp_a_OBJS = charset.o directives.o directives-only.o errors.o \ + expr.o files.o identifiers.o init.o lex.o line-map.o macro.o \ + mkdeps.o pch.o symtab.o traditional.o makedepend_OBJS = makedepend.o -libcpp_a_SOURCES = charset.c directives.c errors.c expr.c files.c \ - identifiers.c init.c lex.c line-map.c macro.c mkdeps.c \ - pch.c symtab.c traditional.c +libcpp_a_SOURCES = charset.c directives.c directives-only.c errors.c \ + expr.c files.c identifiers.c init.c lex.c line-map.c macro.c \ + mkdeps.c pch.c symtab.c traditional.c all: libcpp.a makedepend$(EXEEXT) $(USED_CATALOGS) diff --git a/libcpp/charset.c b/libcpp/charset.c index d1323601bd1..5db8fc13430 100644 --- a/libcpp/charset.c +++ b/libcpp/charset.c @@ -548,6 +548,15 @@ convert_no_conversion (iconv_t cd ATTRIBUTE_UNUSED, /* And this one uses the system iconv primitive. It's a little different, since iconv's interface is a little different. */ #if HAVE_ICONV + +#define CONVERT_ICONV_GROW_BUFFER \ + do { \ + outbytesleft += OUTBUF_BLOCK_SIZE; \ + to->asize += OUTBUF_BLOCK_SIZE; \ + to->text = XRESIZEVEC (uchar, to->text, to->asize); \ + outbuf = (char *)to->text + to->asize - outbytesleft; \ + } while (0) + static bool convert_using_iconv (iconv_t cd, const uchar *from, size_t flen, struct _cpp_strbuf *to) @@ -570,16 +579,24 @@ convert_using_iconv (iconv_t cd, const uchar *from, size_t flen, iconv (cd, &inbuf, &inbytesleft, &outbuf, &outbytesleft); if (__builtin_expect (inbytesleft == 0, 1)) { + /* Close out any shift states, returning to the initial state. */ + if (iconv (cd, 0, 0, &outbuf, &outbytesleft) == (size_t)-1) + { + if (errno != E2BIG) + return false; + + CONVERT_ICONV_GROW_BUFFER; + if (iconv (cd, 0, 0, &outbuf, &outbytesleft) == (size_t)-1) + return false; + } + to->len = to->asize - outbytesleft; return true; } if (errno != E2BIG) return false; - outbytesleft += OUTBUF_BLOCK_SIZE; - to->asize += OUTBUF_BLOCK_SIZE; - to->text = XRESIZEVEC (uchar, to->text, to->asize); - outbuf = (char *)to->text + to->asize - outbytesleft; + CONVERT_ICONV_GROW_BUFFER; } } #else diff --git a/libcpp/config.in b/libcpp/config.in index 2b05ba0c401..5d52ec12210 100644 --- a/libcpp/config.in +++ b/libcpp/config.in @@ -280,3 +280,6 @@ /* Define to `unsigned' if does not define. */ #undef size_t + +/* Define to `int' if does not define. */ +#undef ssize_t diff --git a/libcpp/configure b/libcpp/configure index 82fd6b55f49..5d70aed0487 100755 --- a/libcpp/configure +++ b/libcpp/configure @@ -4114,6 +4114,72 @@ _ACEOF fi +echo "$as_me:$LINENO: checking for ssize_t" >&5 +echo $ECHO_N "checking for ssize_t... $ECHO_C" >&6 +if test "${ac_cv_type_ssize_t+set}" = set; then + echo $ECHO_N "(cached) $ECHO_C" >&6 +else + cat >conftest.$ac_ext <<_ACEOF +/* confdefs.h. */ +_ACEOF +cat confdefs.h >>conftest.$ac_ext +cat >>conftest.$ac_ext <<_ACEOF +/* end confdefs.h. */ +$ac_includes_default +int +main () +{ +if ((ssize_t *) 0) + return 0; +if (sizeof (ssize_t)) + return 0; + ; + return 0; +} +_ACEOF +rm -f conftest.$ac_objext +if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5 + (eval $ac_compile) 2>conftest.er1 + ac_status=$? + grep -v '^ *+' conftest.er1 >conftest.err + rm -f conftest.er1 + cat conftest.err >&5 + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); } && + { ac_try='test -z "$ac_c_werror_flag" + || test ! -s conftest.err' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; } && + { ac_try='test -s conftest.$ac_objext' + { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5 + (eval $ac_try) 2>&5 + ac_status=$? + echo "$as_me:$LINENO: \$? = $ac_status" >&5 + (exit $ac_status); }; }; then + ac_cv_type_ssize_t=yes +else + echo "$as_me: failed program was:" >&5 +sed 's/^/| /' conftest.$ac_ext >&5 + +ac_cv_type_ssize_t=no +fi +rm -f conftest.err conftest.$ac_objext conftest.$ac_ext +fi +echo "$as_me:$LINENO: result: $ac_cv_type_ssize_t" >&5 +echo "${ECHO_T}$ac_cv_type_ssize_t" >&6 +if test $ac_cv_type_ssize_t = yes; then + : +else + +cat >>confdefs.h <<_ACEOF +#define ssize_t int +_ACEOF + +fi + echo "$as_me:$LINENO: checking whether struct tm is in sys/time.h or time.h" >&5 echo $ECHO_N "checking whether struct tm is in sys/time.h or time.h... $ECHO_C" >&6 if test "${ac_cv_struct_tm+set}" = set; then diff --git a/libcpp/configure.ac b/libcpp/configure.ac index 8a23633f4de..40f62715acd 100644 --- a/libcpp/configure.ac +++ b/libcpp/configure.ac @@ -46,6 +46,7 @@ AC_C_INLINE AC_FUNC_OBSTACK AC_TYPE_OFF_T AC_TYPE_SIZE_T +AC_CHECK_TYPE(ssize_t, int) AC_STRUCT_TM AC_CHECK_SIZEOF(int) AC_CHECK_SIZEOF(long) diff --git a/libcpp/directives-only.c b/libcpp/directives-only.c new file mode 100644 index 00000000000..d50cebbdae3 --- /dev/null +++ b/libcpp/directives-only.c @@ -0,0 +1,240 @@ +/* CPP Library - directive only preprocessing for distributed compilation. + Copyright (C) 2007 + Free Software Foundation, Inc. + Contributed by Ollie Wild . + +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 +Free Software Foundation; either version 2, or (at your option) any +later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program; if not, write to the Free Software +Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ + +#include "config.h" +#include "system.h" +#include "cpplib.h" +#include "internal.h" + +/* DO (Directive only) flags. */ +#define DO_BOL (1 << 0) /* At the beginning of a logical line. */ +#define DO_STRING (1 << 1) /* In a string constant. */ +#define DO_CHAR (1 << 2) /* In a character constant. */ +#define DO_BLOCK_COMMENT (1 << 3) /* In a block comment. */ +#define DO_LINE_COMMENT (1 << 4) /* In a single line "//-style" comment. */ + +#define DO_LINE_SPECIAL (DO_STRING | DO_CHAR | DO_LINE_COMMENT) +#define DO_SPECIAL (DO_LINE_SPECIAL | DO_BLOCK_COMMENT) + +/* Writes out the preprocessed file, handling spacing and paste + avoidance issues. */ +void +_cpp_preprocess_dir_only (cpp_reader *pfile, + const struct _cpp_dir_only_callbacks *cb) +{ + struct cpp_buffer *buffer; + const unsigned char *cur, *base, *next_line, *rlimit; + cppchar_t c, last_c; + unsigned flags; + int lines, col; + source_location loc; + + restart: + /* Buffer initialization ala _cpp_clean_line(). */ + buffer = pfile->buffer; + buffer->cur_note = buffer->notes_used = 0; + buffer->cur = buffer->line_base = buffer->next_line; + buffer->need_line = false; + + /* This isn't really needed. It prevents a compiler warning, though. */ + loc = pfile->line_table->highest_line; + + /* Scan initialization. */ + next_line = cur = base = buffer->cur; + rlimit = buffer->rlimit; + flags = DO_BOL; + lines = 0; + col = 1; + + for (last_c = '\n', c = *cur; cur < rlimit; last_c = c, c = *++cur, ++col) + { + /* Skip over escaped newlines. */ + if (__builtin_expect (c == '\\', false)) + { + const unsigned char *tmp = cur + 1; + + while (is_nvspace (*tmp) && tmp < rlimit) + tmp++; + if (*tmp == '\r') + tmp++; + if (*tmp == '\n' && tmp < rlimit) + { + CPP_INCREMENT_LINE (pfile, 0); + lines++; + col = 0; + cur = tmp; + c = last_c; + continue; + } + } + + if (__builtin_expect (last_c == '#', false) && !(flags & DO_SPECIAL)) + { + if (c != '#' && (flags & DO_BOL)) + { + struct line_maps *line_table; + + if (!pfile->state.skipping && next_line != base) + cb->print_lines (lines, base, next_line - base); + + /* Prep things for directive handling. */ + buffer->next_line = cur; + buffer->need_line = true; + _cpp_get_fresh_line (pfile); + + /* Ensure proper column numbering for generated error messages. */ + buffer->line_base -= col - 1; + + _cpp_handle_directive (pfile, 0 /* ignore indented */); + + /* Sanitize the line settings. Duplicate #include's can mess + things up. */ + line_table = pfile->line_table; + line_table->highest_location = line_table->highest_line; + + /* The if block prevents us from outputing line information when + the file ends with a directive and no newline. Note that we + must use pfile->buffer, not buffer. */ + if (pfile->buffer->next_line < pfile->buffer->rlimit) + cb->maybe_print_line (pfile->line_table->highest_line); + + goto restart; + } + + flags &= ~DO_BOL; + pfile->mi_valid = false; + } + else if (__builtin_expect (last_c == '/', false) \ + && !(flags & DO_SPECIAL) && c != '*' && c != '/') + { + /* If a previous slash is not starting a block comment, clear the + DO_BOL flag. */ + flags &= ~DO_BOL; + pfile->mi_valid = false; + } + + switch (c) + { + case '/': + if ((flags & DO_BLOCK_COMMENT) && last_c == '*') + { + flags &= ~DO_BLOCK_COMMENT; + c = 0; + } + else if (!(flags & DO_SPECIAL) && last_c == '/') + flags |= DO_LINE_COMMENT; + else if (!(flags & DO_SPECIAL)) + /* Mark the position for possible error reporting. */ + LINEMAP_POSITION_FOR_COLUMN (loc, pfile->line_table, col); + + break; + + case '*': + if (!(flags & DO_SPECIAL)) + { + if (last_c == '/') + flags |= DO_BLOCK_COMMENT; + else + { + flags &= ~DO_BOL; + pfile->mi_valid = false; + } + } + + break; + + case '\'': + case '"': + { + unsigned state = (c == '"') ? DO_STRING : DO_CHAR; + + if (!(flags & DO_SPECIAL)) + { + flags |= state; + flags &= ~DO_BOL; + pfile->mi_valid = false; + } + else if ((flags & state) && last_c != '\\') + flags &= ~state; + + break; + } + + case '\\': + { + if ((flags & (DO_STRING | DO_CHAR)) && last_c == '\\') + c = 0; + + if (!(flags & DO_SPECIAL)) + { + flags &= ~DO_BOL; + pfile->mi_valid = false; + } + + break; + } + + case '\n': + CPP_INCREMENT_LINE (pfile, 0); + lines++; + col = 0; + flags &= ~DO_LINE_SPECIAL; + if (!(flags & DO_SPECIAL)) + flags |= DO_BOL; + break; + + case '#': + next_line = cur; + /* Don't update DO_BOL yet. */ + break; + + case ' ': case '\t': case '\f': case '\v': case '\0': + break; + + default: + if (!(flags & DO_SPECIAL)) + { + flags &= ~DO_BOL; + pfile->mi_valid = false; + } + break; + } + } + + if (flags & DO_BLOCK_COMMENT) + cpp_error_with_line (pfile, CPP_DL_ERROR, loc, 0, "unterminated comment"); + + if (!pfile->state.skipping && cur != base) + { + /* If the file was not newline terminated, add rlimit, which is + guaranteed to point to a newline, to the end of our range. */ + if (cur[-1] != '\n') + { + cur++; + CPP_INCREMENT_LINE (pfile, 0); + lines++; + } + + cb->print_lines (lines, base, cur - base); + } + + _cpp_pop_buffer (pfile); + if (pfile->buffer) + goto restart; +} diff --git a/libcpp/directives.c b/libcpp/directives.c index ccb9f32b61d..c77e84bfec1 100644 --- a/libcpp/directives.c +++ b/libcpp/directives.c @@ -1,7 +1,7 @@ /* CPP Library. (Directive handling.) Copyright (C) 1986, 1987, 1989, 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, - 2007 Free Software Foundation, Inc. + 2007, 2008 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 @@ -424,8 +424,13 @@ _cpp_handle_directive (cpp_reader *pfile, int indented) does not cause '#define foo bar' to get executed when compiled with -save-temps, we recognize directives in -fpreprocessed mode only if the # is in column 1. macro.c - puts a space in front of any '#' at the start of a macro. */ + puts a space in front of any '#' at the start of a macro. + + We exclude the -fdirectives-only case because macro expansion + has not been performed yet, and block comments can cause spaces + to preceed the directive. */ if (CPP_OPTION (pfile, preprocessed) + && !CPP_OPTION (pfile, directives_only) && (indented || !(dir->flags & IN_I))) { skip = 0; @@ -470,7 +475,7 @@ _cpp_handle_directive (cpp_reader *pfile, int indented) _cpp_backup_tokens (pfile, 1); end_directive (pfile, skip); - if (was_parsing_args) + if (was_parsing_args && !pfile->state.in_deferred_pragma) { /* Restore state when within macro args. */ pfile->state.parsing_args = 2; @@ -693,7 +698,11 @@ parse_include (cpp_reader *pfile, int *pangle_brackets, return NULL; } - if (buf == NULL || CPP_OPTION (pfile, discard_comments)) + if (pfile->directive == &dtable[T_PRAGMA]) + { + /* This pragma allows extra tokens after the file name. */ + } + else if (buf == NULL || CPP_OPTION (pfile, discard_comments)) check_eol (pfile); else { @@ -855,9 +864,12 @@ do_line (cpp_reader *pfile) || strtoul_for_line (token->val.str.text, token->val.str.len, &new_lineno)) { - cpp_error (pfile, CPP_DL_ERROR, - "\"%s\" after #line is not a positive integer", - cpp_token_as_text (pfile, token)); + if (token->type == CPP_EOF) + cpp_error (pfile, CPP_DL_ERROR, "unexpected end of file after #line"); + else + cpp_error (pfile, CPP_DL_ERROR, + "\"%s\" after #line is not a positive integer", + cpp_token_as_text (pfile, token)); return; } @@ -911,6 +923,8 @@ do_linemarker (cpp_reader *pfile) || strtoul_for_line (token->val.str.text, token->val.str.len, &new_lineno)) { + /* Unlike #line, there does not seem to be a way to get an EOF + here. So, it should be safe to always spell the token. */ cpp_error (pfile, CPP_DL_ERROR, "\"%s\" after # is not a positive integer", cpp_token_as_text (pfile, token)); @@ -1458,15 +1472,24 @@ static const cpp_token * get__Pragma_string (cpp_reader *pfile) { const cpp_token *string; + const cpp_token *paren; - if (get_token_no_padding (pfile)->type != CPP_OPEN_PAREN) + paren = get_token_no_padding (pfile); + if (paren->type == CPP_EOF) + _cpp_backup_tokens (pfile, 1); + if (paren->type != CPP_OPEN_PAREN) return NULL; string = get_token_no_padding (pfile); + if (string->type == CPP_EOF) + _cpp_backup_tokens (pfile, 1); if (string->type != CPP_STRING && string->type != CPP_WSTRING) return NULL; - if (get_token_no_padding (pfile)->type != CPP_CLOSE_PAREN) + paren = get_token_no_padding (pfile); + if (paren->type == CPP_EOF) + _cpp_backup_tokens (pfile, 1); + if (paren->type != CPP_CLOSE_PAREN) return NULL; return string; @@ -1586,18 +1609,21 @@ destringize_and_run (cpp_reader *pfile, const cpp_string *in) _cpp_push_token_context (pfile, NULL, toks, count); } -/* Handle the _Pragma operator. */ -void +/* Handle the _Pragma operator. Return 0 on error, 1 if ok. */ +int _cpp_do__Pragma (cpp_reader *pfile) { const cpp_token *string = get__Pragma_string (pfile); pfile->directive_result.type = CPP_PADDING; if (string) - destringize_and_run (pfile, &string->val.str); - else - cpp_error (pfile, CPP_DL_ERROR, - "_Pragma takes a parenthesized string literal"); + { + destringize_and_run (pfile, &string->val.str); + return 1; + } + cpp_error (pfile, CPP_DL_ERROR, + "_Pragma takes a parenthesized string literal"); + return 0; } /* Handle #ifdef. */ diff --git a/libcpp/expr.c b/libcpp/expr.c index f20d50c3fdd..9df75332c05 100644 --- a/libcpp/expr.c +++ b/libcpp/expr.c @@ -83,12 +83,18 @@ static unsigned int interpret_float_suffix (const uchar *s, size_t len) { size_t f, l, w, q, i, d; + size_t r, k, u, h; f = l = w = q = i = d = 0; + r = k = u = h = 0; while (len--) switch (s[len]) { + case 'r': case 'R': r++; break; + case 'k': case 'K': k++; break; + case 'u': case 'U': u++; break; + case 'h': case 'H': h++; break; case 'f': case 'F': if (d > 0) return 0; @@ -98,6 +104,9 @@ interpret_float_suffix (const uchar *s, size_t len) if (d > 0) return 0; l++; + /* If there are two Ls, they must be adjacent and the same case. */ + if (l == 2 && s[len] != s[len + 1]) + return 0; break; case 'w': case 'W': if (d > 0) @@ -116,7 +125,34 @@ interpret_float_suffix (const uchar *s, size_t len) return 0; } - if (f + l + w + q > 1 || i > 1) + if (r + k > 1 || h > 1 || l > 2 || u > 1) + return 0; + + if (r == 1) + { + if (f || i || d || w || q) + return 0; + + return (CPP_N_FRACT + | (u ? CPP_N_UNSIGNED : 0) + | (h ? CPP_N_SMALL : + l == 2 ? CPP_N_LARGE : + l == 1 ? CPP_N_MEDIUM : 0)); + } + + if (k == 1) + { + if (f || i || d || w || q) + return 0; + + return (CPP_N_ACCUM + | (u ? CPP_N_UNSIGNED : 0) + | (h ? CPP_N_SMALL : + l == 2 ? CPP_N_LARGE : + l == 1 ? CPP_N_MEDIUM : 0)); + } + + if (f + l + w + q > 1 || i > 1 || h + u > 0) return 0; /* Allow dd, df, dl suffixes for decimal float constants. */ @@ -238,6 +274,26 @@ cpp_classify_number (cpp_reader *pfile, const cpp_token *token) } } + /* The suffix may be for decimal fixed-point constants without exponent. */ + if (radix != 16 && float_flag == NOT_FLOAT) + { + result = interpret_float_suffix (str, limit - str); + if ((result & CPP_N_FRACT) || (result & CPP_N_ACCUM)) + { + result |= CPP_N_FLOATING; + /* We need to restore the radix to 10, if the radix is 8. */ + if (radix == 8) + radix = 10; + + if (CPP_PEDANTIC (pfile)) + cpp_error (pfile, CPP_DL_PEDWARN, + "fixed-point constants are a GCC extension"); + goto syntax_ok; + } + else + result = 0; + } + if (float_flag != NOT_FLOAT && radix == 8) radix = 10; @@ -304,6 +360,10 @@ cpp_classify_number (cpp_reader *pfile, const cpp_token *token) return CPP_N_INVALID; } + if ((result & (CPP_N_FRACT | CPP_N_ACCUM)) && CPP_PEDANTIC (pfile)) + cpp_error (pfile, CPP_DL_PEDWARN, + "fixed-point constants are a GCC extension"); + if ((result & CPP_N_DFLOAT) && CPP_PEDANTIC (pfile)) cpp_error (pfile, CPP_DL_PEDWARN, "decimal float constants are a GCC extension"); @@ -343,6 +403,7 @@ cpp_classify_number (cpp_reader *pfile, const cpp_token *token) result |= CPP_N_INTEGER; } + syntax_ok: if ((result & CPP_N_IMAGINARY) && CPP_PEDANTIC (pfile)) cpp_error (pfile, CPP_DL_PEDWARN, "imaginary constants are a GCC extension"); diff --git a/libcpp/files.c b/libcpp/files.c index e03324b2e4f..467bb145ab9 100644 --- a/libcpp/files.c +++ b/libcpp/files.c @@ -142,6 +142,7 @@ struct file_hash_entry { struct file_hash_entry *next; cpp_dir *start_dir; + source_location location; union { _cpp_file *file; @@ -149,6 +150,21 @@ struct file_hash_entry } u; }; +/* Number of entries to put in a file_hash_entry pool. */ +#define FILE_HASH_POOL_SIZE 127 + +/* A file hash entry pool. We allocate file_hash_entry object from + one of these. */ +struct file_hash_entry_pool +{ + /* Number of entries used from this pool. */ + unsigned int file_hash_entries_used; + /* Next pool in the chain; used when freeing. */ + struct file_hash_entry_pool *next; + /* The memory pool. */ + struct file_hash_entry pool[FILE_HASH_POOL_SIZE]; +}; + static bool open_file (_cpp_file *file); static bool pch_open_file (cpp_reader *pfile, _cpp_file *file, bool *invalid_pch); @@ -521,6 +537,7 @@ _cpp_find_file (cpp_reader *pfile, const char *fname, cpp_dir *start_dir, bool f entry = new_file_hash_entry (pfile); entry->next = *hash_slot; entry->start_dir = start_dir; + entry->location = pfile->line_table->highest_location; entry->u.file = file; *hash_slot = entry; @@ -533,6 +550,7 @@ _cpp_find_file (cpp_reader *pfile, const char *fname, cpp_dir *start_dir, bool f entry = new_file_hash_entry (pfile); entry->next = *hash_slot; entry->start_dir = pfile->bracket_include; + entry->location = pfile->line_table->highest_location; entry->u.file = file; *hash_slot = entry; } @@ -543,6 +561,7 @@ _cpp_find_file (cpp_reader *pfile, const char *fname, cpp_dir *start_dir, bool f entry = new_file_hash_entry (pfile); entry->next = *hash_slot; entry->start_dir = pfile->quote_include; + entry->location = pfile->line_table->highest_location; entry->u.file = file; *hash_slot = entry; } @@ -791,7 +810,8 @@ _cpp_stack_file (cpp_reader *pfile, _cpp_file *file, bool import) /* Stack the buffer. */ buffer = cpp_push_buffer (pfile, file->buffer, file->st.st_size, - CPP_OPTION (pfile, preprocessed)); + CPP_OPTION (pfile, preprocessed) + && !CPP_OPTION (pfile, directives_only)); buffer->file = file; buffer->sysp = sysp; @@ -832,7 +852,8 @@ search_path_head (cpp_reader *pfile, const char *fname, int angle_brackets, /* For #include_next, skip in the search path past the dir in which the current file was found, but if it was found via an absolute path use the normal search logic. */ - if (type == IT_INCLUDE_NEXT && file->dir) + if (type == IT_INCLUDE_NEXT && file->dir + && file->dir != &pfile->no_search_path) dir = file->dir->next; else if (angle_brackets) dir = pfile->bracket_include; @@ -958,6 +979,19 @@ destroy_cpp_file (_cpp_file *file) free (file); } +/* Release all the files allocated by this reader. */ +static void +destroy_all_cpp_files (cpp_reader *pfile) +{ + _cpp_file *iter = pfile->all_files; + while (iter) + { + _cpp_file *next = iter->next_file; + destroy_cpp_file (iter); + iter = next; + } +} + /* A hash of directory names. The directory names are the path names of files which contain a #include "", the included file name is appended to this directories. @@ -992,6 +1026,7 @@ make_cpp_dir (cpp_reader *pfile, const char *dir_name, int sysp) entry = new_file_hash_entry (pfile); entry->next = *hash_slot; entry->start_dir = NULL; + entry->location = pfile->line_table->highest_location; entry->u.dir = dir; *hash_slot = entry; @@ -1002,20 +1037,35 @@ make_cpp_dir (cpp_reader *pfile, const char *dir_name, int sysp) static void allocate_file_hash_entries (cpp_reader *pfile) { - pfile->file_hash_entries_used = 0; - pfile->file_hash_entries_allocated = 127; - pfile->file_hash_entries = XNEWVEC (struct file_hash_entry, - pfile->file_hash_entries_allocated); + struct file_hash_entry_pool *pool = XNEW (struct file_hash_entry_pool); + pool->file_hash_entries_used = 0; + pool->next = pfile->file_hash_entries; + pfile->file_hash_entries = pool; } /* Return a new file hash entry. */ static struct file_hash_entry * new_file_hash_entry (cpp_reader *pfile) { - if (pfile->file_hash_entries_used == pfile->file_hash_entries_allocated) + unsigned int idx; + if (pfile->file_hash_entries->file_hash_entries_used == FILE_HASH_POOL_SIZE) allocate_file_hash_entries (pfile); - return &pfile->file_hash_entries[pfile->file_hash_entries_used++]; + idx = pfile->file_hash_entries->file_hash_entries_used++; + return &pfile->file_hash_entries->pool[idx]; +} + +/* Free the file hash entry pools. */ +static void +free_file_hash_entries (cpp_reader *pfile) +{ + struct file_hash_entry_pool *iter = pfile->file_hash_entries; + while (iter) + { + struct file_hash_entry_pool *next = iter->next; + free (iter); + iter = next; + } } /* Returns TRUE if a file FNAME has ever been successfully opened. @@ -1035,6 +1085,25 @@ cpp_included (cpp_reader *pfile, const char *fname) return entry != NULL; } +/* Returns TRUE if a file FNAME has ever been successfully opened + before LOCATION. This routine is not intended to correctly handle + filenames aliased by links or redundant . or .. traversals etc. */ +bool +cpp_included_before (cpp_reader *pfile, const char *fname, + source_location location) +{ + struct file_hash_entry *entry; + + entry = (struct file_hash_entry *) + htab_find_with_hash (pfile->file_hash, fname, htab_hash_string (fname)); + + while (entry && (entry->start_dir == NULL || entry->u.file->err_no + || entry->location > location)) + entry = entry->next; + + return entry != NULL; +} + /* Calculate the hash value of a file hash entry P. */ static hashval_t @@ -1099,6 +1168,19 @@ _cpp_cleanup_files (cpp_reader *pfile) htab_delete (pfile->dir_hash); htab_delete (pfile->nonexistent_file_hash); obstack_free (&pfile->nonexistent_file_ob, 0); + free_file_hash_entries (pfile); + destroy_all_cpp_files (pfile); +} + +/* Make the parser forget about files it has seen. This can be useful + for resetting the parser to start another run. */ +void +cpp_clear_file_cache (cpp_reader *pfile) +{ + _cpp_cleanup_files (pfile); + pfile->file_hash_entries = NULL; + pfile->all_files = NULL; + _cpp_init_files (pfile); } /* Enter a file name in the hash for the sake of cpp_included. */ diff --git a/libcpp/include/cpplib.h b/libcpp/include/cpplib.h index ee46c4f169f..e205be7cd6c 100644 --- a/libcpp/include/cpplib.h +++ b/libcpp/include/cpplib.h @@ -1,6 +1,6 @@ /* Definitions for CPP library. Copyright (C) 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, - 2004, 2005 + 2004, 2005, 2007 Free Software Foundation, Inc. Written by Per Bothner, 1994-95. @@ -440,6 +440,9 @@ struct cpp_options /* True means error callback should be used for diagnostics. */ bool client_diagnostic; + + /* True disables tokenization outside of preprocessing directives. */ + bool directives_only; }; /* Callback for header lookup for HEADER, which is the name of a @@ -620,6 +623,10 @@ struct cpp_hashnode GTY(()) extern cpp_reader *cpp_create_reader (enum c_lang, struct ht *, struct line_maps *); +/* Reset the cpp_reader's line_map. This is only used after reading a + PCH file. */ +extern void cpp_set_line_map (cpp_reader *, struct line_maps *); + /* Call this to change the selected language standard (e.g. because of command line options). */ extern void cpp_set_lang (cpp_reader *, enum c_lang); @@ -644,6 +651,10 @@ extern struct deps *cpp_get_deps (cpp_reader *); too. If there was an error opening the file, it returns NULL. */ extern const char *cpp_read_main_file (cpp_reader *, const char *); +/* Set up built-ins with special behavior. Use cpp_init_builtins() + instead unless your know what you are doing. */ +extern void cpp_init_special_builtins (cpp_reader *); + /* Set up built-ins like __FILE__. */ extern void cpp_init_builtins (cpp_reader *, int); @@ -680,6 +691,8 @@ extern void cpp_register_deferred_pragma (cpp_reader *, const char *, extern int cpp_avoid_paste (cpp_reader *, const cpp_token *, const cpp_token *); extern const cpp_token *cpp_get_token (cpp_reader *); +extern const cpp_token *cpp_get_token_with_location (cpp_reader *, + source_location *); extern const unsigned char *cpp_macro_definition (cpp_reader *, const cpp_hashnode *); extern void _cpp_backup_tokens (cpp_reader *, unsigned int); @@ -740,9 +753,10 @@ struct cpp_num #define CPP_N_FLOATING 0x0002 #define CPP_N_WIDTH 0x00F0 -#define CPP_N_SMALL 0x0010 /* int, float. */ -#define CPP_N_MEDIUM 0x0020 /* long, double. */ -#define CPP_N_LARGE 0x0040 /* long long, long double. */ +#define CPP_N_SMALL 0x0010 /* int, float, shrot _Fract/Accum */ +#define CPP_N_MEDIUM 0x0020 /* long, double, long _Fract/_Accum. */ +#define CPP_N_LARGE 0x0040 /* long long, long double, + long long _Fract/Accum. */ #define CPP_N_WIDTH_MD 0xF0000 /* machine defined. */ #define CPP_N_MD_W 0x10000 @@ -758,6 +772,9 @@ struct cpp_num #define CPP_N_IMAGINARY 0x2000 #define CPP_N_DFLOAT 0x4000 +#define CPP_N_FRACT 0x100000 /* Fract types. */ +#define CPP_N_ACCUM 0x200000 /* Accum types. */ + /* Classify a CPP_NUMBER token. The return value is a combination of the flags from the above sets. */ extern unsigned cpp_classify_number (cpp_reader *, const cpp_token *); @@ -836,6 +853,7 @@ extern unsigned char *cpp_quote_string (unsigned char *, const unsigned char *, /* In cppfiles.c */ extern bool cpp_included (cpp_reader *, const char *); +extern bool cpp_included_before (cpp_reader *, const char *, source_location); extern void cpp_make_system_header (cpp_reader *, int, int); extern bool cpp_push_include (cpp_reader *, const char *); extern void cpp_change_file (cpp_reader *, enum lc_reason, const char *); @@ -844,6 +862,7 @@ extern cpp_dir *cpp_get_dir (struct _cpp_file *); extern cpp_buffer *cpp_get_buffer (cpp_reader *); 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 *); /* In cpppch.c */ struct save_macro_data; diff --git a/libcpp/include/line-map.h b/libcpp/include/line-map.h index 7e9ede01a1a..cddc74d432e 100644 --- a/libcpp/include/line-map.h +++ b/libcpp/include/line-map.h @@ -1,5 +1,5 @@ /* Map logical line numbers to (source file, line number) pairs. - Copyright (C) 2001, 2003, 2004 + Copyright (C) 2001, 2003, 2004, 2007 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it @@ -23,6 +23,10 @@ Foundation, 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. #ifndef LIBCPP_LINE_MAP_H #define LIBCPP_LINE_MAP_H +#ifndef GTY +#define GTY(x) /* nothing */ +#endif + /* Reason for adding a line change with add_line_map (). LC_ENTER is when including a new file, e.g. a #include directive in C. LC_LEAVE is when reaching a file's end. LC_RENAME is when a file @@ -35,6 +39,9 @@ enum lc_reason {LC_ENTER = 0, LC_LEAVE, LC_RENAME}; and effectively typedef source_location location_t. */ typedef unsigned int source_location; +/* Memory allocation function typedef. Works like xrealloc. */ +typedef void *(*line_map_realloc) (void *, size_t); + /* Physical source file TO_FILE at line TO_LINE at column 0 is represented by the logical START_LOCATION. TO_LINE+L at column C is represented by START_LOCATION+(L*(1<line_table = line_table; +} + /* Free resources used by PFILE. Accessing PFILE after this function returns leads to undefined behavior. Returns the error count. */ void @@ -350,11 +358,8 @@ mark_named_operators (cpp_reader *pfile) } } -/* Read the builtins table above and enter them, and language-specific - macros, into the hash table. HOSTED is true if this is a hosted - environment. */ void -cpp_init_builtins (cpp_reader *pfile, int hosted) +cpp_init_special_builtins (cpp_reader *pfile) { const struct builtin *b; size_t n = ARRAY_SIZE (builtin_array); @@ -363,10 +368,7 @@ cpp_init_builtins (cpp_reader *pfile, int hosted) n -= 2; else if (! CPP_OPTION (pfile, stdc_0_in_system_headers) || CPP_OPTION (pfile, std)) - { - n--; - _cpp_define_builtin (pfile, "__STDC__ 1"); - } + n--; for (b = builtin_array; b < builtin_array + n; b++) { @@ -375,6 +377,20 @@ cpp_init_builtins (cpp_reader *pfile, int hosted) hp->flags |= NODE_BUILTIN | NODE_WARN; hp->value.builtin = (enum builtin_type) b->value; } +} + +/* Read the builtins table above and enter them, and language-specific + macros, into the hash table. HOSTED is true if this is a hosted + environment. */ +void +cpp_init_builtins (cpp_reader *pfile, int hosted) +{ + cpp_init_special_builtins (pfile); + + if (!CPP_OPTION (pfile, traditional) + && (! CPP_OPTION (pfile, stdc_0_in_system_headers) + || CPP_OPTION (pfile, std))) + _cpp_define_builtin (pfile, "__STDC__ 1"); if (CPP_OPTION (pfile, cplusplus)) _cpp_define_builtin (pfile, "__cplusplus 1"); @@ -622,7 +638,8 @@ post_options (cpp_reader *pfile) preprocessed text. Read preprocesed source in ISO mode. */ if (CPP_OPTION (pfile, preprocessed)) { - pfile->state.prevent_expansion = 1; + if (!CPP_OPTION (pfile, directives_only)) + pfile->state.prevent_expansion = 1; CPP_OPTION (pfile, traditional) = 0; } diff --git a/libcpp/internal.h b/libcpp/internal.h index d000cfda54f..6110e5cdb08 100644 --- a/libcpp/internal.h +++ b/libcpp/internal.h @@ -339,6 +339,14 @@ struct cpp_reader /* Token generated while handling a directive, if any. */ cpp_token directive_result; + /* When expanding a macro at top-level, this is the location of the + macro invocation. */ + source_location invocation_location; + + /* True if this call to cpp_get_token should consider setting + invocation_location. */ + bool set_invocation_location; + /* Search paths for include files. */ struct cpp_dir *quote_include; /* "" */ struct cpp_dir *bracket_include; /* <> */ @@ -352,8 +360,7 @@ struct cpp_reader /* File and directory hash table. */ struct htab *file_hash; struct htab *dir_hash; - struct file_hash_entry *file_hash_entries; - unsigned int file_hash_entries_allocated, file_hash_entries_used; + struct file_hash_entry_pool *file_hash_entries; /* Negative path lookup hash table. */ struct htab *nonexistent_file_hash; @@ -568,13 +575,24 @@ extern int _cpp_handle_directive (cpp_reader *, int); extern void _cpp_define_builtin (cpp_reader *, const char *); extern char ** _cpp_save_pragma_names (cpp_reader *); extern void _cpp_restore_pragma_names (cpp_reader *, char **); -extern void _cpp_do__Pragma (cpp_reader *); +extern int _cpp_do__Pragma (cpp_reader *); extern void _cpp_init_directives (cpp_reader *); extern void _cpp_init_internal_pragmas (cpp_reader *); extern void _cpp_do_file_change (cpp_reader *, enum lc_reason, const char *, unsigned int, unsigned int); extern void _cpp_pop_buffer (cpp_reader *); +/* In directives.c */ +struct _cpp_dir_only_callbacks +{ + /* Called to print a block of lines. */ + void (*print_lines) (int, const void *, size_t); + void (*maybe_print_line) (source_location); +}; + +extern void _cpp_preprocess_dir_only (cpp_reader *, + const struct _cpp_dir_only_callbacks *); + /* In traditional.c. */ extern bool _cpp_scan_out_logical_line (cpp_reader *, cpp_macro *); extern bool _cpp_read_logical_line_trad (cpp_reader *); diff --git a/libcpp/line-map.c b/libcpp/line-map.c index c95eacde7e3..c13a82dcafc 100644 --- a/libcpp/line-map.c +++ b/libcpp/line-map.c @@ -1,5 +1,5 @@ /* Map logical line numbers to (source file, line number) pairs. - Copyright (C) 2001, 2003, 2004 + Copyright (C) 2001, 2003, 2004, 2007 Free Software Foundation, Inc. This program is free software; you can redistribute it and/or modify it @@ -96,8 +96,15 @@ linemap_add (struct line_maps *set, enum lc_reason reason, if (set->used == set->allocated) { + line_map_realloc reallocator + = set->reallocator ? set->reallocator : xrealloc; set->allocated = 2 * set->allocated + 256; - set->maps = XRESIZEVEC (struct line_map, set->maps, set->allocated); + set->maps + = (struct line_map *) (*reallocator) (set->maps, + set->allocated + * sizeof (struct line_map)); + memset (&set->maps[set->used], 0, ((set->allocated - set->used) + * sizeof (struct line_map))); } map = &set->maps[set->used]; diff --git a/libcpp/macro.c b/libcpp/macro.c index c8d099ed210..fd624b10110 100644 --- a/libcpp/macro.c +++ b/libcpp/macro.c @@ -1,7 +1,7 @@ /* Part of CPP library. (Macro and #define handling.) Copyright (C) 1986, 1987, 1989, 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, - 2006 Free Software Foundation, Inc. + 2006, 2007, 2008 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 @@ -41,11 +41,13 @@ struct macro_arg /* Macro expansion. */ -static int enter_macro_context (cpp_reader *, cpp_hashnode *); +static int enter_macro_context (cpp_reader *, cpp_hashnode *, + const cpp_token *); static int builtin_macro (cpp_reader *, cpp_hashnode *); static void push_ptoken_context (cpp_reader *, cpp_hashnode *, _cpp_buff *, const cpp_token **, unsigned int); -static _cpp_buff *collect_args (cpp_reader *, const cpp_hashnode *); +static _cpp_buff *collect_args (cpp_reader *, const cpp_hashnode *, + _cpp_buff **); static cpp_context *next_context (cpp_reader *); static const cpp_token *padding_token (cpp_reader *, const cpp_token *); static void expand_arg (cpp_reader *, macro_arg *); @@ -55,7 +57,8 @@ static void paste_all_tokens (cpp_reader *, const cpp_token *); static bool paste_tokens (cpp_reader *, const cpp_token **, const cpp_token *); static void replace_args (cpp_reader *, cpp_hashnode *, cpp_macro *, macro_arg *); -static _cpp_buff *funlike_invocation_p (cpp_reader *, cpp_hashnode *); +static _cpp_buff *funlike_invocation_p (cpp_reader *, cpp_hashnode *, + _cpp_buff **); static bool create_iso_definition (cpp_reader *, cpp_macro *); /* #define directive parsing and handling. */ @@ -265,6 +268,9 @@ _cpp_builtin_macro_text (cpp_reader *pfile, cpp_hashnode *node) break; case BT_COUNTER: + if (CPP_OPTION (pfile, directives_only) && pfile->state.in_directive) + cpp_error (pfile, CPP_DL_ERROR, + "__COUNTER__ expanded inside directive with -fdirectives-only"); number = pfile->counter++; break; } @@ -297,8 +303,7 @@ builtin_macro (cpp_reader *pfile, cpp_hashnode *node) if (pfile->state.in_directive) return 0; - _cpp_do__Pragma (pfile); - return 1; + return _cpp_do__Pragma (pfile); } buf = _cpp_builtin_macro_text (pfile, node); @@ -449,7 +454,9 @@ paste_tokens (cpp_reader *pfile, const cpp_token **plhs, const cpp_token *rhs) false doesn't work, since we want to clear the PASTE_LEFT flag. */ if ((*plhs)->type == CPP_DIV && rhs->type != CPP_EQ) *end++ = ' '; - end = cpp_spell_token (pfile, rhs, end, false); + /* In one obscure case we might see padding here. */ + if (rhs->type != CPP_PADDING) + end = cpp_spell_token (pfile, rhs, end, false); *end = '\n'; cpp_push_buffer (pfile, buf, end - buf, /* from_stage3 */ true); @@ -512,8 +519,10 @@ paste_all_tokens (cpp_reader *pfile, const cpp_token *lhs) rhs = *FIRST (context).ptoken++; if (rhs->type == CPP_PADDING) - abort (); - + { + if (rhs->flags & PASTE_LEFT) + abort (); + } if (!paste_tokens (pfile, &lhs, rhs)) break; } @@ -569,9 +578,12 @@ _cpp_arguments_ok (cpp_reader *pfile, cpp_macro *macro, const cpp_hashnode *node invocation. Assumes the opening parenthesis has been processed. If there is an error, emits an appropriate diagnostic and returns NULL. Each argument is terminated by a CPP_EOF token, for the - future benefit of expand_arg(). */ + future benefit of expand_arg(). If there are any deferred + #pragma directives among macro arguments, store pointers to the + CPP_PRAGMA ... CPP_PRAGMA_EOL tokens into *PRAGMA_BUFF buffer. */ static _cpp_buff * -collect_args (cpp_reader *pfile, const cpp_hashnode *node) +collect_args (cpp_reader *pfile, const cpp_hashnode *node, + _cpp_buff **pragma_buff) { _cpp_buff *buff, *base_buff; cpp_macro *macro; @@ -639,6 +651,51 @@ collect_args (cpp_reader *pfile, const cpp_hashnode *node) else if (token->type == CPP_EOF || (token->type == CPP_HASH && token->flags & BOL)) break; + else if (token->type == CPP_PRAGMA) + { + cpp_token *newtok = _cpp_temp_token (pfile); + + /* CPP_PRAGMA token lives in directive_result, which will + be overwritten on the next directive. */ + *newtok = *token; + token = newtok; + do + { + if (*pragma_buff == NULL + || BUFF_ROOM (*pragma_buff) < sizeof (cpp_token *)) + { + _cpp_buff *next; + if (*pragma_buff == NULL) + *pragma_buff + = _cpp_get_buff (pfile, 32 * sizeof (cpp_token *)); + else + { + next = *pragma_buff; + *pragma_buff + = _cpp_get_buff (pfile, + (BUFF_FRONT (*pragma_buff) + - (*pragma_buff)->base) * 2); + (*pragma_buff)->next = next; + } + } + *(const cpp_token **) BUFF_FRONT (*pragma_buff) = token; + BUFF_FRONT (*pragma_buff) += sizeof (cpp_token *); + if (token->type == CPP_PRAGMA_EOL) + break; + token = cpp_get_token (pfile); + } + while (token->type != CPP_EOF); + + /* In deferred pragmas parsing_args and prevent_expansion + had been changed, reset it. */ + pfile->state.parsing_args = 2; + pfile->state.prevent_expansion = 1; + + if (token->type == CPP_EOF) + break; + else + continue; + } arg->first[ntokens++] = token; } @@ -703,9 +760,11 @@ collect_args (cpp_reader *pfile, const cpp_hashnode *node) /* Search for an opening parenthesis to the macro of NODE, in such a way that, if none is found, we don't lose the information in any intervening padding tokens. If we find the parenthesis, collect - the arguments and return the buffer containing them. */ + the arguments and return the buffer containing them. PRAGMA_BUFF + argument is the same as in collect_args. */ static _cpp_buff * -funlike_invocation_p (cpp_reader *pfile, cpp_hashnode *node) +funlike_invocation_p (cpp_reader *pfile, cpp_hashnode *node, + _cpp_buff **pragma_buff) { const cpp_token *token, *padding = NULL; @@ -722,7 +781,7 @@ funlike_invocation_p (cpp_reader *pfile, cpp_hashnode *node) if (token->type == CPP_OPEN_PAREN) { pfile->state.parsing_args = 2; - return collect_args (pfile, node); + return collect_args (pfile, node, pragma_buff); } /* CPP_EOF can be the end of macro arguments, or the end of the @@ -743,9 +802,13 @@ funlike_invocation_p (cpp_reader *pfile, cpp_hashnode *node) /* Push the context of a macro with hash entry NODE onto the context stack. If we can successfully expand the macro, we push a context containing its yet-to-be-rescanned replacement list and return one. - Otherwise, we don't push a context and return zero. */ + If there were additionally any unexpanded deferred #pragma directives + among macro arguments, push another context containing the + pragma tokens before the yet-to-be-rescanned replacement list + and return two. Otherwise, we don't push a context and return zero. */ static int -enter_macro_context (cpp_reader *pfile, cpp_hashnode *node) +enter_macro_context (cpp_reader *pfile, cpp_hashnode *node, + const cpp_token *result) { /* The presence of a macro invalidates a file's controlling macro. */ pfile->mi_valid = false; @@ -756,6 +819,7 @@ enter_macro_context (cpp_reader *pfile, cpp_hashnode *node) if (! (node->flags & NODE_BUILTIN)) { cpp_macro *macro = node->value.macro; + _cpp_buff *pragma_buff = NULL; if (macro->fun_like) { @@ -764,7 +828,7 @@ enter_macro_context (cpp_reader *pfile, cpp_hashnode *node) pfile->state.prevent_expansion++; pfile->keep_tokens++; pfile->state.parsing_args = 1; - buff = funlike_invocation_p (pfile, node); + buff = funlike_invocation_p (pfile, node, &pragma_buff); pfile->state.parsing_args = 0; pfile->keep_tokens--; pfile->state.prevent_expansion--; @@ -776,6 +840,9 @@ enter_macro_context (cpp_reader *pfile, cpp_hashnode *node) "function-like macro \"%s\" must be used with arguments in traditional C", NODE_NAME (node)); + if (pragma_buff) + _cpp_release_buff (pfile, pragma_buff); + return 0; } @@ -792,6 +859,25 @@ enter_macro_context (cpp_reader *pfile, cpp_hashnode *node) if (macro->paramc == 0) _cpp_push_token_context (pfile, node, macro->exp.tokens, macro->count); + if (pragma_buff) + { + if (!pfile->state.in_directive) + _cpp_push_token_context (pfile, NULL, + padding_token (pfile, result), 1); + do + { + _cpp_buff *tail = pragma_buff->next; + pragma_buff->next = NULL; + push_ptoken_context (pfile, NULL, pragma_buff, + (const cpp_token **) pragma_buff->base, + ((const cpp_token **) BUFF_FRONT (pragma_buff) + - (const cpp_token **) pragma_buff->base)); + pragma_buff = tail; + } + while (pragma_buff != NULL); + return 2; + } + return 1; } @@ -1091,6 +1177,8 @@ const cpp_token * cpp_get_token (cpp_reader *pfile) { const cpp_token *result; + bool can_set = pfile->set_invocation_location; + pfile->set_invocation_location = false; for (;;) { @@ -1136,10 +1224,17 @@ cpp_get_token (cpp_reader *pfile) if (!(node->flags & NODE_DISABLED)) { - if (!pfile->state.prevent_expansion - && enter_macro_context (pfile, node)) + int ret; + /* If not in a macro context, and we're going to start an + expansion, record the location. */ + if (can_set && !context->macro) + pfile->invocation_location = result->src_loc; + if (pfile->state.prevent_expansion) + break; + ret = enter_macro_context (pfile, node, result); + if (ret) { - if (pfile->state.in_directive) + if (pfile->state.in_directive || ret == 2) continue; return padding_token (pfile, result); } @@ -1161,6 +1256,27 @@ cpp_get_token (cpp_reader *pfile) return result; } +/* Like cpp_get_token, but also returns a location separate from the + one provided by the returned token. LOC is an out parameter; *LOC + is set to the location "as expected by the user". This matters + when a token results from macro expansion -- the token's location + will indicate where the macro is defined, but *LOC will be the + location of the start of the expansion. */ +const cpp_token * +cpp_get_token_with_location (cpp_reader *pfile, source_location *loc) +{ + const cpp_token *result; + + pfile->set_invocation_location = true; + result = cpp_get_token (pfile); + if (pfile->context->macro) + *loc = pfile->invocation_location; + else + *loc = result->src_loc; + + return result; +} + /* 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. */ @@ -1662,7 +1778,14 @@ _cpp_create_definition (cpp_reader *pfile, cpp_hashnode *node) /* Enter definition in hash table. */ node->type = NT_MACRO; node->value.macro = macro; - if (! ustrncmp (NODE_NAME (node), DSC ("__STDC_"))) + if (! ustrncmp (NODE_NAME (node), DSC ("__STDC_")) + && ustrcmp (NODE_NAME (node), (const uchar *) "__STDC_FORMAT_MACROS") + /* __STDC_LIMIT_MACROS and __STDC_CONSTANT_MACROS are mentioned + in the C standard, as something that one must use in C++. + However DR#593 indicates that these aren't actually mentioned + in the C++ standard. We special-case them anyway. */ + && ustrcmp (NODE_NAME (node), (const uchar *) "__STDC_LIMIT_MACROS") + && ustrcmp (NODE_NAME (node), (const uchar *) "__STDC_CONSTANT_MACROS")) node->flags |= NODE_WARN; return ok; diff --git a/libcpp/po/ChangeLog b/libcpp/po/ChangeLog index 337ee0ec447..a060343f184 100644 --- a/libcpp/po/ChangeLog +++ b/libcpp/po/ChangeLog @@ -1,3 +1,55 @@ +2008-02-01 Joseph S. Myers + + * cpplib.pot: Regenerate. + +2008-01-20 Joseph S. Myers + + * sv.po: Update. + +2008-01-20 Joseph S. Myers + + * sv.po: Update. + +2008-01-20 Joseph S. Myers + + * sv.po: Update. + +2007-12-05 Joseph S. Myers + + * vi.po: Update. + +2007-11-15 Joseph S. Myers + + * es.po: Update. + +2007-11-11 Joseph S. Myers + + * de.po, zh_CN.po: Update. + +2007-11-10 Joseph S. Myers + + * be.po, ca.po, da.po, de.po, el.po, es.po, fr.po, ja.po, nl.po, + sv.po, tr.po, uk,po, vi.po, zh_CN.po, zh_TW.po: Update. + +2007-11-08 Joseph S. Myers + + * cpplib.pot: Regenerate. + +2007-10-21 Joseph S. Myers + + * es.po, vi.po: Update. + +2007-10-10 Joseph S. Myers + + * be.po, ca.po, da.po, de.po, el.po, es.po, fr.po, ja.po, nl.po, + sv.po, tr.po, uk,po, vi.po, zh_CN.po, zh_TW.po: Update. + +2007-08-21 Joseph S. Myers + + * be.po, ca.po, da.po, de.po, el.po, es.po, fr.po, ja.po, nl.po, + sv.po, tr.po, vi.po, zh_CN.po, zh_TW.po: Update. + * uk.po: New. + 2007-06-26 Joseph S. Myers * be.po, ca.po, da.po, de.po, el.po, es.po, fr.po, ja.po, nl.po, diff --git a/libcpp/po/be.po b/libcpp/po/be.po index 5090aebb9a4..44c500b85f6 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: http://gcc.gnu.org/bugs.html\n" -"POT-Creation-Date: 2007-05-13 19:48-0700\n" +"POT-Creation-Date: 2007-11-08 21:08+0000\n" "PO-Revision-Date: 2002-05-17 15:54+0200\n" "Last-Translator: Ales Nyakhaychyk \n" "Language-Team: Belarusian \n" @@ -70,7 +70,7 @@ msgstr "" msgid "%.*s is not a valid universal character" msgstr "\"%s\" - гэта не пачатак дэкларацыі" -#: charset.c:1008 lex.c:472 +#: charset.c:1008 lex.c:484 msgid "'$' in identifier or number" msgstr "" @@ -149,231 +149,235 @@ msgstr "пустая сімвальная канстанта" msgid "failure to convert %s to %s" msgstr "" -#: directives.c:214 directives.c:240 +#: directives.c:215 directives.c:241 #, c-format msgid "extra tokens at end of #%s directive" msgstr "" -#: directives.c:343 +#: directives.c:344 #, c-format msgid "#%s is a GCC extension" msgstr "" -#: directives.c:355 +#: directives.c:356 msgid "suggest not using #elif in traditional C" msgstr "" -#: directives.c:358 +#: directives.c:359 #, c-format msgid "traditional C ignores #%s with the # indented" msgstr "" -#: directives.c:362 +#: directives.c:363 #, c-format msgid "suggest hiding #%s from traditional C with an indented #" msgstr "" -#: directives.c:388 +#: directives.c:389 msgid "embedding a directive within macro arguments is not portable" msgstr "" -#: directives.c:408 +#: directives.c:409 msgid "style of line directive is a GCC extension" msgstr "" -#: directives.c:458 +#: directives.c:464 #, c-format msgid "invalid preprocessing directive #%s" msgstr "" -#: directives.c:524 +#: directives.c:532 msgid "\"defined\" cannot be used as a macro name" msgstr "" -#: directives.c:530 +#: directives.c:538 #, c-format msgid "\"%s\" cannot be used as a macro name as it is an operator in C++" msgstr "" -#: directives.c:533 +#: directives.c:541 #, c-format msgid "no macro name given in #%s directive" msgstr "" -#: directives.c:536 +#: directives.c:544 msgid "macro names must be identifiers" msgstr "" -#: directives.c:577 +#: directives.c:585 #, c-format msgid "undefining \"%s\"" msgstr "" -#: directives.c:632 +#: directives.c:640 msgid "missing terminating > character" msgstr "" -#: directives.c:687 +#: directives.c:695 #, c-format msgid "#%s expects \"FILENAME\" or " msgstr "" -#: directives.c:727 +#: directives.c:739 #, c-format msgid "empty filename in #%s" msgstr "" -#: directives.c:737 +#: directives.c:749 msgid "#include nested too deeply" msgstr "" -#: directives.c:778 +#: directives.c:790 msgid "#include_next in primary source file" msgstr "" -#: directives.c:804 +#: directives.c:816 #, c-format msgid "invalid flag \"%s\" in line directive" msgstr "" -#: directives.c:856 +#: directives.c:868 #, c-format msgid "\"%s\" after #line is not a positive integer" msgstr "" -#: directives.c:862 +#: directives.c:874 msgid "line number out of range" msgstr "" -#: directives.c:875 directives.c:952 +#: directives.c:887 directives.c:964 #, c-format msgid "\"%s\" is not a valid filename" msgstr "" -#: directives.c:912 +#: directives.c:924 #, c-format msgid "\"%s\" after # is not a positive integer" msgstr "" -#: directives.c:1014 +#: directives.c:1026 #, fuzzy, c-format msgid "invalid #%s directive" msgstr "нерэчаісны ініцыялізатар" -#: directives.c:1077 +#: directives.c:1089 #, c-format msgid "registering pragmas in namespace \"%s\" with mismatched name expansion" msgstr "" -#: directives.c:1086 +#: directives.c:1098 #, c-format msgid "registering pragma \"%s\" with name expansion and no namespace" msgstr "" -#: directives.c:1104 +#: directives.c:1116 #, c-format msgid "registering \"%s\" as both a pragma and a pragma namespace" msgstr "" -#: directives.c:1107 +#: directives.c:1119 #, fuzzy, c-format msgid "#pragma %s %s is already registered" msgstr "Клас \"%s\" ужо існуе" -#: directives.c:1110 +#: directives.c:1122 #, c-format msgid "#pragma %s is already registered" msgstr "" -#: directives.c:1140 +#: directives.c:1152 msgid "registering pragma with NULL handler" msgstr "" -#: directives.c:1350 +#: directives.c:1362 msgid "#pragma once in main file" msgstr "" -#: directives.c:1373 +#: directives.c:1385 msgid "invalid #pragma GCC poison directive" msgstr "" -#: directives.c:1382 +#: directives.c:1394 #, c-format msgid "poisoning existing macro \"%s\"" msgstr "" -#: directives.c:1403 +#: directives.c:1413 msgid "#pragma system_header ignored outside include file" msgstr "" -#: directives.c:1427 +#: directives.c:1437 #, fuzzy, c-format msgid "cannot find source file %s" msgstr "не магу знайсці крыніцу %s" -#: directives.c:1431 +#: directives.c:1441 #, c-format msgid "current file is older than %s" msgstr "" -#: directives.c:1599 +#: directives.c:1620 msgid "_Pragma takes a parenthesized string literal" msgstr "" -#: directives.c:1671 +#: directives.c:1693 msgid "#else without #if" msgstr "" -#: directives.c:1676 +#: directives.c:1698 msgid "#else after #else" msgstr "" -#: directives.c:1678 directives.c:1711 +#: directives.c:1700 directives.c:1733 msgid "the conditional began here" msgstr "" -#: directives.c:1704 +#: directives.c:1726 msgid "#elif without #if" msgstr "" -#: directives.c:1709 +#: directives.c:1731 msgid "#elif after #else" msgstr "" -#: directives.c:1739 +#: directives.c:1761 msgid "#endif without #if" msgstr "" -#: directives.c:1816 +#: directives.c:1838 msgid "missing '(' after predicate" msgstr "" -#: directives.c:1831 +#: directives.c:1853 msgid "missing ')' to complete answer" msgstr "" -#: directives.c:1851 +#: directives.c:1873 msgid "predicate's answer is empty" msgstr "" -#: directives.c:1878 +#: directives.c:1900 msgid "assertion without predicate" msgstr "" -#: directives.c:1880 +#: directives.c:1902 msgid "predicate must be an identifier" msgstr "" -#: directives.c:1966 +#: directives.c:1988 #, c-format msgid "\"%s\" re-asserted" msgstr "" -#: directives.c:2190 +#: directives.c:2271 #, c-format msgid "unterminated #%s" msgstr "" +#: directives-only.c:221 lex.c:1016 traditional.c:162 +msgid "unterminated comment" +msgstr "незавершаныя каментарыі" + #: errors.c:118 msgid "warning: " msgstr "" @@ -396,486 +400,509 @@ msgstr "структура" msgid "%s: %s" msgstr "" -#: expr.c:203 +#: expr.c:261 msgid "too many decimal points in number" msgstr "" -#: expr.c:223 +#: expr.c:290 expr.c:365 +msgid "fixed-point constants are a GCC extension" +msgstr "" + +#: expr.c:303 +#, fuzzy, c-format +msgid "invalid digit \"%c\" in binary constant" +msgstr "`%E' - нерэчаісная нязьменная тыпу string" + +#: expr.c:305 #, fuzzy, c-format msgid "invalid digit \"%c\" in octal constant" msgstr "`%E' - нерэчаісная нязьменная тыпу string" -#: expr.c:229 +#: expr.c:313 +#, fuzzy +msgid "invalid prefix \"0b\" for floating constant" +msgstr "`%E' - нерэчаісная нязьменная тыпу string" + +#: expr.c:319 msgid "use of C99 hexadecimal floating constant" msgstr "" -#: expr.c:238 +#: expr.c:328 msgid "exponent has no digits" msgstr "" -#: expr.c:245 +#: expr.c:335 msgid "hexadecimal floating constants require an exponent" msgstr "" -#: expr.c:251 +#: expr.c:341 #, fuzzy, c-format msgid "invalid suffix \"%.*s\" on floating constant" msgstr "`%E' - нерэчаісная нязьменная тыпу string" -#: expr.c:261 expr.c:295 +#: expr.c:351 expr.c:393 #, c-format msgid "traditional C rejects the \"%.*s\" suffix" msgstr "" -#: expr.c:268 +#: expr.c:358 #, c-format msgid "invalid suffix \"%.*s\" with hexadecimal floating constant" msgstr "" -#: expr.c:281 +#: expr.c:369 +msgid "decimal float constants are a GCC extension" +msgstr "" + +#: expr.c:379 #, fuzzy, c-format msgid "invalid suffix \"%.*s\" on integer constant" msgstr "`%E' - нерэчаісная нязьменная тыпу string" -#: expr.c:303 +#: expr.c:401 msgid "use of C99 long long integer constant" msgstr "" -#: expr.c:310 +#: expr.c:409 msgid "imaginary constants are a GCC extension" msgstr "" -#: expr.c:396 +#: expr.c:412 +msgid "binary constants are a GCC extension" +msgstr "" + +#: expr.c:505 msgid "integer constant is too large for its type" msgstr "" -#: expr.c:408 +#: expr.c:517 msgid "integer constant is so large that it is unsigned" msgstr "" -#: expr.c:490 +#: expr.c:612 msgid "missing ')' after \"defined\"" msgstr "" -#: expr.c:497 +#: expr.c:619 msgid "operator \"defined\" requires an identifier" msgstr "" -#: expr.c:505 +#: expr.c:627 #, c-format msgid "(\"%s\" is an alternative token for \"%s\" in C++)" msgstr "" -#: expr.c:515 +#: expr.c:637 msgid "this use of \"defined\" may not be portable" msgstr "" -#: expr.c:554 +#: expr.c:676 msgid "floating constant in preprocessor expression" msgstr "" -#: expr.c:560 +#: expr.c:682 msgid "imaginary number in preprocessor expression" msgstr "" -#: expr.c:605 +#: expr.c:727 #, c-format msgid "\"%s\" is not defined" msgstr "" -#: expr.c:733 expr.c:762 +#: expr.c:855 expr.c:884 #, fuzzy, c-format msgid "missing binary operator before token \"%s\"" msgstr "прапушчан прабел пасля нумара \"%.*s\"" -#: expr.c:753 +#: expr.c:875 #, c-format msgid "token \"%s\" is not valid in preprocessor expressions" msgstr "" -#: expr.c:770 +#: expr.c:892 msgid "missing expression between '(' and ')'" msgstr "" -#: expr.c:773 +#: expr.c:895 msgid "#if with no expression" msgstr "" -#: expr.c:776 +#: expr.c:898 #, c-format msgid "operator '%s' has no right operand" msgstr "" -#: expr.c:781 +#: expr.c:903 #, c-format msgid "operator '%s' has no left operand" msgstr "" -#: expr.c:807 +#: expr.c:929 msgid " ':' without preceding '?'" msgstr "" -#: expr.c:834 +#: expr.c:956 msgid "unbalanced stack in #if" msgstr "" -#: expr.c:853 +#: expr.c:975 #, fuzzy, c-format msgid "impossible operator '%u'" msgstr "немагчымы апэратар '%s'" -#: expr.c:943 +#: expr.c:1065 msgid "missing ')' in expression" msgstr "" -#: expr.c:964 +#: expr.c:1086 msgid "'?' without following ':'" msgstr "" -#: expr.c:974 +#: expr.c:1096 msgid "integer overflow in preprocessor expression" msgstr "" -#: expr.c:979 +#: expr.c:1101 msgid "missing '(' in expression" msgstr "" -#: expr.c:1011 +#: expr.c:1133 #, c-format msgid "the left operand of \"%s\" changes sign when promoted" msgstr "" -#: expr.c:1016 +#: expr.c:1138 #, c-format msgid "the right operand of \"%s\" changes sign when promoted" msgstr "" -#: expr.c:1275 +#: expr.c:1397 msgid "traditional C rejects the unary plus operator" msgstr "" -#: expr.c:1358 +#: expr.c:1480 msgid "comma operator in operand of #if" msgstr "" -#: expr.c:1490 +#: expr.c:1612 msgid "division by zero in #if" msgstr "" -#: files.c:402 +#: files.c:442 msgid "NULL directory in find_file" msgstr "" -#: files.c:440 +#: files.c:480 msgid "one or more PCH files were found, but they were invalid" msgstr "" -#: files.c:443 +#: files.c:483 msgid "use -Winvalid-pch for more information" msgstr "" -#: files.c:501 +#: files.c:570 #, c-format msgid "%s is a block device" msgstr "%s - гэта блёчная прылада" -#: files.c:518 +#: files.c:587 #, c-format msgid "%s is too large" msgstr "%s - вельмі вялікі" -#: files.c:553 +#: files.c:622 #, c-format msgid "%s is shorter than expected" msgstr "" -#: files.c:782 +#: files.c:852 #, c-format msgid "no include path in which to search for %s" msgstr "" -#: files.c:1071 +#: files.c:1157 msgid "Multiple include guards may be useful for:\n" msgstr "" -#: init.c:407 +#: init.c:426 msgid "cppchar_t must be an unsigned type" msgstr "" -#: init.c:411 +#: init.c:430 #, c-format msgid "preprocessor arithmetic has maximum precision of %lu bits; target requires %lu bits" msgstr "" -#: init.c:418 +#: init.c:437 msgid "CPP arithmetic must be at least as precise as a target int" msgstr "" -#: init.c:421 +#: init.c:440 msgid "target char is less than 8 bits wide" msgstr "" -#: init.c:425 +#: init.c:444 msgid "target wchar_t is narrower than target char" msgstr "" -#: init.c:429 +#: init.c:448 msgid "target int is narrower than target char" msgstr "" -#: init.c:434 +#: init.c:453 msgid "CPP half-integer narrower than CPP character" msgstr "" -#: init.c:438 +#: init.c:457 #, c-format msgid "CPP on this host cannot handle wide character constants over %lu bits, but the target requires %lu bits" msgstr "" -#: lex.c:271 +#: lex.c:283 msgid "backslash and newline separated by space" msgstr "" -#: lex.c:276 +#: lex.c:288 msgid "backslash-newline at end of file" msgstr "" -#: lex.c:291 +#: lex.c:303 #, c-format msgid "trigraph ??%c converted to %c" msgstr "" -#: lex.c:298 +#: lex.c:310 #, c-format msgid "trigraph ??%c ignored, use -trigraphs to enable" msgstr "" -#: lex.c:344 +#: lex.c:356 msgid "\"/*\" within comment" msgstr "" -#: lex.c:402 +#: lex.c:414 #, c-format msgid "%s in preprocessing directive" msgstr "" -#: lex.c:411 +#: lex.c:423 msgid "null character(s) ignored" msgstr "" -#: lex.c:448 +#: lex.c:460 #, c-format msgid "`%.*s' is not in NFKC" msgstr "" -#: lex.c:451 +#: lex.c:463 #, fuzzy, c-format msgid "`%.*s' is not in NFC" msgstr "`%D' - гэта ня функцыя," -#: lex.c:539 +#: lex.c:551 #, c-format msgid "attempt to use poisoned \"%s\"" msgstr "" -#: lex.c:547 +#: lex.c:559 msgid "__VA_ARGS__ can only appear in the expansion of a C99 variadic macro" msgstr "" -#: lex.c:647 +#: lex.c:659 msgid "null character(s) preserved in literal" msgstr "" -#: lex.c:650 +#: lex.c:662 #, c-format msgid "missing terminating %c character" msgstr "прапушчан завяршаючы сімвал %c" -#: lex.c:842 -msgid "no newline at end of file" -msgstr "" - -#: lex.c:1002 traditional.c:162 -msgid "unterminated comment" -msgstr "незавершаныя каментарыі" - -#: lex.c:1013 +#: lex.c:1027 msgid "C++ style comments are not allowed in ISO C90" msgstr "" -#: lex.c:1015 +#: lex.c:1029 msgid "(this will be reported only once per input file)" msgstr "" -#: lex.c:1020 +#: lex.c:1034 msgid "multi-line comment" msgstr "" -#: lex.c:1333 +#: lex.c:1347 #, fuzzy, c-format msgid "unspellable token %s" msgstr "немагу адчыніць файл \"%s\"" -#: line-map.c:313 +#: line-map.c:320 #, c-format msgid "In file included from %s:%u" msgstr "" -#: line-map.c:331 +#: line-map.c:338 #, c-format msgid "" ",\n" " from %s:%u" msgstr "" -#: macro.c:83 +#: macro.c:84 #, c-format msgid "macro \"%s\" is not used" msgstr "" -#: macro.c:122 macro.c:312 +#: macro.c:123 macro.c:319 #, c-format msgid "invalid built-in macro \"%s\"" msgstr "" -#: macro.c:156 +#: macro.c:157 #, fuzzy msgid "could not determine file timestamp" msgstr "не магу знайсці крыніцу %s\n" -#: macro.c:253 +#: macro.c:254 #, fuzzy msgid "could not determine date and time" msgstr "Немагчыма адчыніць файл з дадзенымі %s.\n" -#: macro.c:416 +#: macro.c:270 +msgid "__COUNTER__ expanded inside directive with -fdirectives-only" +msgstr "" + +#: macro.c:423 msgid "invalid string literal, ignoring final '\\'" msgstr "" -#: macro.c:466 +#: macro.c:483 #, c-format msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token" msgstr "" -#: macro.c:538 +#: macro.c:558 msgid "ISO C99 requires rest arguments to be used" msgstr "" -#: macro.c:543 +#: macro.c:563 #, c-format msgid "macro \"%s\" requires %u arguments, but only %u given" msgstr "" -#: macro.c:548 +#: macro.c:568 #, c-format msgid "macro \"%s\" passed %u arguments, but takes just %u" msgstr "" -#: macro.c:659 traditional.c:675 +#: macro.c:679 traditional.c:680 #, c-format msgid "unterminated argument list invoking macro \"%s\"" msgstr "" -#: macro.c:762 +#: macro.c:782 #, c-format msgid "function-like macro \"%s\" must be used with arguments in traditional C" msgstr "" -#: macro.c:1278 +#: macro.c:1325 #, c-format msgid "duplicate macro parameter \"%s\"" msgstr "" -#: macro.c:1324 +#: macro.c:1371 #, c-format msgid "\"%s\" may not appear in macro parameter list" msgstr "" -#: macro.c:1332 +#: macro.c:1379 msgid "macro parameters must be comma-separated" msgstr "" -#: macro.c:1349 +#: macro.c:1396 msgid "parameter name missing" msgstr "" -#: macro.c:1366 +#: macro.c:1413 msgid "anonymous variadic macros were introduced in C99" msgstr "" -#: macro.c:1371 +#: macro.c:1418 msgid "ISO C does not permit named variadic macros" msgstr "" -#: macro.c:1380 +#: macro.c:1427 msgid "missing ')' in macro parameter list" msgstr "" -#: macro.c:1458 +#: macro.c:1476 +msgid "'##' cannot appear at either end of a macro expansion" +msgstr "" + +#: macro.c:1510 msgid "ISO C99 requires whitespace after the macro name" msgstr "" -#: macro.c:1482 +#: macro.c:1534 #, fuzzy msgid "missing whitespace after the macro name" msgstr "прапушчан прабел пасля нумара \"%.*s\"" -#: macro.c:1512 +#: macro.c:1564 msgid "'#' is not followed by a macro parameter" msgstr "" -#: macro.c:1531 -msgid "'##' cannot appear at either end of a macro expansion" -msgstr "" - -#: macro.c:1629 +#: macro.c:1683 #, c-format msgid "\"%s\" redefined" msgstr "" -#: macro.c:1634 +#: macro.c:1688 msgid "this is the location of the previous definition" msgstr "" -#: macro.c:1684 +#: macro.c:1738 #, c-format msgid "macro argument \"%s\" would be stringified in traditional C" msgstr "" -#: macro.c:1707 +#: macro.c:1761 #, c-format msgid "invalid hash type %d in cpp_macro_definition" msgstr "" -#: pch.c:84 pch.c:332 pch.c:354 pch.c:360 +#: pch.c:84 pch.c:332 pch.c:344 pch.c:362 pch.c:368 pch.c:377 msgid "while writing precompiled header" msgstr "" -#: pch.c:467 +#: pch.c:485 #, fuzzy, c-format msgid "%s: not used because `%.*s' not defined" msgstr "адмеціна `%s' выкарыстоўвываецца, але ня вызначана" -#: pch.c:479 +#: pch.c:497 #, c-format msgid "%s: not used because `%.*s' defined as `%s' not `%.*s'" msgstr "" -#: pch.c:520 +#: pch.c:538 #, c-format msgid "%s: not used because `%s' is defined" msgstr "" -#: pch.c:533 pch.c:696 +#: pch.c:558 +#, c-format +msgid "%s: not used because `__COUNTER__' is invalid" +msgstr "" + +#: pch.c:567 pch.c:737 msgid "while reading precompiled header" msgstr "" -#: traditional.c:745 +#: traditional.c:750 #, c-format msgid "detected recursion whilst expanding macro \"%s\"" msgstr "" -#: traditional.c:912 +#: traditional.c:917 msgid "syntax error in macro parameter list" msgstr "" diff --git a/libcpp/po/ca.po b/libcpp/po/ca.po index 1f453d5baea..930aaefd17f 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: http://gcc.gnu.org/bugs.html\n" -"POT-Creation-Date: 2007-05-13 19:48-0700\n" +"POT-Creation-Date: 2007-11-08 21:08+0000\n" "PO-Revision-Date: 2005-11-25 22:56+0100\n" "Last-Translator: Mateu Gilles \n" "Language-Team: Catalan \n" @@ -75,7 +75,7 @@ msgstr "el nom de car msgid "%.*s is not a valid universal character" msgstr "%.*s no s un carcter universal vlid" -#: charset.c:1008 lex.c:472 +#: charset.c:1008 lex.c:484 msgid "'$' in identifier or number" msgstr "\"$\" en un identificador o un nombre" @@ -153,231 +153,235 @@ msgstr "constant de car msgid "failure to convert %s to %s" msgstr "fallada convertint %s a %s" -#: directives.c:214 directives.c:240 +#: directives.c:215 directives.c:241 #, c-format msgid "extra tokens at end of #%s directive" msgstr "elements superflus al final de la directiva #%s" -#: directives.c:343 +#: directives.c:344 #, c-format msgid "#%s is a GCC extension" msgstr "#%s s una extenci del GCC" -#: directives.c:355 +#: directives.c:356 msgid "suggest not using #elif in traditional C" msgstr "es suggereix no usar #elif en C tradicional" -#: directives.c:358 +#: directives.c:359 #, c-format msgid "traditional C ignores #%s with the # indented" msgstr "C tradicional ignora #%s amb el # indentat" -#: directives.c:362 +#: directives.c:363 #, c-format msgid "suggest hiding #%s from traditional C with an indented #" msgstr "es suggereix ocultar #%s del C tradicional amb el # indentat" -#: directives.c:388 +#: directives.c:389 msgid "embedding a directive within macro arguments is not portable" msgstr "l'incrustaci d'una directiva entre arguments de macro no s portable" -#: directives.c:408 +#: directives.c:409 msgid "style of line directive is a GCC extension" msgstr "la directiva d'estil de lnia s una extenci del GCC" -#: directives.c:458 +#: directives.c:464 #, c-format msgid "invalid preprocessing directive #%s" msgstr "directiva de preprocessament #%s invlida" -#: directives.c:524 +#: directives.c:532 msgid "\"defined\" cannot be used as a macro name" msgstr "\"defined\" no es pot usar com un nom de macro" -#: directives.c:530 +#: directives.c:538 #, c-format msgid "\"%s\" cannot be used as a macro name as it is an operator in C++" msgstr "no es pot usar \"%s\" com un nom de macro perqu s un operador en C++" -#: directives.c:533 +#: directives.c:541 #, c-format msgid "no macro name given in #%s directive" msgstr "no es va donar un nom de macro en la directiva #%s" -#: directives.c:536 +#: directives.c:544 msgid "macro names must be identifiers" msgstr "els noms de macro han de ser identificadors" -#: directives.c:577 +#: directives.c:585 #, c-format msgid "undefining \"%s\"" msgstr "esborrant la definici de \"%s\"" -#: directives.c:632 +#: directives.c:640 msgid "missing terminating > character" msgstr "falta el carcter de terminaci >" -#: directives.c:687 +#: directives.c:695 #, c-format msgid "#%s expects \"FILENAME\" or " msgstr "#%s espera \"NOM_DE_FITXER\" o " -#: directives.c:727 +#: directives.c:739 #, c-format msgid "empty filename in #%s" msgstr "nom de fitxer buit en #%s" -#: directives.c:737 +#: directives.c:749 msgid "#include nested too deeply" msgstr "#include niat amb massa profunditat" -#: directives.c:778 +#: directives.c:790 msgid "#include_next in primary source file" msgstr "#include_next en el fitxer font primari" -#: directives.c:804 +#: directives.c:816 #, c-format msgid "invalid flag \"%s\" in line directive" msgstr "indicador \"%s\" invlid en la directiva de lnia" -#: directives.c:856 +#: directives.c:868 #, c-format msgid "\"%s\" after #line is not a positive integer" msgstr "\"%s\" desprs de #line no s un enter positiu" -#: directives.c:862 +#: directives.c:874 msgid "line number out of range" msgstr "nombre de lnia fora de rang" -#: directives.c:875 directives.c:952 +#: directives.c:887 directives.c:964 #, c-format msgid "\"%s\" is not a valid filename" msgstr "\"%s\" no s un nom de fitxer vlid" -#: directives.c:912 +#: directives.c:924 #, c-format msgid "\"%s\" after # is not a positive integer" msgstr "\"%s\" desprs de # no s un enter positiu" -#: directives.c:1014 +#: directives.c:1026 #, fuzzy, c-format msgid "invalid #%s directive" msgstr "directiva #ident invlida" -#: directives.c:1077 +#: directives.c:1089 #, c-format msgid "registering pragmas in namespace \"%s\" with mismatched name expansion" msgstr "" -#: directives.c:1086 +#: directives.c:1098 #, fuzzy, c-format msgid "registering pragma \"%s\" with name expansion and no namespace" msgstr "desant \"%s\" com a pragma i espai de noms de pragma" -#: directives.c:1104 +#: directives.c:1116 #, 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:1107 +#: directives.c:1119 #, c-format msgid "#pragma %s %s is already registered" msgstr "ja s'ha desat #pragma %s %s" -#: directives.c:1110 +#: directives.c:1122 #, c-format msgid "#pragma %s is already registered" msgstr "ja s'ha desat #pragma %s" -#: directives.c:1140 +#: directives.c:1152 msgid "registering pragma with NULL handler" msgstr "" -#: directives.c:1350 +#: directives.c:1362 msgid "#pragma once in main file" msgstr "#pragma una vegada en el fitxer principal" -#: directives.c:1373 +#: directives.c:1385 msgid "invalid #pragma GCC poison directive" msgstr "directiva #pragma de GCC enverinada invlida" -#: directives.c:1382 +#: directives.c:1394 #, c-format msgid "poisoning existing macro \"%s\"" msgstr "enverinant la macro existent \"%s\"" -#: directives.c:1403 +#: directives.c:1413 msgid "#pragma system_header ignored outside include file" msgstr "#pragma system_header ignorat fora del fitxer d'inclusi" -#: directives.c:1427 +#: directives.c:1437 #, c-format msgid "cannot find source file %s" msgstr "no es pot trobar la font %s" -#: directives.c:1431 +#: directives.c:1441 #, c-format msgid "current file is older than %s" msgstr "el fitxer actual s ms vell que %s" -#: directives.c:1599 +#: directives.c:1620 msgid "_Pragma takes a parenthesized string literal" msgstr "_Pragma pren una cadena literal entre parntesis" -#: directives.c:1671 +#: directives.c:1693 msgid "#else without #if" msgstr "#else sense #if" -#: directives.c:1676 +#: directives.c:1698 msgid "#else after #else" msgstr "#else desprs de #else" -#: directives.c:1678 directives.c:1711 +#: directives.c:1700 directives.c:1733 msgid "the conditional began here" msgstr "el condicional va comenar aqu" -#: directives.c:1704 +#: directives.c:1726 msgid "#elif without #if" msgstr "#elif sense #if" -#: directives.c:1709 +#: directives.c:1731 msgid "#elif after #else" msgstr "#elif desprs de #else" -#: directives.c:1739 +#: directives.c:1761 msgid "#endif without #if" msgstr "#endif sense #if" -#: directives.c:1816 +#: directives.c:1838 msgid "missing '(' after predicate" msgstr "falta \"(\" abans del predicat" -#: directives.c:1831 +#: directives.c:1853 msgid "missing ')' to complete answer" msgstr "falta \")\" per a completar la resposta" -#: directives.c:1851 +#: directives.c:1873 msgid "predicate's answer is empty" msgstr "el predicat de la resposta est buit" -#: directives.c:1878 +#: directives.c:1900 msgid "assertion without predicate" msgstr "afirmaci sense predicat" -#: directives.c:1880 +#: directives.c:1902 msgid "predicate must be an identifier" msgstr "el predicat ha de ser un identificador" -#: directives.c:1966 +#: directives.c:1988 #, c-format msgid "\"%s\" re-asserted" msgstr "\"%s\" reafirmat" -#: directives.c:2190 +#: directives.c:2271 #, c-format msgid "unterminated #%s" msgstr "#%s sense acabar" +#: directives-only.c:221 lex.c:1016 traditional.c:162 +msgid "unterminated comment" +msgstr "comentari sense acabar" + #: errors.c:118 msgid "warning: " msgstr "avs: " @@ -399,332 +403,349 @@ msgstr "stdout" msgid "%s: %s" msgstr "%s: %s" -#: expr.c:203 +#: expr.c:261 msgid "too many decimal points in number" msgstr "nombre amb massa punts decimals" -#: expr.c:223 +#: expr.c:290 expr.c:365 +#, fuzzy +msgid "fixed-point constants are a GCC extension" +msgstr "les constants imaginries sn una extensi d'el GCC" + +#: expr.c:303 +#, fuzzy, c-format +msgid "invalid digit \"%c\" in binary constant" +msgstr "dgit \"%c\" invlid en la constant octal" + +#: expr.c:305 #, c-format msgid "invalid digit \"%c\" in octal constant" msgstr "dgit \"%c\" invlid en la constant octal" -#: expr.c:229 +#: expr.c:313 +#, fuzzy +msgid "invalid prefix \"0b\" for floating constant" +msgstr "sufix \"%.*s\" invlid en la constant de coma flotant" + +#: expr.c:319 msgid "use of C99 hexadecimal floating constant" msgstr "s d'una constant de coma flotant hexadecimal C99" -#: expr.c:238 +#: expr.c:328 msgid "exponent has no digits" msgstr "exponent no t dgits" -#: expr.c:245 +#: expr.c:335 msgid "hexadecimal floating constants require an exponent" msgstr "la constant de coma flotant hexadecimal requereix un exponent" -#: expr.c:251 +#: expr.c:341 #, c-format msgid "invalid suffix \"%.*s\" on floating constant" msgstr "sufix \"%.*s\" invlid en la constant de coma flotant" -#: expr.c:261 expr.c:295 +#: expr.c:351 expr.c:393 #, c-format msgid "traditional C rejects the \"%.*s\" suffix" msgstr "el C tradicional rebutja el sufix \"%.*s\"" -#: expr.c:268 +#: expr.c:358 #, fuzzy, c-format msgid "invalid suffix \"%.*s\" with hexadecimal floating constant" msgstr "sufix \"%.*s\" invlid en la constant de coma flotant" -#: expr.c:281 +#: expr.c:369 +#, fuzzy +msgid "decimal float constants are a GCC extension" +msgstr "les constants imaginries sn una extensi d'el GCC" + +#: expr.c:379 #, c-format msgid "invalid suffix \"%.*s\" on integer constant" msgstr "sufix \"%.*s\" invlid en constant entera" -#: expr.c:303 +#: expr.c:401 msgid "use of C99 long long integer constant" msgstr "s d'una constant entera long long C99" -#: expr.c:310 +#: expr.c:409 msgid "imaginary constants are a GCC extension" msgstr "les constants imaginries sn una extensi d'el GCC" -#: expr.c:396 +#: expr.c:412 +#, fuzzy +msgid "binary constants are a GCC extension" +msgstr "les constants imaginries sn una extensi d'el GCC" + +#: expr.c:505 msgid "integer constant is too large for its type" msgstr "la constant entera s massa gran pel seu tipus" -#: expr.c:408 +#: expr.c:517 msgid "integer constant is so large that it is unsigned" msgstr "la constant entera s tan gran que s unsigned" -#: expr.c:490 +#: expr.c:612 msgid "missing ')' after \"defined\"" msgstr "\")\" faltant desprs de \"defined\"" -#: expr.c:497 +#: expr.c:619 msgid "operator \"defined\" requires an identifier" msgstr "l'operador \"defined\" requereix un identificador" -#: expr.c:505 +#: expr.c:627 #, 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:515 +#: expr.c:637 msgid "this use of \"defined\" may not be portable" msgstr "aquest s de \"defined\" podria no ser portable" -#: expr.c:554 +#: expr.c:676 msgid "floating constant in preprocessor expression" msgstr "constant de coma flotant en l'expressi del preprocessador" -#: expr.c:560 +#: expr.c:682 msgid "imaginary number in preprocessor expression" msgstr "nombre imaginari en l'expressi del preprocessador" -#: expr.c:605 +#: expr.c:727 #, c-format msgid "\"%s\" is not defined" msgstr "\"%s\" no s definit" -#: expr.c:733 expr.c:762 +#: expr.c:855 expr.c:884 #, c-format msgid "missing binary operator before token \"%s\"" msgstr "operador binari faltant abans de l'element \"%s\"" -#: expr.c:753 +#: expr.c:875 #, c-format msgid "token \"%s\" is not valid in preprocessor expressions" msgstr "l'element \"%s\" no s vlid en les expressions del preprocesador" -#: expr.c:770 +#: expr.c:892 msgid "missing expression between '(' and ')'" msgstr "expressin faltant entre \"(\" i \")\"" -#: expr.c:773 +#: expr.c:895 msgid "#if with no expression" msgstr "#if sense expressi" -#: expr.c:776 +#: expr.c:898 #, c-format msgid "operator '%s' has no right operand" msgstr "l'operador \"%s\" no t operant de dreta" -#: expr.c:781 +#: expr.c:903 #, c-format msgid "operator '%s' has no left operand" msgstr "l'operador \"%s\" no t operant d'esquera" -#: expr.c:807 +#: expr.c:929 msgid " ':' without preceding '?'" msgstr " \":\" sense \"?\" precedent" -#: expr.c:834 +#: expr.c:956 msgid "unbalanced stack in #if" msgstr "pila desequilibrada en #if" -#: expr.c:853 +#: expr.c:975 #, c-format msgid "impossible operator '%u'" msgstr "operador \"%u\" impossible" -#: expr.c:943 +#: expr.c:1065 msgid "missing ')' in expression" msgstr "\")\" faltant en l'expressi" -#: expr.c:964 +#: expr.c:1086 msgid "'?' without following ':'" msgstr " \"?\" sense el \":\" segent" -#: expr.c:974 +#: expr.c:1096 msgid "integer overflow in preprocessor expression" msgstr "desbordament d'enter en l'expressi del preprocessador" -#: expr.c:979 +#: expr.c:1101 msgid "missing '(' in expression" msgstr "\"(\" faltant en l'expressi" -#: expr.c:1011 +#: expr.c:1133 #, 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:1016 +#: expr.c:1138 #, 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:1275 +#: expr.c:1397 msgid "traditional C rejects the unary plus operator" msgstr "C tradicional rebutja l'operador unari ms" -#: expr.c:1358 +#: expr.c:1480 msgid "comma operator in operand of #if" msgstr "operador coma en operant de #if" -#: expr.c:1490 +#: expr.c:1612 msgid "division by zero in #if" msgstr "divisi per zero en #if" -#: files.c:402 +#: files.c:442 msgid "NULL directory in find_file" msgstr "directori NULL en find_file" -#: files.c:440 +#: files.c:480 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:443 +#: files.c:483 msgid "use -Winvalid-pch for more information" msgstr "usi -Winvalid-pch per a ms informaci" -#: files.c:501 +#: files.c:570 #, c-format msgid "%s is a block device" msgstr "%s s un dispositiu de blocs" -#: files.c:518 +#: files.c:587 #, c-format msgid "%s is too large" msgstr "%s s massa gran" -#: files.c:553 +#: files.c:622 #, c-format msgid "%s is shorter than expected" msgstr "%s s ms curt qu'esperat" -#: files.c:782 +#: files.c:852 #, 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:1071 +#: files.c:1157 msgid "Multiple include guards may be useful for:\n" msgstr "Mltiples gurdies d'inclusi poden ser tils per a:\n" -#: init.c:407 +#: init.c:426 msgid "cppchar_t must be an unsigned type" msgstr "cppchar_t ha de ser d'un tipus unsigned" -#: init.c:411 +#: init.c:430 #, 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:418 +#: init.c:437 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:421 +#: init.c:440 msgid "target char is less than 8 bits wide" msgstr "el char de l'objectiu t menys de 8 bits d'ampliaria" -#: init.c:425 +#: init.c:444 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:429 +#: init.c:448 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:434 +#: init.c:453 msgid "CPP half-integer narrower than CPP character" msgstr "el half-integer de CPP s ms estret que el carcter de CPP" -#: init.c:438 +#: init.c:457 #, 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" -#: lex.c:271 +#: lex.c:283 msgid "backslash and newline separated by space" msgstr "barra invertida i fi de lnia separats per un espai" -#: lex.c:276 +#: lex.c:288 msgid "backslash-newline at end of file" msgstr "barra invertida i nova lnia al final del fitxer" -#: lex.c:291 +#: lex.c:303 #, c-format msgid "trigraph ??%c converted to %c" msgstr "trigraph ??%c convertit a %c" -#: lex.c:298 +#: lex.c:310 #, c-format msgid "trigraph ??%c ignored, use -trigraphs to enable" msgstr "s'ignora el trigraph ??%c, usi -trigraphs per permetre-ho" -#: lex.c:344 +#: lex.c:356 msgid "\"/*\" within comment" msgstr "\"/*\" dintre d'un comentari" -#: lex.c:402 +#: lex.c:414 #, c-format msgid "%s in preprocessing directive" msgstr "%s en una directiva de preprocessament" -#: lex.c:411 +#: lex.c:423 msgid "null character(s) ignored" msgstr "carter(es) nul(s) ignorats" -#: lex.c:448 +#: lex.c:460 #, fuzzy, c-format msgid "`%.*s' is not in NFKC" msgstr "\"%s\" no s definit" -#: lex.c:451 +#: lex.c:463 #, fuzzy, c-format msgid "`%.*s' is not in NFC" msgstr "\"%s\" no s definit" -#: lex.c:539 +#: lex.c:551 #, c-format msgid "attempt to use poisoned \"%s\"" msgstr "intent d'usar \"%s\" enverinat" -#: lex.c:547 +#: lex.c:559 msgid "__VA_ARGS__ can only appear in the expansion of a C99 variadic macro" msgstr "__VA_ARGS__ solament pot aparixer en l'expansi d'una macro variadic C99" -#: lex.c:647 +#: lex.c:659 msgid "null character(s) preserved in literal" msgstr "carcter(es) nul(s) preservats en la literal" -#: lex.c:650 +#: lex.c:662 #, fuzzy, c-format msgid "missing terminating %c character" msgstr "falta el carcter de terminaci >" -#: lex.c:842 -msgid "no newline at end of file" -msgstr "no hi ha carcter de fi de lnia al final del fitxer" - -#: lex.c:1002 traditional.c:162 -msgid "unterminated comment" -msgstr "comentari sense acabar" - -#: lex.c:1013 +#: lex.c:1027 msgid "C++ style comments are not allowed in ISO C90" msgstr "els comentaris d'estil C++ no sn permesos en ISO C90" -#: lex.c:1015 +#: lex.c:1029 msgid "(this will be reported only once per input file)" msgstr "(aix es reportar solament una vegada per cada fitxer d'entrada)" -#: lex.c:1020 +#: lex.c:1034 msgid "multi-line comment" msgstr "comentari en mltiples lnies" -#: lex.c:1333 +#: lex.c:1347 #, c-format msgid "unspellable token %s" msgstr "Element %s impronunciable" -#: line-map.c:313 +#: line-map.c:320 #, c-format msgid "In file included from %s:%u" msgstr "En el fitxer incls ds de %s:%u" -#: line-map.c:331 +#: line-map.c:338 #, c-format msgid "" ",\n" @@ -733,154 +754,166 @@ msgstr "" ",\n" " ds de %s:%u" -#: macro.c:83 +#: macro.c:84 #, c-format msgid "macro \"%s\" is not used" msgstr "no s'usa la macro \"%s\"" -#: macro.c:122 macro.c:312 +#: macro.c:123 macro.c:319 #, c-format msgid "invalid built-in macro \"%s\"" msgstr "macro interna \"%s\" invlida" -#: macro.c:156 +#: macro.c:157 #, fuzzy msgid "could not determine file timestamp" msgstr "no es pot determinar la data i l'hora" -#: macro.c:253 +#: macro.c:254 msgid "could not determine date and time" msgstr "no es pot determinar la data i l'hora" -#: macro.c:416 +#: macro.c:270 +msgid "__COUNTER__ expanded inside directive with -fdirectives-only" +msgstr "" + +#: macro.c:423 msgid "invalid string literal, ignoring final '\\'" msgstr "cadena literal invlida, s'ignora el \"\\\" final" -#: macro.c:466 +#: macro.c:483 #, 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:538 +#: macro.c:558 msgid "ISO C99 requires rest arguments to be used" msgstr "ISO C99 requereix que la resta dels arguments sigui usat" -#: macro.c:543 +#: macro.c:563 #, 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:548 +#: macro.c:568 #, 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:659 traditional.c:675 +#: macro.c:679 traditional.c:680 #, c-format msgid "unterminated argument list invoking macro \"%s\"" msgstr "llista d'arguments sense acabar a l'invocar la macro \"%s\"" -#: macro.c:762 +#: macro.c:782 #, 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:1278 +#: macro.c:1325 #, c-format msgid "duplicate macro parameter \"%s\"" msgstr "parmetre de macro \"%s\" duplicat" -#: macro.c:1324 +#: macro.c:1371 #, c-format msgid "\"%s\" may not appear in macro parameter list" msgstr "\"%s\" podria faltar en la llista de parmetre de macro" -#: macro.c:1332 +#: macro.c:1379 msgid "macro parameters must be comma-separated" msgstr "els parmetres de macro han de ser separats per comes" -#: macro.c:1349 +#: macro.c:1396 msgid "parameter name missing" msgstr "falta el nom del parmetre" -#: macro.c:1366 +#: macro.c:1413 msgid "anonymous variadic macros were introduced in C99" msgstr "els macros variadic annims es van introduir en C99" -#: macro.c:1371 +#: macro.c:1418 msgid "ISO C does not permit named variadic macros" msgstr "ISO C no permet macros variadic nomenats" -#: macro.c:1380 +#: macro.c:1427 msgid "missing ')' in macro parameter list" msgstr "\")\" faltant en la llista de parmetres de macro" -#: macro.c:1458 +#: macro.c:1476 +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:1510 msgid "ISO C99 requires whitespace after the macro name" msgstr "ISO C99 requereix espais en blanc desprs del nom de macro" -#: macro.c:1482 +#: macro.c:1534 msgid "missing whitespace after the macro name" msgstr "espais en blanc faltant desprs del nom de macro" -#: macro.c:1512 +#: macro.c:1564 msgid "'#' is not followed by a macro parameter" msgstr "\"#\" no s seguit per un parmetre de macro" -#: macro.c:1531 -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:1629 +#: macro.c:1683 #, c-format msgid "\"%s\" redefined" msgstr "\"%s\" re-definit" -#: macro.c:1634 +#: macro.c:1688 msgid "this is the location of the previous definition" msgstr "aquesta s la ubicaci de la definici prvia" -#: macro.c:1684 +#: macro.c:1738 #, 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" -#: macro.c:1707 +#: macro.c:1761 #, c-format msgid "invalid hash type %d in cpp_macro_definition" msgstr "tipus de hash %d invlid en cpp_macro_definition" -#: pch.c:84 pch.c:332 pch.c:354 pch.c:360 +#: pch.c:84 pch.c:332 pch.c:344 pch.c:362 pch.c:368 pch.c:377 msgid "while writing precompiled header" msgstr "mentre escrivint capalera precompilada" -#: pch.c:467 +#: pch.c:485 #, c-format msgid "%s: not used because `%.*s' not defined" msgstr "%s: no utilitzat perqu \"%.*s\" no est definit" -#: pch.c:479 +#: pch.c:497 #, c-format msgid "%s: not used because `%.*s' defined as `%s' not `%.*s'" msgstr "%s: no utilitzat perqu \"%.*s\" est definit com a \"%s\" i no com a \"%.*s\"" -#: pch.c:520 +#: pch.c:538 #, c-format msgid "%s: not used because `%s' is defined" msgstr "%s: no utilitzat perqu \"%s\" s definit" -#: pch.c:533 pch.c:696 +#: pch.c:558 +#, fuzzy, c-format +msgid "%s: not used because `__COUNTER__' is invalid" +msgstr "%s: no utilitzat perqu \"%s\" s definit" + +#: pch.c:567 pch.c:737 msgid "while reading precompiled header" msgstr "mentre llegint capalera precompilada" -#: traditional.c:745 +#: traditional.c:750 #, c-format msgid "detected recursion whilst expanding macro \"%s\"" msgstr "whilst recursiu detectat en expandint la macro \"%s\"" -#: traditional.c:912 +#: traditional.c:917 msgid "syntax error in macro parameter list" msgstr "error sintctic en la llista de parmetre de macro" #~ msgid "unknown escape sequence: '\\%03o'" #~ msgstr "seqncia d'escapa desconeguda: '\\%03o'" + +#~ msgid "no newline at end of file" +#~ msgstr "no hi ha carcter de fi de lnia al final del fitxer" diff --git a/libcpp/po/cpplib.pot b/libcpp/po/cpplib.pot index 00a14c7c62b..9ed394333de 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: http://gcc.gnu.org/bugs.html\n" -"POT-Creation-Date: 2007-03-07 17:59+0000\n" +"POT-Creation-Date: 2008-02-01 16:21+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,140 +16,140 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: charset.c:654 +#: charset.c:671 #, c-format msgid "conversion from %s to %s not supported by iconv" msgstr "" -#: charset.c:657 +#: charset.c:674 msgid "iconv_open" msgstr "" -#: charset.c:665 +#: charset.c:682 #, c-format msgid "no iconv implementation, cannot convert from %s to %s" msgstr "" -#: charset.c:742 +#: charset.c:759 #, c-format msgid "character 0x%lx is not in the basic source character set\n" msgstr "" -#: charset.c:759 -#: charset.c:1352 +#: charset.c:776 +#: charset.c:1369 msgid "converting to execution character set" msgstr "" -#: charset.c:765 +#: charset.c:782 #, c-format msgid "character 0x%lx is not unibyte in execution character set" msgstr "" -#: charset.c:889 +#: charset.c:906 #, c-format msgid "Character %x might not be NFKC" msgstr "" -#: charset.c:949 +#: charset.c:966 msgid "universal character names are only valid in C++ and C99" msgstr "" -#: charset.c:952 +#: charset.c:969 #, c-format msgid "the meaning of '\\%c' is different in traditional C" msgstr "" -#: charset.c:961 +#: charset.c:978 msgid "In _cpp_valid_ucn but not a UCN" msgstr "" -#: charset.c:986 +#: charset.c:1003 #, c-format msgid "incomplete universal character name %.*s" msgstr "" -#: charset.c:998 +#: charset.c:1015 #, c-format msgid "%.*s is not a valid universal character" msgstr "" -#: charset.c:1008 +#: charset.c:1025 #: lex.c:484 msgid "'$' in identifier or number" msgstr "" -#: charset.c:1018 +#: charset.c:1035 #, c-format msgid "universal character %.*s is not valid in an identifier" msgstr "" -#: charset.c:1022 +#: charset.c:1039 #, c-format msgid "universal character %.*s is not valid at the start of an identifier" msgstr "" -#: charset.c:1056 -#: charset.c:1571 +#: charset.c:1073 +#: charset.c:1588 msgid "converting UCN to source character set" msgstr "" -#: charset.c:1060 +#: charset.c:1077 msgid "converting UCN to execution character set" msgstr "" -#: charset.c:1132 +#: charset.c:1149 msgid "the meaning of '\\x' is different in traditional C" msgstr "" -#: charset.c:1149 +#: charset.c:1166 msgid "\\x used with no following hex digits" msgstr "" -#: charset.c:1156 +#: charset.c:1173 msgid "hex escape sequence out of range" msgstr "" -#: charset.c:1195 +#: charset.c:1212 msgid "octal escape sequence out of range" msgstr "" -#: charset.c:1263 +#: charset.c:1280 msgid "the meaning of '\\a' is different in traditional C" msgstr "" -#: charset.c:1270 +#: charset.c:1287 #, c-format msgid "non-ISO-standard escape sequence, '\\%c'" msgstr "" -#: charset.c:1278 +#: charset.c:1295 #, c-format msgid "unknown escape sequence '\\%c'" msgstr "" -#: charset.c:1286 +#: charset.c:1303 #, c-format msgid "unknown escape sequence: '\\%s'" msgstr "" -#: charset.c:1293 +#: charset.c:1310 msgid "converting escape sequence to execution character set" msgstr "" -#: charset.c:1415 -#: charset.c:1478 +#: charset.c:1432 +#: charset.c:1495 msgid "character constant too long for its type" msgstr "" -#: charset.c:1418 +#: charset.c:1435 msgid "multi-character character constant" msgstr "" -#: charset.c:1510 +#: charset.c:1527 msgid "empty character constant" msgstr "" -#: charset.c:1612 +#: charset.c:1629 #, c-format msgid "failure to convert %s to %s" msgstr "" @@ -187,201 +187,211 @@ msgstr "" msgid "style of line directive is a GCC extension" msgstr "" -#: directives.c:459 +#: directives.c:464 #, c-format msgid "invalid preprocessing directive #%s" msgstr "" -#: directives.c:527 +#: directives.c:532 msgid "\"defined\" cannot be used as a macro name" msgstr "" -#: directives.c:533 +#: directives.c:538 #, c-format msgid "\"%s\" cannot be used as a macro name as it is an operator in C++" msgstr "" -#: directives.c:536 +#: directives.c:541 #, c-format msgid "no macro name given in #%s directive" msgstr "" -#: directives.c:539 +#: directives.c:544 msgid "macro names must be identifiers" msgstr "" -#: directives.c:580 +#: directives.c:585 #, c-format msgid "undefining \"%s\"" msgstr "" -#: directives.c:635 +#: directives.c:640 msgid "missing terminating > character" msgstr "" -#: directives.c:690 +#: directives.c:695 #, c-format msgid "#%s expects \"FILENAME\" or " msgstr "" -#: directives.c:730 +#: directives.c:739 #, c-format msgid "empty filename in #%s" msgstr "" -#: directives.c:740 +#: directives.c:749 msgid "#include nested too deeply" msgstr "" -#: directives.c:781 +#: directives.c:790 msgid "#include_next in primary source file" msgstr "" -#: directives.c:807 +#: directives.c:816 #, c-format msgid "invalid flag \"%s\" in line directive" msgstr "" -#: directives.c:859 +#: directives.c:868 +msgid "unexpected end of file after #line" +msgstr "" + +#: directives.c:871 #, c-format msgid "\"%s\" after #line is not a positive integer" msgstr "" -#: directives.c:865 +#: directives.c:877 msgid "line number out of range" msgstr "" -#: directives.c:878 -#: directives.c:955 +#: directives.c:890 +#: directives.c:969 #, c-format msgid "\"%s\" is not a valid filename" msgstr "" -#: directives.c:915 +#: directives.c:929 #, c-format msgid "\"%s\" after # is not a positive integer" msgstr "" -#: directives.c:1017 +#: directives.c:1031 #, c-format msgid "invalid #%s directive" msgstr "" -#: directives.c:1080 +#: directives.c:1094 #, c-format msgid "registering pragmas in namespace \"%s\" with mismatched name expansion" msgstr "" -#: directives.c:1089 +#: directives.c:1103 #, c-format msgid "registering pragma \"%s\" with name expansion and no namespace" msgstr "" -#: directives.c:1107 +#: directives.c:1121 #, c-format msgid "registering \"%s\" as both a pragma and a pragma namespace" msgstr "" -#: directives.c:1110 +#: directives.c:1124 #, c-format msgid "#pragma %s %s is already registered" msgstr "" -#: directives.c:1113 +#: directives.c:1127 #, c-format msgid "#pragma %s is already registered" msgstr "" -#: directives.c:1143 +#: directives.c:1157 msgid "registering pragma with NULL handler" msgstr "" -#: directives.c:1353 +#: directives.c:1367 msgid "#pragma once in main file" msgstr "" -#: directives.c:1376 +#: directives.c:1390 msgid "invalid #pragma GCC poison directive" msgstr "" -#: directives.c:1385 +#: directives.c:1399 #, c-format msgid "poisoning existing macro \"%s\"" msgstr "" -#: directives.c:1404 +#: directives.c:1418 msgid "#pragma system_header ignored outside include file" msgstr "" -#: directives.c:1428 +#: directives.c:1442 #, c-format msgid "cannot find source file %s" msgstr "" -#: directives.c:1432 +#: directives.c:1446 #, c-format msgid "current file is older than %s" msgstr "" -#: directives.c:1600 +#: directives.c:1625 msgid "_Pragma takes a parenthesized string literal" msgstr "" -#: directives.c:1672 +#: directives.c:1698 msgid "#else without #if" msgstr "" -#: directives.c:1677 +#: directives.c:1703 msgid "#else after #else" msgstr "" -#: directives.c:1679 -#: directives.c:1712 +#: directives.c:1705 +#: directives.c:1738 msgid "the conditional began here" msgstr "" -#: directives.c:1705 +#: directives.c:1731 msgid "#elif without #if" msgstr "" -#: directives.c:1710 +#: directives.c:1736 msgid "#elif after #else" msgstr "" -#: directives.c:1740 +#: directives.c:1766 msgid "#endif without #if" msgstr "" -#: directives.c:1817 +#: directives.c:1843 msgid "missing '(' after predicate" msgstr "" -#: directives.c:1832 +#: directives.c:1858 msgid "missing ')' to complete answer" msgstr "" -#: directives.c:1852 +#: directives.c:1878 msgid "predicate's answer is empty" msgstr "" -#: directives.c:1879 +#: directives.c:1905 msgid "assertion without predicate" msgstr "" -#: directives.c:1881 +#: directives.c:1907 msgid "predicate must be an identifier" msgstr "" -#: directives.c:1967 +#: directives.c:1993 #, c-format msgid "\"%s\" re-asserted" msgstr "" -#: directives.c:2191 +#: directives.c:2276 #, c-format msgid "unterminated #%s" msgstr "" +#: directives-only.c:221 +#: lex.c:1016 +#: traditional.c:162 +msgid "unterminated comment" +msgstr "" + #: errors.c:118 msgid "warning: " msgstr "" @@ -403,240 +413,264 @@ msgstr "" msgid "%s: %s" msgstr "" -#: expr.c:203 +#: expr.c:261 msgid "too many decimal points in number" msgstr "" -#: expr.c:223 +#: expr.c:290 +#: expr.c:365 +msgid "fixed-point constants are a GCC extension" +msgstr "" + +#: expr.c:303 +#, c-format +msgid "invalid digit \"%c\" in binary constant" +msgstr "" + +#: expr.c:305 #, c-format msgid "invalid digit \"%c\" in octal constant" msgstr "" -#: expr.c:229 +#: expr.c:313 +msgid "invalid prefix \"0b\" for floating constant" +msgstr "" + +#: expr.c:319 msgid "use of C99 hexadecimal floating constant" msgstr "" -#: expr.c:238 +#: expr.c:328 msgid "exponent has no digits" msgstr "" -#: expr.c:245 +#: expr.c:335 msgid "hexadecimal floating constants require an exponent" msgstr "" -#: expr.c:251 +#: expr.c:341 #, c-format msgid "invalid suffix \"%.*s\" on floating constant" msgstr "" -#: expr.c:261 expr.c:295 +#: expr.c:351 +#: expr.c:393 #, c-format msgid "traditional C rejects the \"%.*s\" suffix" msgstr "" -#: expr.c:268 +#: expr.c:358 #, c-format msgid "invalid suffix \"%.*s\" with hexadecimal floating constant" msgstr "" -#: expr.c:281 +#: expr.c:369 +msgid "decimal float constants are a GCC extension" +msgstr "" + +#: expr.c:379 #, c-format msgid "invalid suffix \"%.*s\" on integer constant" msgstr "" -#: expr.c:303 +#: expr.c:401 msgid "use of C99 long long integer constant" msgstr "" -#: expr.c:310 +#: expr.c:409 msgid "imaginary constants are a GCC extension" msgstr "" -#: expr.c:396 +#: expr.c:412 +msgid "binary constants are a GCC extension" +msgstr "" + +#: expr.c:505 msgid "integer constant is too large for its type" msgstr "" -#: expr.c:408 +#: expr.c:517 msgid "integer constant is so large that it is unsigned" msgstr "" -#: expr.c:490 +#: expr.c:612 msgid "missing ')' after \"defined\"" msgstr "" -#: expr.c:497 +#: expr.c:619 msgid "operator \"defined\" requires an identifier" msgstr "" -#: expr.c:505 +#: expr.c:627 #, c-format msgid "(\"%s\" is an alternative token for \"%s\" in C++)" msgstr "" -#: expr.c:515 +#: expr.c:637 msgid "this use of \"defined\" may not be portable" msgstr "" -#: expr.c:554 +#: expr.c:676 msgid "floating constant in preprocessor expression" msgstr "" -#: expr.c:560 +#: expr.c:682 msgid "imaginary number in preprocessor expression" msgstr "" -#: expr.c:605 +#: expr.c:727 #, c-format msgid "\"%s\" is not defined" msgstr "" -#: expr.c:733 expr.c:762 +#: expr.c:855 +#: expr.c:884 #, c-format msgid "missing binary operator before token \"%s\"" msgstr "" -#: expr.c:753 +#: expr.c:875 #, c-format msgid "token \"%s\" is not valid in preprocessor expressions" msgstr "" -#: expr.c:770 +#: expr.c:892 msgid "missing expression between '(' and ')'" msgstr "" -#: expr.c:773 +#: expr.c:895 msgid "#if with no expression" msgstr "" -#: expr.c:776 +#: expr.c:898 #, c-format msgid "operator '%s' has no right operand" msgstr "" -#: expr.c:781 +#: expr.c:903 #, c-format msgid "operator '%s' has no left operand" msgstr "" -#: expr.c:807 +#: expr.c:929 msgid " ':' without preceding '?'" msgstr "" -#: expr.c:834 +#: expr.c:956 msgid "unbalanced stack in #if" msgstr "" -#: expr.c:853 +#: expr.c:975 #, c-format msgid "impossible operator '%u'" msgstr "" -#: expr.c:943 +#: expr.c:1065 msgid "missing ')' in expression" msgstr "" -#: expr.c:964 +#: expr.c:1086 msgid "'?' without following ':'" msgstr "" -#: expr.c:974 +#: expr.c:1096 msgid "integer overflow in preprocessor expression" msgstr "" -#: expr.c:979 +#: expr.c:1101 msgid "missing '(' in expression" msgstr "" -#: expr.c:1011 +#: expr.c:1133 #, c-format msgid "the left operand of \"%s\" changes sign when promoted" msgstr "" -#: expr.c:1016 +#: expr.c:1138 #, c-format msgid "the right operand of \"%s\" changes sign when promoted" msgstr "" -#: expr.c:1275 +#: expr.c:1397 msgid "traditional C rejects the unary plus operator" msgstr "" -#: expr.c:1358 +#: expr.c:1480 msgid "comma operator in operand of #if" msgstr "" -#: expr.c:1490 +#: expr.c:1612 msgid "division by zero in #if" msgstr "" -#: files.c:402 +#: files.c:458 msgid "NULL directory in find_file" msgstr "" -#: files.c:440 +#: files.c:496 msgid "one or more PCH files were found, but they were invalid" msgstr "" -#: files.c:443 +#: files.c:499 msgid "use -Winvalid-pch for more information" msgstr "" -#: files.c:501 +#: files.c:589 #, c-format msgid "%s is a block device" msgstr "" -#: files.c:518 +#: files.c:606 #, c-format msgid "%s is too large" msgstr "" -#: files.c:553 +#: files.c:641 #, c-format msgid "%s is shorter than expected" msgstr "" -#: files.c:782 +#: files.c:872 #, c-format msgid "no include path in which to search for %s" msgstr "" -#: files.c:1071 +#: files.c:1238 msgid "Multiple include guards may be useful for:\n" msgstr "" -#: init.c:409 +#: init.c:426 msgid "cppchar_t must be an unsigned type" msgstr "" -#: init.c:413 +#: init.c:430 #, c-format msgid "" "preprocessor arithmetic has maximum precision of %lu bits; target requires %" "lu bits" msgstr "" -#: init.c:420 +#: init.c:437 msgid "CPP arithmetic must be at least as precise as a target int" msgstr "" -#: init.c:423 +#: init.c:440 msgid "target char is less than 8 bits wide" msgstr "" -#: init.c:427 +#: init.c:444 msgid "target wchar_t is narrower than target char" msgstr "" -#: init.c:431 +#: init.c:448 msgid "target int is narrower than target char" msgstr "" -#: init.c:436 +#: init.c:453 msgid "CPP half-integer narrower than CPP character" msgstr "" -#: init.c:440 +#: init.c:457 #, c-format msgid "" "CPP on this host cannot handle wide character constants over %lu bits, but " @@ -702,190 +736,196 @@ msgstr "" msgid "missing terminating %c character" msgstr "" -#: lex.c:859 -msgid "no newline at end of file" -msgstr "" - -#: lex.c:1019 -#: traditional.c:162 -msgid "unterminated comment" -msgstr "" - -#: lex.c:1030 +#: lex.c:1027 msgid "C++ style comments are not allowed in ISO C90" msgstr "" -#: lex.c:1032 +#: lex.c:1029 msgid "(this will be reported only once per input file)" msgstr "" -#: lex.c:1037 +#: lex.c:1034 msgid "multi-line comment" msgstr "" -#: lex.c:1350 +#: lex.c:1347 #, c-format msgid "unspellable token %s" msgstr "" -#: line-map.c:313 +#: line-map.c:320 #, c-format msgid "In file included from %s:%u" msgstr "" -#: line-map.c:331 +#: line-map.c:338 #, c-format msgid "" ",\n" " from %s:%u" msgstr "" -#: macro.c:84 +#: macro.c:87 #, c-format msgid "macro \"%s\" is not used" msgstr "" -#: macro.c:123 macro.c:313 +#: macro.c:126 +#: macro.c:322 #, c-format msgid "invalid built-in macro \"%s\"" msgstr "" -#: macro.c:157 +#: macro.c:160 msgid "could not determine file timestamp" msgstr "" -#: macro.c:254 +#: macro.c:257 msgid "could not determine date and time" msgstr "" -#: macro.c:417 +#: macro.c:273 +msgid "__COUNTER__ expanded inside directive with -fdirectives-only" +msgstr "" + +#: macro.c:426 msgid "invalid string literal, ignoring final '\\'" msgstr "" -#: macro.c:467 +#: macro.c:486 #, c-format msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token" msgstr "" -#: macro.c:539 +#: macro.c:561 msgid "ISO C99 requires rest arguments to be used" msgstr "" -#: macro.c:544 +#: macro.c:566 #, c-format msgid "macro \"%s\" requires %u arguments, but only %u given" msgstr "" -#: macro.c:549 +#: macro.c:571 #, c-format msgid "macro \"%s\" passed %u arguments, but takes just %u" msgstr "" -#: macro.c:660 -#: traditional.c:675 +#: macro.c:730 +#: traditional.c:680 #, c-format msgid "unterminated argument list invoking macro \"%s\"" msgstr "" -#: macro.c:763 +#: macro.c:840 #, c-format msgid "function-like macro \"%s\" must be used with arguments in traditional C" msgstr "" -#: macro.c:1279 +#: macro.c:1408 #, c-format msgid "duplicate macro parameter \"%s\"" msgstr "" -#: macro.c:1325 +#: macro.c:1454 #, c-format msgid "\"%s\" may not appear in macro parameter list" msgstr "" -#: macro.c:1333 +#: macro.c:1462 msgid "macro parameters must be comma-separated" msgstr "" -#: macro.c:1350 +#: macro.c:1479 msgid "parameter name missing" msgstr "" -#: macro.c:1367 +#: macro.c:1496 msgid "anonymous variadic macros were introduced in C99" msgstr "" -#: macro.c:1372 +#: macro.c:1501 msgid "ISO C does not permit named variadic macros" msgstr "" -#: macro.c:1381 +#: macro.c:1510 msgid "missing ')' in macro parameter list" msgstr "" -#: macro.c:1461 +#: macro.c:1559 +msgid "'##' cannot appear at either end of a macro expansion" +msgstr "" + +#: macro.c:1593 msgid "ISO C99 requires whitespace after the macro name" msgstr "" -#: macro.c:1485 +#: macro.c:1617 msgid "missing whitespace after the macro name" msgstr "" -#: macro.c:1515 +#: macro.c:1647 msgid "'#' is not followed by a macro parameter" msgstr "" -#: macro.c:1534 -msgid "'##' cannot appear at either end of a macro expansion" -msgstr "" - -#: macro.c:1626 +#: macro.c:1766 #, c-format msgid "\"%s\" redefined" msgstr "" -#: macro.c:1631 +#: macro.c:1771 msgid "this is the location of the previous definition" msgstr "" -#: macro.c:1681 +#: macro.c:1828 #, c-format msgid "macro argument \"%s\" would be stringified in traditional C" msgstr "" -#: macro.c:1704 +#: macro.c:1851 #, c-format msgid "invalid hash type %d in cpp_macro_definition" msgstr "" -#: pch.c:84 pch.c:332 -#: pch.c:354 pch.c:360 +#: pch.c:84 +#: pch.c:332 +#: pch.c:344 +#: pch.c:362 +#: pch.c:368 +#: pch.c:377 msgid "while writing precompiled header" msgstr "" -#: pch.c:467 +#: pch.c:485 #, c-format msgid "%s: not used because `%.*s' not defined" msgstr "" -#: pch.c:479 +#: pch.c:497 #, c-format msgid "%s: not used because `%.*s' defined as `%s' not `%.*s'" msgstr "" -#: pch.c:520 +#: pch.c:538 #, c-format msgid "%s: not used because `%s' is defined" msgstr "" -#: pch.c:533 pch.c:696 +#: pch.c:558 +#, c-format +msgid "%s: not used because `__COUNTER__' is invalid" +msgstr "" + +#: pch.c:567 +#: pch.c:737 msgid "while reading precompiled header" msgstr "" -#: traditional.c:745 +#: traditional.c:750 #, c-format msgid "detected recursion whilst expanding macro \"%s\"" msgstr "" -#: traditional.c:912 +#: traditional.c:968 msgid "syntax error in macro parameter list" msgstr "" diff --git a/libcpp/po/da.po b/libcpp/po/da.po index 2e0fca93a6a..5224116245c 100644 --- a/libcpp/po/da.po +++ b/libcpp/po/da.po @@ -128,7 +128,7 @@ msgid "" msgstr "" "Project-Id-Version: gcc 3.3\n" "Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n" -"POT-Creation-Date: 2007-05-13 19:48-0700\n" +"POT-Creation-Date: 2007-11-08 21:08+0000\n" "PO-Revision-Date: 2003-05-25 18:00+0200\n" "Last-Translator: Ole Laursen \n" "Language-Team: Danish \n" @@ -193,7 +193,7 @@ msgstr "ufuldst msgid "%.*s is not a valid universal character" msgstr "'%T::%D' er ikke en gyldig erklrer" -#: charset.c:1008 lex.c:472 +#: charset.c:1008 lex.c:484 #, fuzzy msgid "'$' in identifier or number" msgstr "'$'-tegn i kaldenavn eller tal" @@ -275,231 +275,235 @@ msgstr "tom tegnkonstant" msgid "failure to convert %s to %s" msgstr "kunne ikke konvertere '%E' til '%T'" -#: directives.c:214 directives.c:240 +#: directives.c:215 directives.c:241 #, c-format msgid "extra tokens at end of #%s directive" msgstr "ekstra symboler i slutningen af #%s-direktiv" -#: directives.c:343 +#: directives.c:344 #, c-format msgid "#%s is a GCC extension" msgstr "#%s er en GCC-udvidelse" -#: directives.c:355 +#: directives.c:356 msgid "suggest not using #elif in traditional C" msgstr "foreslr undladelse af brug af #elif i traditionel C" -#: directives.c:358 +#: directives.c:359 #, c-format msgid "traditional C ignores #%s with the # indented" msgstr "traditionel C ignorerer #%s nr '#' er indrykket" -#: directives.c:362 +#: directives.c:363 #, c-format msgid "suggest hiding #%s from traditional C with an indented #" msgstr "foreslr at skjule #%s fra traditionel C vha. indrykket '#'" -#: directives.c:388 +#: directives.c:389 msgid "embedding a directive within macro arguments is not portable" msgstr "indlejring af et direktiv inden i makroparametre er ikke portabelt" -#: directives.c:408 +#: directives.c:409 msgid "style of line directive is a GCC extension" msgstr "linjestilsdirektiv er en GCC-udvidelse" -#: directives.c:458 +#: directives.c:464 #, c-format msgid "invalid preprocessing directive #%s" msgstr "ugyldigt prprocessordirektiv #%s" -#: directives.c:524 +#: directives.c:532 msgid "\"defined\" cannot be used as a macro name" msgstr "\"defined\" kan ikke bruges som makronavn" -#: directives.c:530 +#: directives.c:538 #, c-format msgid "\"%s\" cannot be used as a macro name as it is an operator in C++" msgstr "\"%s\" kan ikke bruges som et makronavn da det er en operator i C++" -#: directives.c:533 +#: directives.c:541 #, c-format msgid "no macro name given in #%s directive" msgstr "intet makronavn angivet i direktivet #%s" -#: directives.c:536 +#: directives.c:544 msgid "macro names must be identifiers" msgstr "makronavne skal vre kaldenavne" -#: directives.c:577 +#: directives.c:585 #, c-format msgid "undefining \"%s\"" msgstr "glemmer definitionen af \"%s\"" -#: directives.c:632 +#: directives.c:640 msgid "missing terminating > character" msgstr "manglende afsluttende '>'-tegn" -#: directives.c:687 +#: directives.c:695 #, c-format msgid "#%s expects \"FILENAME\" or " msgstr "#%s forventer \"FILNAVN\" eller " -#: directives.c:727 +#: directives.c:739 #, fuzzy, c-format msgid "empty filename in #%s" msgstr "tomt filnavn i #%s" -#: directives.c:737 +#: directives.c:749 msgid "#include nested too deeply" msgstr "#include indlejret for dybt" -#: directives.c:778 +#: directives.c:790 msgid "#include_next in primary source file" msgstr "#include_next i den primre kildekodefil" -#: directives.c:804 +#: directives.c:816 #, c-format msgid "invalid flag \"%s\" in line directive" msgstr "ugyldigt flag \"%s\" i linjedirektiv" -#: directives.c:856 +#: directives.c:868 #, c-format msgid "\"%s\" after #line is not a positive integer" msgstr "\"%s\" efter #line er ikke et positivt heltal" -#: directives.c:862 +#: directives.c:874 msgid "line number out of range" msgstr "linjenummer er uden for det gyldige interval" -#: directives.c:875 directives.c:952 +#: directives.c:887 directives.c:964 #, c-format msgid "\"%s\" is not a valid filename" msgstr "\"%s\" er ikke et ugyldigt filnavn" -#: directives.c:912 +#: directives.c:924 #, c-format msgid "\"%s\" after # is not a positive integer" msgstr "\"%s\" efter # er ikke et positivt heltal" -#: directives.c:1014 +#: directives.c:1026 #, fuzzy, c-format msgid "invalid #%s directive" msgstr "ugyldigt #ident-direktiv" -#: directives.c:1077 +#: directives.c:1089 #, c-format msgid "registering pragmas in namespace \"%s\" with mismatched name expansion" msgstr "" -#: directives.c:1086 +#: directives.c:1098 #, fuzzy, c-format msgid "registering pragma \"%s\" with name expansion and no namespace" msgstr "registrerer \"%s\" som bde et pragma og som et pragmanavnerum" -#: directives.c:1104 +#: directives.c:1116 #, c-format msgid "registering \"%s\" as both a pragma and a pragma namespace" msgstr "registrerer \"%s\" som bde et pragma og som et pragmanavnerum" -#: directives.c:1107 +#: directives.c:1119 #, c-format msgid "#pragma %s %s is already registered" msgstr "#pragma %s %s er allerede registreret" -#: directives.c:1110 +#: directives.c:1122 #, c-format msgid "#pragma %s is already registered" msgstr "#pragma %s er allerede registreret" -#: directives.c:1140 +#: directives.c:1152 msgid "registering pragma with NULL handler" msgstr "" -#: directives.c:1350 +#: directives.c:1362 msgid "#pragma once in main file" msgstr "'#pragma once' i hovedfil" -#: directives.c:1373 +#: directives.c:1385 msgid "invalid #pragma GCC poison directive" msgstr "ugyldigt #pragma GCC poison-direktiv" -#: directives.c:1382 +#: directives.c:1394 #, c-format msgid "poisoning existing macro \"%s\"" msgstr "forgifter eksisterende makro \"%s\"" -#: directives.c:1403 +#: directives.c:1413 msgid "#pragma system_header ignored outside include file" msgstr "'#pragma system_header' ignoreret uden for inkluderingsfil" -#: directives.c:1427 +#: directives.c:1437 #, fuzzy, c-format msgid "cannot find source file %s" msgstr "kan ikke finde kilden %s" -#: directives.c:1431 +#: directives.c:1441 #, c-format msgid "current file is older than %s" msgstr "aktuel fil er ldre end %s" -#: directives.c:1599 +#: directives.c:1620 msgid "_Pragma takes a parenthesized string literal" msgstr "_Pragma tager en strengkonstant med paranteser omkring" -#: directives.c:1671 +#: directives.c:1693 msgid "#else without #if" msgstr "#else uden #if" -#: directives.c:1676 +#: directives.c:1698 msgid "#else after #else" msgstr "#else efter #else" -#: directives.c:1678 directives.c:1711 +#: directives.c:1700 directives.c:1733 msgid "the conditional began here" msgstr "betingelsen begyndte her" -#: directives.c:1704 +#: directives.c:1726 msgid "#elif without #if" msgstr "#elif uden #if" -#: directives.c:1709 +#: directives.c:1731 msgid "#elif after #else" msgstr "#elif efter #else" -#: directives.c:1739 +#: directives.c:1761 msgid "#endif without #if" msgstr "#endif uden #if" -#: directives.c:1816 +#: directives.c:1838 msgid "missing '(' after predicate" msgstr "manglende '(' efter udsagn" -#: directives.c:1831 +#: directives.c:1853 msgid "missing ')' to complete answer" msgstr "manglende ')' til at fuldfre svar" -#: directives.c:1851 +#: directives.c:1873 msgid "predicate's answer is empty" msgstr "udsagnets svar et tomt" -#: directives.c:1878 +#: directives.c:1900 msgid "assertion without predicate" msgstr "postulat uden udsagn" -#: directives.c:1880 +#: directives.c:1902 msgid "predicate must be an identifier" msgstr "udsagn skal vre et kaldenavn" -#: directives.c:1966 +#: directives.c:1988 #, c-format msgid "\"%s\" re-asserted" msgstr "\"%s\" genpostuleret" -#: directives.c:2190 +#: directives.c:2271 #, c-format msgid "unterminated #%s" msgstr "uafsluttet #%s" +#: directives-only.c:221 lex.c:1016 traditional.c:162 +msgid "unterminated comment" +msgstr "uafsluttet kommentar" + #: errors.c:118 msgid "warning: " msgstr "advarsel: " @@ -522,333 +526,350 @@ msgstr "std-ud" msgid "%s: %s" msgstr "%s: %s" -#: expr.c:203 +#: expr.c:261 msgid "too many decimal points in number" msgstr "for mange decimalkommaer i tal" -#: expr.c:223 +#: expr.c:290 expr.c:365 +#, fuzzy +msgid "fixed-point constants are a GCC extension" +msgstr "imaginre konstanter er en GCC-udvidelse" + +#: expr.c:303 +#, fuzzy, c-format +msgid "invalid digit \"%c\" in binary constant" +msgstr "ugyldig ciffer \"%c\" i oktal konstant" + +#: expr.c:305 #, c-format msgid "invalid digit \"%c\" in octal constant" msgstr "ugyldig ciffer \"%c\" i oktal konstant" -#: expr.c:229 +#: expr.c:313 +#, fuzzy +msgid "invalid prefix \"0b\" for floating constant" +msgstr "ugyldig endelse \"%.*s\" i kommatalskonstant" + +#: expr.c:319 msgid "use of C99 hexadecimal floating constant" msgstr "brug af C99 hexadecimal kommatalskonstant" -#: expr.c:238 +#: expr.c:328 msgid "exponent has no digits" msgstr "der er ingen cifre i eksponent" -#: expr.c:245 +#: expr.c:335 msgid "hexadecimal floating constants require an exponent" msgstr "hexadecimal kommatalskonstant skal have en eksponent" -#: expr.c:251 +#: expr.c:341 #, c-format msgid "invalid suffix \"%.*s\" on floating constant" msgstr "ugyldig endelse \"%.*s\" i kommatalskonstant" -#: expr.c:261 expr.c:295 +#: expr.c:351 expr.c:393 #, c-format msgid "traditional C rejects the \"%.*s\" suffix" msgstr "traditionel C tillader ikke endelsen \"%.*s\"" -#: expr.c:268 +#: expr.c:358 #, fuzzy, c-format msgid "invalid suffix \"%.*s\" with hexadecimal floating constant" msgstr "ugyldig endelse \"%.*s\" i kommatalskonstant" -#: expr.c:281 +#: expr.c:369 +#, fuzzy +msgid "decimal float constants are a GCC extension" +msgstr "imaginre konstanter er en GCC-udvidelse" + +#: expr.c:379 #, c-format msgid "invalid suffix \"%.*s\" on integer constant" msgstr "ugyldig endelse \"%.*s\" i heltalskonstant" -#: expr.c:303 +#: expr.c:401 msgid "use of C99 long long integer constant" msgstr "brug af ISO C99 long long-heltalskonstanter" -#: expr.c:310 +#: expr.c:409 msgid "imaginary constants are a GCC extension" msgstr "imaginre konstanter er en GCC-udvidelse" -#: expr.c:396 +#: expr.c:412 +#, fuzzy +msgid "binary constants are a GCC extension" +msgstr "imaginre konstanter er en GCC-udvidelse" + +#: expr.c:505 msgid "integer constant is too large for its type" msgstr "heltalskonstanten er for stor for dens type" -#: expr.c:408 +#: expr.c:517 msgid "integer constant is so large that it is unsigned" msgstr "heltalskonstanten er s stor at den er unsigned" -#: expr.c:490 +#: expr.c:612 msgid "missing ')' after \"defined\"" msgstr "manglende ')' efter \"defined\"" -#: expr.c:497 +#: expr.c:619 msgid "operator \"defined\" requires an identifier" msgstr "operatoren \"defined\" krver et kaldenavn" -#: expr.c:505 +#: expr.c:627 #, c-format msgid "(\"%s\" is an alternative token for \"%s\" in C++)" msgstr "(\"%s\" er et alternativt symbol for \"%s\" i C++)" -#: expr.c:515 +#: expr.c:637 msgid "this use of \"defined\" may not be portable" msgstr "denne brug af \"defined\" er muligvis ikke portabel" -#: expr.c:554 +#: expr.c:676 msgid "floating constant in preprocessor expression" msgstr "kommatalskonstant i prprocessorudtryk" -#: expr.c:560 +#: expr.c:682 msgid "imaginary number in preprocessor expression" msgstr "imaginrt tal i prprocessorudtryk" -#: expr.c:605 +#: expr.c:727 #, c-format msgid "\"%s\" is not defined" msgstr "\"%s\" er ikke defineret" -#: expr.c:733 expr.c:762 +#: expr.c:855 expr.c:884 #, c-format msgid "missing binary operator before token \"%s\"" msgstr "manglende binr operator fr symbolet \"%s\"" -#: expr.c:753 +#: expr.c:875 #, c-format msgid "token \"%s\" is not valid in preprocessor expressions" msgstr "symbolet \"%s\" er ikke gyldigt i prprocessorudtryk" -#: expr.c:770 +#: expr.c:892 #, fuzzy msgid "missing expression between '(' and ')'" msgstr "tomt udtryk mellem '(' og ')'" -#: expr.c:773 +#: expr.c:895 msgid "#if with no expression" msgstr "#if uden noget udtryk" -#: expr.c:776 +#: expr.c:898 #, c-format msgid "operator '%s' has no right operand" msgstr "operatoren '%s' har ikke nogen hjre operand" -#: expr.c:781 +#: expr.c:903 #, c-format msgid "operator '%s' has no left operand" msgstr "operatoren '%s' har ikke nogen venstre operand" -#: expr.c:807 +#: expr.c:929 msgid " ':' without preceding '?'" msgstr " ':' uden forudgende '?'" -#: expr.c:834 +#: expr.c:956 msgid "unbalanced stack in #if" msgstr "uafbalanceret stak i #if" -#: expr.c:853 +#: expr.c:975 #, c-format msgid "impossible operator '%u'" msgstr "umulig operator '%u'" -#: expr.c:943 +#: expr.c:1065 msgid "missing ')' in expression" msgstr "manglende ')' i udtryk" -#: expr.c:964 +#: expr.c:1086 msgid "'?' without following ':'" msgstr "'?' uden efterflgende ':'" -#: expr.c:974 +#: expr.c:1096 msgid "integer overflow in preprocessor expression" msgstr "heltallet lber over i prprocessorudtrykket" -#: expr.c:979 +#: expr.c:1101 msgid "missing '(' in expression" msgstr "manglende '(' i udtryk" -#: expr.c:1011 +#: expr.c:1133 #, c-format msgid "the left operand of \"%s\" changes sign when promoted" msgstr "den venstre operand til \"%s\" ndrer fortegn ved forfremmelse" -#: expr.c:1016 +#: expr.c:1138 #, c-format msgid "the right operand of \"%s\" changes sign when promoted" msgstr "den hjre operand til \"%s\" ndrer fortegn ved forfremmelse" -#: expr.c:1275 +#: expr.c:1397 msgid "traditional C rejects the unary plus operator" msgstr "traditionel C tillader ikke operatoren unr plus" -#: expr.c:1358 +#: expr.c:1480 msgid "comma operator in operand of #if" msgstr "kommeoperator i en operand til #if" -#: expr.c:1490 +#: expr.c:1612 msgid "division by zero in #if" msgstr "division med nul i #if" -#: files.c:402 +#: files.c:442 msgid "NULL directory in find_file" msgstr "" -#: files.c:440 +#: files.c:480 msgid "one or more PCH files were found, but they were invalid" msgstr "" -#: files.c:443 +#: files.c:483 msgid "use -Winvalid-pch for more information" msgstr "" -#: files.c:501 +#: files.c:570 #, c-format msgid "%s is a block device" msgstr "%s er en blokenhed" -#: files.c:518 +#: files.c:587 #, c-format msgid "%s is too large" msgstr "%s er for stor" -#: files.c:553 +#: files.c:622 #, c-format msgid "%s is shorter than expected" msgstr "%s er kortere end forventet" -#: files.c:782 +#: files.c:852 #, fuzzy, c-format msgid "no include path in which to search for %s" msgstr "der er ingen inkluderingssti at finde %s i" -#: files.c:1071 +#: files.c:1157 msgid "Multiple include guards may be useful for:\n" msgstr "Flere inkluderingsvagter kan vre nyttige til:\n" -#: init.c:407 +#: init.c:426 msgid "cppchar_t must be an unsigned type" msgstr "cppchar_t skal vre en unsigned type" -#: init.c:411 +#: init.c:430 #, c-format msgid "preprocessor arithmetic has maximum precision of %lu bits; target requires %lu bits" msgstr "prprocessorberegning har en maksimal prcision p %lu bit; mlarkitektur krver %lu bit" -#: init.c:418 +#: init.c:437 msgid "CPP arithmetic must be at least as precise as a target int" msgstr "CPP-beregning skal vre mindst lige s prcis som en mlarkitekturs int" -#: init.c:421 +#: init.c:440 msgid "target char is less than 8 bits wide" msgstr "mlarkitekturs char er mindre end 8 bit bred" -#: init.c:425 +#: init.c:444 msgid "target wchar_t is narrower than target char" msgstr "mlarkitekturs wchar_t er mindre end mlarkitekturs char" -#: init.c:429 +#: init.c:448 msgid "target int is narrower than target char" msgstr "mlarkitekturs int er mindre end mlarkitekturs char" -#: init.c:434 +#: init.c:453 msgid "CPP half-integer narrower than CPP character" msgstr "CPP-halvheltal er mindre end CPP-tegn" -#: init.c:438 +#: init.c:457 #, 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 vrt kan ikke hndtere bredtegnkonstanter over %lu bit, men mlarkitekturen krver %lu bit" -#: lex.c:271 +#: lex.c:283 msgid "backslash and newline separated by space" msgstr "omvendt skrstreg og linjeskift er adskilt af mellemrum" -#: lex.c:276 +#: lex.c:288 msgid "backslash-newline at end of file" msgstr "omvendt skrstreg efterfulgt af linjeskift ved slutningen af filen" -#: lex.c:291 +#: lex.c:303 #, c-format msgid "trigraph ??%c converted to %c" msgstr "trigrafen ??%c konverteret til %c" -#: lex.c:298 +#: lex.c:310 #, fuzzy, c-format msgid "trigraph ??%c ignored, use -trigraphs to enable" msgstr "trigrafen ??%c ignoreret" -#: lex.c:344 +#: lex.c:356 msgid "\"/*\" within comment" msgstr "\"/*\" i en kommentar" -#: lex.c:402 +#: lex.c:414 #, c-format msgid "%s in preprocessing directive" msgstr "%s i prprocessordirektiv" -#: lex.c:411 +#: lex.c:423 msgid "null character(s) ignored" msgstr "nultegn ignoreret" -#: lex.c:448 +#: lex.c:460 #, fuzzy, c-format msgid "`%.*s' is not in NFKC" msgstr "\"%s\" er ikke defineret" -#: lex.c:451 +#: lex.c:463 #, fuzzy, c-format msgid "`%.*s' is not in NFC" msgstr "\"%s\" er ikke defineret" -#: lex.c:539 +#: lex.c:551 #, c-format msgid "attempt to use poisoned \"%s\"" msgstr "forsg p at bruge forgiftet \"%s\"" -#: lex.c:547 +#: lex.c:559 msgid "__VA_ARGS__ can only appear in the expansion of a C99 variadic macro" msgstr "__VA_ARGS__ kan kun optrde i udfoldelsen af en C99-makro med vilkrligt antal parametre" -#: lex.c:647 +#: lex.c:659 msgid "null character(s) preserved in literal" msgstr "nultegn bevaret i strengkonstant" -#: lex.c:650 +#: lex.c:662 #, c-format msgid "missing terminating %c character" msgstr "manglende afsluttende '%c'-tegn" -#: lex.c:842 -msgid "no newline at end of file" -msgstr "ingen linjeskift ved slutningen af filen" - -#: lex.c:1002 traditional.c:162 -msgid "unterminated comment" -msgstr "uafsluttet kommentar" - -#: lex.c:1013 +#: lex.c:1027 msgid "C++ style comments are not allowed in ISO C90" msgstr "kommentarer i C++-stil er ikke tilladt i ISO C90" -#: lex.c:1015 +#: lex.c:1029 msgid "(this will be reported only once per input file)" msgstr "(dette rapporteres kun en enkelt gang per inddatafil)" -#: lex.c:1020 +#: lex.c:1034 msgid "multi-line comment" msgstr "flerlinjers kommentar" -#: lex.c:1333 +#: lex.c:1347 #, c-format msgid "unspellable token %s" msgstr "symbol %s kan ikke staves" -#: line-map.c:313 +#: line-map.c:320 #, c-format msgid "In file included from %s:%u" msgstr "I filen inkluderet af %s:%u" -#: line-map.c:331 +#: line-map.c:338 #, c-format msgid "" ",\n" @@ -857,154 +878,163 @@ msgstr "" ",\n" " af %s:%u" -#: macro.c:83 +#: macro.c:84 #, c-format msgid "macro \"%s\" is not used" msgstr "makroen \"%s\" bliver ikke brugt" -#: macro.c:122 macro.c:312 +#: macro.c:123 macro.c:319 #, c-format msgid "invalid built-in macro \"%s\"" msgstr "ugyldig indbygget makro \"%s\"" -#: macro.c:156 +#: macro.c:157 #, fuzzy msgid "could not determine file timestamp" msgstr "kunne ikke bestemme dato og tid" -#: macro.c:253 +#: macro.c:254 msgid "could not determine date and time" msgstr "kunne ikke bestemme dato og tid" -#: macro.c:416 +#: macro.c:270 +msgid "__COUNTER__ expanded inside directive with -fdirectives-only" +msgstr "" + +#: macro.c:423 msgid "invalid string literal, ignoring final '\\'" msgstr "ugyldig strengkonstant, ignorerer afsluttende '\\'" -#: macro.c:466 +#: macro.c:483 #, c-format msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token" msgstr "indsttelse af \"%s\" og \"%s\" giver ikke et gyldigt prprocessorsymbol" -#: macro.c:538 +#: macro.c:558 msgid "ISO C99 requires rest arguments to be used" msgstr "ISO C99 pkrver at restparametrene skal bruges" -#: macro.c:543 +#: macro.c:563 #, c-format msgid "macro \"%s\" requires %u arguments, but only %u given" msgstr "makroen \"%s\" krver %u parametre, men modtager kun %u" -#: macro.c:548 +#: macro.c:568 #, c-format msgid "macro \"%s\" passed %u arguments, but takes just %u" msgstr "makroen \"%s\" bliver viderebragt %u parametre, men tager kun mod %u" -#: macro.c:659 traditional.c:675 +#: macro.c:679 traditional.c:680 #, c-format msgid "unterminated argument list invoking macro \"%s\"" msgstr "uafsluttet parameterliste ved kald af makroen \"%s\"" -#: macro.c:762 +#: macro.c:782 #, 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:1278 +#: macro.c:1325 #, c-format msgid "duplicate macro parameter \"%s\"" msgstr "makroparameternavnet \"%s\" optrder mere end n gang" -#: macro.c:1324 +#: macro.c:1371 #, c-format msgid "\"%s\" may not appear in macro parameter list" msgstr "\"%s\" m ikke optrde i makroparameterliste" -#: macro.c:1332 +#: macro.c:1379 msgid "macro parameters must be comma-separated" msgstr "makroparametre skal vre komma-adskilte" -#: macro.c:1349 +#: macro.c:1396 msgid "parameter name missing" msgstr "parameternavn mangler" -#: macro.c:1366 +#: macro.c:1413 msgid "anonymous variadic macros were introduced in C99" msgstr "anonyme makroer med vilkrligt antal parametre blev introduceret i C99" -#: macro.c:1371 +#: macro.c:1418 msgid "ISO C does not permit named variadic macros" msgstr "ISO C tillader ikke navngivne makroer med vilkrligt antal parametre" -#: macro.c:1380 +#: macro.c:1427 msgid "missing ')' in macro parameter list" msgstr "manglende ')' i makroparameterliste" -#: macro.c:1458 +#: macro.c:1476 +msgid "'##' cannot appear at either end of a macro expansion" +msgstr "'##' m ikke optrde ved nogen af enderne i en makrokrop" + +#: macro.c:1510 #, fuzzy msgid "ISO C99 requires whitespace after the macro name" msgstr "ISO C pkrver mellemrum efter makronavnet" -#: macro.c:1482 +#: macro.c:1534 #, fuzzy msgid "missing whitespace after the macro name" msgstr "ISO C pkrver mellemrum efter makronavnet" -#: macro.c:1512 +#: macro.c:1564 msgid "'#' is not followed by a macro parameter" msgstr "'#' efterflges ikke af en makroparameter" -#: macro.c:1531 -msgid "'##' cannot appear at either end of a macro expansion" -msgstr "'##' m ikke optrde ved nogen af enderne i en makrokrop" - -#: macro.c:1629 +#: macro.c:1683 #, c-format msgid "\"%s\" redefined" msgstr "\"%s\" omdefineret" -#: macro.c:1634 +#: macro.c:1688 msgid "this is the location of the previous definition" msgstr "den foregende definition er her" -#: macro.c:1684 +#: macro.c:1738 #, c-format msgid "macro argument \"%s\" would be stringified in traditional C" msgstr "makroparameteren \"%s\" ville blive gjort til en streng i traditionel C" -#: macro.c:1707 +#: macro.c:1761 #, c-format msgid "invalid hash type %d in cpp_macro_definition" msgstr "ugyldig hashtype %d i cpp_macro_definition" -#: pch.c:84 pch.c:332 pch.c:354 pch.c:360 +#: pch.c:84 pch.c:332 pch.c:344 pch.c:362 pch.c:368 pch.c:377 msgid "while writing precompiled header" msgstr "" -#: pch.c:467 +#: pch.c:485 #, fuzzy, c-format msgid "%s: not used because `%.*s' not defined" msgstr "etiketten '%s' er benyttet, men ikke defineret" -#: pch.c:479 +#: pch.c:497 #, c-format msgid "%s: not used because `%.*s' defined as `%s' not `%.*s'" msgstr "" -#: pch.c:520 +#: pch.c:538 #, fuzzy, c-format msgid "%s: not used because `%s' is defined" msgstr "'%s' brugt, men aldrig defineret" -#: pch.c:533 pch.c:696 +#: pch.c:558 +#, c-format +msgid "%s: not used because `__COUNTER__' is invalid" +msgstr "" + +#: pch.c:567 pch.c:737 msgid "while reading precompiled header" msgstr "" -#: traditional.c:745 +#: traditional.c:750 #, c-format msgid "detected recursion whilst expanding macro \"%s\"" msgstr "opdagede rekursion ved udfoldelse af makroen \"%s\"" -#: traditional.c:912 +#: traditional.c:917 #, fuzzy msgid "syntax error in macro parameter list" msgstr "\"%s\" m ikke optrde i makroparameterliste" @@ -3836,6 +3866,9 @@ msgstr "\"%s\" m #~ msgid "-I- specified twice" #~ msgstr "-I- er angivet to gange" +#~ msgid "no newline at end of file" +#~ msgstr "ingen linjeskift ved slutningen af filen" + #~ msgid "unknown string token %s\n" #~ msgstr "ukendt strengsymbol %s\n" diff --git a/libcpp/po/de.po b/libcpp/po/de.po index 54a160e5ed6..57dc56ceddd 100644 --- a/libcpp/po/de.po +++ b/libcpp/po/de.po @@ -1,15 +1,15 @@ # German translation of gcc messages. # Copyright © 2002, 2003, 2004, 2005 Free Software Foundation, Inc. # Karl Eichwalder , 2002, 2003. -# Roland Stigge , 2003, 2004, 2005, 2006. +# Roland Stigge , 2003, 2004, 2005, 2006, 2007. # This file is distributed under the same license as the gcc package. # msgid "" msgstr "" -"Project-Id-Version: cpplib 4.2.0\n" +"Project-Id-Version: cpplib 4.3-b20071109\n" "Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n" -"POT-Creation-Date: 2007-05-13 19:48-0700\n" -"PO-Revision-Date: 2007-05-28 13:30+0100\n" +"POT-Creation-Date: 2007-11-08 21:08+0000\n" +"PO-Revision-Date: 2007-11-11 11:11+0100\n" "Last-Translator: Roland Stigge \n" "Language-Team: German \n" "MIME-Version: 1.0\n" @@ -72,7 +72,7 @@ msgstr "unvollständiger Universal-Zeichenname %.*s" msgid "%.*s is not a valid universal character" msgstr "»%.*s« ist kein gültiges universelles Zeichen" -#: charset.c:1008 lex.c:472 +#: charset.c:1008 lex.c:484 msgid "'$' in identifier or number" msgstr "'$' in Bezeichner oder Zahl" @@ -150,231 +150,235 @@ msgstr "Leere Zeichenkonstante" msgid "failure to convert %s to %s" msgstr "Fehler beim Konvertieren von %s nach %s" -#: directives.c:214 directives.c:240 +#: directives.c:215 directives.c:241 #, c-format msgid "extra tokens at end of #%s directive" msgstr "mehrere Token am Ende der Direktive #%s" -#: directives.c:343 +#: directives.c:344 #, c-format msgid "#%s is a GCC extension" msgstr "#%s ist eine Erweiterung des GCC" -#: directives.c:355 +#: directives.c:356 msgid "suggest not using #elif in traditional C" msgstr "es wird empfohlen, in traditionellem C nicht #elif zu verwenden" -#: directives.c:358 +#: directives.c:359 #, c-format msgid "traditional C ignores #%s with the # indented" msgstr "traditionelles C ignoriert #%s mit eingerücktem #" -#: directives.c:362 +#: directives.c:363 #, c-format msgid "suggest hiding #%s from traditional C with an indented #" msgstr "es wird empfohlen, #%s vor traditionellem C mit # zu verbergen" -#: directives.c:388 +#: directives.c:389 msgid "embedding a directive within macro arguments is not portable" msgstr "das Einbetten einer Direktive innerhalb von Makroargumenten ist nicht portierbar" -#: directives.c:408 +#: directives.c:409 msgid "style of line directive is a GCC extension" msgstr "der Stil der line-Direktive ist eine Erweiterung des GCC" -#: directives.c:458 +#: directives.c:464 #, c-format msgid "invalid preprocessing directive #%s" msgstr "ungültige Präprozessordirektive #%s" -#: directives.c:524 +#: directives.c:532 msgid "\"defined\" cannot be used as a macro name" msgstr "»defined« kann nicht als Makroname verwendet werden" -#: directives.c:530 +#: directives.c:538 #, c-format msgid "\"%s\" cannot be used as a macro name as it is an operator in C++" msgstr "»%s« kann nicht als Makroname verwendet werden, da es ein Operator in C++ ist" -#: directives.c:533 +#: directives.c:541 #, c-format msgid "no macro name given in #%s directive" msgstr "kein Makroname in Direktive #%s angegeben" -#: directives.c:536 +#: directives.c:544 msgid "macro names must be identifiers" msgstr "Makronamen müssen Bezeichner sein" -#: directives.c:577 +#: directives.c:585 #, c-format msgid "undefining \"%s\"" msgstr "»%s« wird un-definiert" -#: directives.c:632 +#: directives.c:640 msgid "missing terminating > character" msgstr "fehlendes abschließendes »>«-Zeichen" -#: directives.c:687 +#: directives.c:695 #, c-format msgid "#%s expects \"FILENAME\" or " msgstr "#%s erwartet \"DATEINAME\" oder " -#: directives.c:727 +#: directives.c:739 #, c-format msgid "empty filename in #%s" msgstr "leerer Dateiname in #%s" -#: directives.c:737 +#: directives.c:749 msgid "#include nested too deeply" msgstr "#include ist zu tief geschachtelt" -#: directives.c:778 +#: directives.c:790 msgid "#include_next in primary source file" msgstr "#include_next in erster Quelldatei" -#: directives.c:804 +#: directives.c:816 #, c-format msgid "invalid flag \"%s\" in line directive" msgstr "ungültiges Kennzeichen »%s« in line-Direktive" -#: directives.c:856 +#: directives.c:868 #, c-format msgid "\"%s\" after #line is not a positive integer" msgstr "»%s« hinter #line ist keine positive Ganzzahl" -#: directives.c:862 +#: directives.c:874 msgid "line number out of range" msgstr "Zeilennummer ist außerhalb des Wertebereiches" -#: directives.c:875 directives.c:952 +#: directives.c:887 directives.c:964 #, c-format msgid "\"%s\" is not a valid filename" msgstr "»%s« ist kein gültiger Dateiname" -#: directives.c:912 +#: directives.c:924 #, c-format msgid "\"%s\" after # is not a positive integer" msgstr "»%s« hinter # ist keine positive Ganzzahl" -#: directives.c:1014 +#: directives.c:1026 #, c-format msgid "invalid #%s directive" msgstr "ungültige #%s-Direktive" -#: directives.c:1077 +#: directives.c:1089 #, c-format msgid "registering pragmas in namespace \"%s\" with mismatched name expansion" msgstr "Pragmas im Namespace »%s« werden ohne passende Namensauflösung registriert" -#: directives.c:1086 +#: directives.c:1098 #, c-format msgid "registering pragma \"%s\" with name expansion and no namespace" msgstr "Pragma »%s« wird mit Namensauflösung und ohne Namespace registriert" -#: directives.c:1104 +#: directives.c:1116 #, c-format msgid "registering \"%s\" as both a pragma and a pragma namespace" msgstr "»%s« wird sowohl als Pragma als auch als Pragma-Namespace registriert" -#: directives.c:1107 +#: directives.c:1119 #, c-format msgid "#pragma %s %s is already registered" msgstr "#pragma %s %s ist bereits registriert" -#: directives.c:1110 +#: directives.c:1122 #, c-format msgid "#pragma %s is already registered" msgstr "#pragma %s ist bereits registriert" -#: directives.c:1140 +#: directives.c:1152 msgid "registering pragma with NULL handler" msgstr "Pragma mit NULL-Handler wird registriert" -#: directives.c:1350 +#: directives.c:1362 msgid "#pragma once in main file" msgstr "#pragma once in Hauptdatei" -#: directives.c:1373 +#: directives.c:1385 msgid "invalid #pragma GCC poison directive" msgstr "ungültige #pragma GCC Poison Direktive" -#: directives.c:1382 +#: directives.c:1394 #, c-format msgid "poisoning existing macro \"%s\"" msgstr "schlechtes existierendes Makro »%s«" -#: directives.c:1403 +#: directives.c:1413 msgid "#pragma system_header ignored outside include file" msgstr "#pragma system_header außerhalb include-Datei ignoriert" -#: directives.c:1427 +#: directives.c:1437 #, c-format msgid "cannot find source file %s" msgstr "Quelldatei %s kann nicht gefunden werden" -#: directives.c:1431 +#: directives.c:1441 #, c-format msgid "current file is older than %s" msgstr "aktuelle Datei ist älter als %s" -#: directives.c:1599 +#: directives.c:1620 msgid "_Pragma takes a parenthesized string literal" msgstr "_Pragma nimmt ein geklammertes Zeichenkettenliteral" -#: directives.c:1671 +#: directives.c:1693 msgid "#else without #if" msgstr "#else ohne #if" -#: directives.c:1676 +#: directives.c:1698 msgid "#else after #else" msgstr "#else hinter #else" -#: directives.c:1678 directives.c:1711 +#: directives.c:1700 directives.c:1733 msgid "the conditional began here" msgstr "die Bedingung begann hier" -#: directives.c:1704 +#: directives.c:1726 msgid "#elif without #if" msgstr "#elif ohne #if" -#: directives.c:1709 +#: directives.c:1731 msgid "#elif after #else" msgstr "#elif hinter #else" -#: directives.c:1739 +#: directives.c:1761 msgid "#endif without #if" msgstr "#endif ohne #if" -#: directives.c:1816 +#: directives.c:1838 msgid "missing '(' after predicate" msgstr "fehlendes '(' hinter Prädikat" -#: directives.c:1831 +#: directives.c:1853 msgid "missing ')' to complete answer" msgstr "fehlendes ')', um Antwort abzuschließen" -#: directives.c:1851 +#: directives.c:1873 msgid "predicate's answer is empty" msgstr "Prädikatantwort ist leer" -#: directives.c:1878 +#: directives.c:1900 msgid "assertion without predicate" msgstr "Behauptung ohne Prädikat" -#: directives.c:1880 +#: directives.c:1902 msgid "predicate must be an identifier" msgstr "Prädikat muss ein Bezeichner sein" -#: directives.c:1966 +#: directives.c:1988 #, c-format msgid "\"%s\" re-asserted" msgstr "»%s« wieder behauptet" -#: directives.c:2190 +#: directives.c:2271 #, c-format msgid "unterminated #%s" msgstr "unbeendetes #%s" +#: directives-only.c:221 lex.c:1016 traditional.c:162 +msgid "unterminated comment" +msgstr "nicht beendeter Kommentar" + #: errors.c:118 msgid "warning: " msgstr "Warnung: " @@ -396,332 +400,345 @@ msgstr "Standardausgabe" msgid "%s: %s" msgstr "%s: %s" -#: expr.c:203 +#: expr.c:261 msgid "too many decimal points in number" msgstr "zu viele Dezimalpunkte in Zahl" -#: expr.c:223 +#: expr.c:290 expr.c:365 +msgid "fixed-point constants are a GCC extension" +msgstr "Festkommakonstanten sind eine GCC-Erweiterung" + +#: expr.c:303 +#, c-format +msgid "invalid digit \"%c\" in binary constant" +msgstr "ungültige Ziffer »%c« in binärer Konstante" + +#: expr.c:305 #, c-format msgid "invalid digit \"%c\" in octal constant" msgstr "ungültige Ziffer »%c« in Oktal-Konstante" -#: expr.c:229 +#: expr.c:313 +msgid "invalid prefix \"0b\" for floating constant" +msgstr "ungültiger Prefix »0b« für Gleitkommakonstante" + +#: expr.c:319 msgid "use of C99 hexadecimal floating constant" msgstr "Verwendung von hexadezimaler C99-Gleitkommakonstante" -#: expr.c:238 +#: expr.c:328 msgid "exponent has no digits" msgstr "Exponent hat keine Ziffern" -#: expr.c:245 +#: expr.c:335 msgid "hexadecimal floating constants require an exponent" msgstr "hexadezimale Gleitkommakonstanten benötigen Exponenten" -#: expr.c:251 +#: expr.c:341 #, c-format msgid "invalid suffix \"%.*s\" on floating constant" msgstr "ungültiger Suffix »%.*s« an Gleitkommakonstante" -#: expr.c:261 expr.c:295 +#: expr.c:351 expr.c:393 #, c-format msgid "traditional C rejects the \"%.*s\" suffix" msgstr "traditionelles C lehnt den Suffix »%.*s« ab" -#: expr.c:268 +#: expr.c:358 #, c-format msgid "invalid suffix \"%.*s\" with hexadecimal floating constant" msgstr "ungültiger Suffix »%.*s« mit hexadezimaler Gleitkommakonstante" -#: expr.c:281 +#: expr.c:369 +msgid "decimal float constants are a GCC extension" +msgstr "dezimale Gleitkommakonstanten sind eine GCC-Erweiterung" + +#: expr.c:379 #, c-format msgid "invalid suffix \"%.*s\" on integer constant" msgstr "ungültiger Suffix »%.*s« an Ganzzahlkonstante" -#: expr.c:303 +#: expr.c:401 msgid "use of C99 long long integer constant" msgstr "C99 long long Ganzzahlkonstante verwendet" -#: expr.c:310 +#: expr.c:409 msgid "imaginary constants are a GCC extension" msgstr "imaginäre Konstanten sind eine GCC-Erweiterung" -#: expr.c:396 +#: expr.c:412 +msgid "binary constants are a GCC extension" +msgstr "binäre Konstanten sind eine GCC-Erweiterung" + +#: expr.c:505 msgid "integer constant is too large for its type" msgstr "Ganzzahlkonstante ist zu groß für ihren Typ" -#: expr.c:408 +#: expr.c:517 msgid "integer constant is so large that it is unsigned" msgstr "Ganzzahlkonstante ist so groß, dass sie vorzeichenlos ist" -#: expr.c:490 +#: expr.c:612 msgid "missing ')' after \"defined\"" msgstr "fehlendes ')' hinter »defined«" -#: expr.c:497 +#: expr.c:619 msgid "operator \"defined\" requires an identifier" msgstr "Operator »defined« erfordert einen Bezeichner" -#: expr.c:505 +#: expr.c:627 #, c-format msgid "(\"%s\" is an alternative token for \"%s\" in C++)" msgstr "(»%s« ist ein alternatives Token for »%s« in C++)" -#: expr.c:515 +#: expr.c:637 msgid "this use of \"defined\" may not be portable" msgstr "diese Verwendung von »defined« könnte nicht portierbar sein" -#: expr.c:554 +#: expr.c:676 msgid "floating constant in preprocessor expression" msgstr "Gleitkommakonstante in Präprozessorausdruck" -#: expr.c:560 +#: expr.c:682 msgid "imaginary number in preprocessor expression" msgstr "imaginäre Zahl in Präprozessorausdruck" -#: expr.c:605 +#: expr.c:727 #, c-format msgid "\"%s\" is not defined" msgstr "»%s« ist nicht definiert" -#: expr.c:733 expr.c:762 +#: expr.c:855 expr.c:884 #, c-format msgid "missing binary operator before token \"%s\"" msgstr "fehlender binärer Operator vor Token »%s«" -#: expr.c:753 +#: expr.c:875 #, c-format msgid "token \"%s\" is not valid in preprocessor expressions" msgstr "Token »%s« ist nicht gültig in Präprozessorausdrücken" -#: expr.c:770 +#: expr.c:892 msgid "missing expression between '(' and ')'" msgstr "fehlender Ausdruck zwischen '(' und ')'" -#: expr.c:773 +#: expr.c:895 msgid "#if with no expression" msgstr "#if ohne Ausdruck" -#: expr.c:776 +#: expr.c:898 #, c-format msgid "operator '%s' has no right operand" msgstr "Operator »%s« hat keinen rechten Operanden" -#: expr.c:781 +#: expr.c:903 #, c-format msgid "operator '%s' has no left operand" msgstr "Operator »%s« hat keinen linken Operanden" -#: expr.c:807 +#: expr.c:929 msgid " ':' without preceding '?'" msgstr " ':' ohne vorangehendes '?'" -#: expr.c:834 +#: expr.c:956 msgid "unbalanced stack in #if" msgstr "unausgeglichener Keller in #if" -#: expr.c:853 +#: expr.c:975 #, c-format msgid "impossible operator '%u'" msgstr "unmöglicher Operator '%u'" -#: expr.c:943 +#: expr.c:1065 msgid "missing ')' in expression" msgstr "fehlendes ')' in Ausdruck" -#: expr.c:964 +#: expr.c:1086 msgid "'?' without following ':'" msgstr "'?' ohne folgendes ':'" -#: expr.c:974 +#: expr.c:1096 msgid "integer overflow in preprocessor expression" msgstr "Ganzzahlüberlauf in Präprozessorausdruck" -#: expr.c:979 +#: expr.c:1101 msgid "missing '(' in expression" msgstr "fehlendes '(' in Ausdruck" -#: expr.c:1011 +#: expr.c:1133 #, 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:1016 +#: expr.c:1138 #, 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:1275 +#: expr.c:1397 msgid "traditional C rejects the unary plus operator" msgstr "traditionelles C weist den unären Plus-Operator zurück" -#: expr.c:1358 +#: expr.c:1480 msgid "comma operator in operand of #if" msgstr "Kommaoperator in Operand von #if" -#: expr.c:1490 +#: expr.c:1612 msgid "division by zero in #if" msgstr "Division durch Null in #if" -#: files.c:402 +#: files.c:442 msgid "NULL directory in find_file" msgstr "NULL-Verzeichnis in find_file" -#: files.c:440 +#: files.c:480 msgid "one or more PCH files were found, but they were invalid" msgstr "ein oder mehrere PCH-Dateien wurden gefunden, aber sie sind ungültig" -#: files.c:443 +#: files.c:483 msgid "use -Winvalid-pch for more information" msgstr "-Winvalid-pch für mehr Informationen verwenden" -#: files.c:501 +#: files.c:570 #, c-format msgid "%s is a block device" msgstr "%s ist ein Block-Gerät" -#: files.c:518 +#: files.c:587 #, c-format msgid "%s is too large" msgstr "%s ist zu groß" -#: files.c:553 +#: files.c:622 #, c-format msgid "%s is shorter than expected" msgstr "%s ist kürzer als erwartet" -#: files.c:782 +#: files.c:852 #, c-format msgid "no include path in which to search for %s" msgstr "kein Include-Pfad, um %s zu finden" -#: files.c:1071 +#: files.c:1157 msgid "Multiple include guards may be useful for:\n" msgstr "Mehrere Include-Wächter könnten nützlich sein für:\n" -#: init.c:407 +#: init.c:426 msgid "cppchar_t must be an unsigned type" msgstr "cppchar_t muss ein vorzeichenloser Typ sein" -#: init.c:411 +#: init.c:430 #, 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:418 +#: init.c:437 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:421 +#: init.c:440 msgid "target char is less than 8 bits wide" msgstr "Ziel-char ist weniger als 8 Bits breit" -#: init.c:425 +#: init.c:444 msgid "target wchar_t is narrower than target char" msgstr "Ziel-wchar_t ist schmaler als Ziel char" -#: init.c:429 +#: init.c:448 msgid "target int is narrower than target char" msgstr "Ziel-int ist schmaler als Ziel-char" -#: init.c:434 +#: init.c:453 msgid "CPP half-integer narrower than CPP character" msgstr "CPP Halb-Ganzzahl ist schmaler als CPP-Zeichen" -#: init.c:438 +#: init.c:457 #, 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" -#: lex.c:271 +#: lex.c:283 msgid "backslash and newline separated by space" msgstr "Backslash und Newline durch Leerzeichen getrennt" -#: lex.c:276 +#: lex.c:288 msgid "backslash-newline at end of file" msgstr "Backslash-Newline am Dateiende" -#: lex.c:291 +#: lex.c:303 #, c-format msgid "trigraph ??%c converted to %c" msgstr "Trigraph ??%c in %c konvertiert" -#: lex.c:298 +#: lex.c:310 #, c-format msgid "trigraph ??%c ignored, use -trigraphs to enable" msgstr "Trigraph ??%c ignoriert, -trigraphs zum Aktivieren verwenden" -#: lex.c:344 +#: lex.c:356 msgid "\"/*\" within comment" msgstr "»/*« innerhalb des Kommentars" -#: lex.c:402 +#: lex.c:414 #, c-format msgid "%s in preprocessing directive" msgstr "%s in Präprozessordirektive" -#: lex.c:411 +#: lex.c:423 msgid "null character(s) ignored" msgstr "Null-Zeichen ignoriert" -#: lex.c:448 +#: lex.c:460 #, c-format msgid "`%.*s' is not in NFKC" msgstr "»%.*s« ist nicht in NFKC" -#: lex.c:451 +#: lex.c:463 #, c-format msgid "`%.*s' is not in NFC" msgstr "»%.*s« ist nicht in NFC" -#: lex.c:539 +#: lex.c:551 #, c-format msgid "attempt to use poisoned \"%s\"" msgstr "Versuch, schlechtes »%s« zu verwenden" -#: lex.c:547 +#: lex.c:559 msgid "__VA_ARGS__ can only appear in the expansion of a C99 variadic macro" msgstr "__VA_ARGS__ kann nur in Erweiterung eines variadischen C99-Makros auftreten" -#: lex.c:647 +#: lex.c:659 msgid "null character(s) preserved in literal" msgstr "Null-Zeichen im Literal erhalten" -#: lex.c:650 +#: lex.c:662 #, c-format msgid "missing terminating %c character" msgstr "fehlendes abschließendes Zeichen %c" -#: lex.c:842 -msgid "no newline at end of file" -msgstr "Kein Newline am Dateiende" - -#: lex.c:1002 traditional.c:162 -msgid "unterminated comment" -msgstr "nicht beendeter Kommentar" - -#: lex.c:1013 +#: lex.c:1027 msgid "C++ style comments are not allowed in ISO C90" msgstr "C++-Stil-Kommentare sind in ISO-C90 nicht erlaubt" -#: lex.c:1015 +#: lex.c:1029 msgid "(this will be reported only once per input file)" msgstr "(dies wird nur einmal pro Eingabedatei gemeldet)" -#: lex.c:1020 +#: lex.c:1034 msgid "multi-line comment" msgstr "mehrzeiliger Kommentar" -#: lex.c:1333 +#: lex.c:1347 #, c-format msgid "unspellable token %s" msgstr "nicht buchstabierbares Token %s" -#: line-map.c:313 +#: line-map.c:320 #, c-format msgid "In file included from %s:%u" msgstr "In Datei, eingefügt von %s:%u" -#: line-map.c:331 +#: line-map.c:338 #, c-format msgid "" ",\n" @@ -730,154 +747,166 @@ msgstr "" ",\n" " von %s:%u" -#: macro.c:83 +#: macro.c:84 #, c-format msgid "macro \"%s\" is not used" msgstr "Makro »%s« wird nicht benutzt" -#: macro.c:122 macro.c:312 +#: macro.c:123 macro.c:319 #, c-format msgid "invalid built-in macro \"%s\"" msgstr "ungültiges eingebautes Makro »%s«" -#: macro.c:156 +#: macro.c:157 msgid "could not determine file timestamp" msgstr "Datum und Zeit der Datei konnten nicht bestimmt werden" -#: macro.c:253 +#: macro.c:254 msgid "could not determine date and time" msgstr "Datum und Zeit konnten nicht bestimmt werden" -#: macro.c:416 +#: macro.c:270 +msgid "__COUNTER__ expanded inside directive with -fdirectives-only" +msgstr "__COUNTER__ innerhalb von Anweisung mit -fdirectives-only expandiert" + +#: macro.c:423 msgid "invalid string literal, ignoring final '\\'" msgstr "ungültiges Zeichenkettenliteral, abschließendes '\\' wird ignoriert" -#: macro.c:466 +#: macro.c:483 #, 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:538 +#: macro.c:558 msgid "ISO C99 requires rest arguments to be used" msgstr "ISO-C99 erfordert, dass Restargumente verwendet werden" -#: macro.c:543 +#: macro.c:563 #, 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:548 +#: macro.c:568 #, c-format msgid "macro \"%s\" passed %u arguments, but takes just %u" msgstr "dem Makro »%s« wurden %u Argumente übergeben, aber es nimmt nur %u" -#: macro.c:659 traditional.c:675 +#: macro.c:679 traditional.c:680 #, c-format msgid "unterminated argument list invoking macro \"%s\"" msgstr "unvollendete Argumentliste beim Makroaufruf »%s«" -#: macro.c:762 +#: macro.c:782 #, 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:1278 +#: macro.c:1325 #, c-format msgid "duplicate macro parameter \"%s\"" msgstr "doppelter Makroparameter »%s«" -#: macro.c:1324 +#: macro.c:1371 #, c-format msgid "\"%s\" may not appear in macro parameter list" msgstr "»%s« darf nicht in Makroparameterliste auftreten" -#: macro.c:1332 +#: macro.c:1379 msgid "macro parameters must be comma-separated" msgstr "Makroparameter müssen mit Komma getrennt sein" -#: macro.c:1349 +#: macro.c:1396 msgid "parameter name missing" msgstr "Parametername fehlt" -#: macro.c:1366 +#: macro.c:1413 msgid "anonymous variadic macros were introduced in C99" msgstr "anonyme variadische Makros wurden in C99 eingeführt" -#: macro.c:1371 +#: macro.c:1418 msgid "ISO C does not permit named variadic macros" msgstr "ISO-C erlaubt keine benannten variadischen Makros" -#: macro.c:1380 +#: macro.c:1427 msgid "missing ')' in macro parameter list" msgstr "fehlendes ')' in Makroparameterliste" -#: macro.c:1458 +#: macro.c:1476 +msgid "'##' cannot appear at either end of a macro expansion" +msgstr "'##' kann nicht an den Enden einer Makroexpansion auftreten" + +#: macro.c:1510 msgid "ISO C99 requires whitespace after the macro name" msgstr "ISO-C99 erfordert Whitespace hinter Makroname" -#: macro.c:1482 +#: macro.c:1534 msgid "missing whitespace after the macro name" msgstr "Whitespace hinter Makroname fehlt" -#: macro.c:1512 +#: macro.c:1564 msgid "'#' is not followed by a macro parameter" msgstr "'#' wird nicht von einem Makroparameter gefolgt" -#: macro.c:1531 -msgid "'##' cannot appear at either end of a macro expansion" -msgstr "'##' kann nicht an den Enden einer Makroexpansion auftreten" - -#: macro.c:1629 +#: macro.c:1683 #, c-format msgid "\"%s\" redefined" msgstr "»%s« redefiniert" -#: macro.c:1634 +#: macro.c:1688 msgid "this is the location of the previous definition" msgstr "dies ist die Stelle der vorherigen Definition" -#: macro.c:1684 +#: macro.c:1738 #, c-format msgid "macro argument \"%s\" would be stringified in traditional C" msgstr "Makroargument »%s« würde in traditionellem C zum String gewandelt werden" -#: macro.c:1707 +#: macro.c:1761 #, c-format msgid "invalid hash type %d in cpp_macro_definition" msgstr "ungültiger Hash-Typ %d in cpp_macro_definition" -#: pch.c:84 pch.c:332 pch.c:354 pch.c:360 +#: pch.c:84 pch.c:332 pch.c:344 pch.c:362 pch.c:368 pch.c:377 msgid "while writing precompiled header" msgstr "beim Schreiben des vorkompilierten Headers" -#: pch.c:467 +#: pch.c:485 #, c-format msgid "%s: not used because `%.*s' not defined" msgstr "%s: nicht verwendet, da »%.*s« nicht definiert" -#: pch.c:479 +#: pch.c:497 #, c-format msgid "%s: not used because `%.*s' defined as `%s' not `%.*s'" msgstr "%s: nicht verwendet, da »%.*s« als »%s« statt als »%.*s« definiert wurde" -#: pch.c:520 +#: pch.c:538 #, c-format msgid "%s: not used because `%s' is defined" msgstr "%s: nicht verwendet, da »%s« definiert ist" -#: pch.c:533 pch.c:696 +#: pch.c:558 +#, c-format +msgid "%s: not used because `__COUNTER__' is invalid" +msgstr "%s: nicht verwendet, da »__COUNTER__« ungültig ist" + +#: pch.c:567 pch.c:737 msgid "while reading precompiled header" msgstr "beim Lesen des vorkompilierten Headers" -#: traditional.c:745 +#: traditional.c:750 #, c-format msgid "detected recursion whilst expanding macro \"%s\"" msgstr "Rekursion bei Expansion des Makros »%s« entdeckt" -#: traditional.c:912 +#: traditional.c:917 msgid "syntax error in macro parameter list" msgstr "Syntaxfehler in Makroparameterliste" +#~ msgid "no newline at end of file" +#~ msgstr "Kein Newline am Dateiende" + #~ msgid "unknown escape sequence: '\\%03o'" #~ msgstr "unbekannte Fluchtsequenz: '\\%03o'" diff --git a/libcpp/po/el.po b/libcpp/po/el.po index 5545f87a086..cad63342e0c 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: http://gcc.gnu.org/bugs.html\n" -"POT-Creation-Date: 2007-05-13 19:48-0700\n" +"POT-Creation-Date: 2007-11-08 21:08+0000\n" "PO-Revision-Date: 2002-08-18 15:46+0100\n" "Last-Translator: Simos Xenitellis \n" "Language-Team: Greek \n" @@ -71,7 +71,7 @@ msgstr "" msgid "%.*s is not a valid universal character" msgstr " `%s' ." -#: charset.c:1008 lex.c:472 +#: charset.c:1008 lex.c:484 msgid "'$' in identifier or number" msgstr "" @@ -157,236 +157,241 @@ msgstr " msgid "failure to convert %s to %s" msgstr " %s `%s' `%s'" -#: directives.c:214 directives.c:240 +#: directives.c:215 directives.c:241 #, c-format msgid "extra tokens at end of #%s directive" msgstr "" -#: directives.c:343 +#: directives.c:344 #, c-format msgid "#%s is a GCC extension" msgstr "" -#: directives.c:355 +#: directives.c:356 msgid "suggest not using #elif in traditional C" msgstr "" -#: directives.c:358 +#: directives.c:359 #, c-format msgid "traditional C ignores #%s with the # indented" msgstr "" -#: directives.c:362 +#: directives.c:363 #, c-format msgid "suggest hiding #%s from traditional C with an indented #" msgstr "" -#: directives.c:388 +#: directives.c:389 msgid "embedding a directive within macro arguments is not portable" msgstr "" -#: directives.c:408 +#: directives.c:409 msgid "style of line directive is a GCC extension" msgstr "" -#: directives.c:458 +#: directives.c:464 #, c-format msgid "invalid preprocessing directive #%s" msgstr "" -#: directives.c:524 +#: directives.c:532 msgid "\"defined\" cannot be used as a macro name" msgstr "" -#: directives.c:530 +#: directives.c:538 #, c-format msgid "\"%s\" cannot be used as a macro name as it is an operator in C++" msgstr "" -#: directives.c:533 +#: directives.c:541 #, c-format msgid "no macro name given in #%s directive" msgstr "" -#: directives.c:536 +#: directives.c:544 #, fuzzy msgid "macro names must be identifiers" msgstr " " -#: directives.c:577 +#: directives.c:585 #, fuzzy, c-format msgid "undefining \"%s\"" msgstr " %s" -#: directives.c:632 +#: directives.c:640 #, fuzzy msgid "missing terminating > character" msgstr " " -#: directives.c:687 +#: directives.c:695 #, c-format msgid "#%s expects \"FILENAME\" or " msgstr "" -#: directives.c:727 +#: directives.c:739 #, fuzzy, c-format msgid "empty filename in #%s" msgstr " %s" -#: directives.c:737 +#: directives.c:749 msgid "#include nested too deeply" msgstr "" -#: directives.c:778 +#: directives.c:790 msgid "#include_next in primary source file" msgstr "" -#: directives.c:804 +#: directives.c:816 #, c-format msgid "invalid flag \"%s\" in line directive" msgstr "" -#: directives.c:856 +#: directives.c:868 #, fuzzy, c-format msgid "\"%s\" after #line is not a positive integer" msgstr "%s' ." -#: directives.c:862 +#: directives.c:874 #, fuzzy msgid "line number out of range" msgstr "%s: " -#: directives.c:875 directives.c:952 +#: directives.c:887 directives.c:964 #, fuzzy, c-format msgid "\"%s\" is not a valid filename" msgstr "%s' ." -#: directives.c:912 +#: directives.c:924 #, fuzzy, c-format msgid "\"%s\" after # is not a positive integer" msgstr "%s' ." -#: directives.c:1014 +#: directives.c:1026 #, fuzzy, c-format msgid "invalid #%s directive" msgstr "%%%c: ." -#: directives.c:1077 +#: directives.c:1089 #, c-format msgid "registering pragmas in namespace \"%s\" with mismatched name expansion" msgstr "" -#: directives.c:1086 +#: directives.c:1098 #, c-format msgid "registering pragma \"%s\" with name expansion and no namespace" msgstr "" -#: directives.c:1104 +#: directives.c:1116 #, c-format msgid "registering \"%s\" as both a pragma and a pragma namespace" msgstr "" -#: directives.c:1107 +#: directives.c:1119 #, c-format msgid "#pragma %s %s is already registered" msgstr "" -#: directives.c:1110 +#: directives.c:1122 #, fuzzy, c-format msgid "#pragma %s is already registered" msgstr " `%s' " -#: directives.c:1140 +#: directives.c:1152 msgid "registering pragma with NULL handler" msgstr "" -#: directives.c:1350 +#: directives.c:1362 msgid "#pragma once in main file" msgstr "" -#: directives.c:1373 +#: directives.c:1385 msgid "invalid #pragma GCC poison directive" msgstr "" -#: directives.c:1382 +#: directives.c:1394 #, c-format msgid "poisoning existing macro \"%s\"" msgstr "" -#: directives.c:1403 +#: directives.c:1413 msgid "#pragma system_header ignored outside include file" msgstr "" -#: directives.c:1427 +#: directives.c:1437 #, fuzzy, c-format msgid "cannot find source file %s" msgstr " : %s" -#: directives.c:1431 +#: directives.c:1441 #, c-format msgid "current file is older than %s" msgstr "" -#: directives.c:1599 +#: directives.c:1620 msgid "_Pragma takes a parenthesized string literal" msgstr "" -#: directives.c:1671 +#: directives.c:1693 msgid "#else without #if" msgstr "" -#: directives.c:1676 +#: directives.c:1698 msgid "#else after #else" msgstr "#else #else" -#: directives.c:1678 directives.c:1711 +#: directives.c:1700 directives.c:1733 msgid "the conditional began here" msgstr "" -#: directives.c:1704 +#: directives.c:1726 msgid "#elif without #if" msgstr "" -#: directives.c:1709 +#: directives.c:1731 msgid "#elif after #else" msgstr "#elif #else" -#: directives.c:1739 +#: directives.c:1761 msgid "#endif without #if" msgstr "" -#: directives.c:1816 +#: directives.c:1838 msgid "missing '(' after predicate" msgstr "" -#: directives.c:1831 +#: directives.c:1853 msgid "missing ')' to complete answer" msgstr "" -#: directives.c:1851 +#: directives.c:1873 msgid "predicate's answer is empty" msgstr "" -#: directives.c:1878 +#: directives.c:1900 #, fuzzy msgid "assertion without predicate" msgstr " " -#: directives.c:1880 +#: directives.c:1902 #, fuzzy msgid "predicate must be an identifier" msgstr " " -#: directives.c:1966 +#: directives.c:1988 #, c-format msgid "\"%s\" re-asserted" msgstr "" -#: directives.c:2190 +#: directives.c:2271 #, fuzzy, c-format msgid "unterminated #%s" msgstr " o " +#: directives-only.c:221 lex.c:1016 traditional.c:162 +#, fuzzy +msgid "unterminated comment" +msgstr " `s'" + #: errors.c:118 msgid "warning: " msgstr ": " @@ -411,506 +416,528 @@ msgstr " msgid "%s: %s" msgstr "%s: %s" -#: expr.c:203 +#: expr.c:261 #, fuzzy msgid "too many decimal points in number" msgstr " " -#: expr.c:223 +#: expr.c:290 expr.c:365 +msgid "fixed-point constants are a GCC extension" +msgstr "" + +#: expr.c:303 +#, fuzzy, c-format +msgid "invalid digit \"%c\" in binary constant" +msgstr " `%s'" + +#: expr.c:305 #, fuzzy, c-format msgid "invalid digit \"%c\" in octal constant" msgstr " `%s'" -#: expr.c:229 +#: expr.c:313 +#, fuzzy +msgid "invalid prefix \"0b\" for floating constant" +msgstr " : %s" + +#: expr.c:319 msgid "use of C99 hexadecimal floating constant" msgstr "" -#: expr.c:238 +#: expr.c:328 msgid "exponent has no digits" msgstr "" -#: expr.c:245 +#: expr.c:335 msgid "hexadecimal floating constants require an exponent" msgstr "" -#: expr.c:251 +#: expr.c:341 #, fuzzy, c-format msgid "invalid suffix \"%.*s\" on floating constant" msgstr " : %s" -#: expr.c:261 expr.c:295 +#: expr.c:351 expr.c:393 #, c-format msgid "traditional C rejects the \"%.*s\" suffix" msgstr "" -#: expr.c:268 +#: expr.c:358 #, fuzzy, c-format msgid "invalid suffix \"%.*s\" with hexadecimal floating constant" msgstr " : %s" -#: expr.c:281 +#: expr.c:369 +#, fuzzy +msgid "decimal float constants are a GCC extension" +msgstr "%s: %s " + +#: expr.c:379 #, fuzzy, c-format msgid "invalid suffix \"%.*s\" on integer constant" msgstr " `%s'" -#: expr.c:303 +#: expr.c:401 #, fuzzy msgid "use of C99 long long integer constant" msgstr " `%s'" -#: expr.c:310 +#: expr.c:409 msgid "imaginary constants are a GCC extension" msgstr "" -#: expr.c:396 +#: expr.c:412 +msgid "binary constants are a GCC extension" +msgstr "" + +#: expr.c:505 #, fuzzy msgid "integer constant is too large for its type" msgstr "%s: %s " -#: expr.c:408 +#: expr.c:517 #, fuzzy msgid "integer constant is so large that it is unsigned" msgstr "%s: %s " -#: expr.c:490 +#: expr.c:612 #, fuzzy msgid "missing ')' after \"defined\"" msgstr " " -#: expr.c:497 +#: expr.c:619 msgid "operator \"defined\" requires an identifier" msgstr "" -#: expr.c:505 +#: expr.c:627 #, c-format msgid "(\"%s\" is an alternative token for \"%s\" in C++)" msgstr "" -#: expr.c:515 +#: expr.c:637 msgid "this use of \"defined\" may not be portable" msgstr "" -#: expr.c:554 +#: expr.c:676 #, fuzzy msgid "floating constant in preprocessor expression" msgstr " " -#: expr.c:560 +#: expr.c:682 #, fuzzy msgid "imaginary number in preprocessor expression" msgstr " " -#: expr.c:605 +#: expr.c:727 #, fuzzy, c-format msgid "\"%s\" is not defined" msgstr " `%s' " -#: expr.c:733 expr.c:762 +#: expr.c:855 expr.c:884 #, fuzzy, c-format msgid "missing binary operator before token \"%s\"" msgstr "%s: .\n" -#: expr.c:753 +#: expr.c:875 #, fuzzy, c-format msgid "token \"%s\" is not valid in preprocessor expressions" msgstr "%s: : %s" -#: expr.c:770 +#: expr.c:892 msgid "missing expression between '(' and ')'" msgstr "" -#: expr.c:773 +#: expr.c:895 msgid "#if with no expression" msgstr "" -#: expr.c:776 +#: expr.c:898 #, c-format msgid "operator '%s' has no right operand" msgstr "" -#: expr.c:781 +#: expr.c:903 #, c-format msgid "operator '%s' has no left operand" msgstr "" -#: expr.c:807 +#: expr.c:929 msgid " ':' without preceding '?'" msgstr "" -#: expr.c:834 +#: expr.c:956 msgid "unbalanced stack in #if" msgstr "" -#: expr.c:853 +#: expr.c:975 #, fuzzy, c-format msgid "impossible operator '%u'" msgstr "RPC: RPC" -#: expr.c:943 +#: expr.c:1065 #, fuzzy msgid "missing ')' in expression" msgstr " " -#: expr.c:964 +#: expr.c:1086 #, fuzzy msgid "'?' without following ':'" msgstr " : %s" -#: expr.c:974 +#: expr.c:1096 msgid "integer overflow in preprocessor expression" msgstr "" -#: expr.c:979 +#: expr.c:1101 #, fuzzy msgid "missing '(' in expression" msgstr " " -#: expr.c:1011 +#: expr.c:1133 #, c-format msgid "the left operand of \"%s\" changes sign when promoted" msgstr "" -#: expr.c:1016 +#: expr.c:1138 #, c-format msgid "the right operand of \"%s\" changes sign when promoted" msgstr "" -#: expr.c:1275 +#: expr.c:1397 msgid "traditional C rejects the unary plus operator" msgstr "" -#: expr.c:1358 +#: expr.c:1480 msgid "comma operator in operand of #if" msgstr "" -#: expr.c:1490 +#: expr.c:1612 #, fuzzy msgid "division by zero in #if" msgstr " : %s" -#: files.c:402 +#: files.c:442 msgid "NULL directory in find_file" msgstr "" -#: files.c:440 +#: files.c:480 msgid "one or more PCH files were found, but they were invalid" msgstr "" -#: files.c:443 +#: files.c:483 msgid "use -Winvalid-pch for more information" msgstr "" -#: files.c:501 +#: files.c:570 #, fuzzy, c-format msgid "%s is a block device" msgstr " " # src/shred.c:1134 -#: files.c:518 +#: files.c:587 #, fuzzy, c-format msgid "%s is too large" msgstr "%s: " -#: files.c:553 +#: files.c:622 #, fuzzy, c-format msgid "%s is shorter than expected" msgstr "%s: .\n" -#: files.c:782 +#: files.c:852 #, c-format msgid "no include path in which to search for %s" msgstr "" -#: files.c:1071 +#: files.c:1157 msgid "Multiple include guards may be useful for:\n" msgstr "" -#: init.c:407 +#: init.c:426 #, fuzzy msgid "cppchar_t must be an unsigned type" msgstr " " -#: init.c:411 +#: init.c:430 #, c-format msgid "preprocessor arithmetic has maximum precision of %lu bits; target requires %lu bits" msgstr "" -#: init.c:418 +#: init.c:437 msgid "CPP arithmetic must be at least as precise as a target int" msgstr "" -#: init.c:421 +#: init.c:440 msgid "target char is less than 8 bits wide" msgstr "" -#: init.c:425 +#: init.c:444 msgid "target wchar_t is narrower than target char" msgstr "" -#: init.c:429 +#: init.c:448 msgid "target int is narrower than target char" msgstr "" -#: init.c:434 +#: init.c:453 msgid "CPP half-integer narrower than CPP character" msgstr "" -#: init.c:438 +#: init.c:457 #, c-format msgid "CPP on this host cannot handle wide character constants over %lu bits, but the target requires %lu bits" msgstr "" -#: lex.c:271 +#: lex.c:283 msgid "backslash and newline separated by space" msgstr "" -#: lex.c:276 +#: lex.c:288 #, fuzzy msgid "backslash-newline at end of file" msgstr " " -#: lex.c:291 +#: lex.c:303 #, c-format msgid "trigraph ??%c converted to %c" msgstr "" -#: lex.c:298 +#: lex.c:310 #, c-format msgid "trigraph ??%c ignored, use -trigraphs to enable" msgstr "" -#: lex.c:344 +#: lex.c:356 msgid "\"/*\" within comment" msgstr "" -#: lex.c:402 +#: lex.c:414 #, c-format msgid "%s in preprocessing directive" msgstr "" -#: lex.c:411 +#: lex.c:423 #, fuzzy msgid "null character(s) ignored" msgstr " : " -#: lex.c:448 +#: lex.c:460 #, fuzzy, c-format msgid "`%.*s' is not in NFKC" msgstr " `%s' " -#: lex.c:451 +#: lex.c:463 #, fuzzy, c-format msgid "`%.*s' is not in NFC" msgstr " `%s' " -#: lex.c:539 +#: lex.c:551 #, c-format msgid "attempt to use poisoned \"%s\"" msgstr "" -#: lex.c:547 +#: lex.c:559 msgid "__VA_ARGS__ can only appear in the expansion of a C99 variadic macro" msgstr "" -#: lex.c:647 +#: lex.c:659 msgid "null character(s) preserved in literal" msgstr "" -#: lex.c:650 +#: lex.c:662 #, c-format msgid "missing terminating %c character" msgstr " %c" -#: lex.c:842 -#, fuzzy -msgid "no newline at end of file" -msgstr "%s: " - -#: lex.c:1002 traditional.c:162 -#, fuzzy -msgid "unterminated comment" -msgstr " `s'" - -#: lex.c:1013 +#: lex.c:1027 msgid "C++ style comments are not allowed in ISO C90" msgstr "" -#: lex.c:1015 +#: lex.c:1029 msgid "(this will be reported only once per input file)" msgstr "" -#: lex.c:1020 +#: lex.c:1034 msgid "multi-line comment" msgstr "" -#: lex.c:1333 +#: lex.c:1347 #, fuzzy, c-format msgid "unspellable token %s" msgstr "%s: %s: %m\n" -#: line-map.c:313 +#: line-map.c:320 #, c-format msgid "In file included from %s:%u" msgstr "" -#: line-map.c:331 +#: line-map.c:338 #, c-format msgid "" ",\n" " from %s:%u" msgstr "" -#: macro.c:83 +#: macro.c:84 #, fuzzy, c-format msgid "macro \"%s\" is not used" msgstr " `%s' " -#: macro.c:122 macro.c:312 +#: macro.c:123 macro.c:319 #, fuzzy, c-format msgid "invalid built-in macro \"%s\"" msgstr " : %s" -#: macro.c:156 +#: macro.c:157 #, fuzzy msgid "could not determine file timestamp" msgstr " %s" -#: macro.c:253 +#: macro.c:254 #, fuzzy msgid "could not determine date and time" msgstr " %s" -#: macro.c:416 +#: macro.c:270 +msgid "__COUNTER__ expanded inside directive with -fdirectives-only" +msgstr "" + +#: macro.c:423 #, fuzzy msgid "invalid string literal, ignoring final '\\'" msgstr " : `%s'" -#: macro.c:466 +#: macro.c:483 #, c-format msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token" msgstr "" -#: macro.c:538 +#: macro.c:558 #, fuzzy msgid "ISO C99 requires rest arguments to be used" msgstr " " -#: macro.c:543 +#: macro.c:563 #, c-format msgid "macro \"%s\" requires %u arguments, but only %u given" msgstr "" -#: macro.c:548 +#: macro.c:568 #, c-format msgid "macro \"%s\" passed %u arguments, but takes just %u" msgstr "" -#: macro.c:659 traditional.c:675 +#: macro.c:679 traditional.c:680 #, c-format msgid "unterminated argument list invoking macro \"%s\"" msgstr "" -#: macro.c:762 +#: macro.c:782 #, c-format msgid "function-like macro \"%s\" must be used with arguments in traditional C" msgstr "" -#: macro.c:1278 +#: macro.c:1325 #, fuzzy, c-format msgid "duplicate macro parameter \"%s\"" msgstr " `%s'" -#: macro.c:1324 +#: macro.c:1371 #, c-format msgid "\"%s\" may not appear in macro parameter list" msgstr "" -#: macro.c:1332 +#: macro.c:1379 msgid "macro parameters must be comma-separated" msgstr "" -#: macro.c:1349 +#: macro.c:1396 msgid "parameter name missing" msgstr "" -#: macro.c:1366 +#: macro.c:1413 msgid "anonymous variadic macros were introduced in C99" msgstr "" -#: macro.c:1371 +#: macro.c:1418 msgid "ISO C does not permit named variadic macros" msgstr "" -#: macro.c:1380 +#: macro.c:1427 msgid "missing ')' in macro parameter list" msgstr "" -#: macro.c:1458 +#: macro.c:1476 +msgid "'##' cannot appear at either end of a macro expansion" +msgstr "" + +#: macro.c:1510 #, fuzzy msgid "ISO C99 requires whitespace after the macro name" msgstr " " -#: macro.c:1482 +#: macro.c:1534 msgid "missing whitespace after the macro name" msgstr "" -#: macro.c:1512 +#: macro.c:1564 msgid "'#' is not followed by a macro parameter" msgstr "" -#: macro.c:1531 -msgid "'##' cannot appear at either end of a macro expansion" -msgstr "" - -#: macro.c:1629 +#: macro.c:1683 #, fuzzy, c-format msgid "\"%s\" redefined" msgstr "" -#: macro.c:1634 +#: macro.c:1688 #, fuzzy msgid "this is the location of the previous definition" msgstr " " -#: macro.c:1684 +#: macro.c:1738 #, c-format msgid "macro argument \"%s\" would be stringified in traditional C" msgstr "" -#: macro.c:1707 +#: macro.c:1761 #, c-format msgid "invalid hash type %d in cpp_macro_definition" msgstr "" -#: pch.c:84 pch.c:332 pch.c:354 pch.c:360 +#: pch.c:84 pch.c:332 pch.c:344 pch.c:362 pch.c:368 pch.c:377 msgid "while writing precompiled header" msgstr "" -#: pch.c:467 +#: pch.c:485 #, c-format msgid "%s: not used because `%.*s' not defined" msgstr "" -#: pch.c:479 +#: pch.c:497 #, c-format msgid "%s: not used because `%.*s' defined as `%s' not `%.*s'" msgstr "" -#: pch.c:520 +#: pch.c:538 #, c-format msgid "%s: not used because `%s' is defined" msgstr "" -#: pch.c:533 pch.c:696 +#: pch.c:558 +#, c-format +msgid "%s: not used because `__COUNTER__' is invalid" +msgstr "" + +#: pch.c:567 pch.c:737 msgid "while reading precompiled header" msgstr "" -#: traditional.c:745 +#: traditional.c:750 #, c-format msgid "detected recursion whilst expanding macro \"%s\"" msgstr "" -#: traditional.c:912 +#: traditional.c:917 #, fuzzy msgid "syntax error in macro parameter list" msgstr " " @@ -1267,10 +1294,6 @@ msgstr " #~ msgid "'lul' is not a valid integer suffix" #~ msgstr "%s' ." -#, fuzzy -#~ msgid "decimal constant is so large that it is unsigned" -#~ msgstr "%s: %s " - #, fuzzy #~ msgid "integer constant is larger than the maximum value for its type" #~ msgstr "" @@ -1722,6 +1745,10 @@ msgstr " #~ msgid "multi-line string literals are deprecated" #~ msgstr " " +#, fuzzy +#~ msgid "no newline at end of file" +#~ msgstr "%s: " + #, fuzzy #~ msgid "unknown string token %s\n" #~ msgstr " `s'" diff --git a/libcpp/po/es.po b/libcpp/po/es.po index 9f86c010740..f02736479a6 100644 --- a/libcpp/po/es.po +++ b/libcpp/po/es.po @@ -1,13 +1,13 @@ -# Mensajes en espaol para cpplib-4.2.0. +# Mensajes en espaol para cpplib-4.3-b20071109 # Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. # Cristian Othn Martnez Vera , 2001, 2002, 2003, 2004, 2005, 2006, 2007. # msgid "" msgstr "" -"Project-Id-Version: cpplib-4.2.0\n" +"Project-Id-Version: cpplib-4.3-b20071109\n" "Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n" -"POT-Creation-Date: 2007-05-13 19:48-0700\n" -"PO-Revision-Date: 2007-05-22 09:19-0500\n" +"POT-Creation-Date: 2007-11-08 21:08+0000\n" +"PO-Revision-Date: 2007-11-13 19:48-0600\n" "Last-Translator: Cristian Othn Martnez Vera \n" "Language-Team: Spanish \n" "MIME-Version: 1.0\n" @@ -70,7 +70,7 @@ msgstr "nombre universal de car msgid "%.*s is not a valid universal character" msgstr "%.*s no es un carcter universal vlido" -#: charset.c:1008 lex.c:472 +#: charset.c:1008 lex.c:484 msgid "'$' in identifier or number" msgstr "'$' en el identificador o nmero" @@ -148,231 +148,235 @@ msgstr "constante de car msgid "failure to convert %s to %s" msgstr "no se puede convertir %s a %s" -#: directives.c:214 directives.c:240 +#: directives.c:215 directives.c:241 #, c-format msgid "extra tokens at end of #%s directive" msgstr "elementos extra al final de la directiva #%s" -#: directives.c:343 +#: directives.c:344 #, c-format msgid "#%s is a GCC extension" msgstr "#%s es una extensin de GCC" -#: directives.c:355 +#: directives.c:356 msgid "suggest not using #elif in traditional C" msgstr "se sugiere no usar #elif en C tradicional" -#: directives.c:358 +#: directives.c:359 #, c-format msgid "traditional C ignores #%s with the # indented" msgstr "C tradicional ignora #%s con el # indentado" -#: directives.c:362 +#: directives.c:363 #, c-format msgid "suggest hiding #%s from traditional C with an indented #" msgstr "se sugiere ocultar #%s de C tradicional con un # indentado" -#: directives.c:388 +#: directives.c:389 msgid "embedding a directive within macro arguments is not portable" msgstr "imbuir una directiva dentro de los argumentos de una macro no es transportable" -#: directives.c:408 +#: directives.c:409 msgid "style of line directive is a GCC extension" msgstr "la directiva de estilo de lnea es una extensin de GCC" -#: directives.c:458 +#: directives.c:464 #, c-format msgid "invalid preprocessing directive #%s" msgstr "directiva de preprocesamiento #%s invlida" -#: directives.c:524 +#: directives.c:532 msgid "\"defined\" cannot be used as a macro name" msgstr "\"defined\" no se puede usar como un nombre de macro" -#: directives.c:530 +#: directives.c:538 #, c-format msgid "\"%s\" cannot be used as a macro name as it is an operator in C++" msgstr "no se puede usar \"%s\" como un nombre de macro porque es un operador en C++" -#: directives.c:533 +#: directives.c:541 #, c-format msgid "no macro name given in #%s directive" msgstr "no se dio un nombre de macro en la directiva #%s" -#: directives.c:536 +#: directives.c:544 msgid "macro names must be identifiers" msgstr "los nombres de macro deben ser identificadores" -#: directives.c:577 +#: directives.c:585 #, c-format msgid "undefining \"%s\"" msgstr "borrando la definicin de \"%s\"" -#: directives.c:632 +#: directives.c:640 msgid "missing terminating > character" msgstr "falta el carcter de terminacin >" -#: directives.c:687 +#: directives.c:695 #, c-format msgid "#%s expects \"FILENAME\" or " msgstr "#%s espera \"NOMBRE_ARCHIVO\" " -#: directives.c:727 +#: directives.c:739 #, c-format msgid "empty filename in #%s" msgstr "nombre de fichero vaco en #%s" -#: directives.c:737 +#: directives.c:749 msgid "#include nested too deeply" msgstr "#include anidado con demasiada profundidad" -#: directives.c:778 +#: directives.c:790 msgid "#include_next in primary source file" msgstr "#include_next en fichero primario de cdigo fuente" -#: directives.c:804 +#: directives.c:816 #, c-format msgid "invalid flag \"%s\" in line directive" msgstr "indicador \"%s\" invlido en la lnea de la directiva" -#: directives.c:856 +#: directives.c:868 #, c-format msgid "\"%s\" after #line is not a positive integer" msgstr "\"%s\" despus de #line no es un entero positivo" -#: directives.c:862 +#: directives.c:874 msgid "line number out of range" msgstr "nmero de lnea fuera de rango" -#: directives.c:875 directives.c:952 +#: directives.c:887 directives.c:964 #, c-format msgid "\"%s\" is not a valid filename" msgstr "\"%s\" no es un nombre de fichero vlido" -#: directives.c:912 +#: directives.c:924 #, c-format msgid "\"%s\" after # is not a positive integer" msgstr "\"%s\" despus de # no es un entero positivo" -#: directives.c:1014 +#: directives.c:1026 #, c-format msgid "invalid #%s directive" msgstr "directiva #%s invlida" -#: directives.c:1077 +#: directives.c:1089 #, c-format msgid "registering pragmas in namespace \"%s\" with mismatched name expansion" msgstr "registrando pragmas en el espaco de nombres \"%s\" con una expansin de nombre que no coincide" -#: directives.c:1086 +#: directives.c:1098 #, c-format msgid "registering pragma \"%s\" with name expansion and no namespace" msgstr "registrando el pragma \"%s\" con expansin de nombre y sin un espacio de nombres" -#: directives.c:1104 +#: directives.c:1116 #, c-format msgid "registering \"%s\" as both a pragma and a pragma namespace" msgstr "registrando \"%s\" como un pragma y como un espacio de nombres de pragma" -#: directives.c:1107 +#: directives.c:1119 #, c-format msgid "#pragma %s %s is already registered" msgstr "#pragma %s %s ya est registrado" -#: directives.c:1110 +#: directives.c:1122 #, c-format msgid "#pragma %s is already registered" msgstr "#pragma %s ya est registrado" -#: directives.c:1140 +#: directives.c:1152 msgid "registering pragma with NULL handler" msgstr "registrando un pragma con manejador NULL" -#: directives.c:1350 +#: directives.c:1362 msgid "#pragma once in main file" msgstr "#pragma una vez en el fichero principal" -#: directives.c:1373 +#: directives.c:1385 msgid "invalid #pragma GCC poison directive" msgstr "directiva #pragma de GCC envenenada invlida" -#: directives.c:1382 +#: directives.c:1394 #, c-format msgid "poisoning existing macro \"%s\"" msgstr "envenenando la macro existente \"%s\"" -#: directives.c:1403 +#: directives.c:1413 msgid "#pragma system_header ignored outside include file" msgstr "#pragma system_header ignorado fuera del fichero a incluir" -#: directives.c:1427 +#: directives.c:1437 #, c-format msgid "cannot find source file %s" msgstr "no se puede encontrar el fichero fuente %s" -#: directives.c:1431 +#: directives.c:1441 #, c-format msgid "current file is older than %s" msgstr "el fichero actual es ms antiguo que %s" -#: directives.c:1599 +#: directives.c:1620 msgid "_Pragma takes a parenthesized string literal" msgstr "_Pragma lleva una cadena literal entre parntesis" -#: directives.c:1671 +#: directives.c:1693 msgid "#else without #if" msgstr "#else sin #if" -#: directives.c:1676 +#: directives.c:1698 msgid "#else after #else" msgstr "#else despus de #else" -#: directives.c:1678 directives.c:1711 +#: directives.c:1700 directives.c:1733 msgid "the conditional began here" msgstr "el condicional empez aqu" -#: directives.c:1704 +#: directives.c:1726 msgid "#elif without #if" msgstr "#elif sin #if" -#: directives.c:1709 +#: directives.c:1731 msgid "#elif after #else" msgstr "#elif despus de #else" -#: directives.c:1739 +#: directives.c:1761 msgid "#endif without #if" msgstr "#endif sin #if" -#: directives.c:1816 +#: directives.c:1838 msgid "missing '(' after predicate" msgstr "falta '(' antes del predicado" -#: directives.c:1831 +#: directives.c:1853 msgid "missing ')' to complete answer" msgstr "falta ')' para completar la respuesta" -#: directives.c:1851 +#: directives.c:1873 msgid "predicate's answer is empty" msgstr "el predicado de la respuesta est vaco" -#: directives.c:1878 +#: directives.c:1900 msgid "assertion without predicate" msgstr "afirmacin sin predicado" -#: directives.c:1880 +#: directives.c:1902 msgid "predicate must be an identifier" msgstr "el predicado debe ser un identificador" -#: directives.c:1966 +#: directives.c:1988 #, c-format msgid "\"%s\" re-asserted" msgstr "\"%s\" reafirmado" -#: directives.c:2190 +#: directives.c:2271 #, c-format msgid "unterminated #%s" msgstr "#%s sin terminar" +#: directives-only.c:221 lex.c:1016 traditional.c:162 +msgid "unterminated comment" +msgstr "comentario sin terminar" + #: errors.c:118 msgid "warning: " msgstr "aviso: " @@ -394,332 +398,345 @@ msgstr "salida est msgid "%s: %s" msgstr "%s: %s" -#: expr.c:203 +#: expr.c:261 msgid "too many decimal points in number" msgstr "demasiados puntos decimales en el nmero" -#: expr.c:223 +#: expr.c:290 expr.c:365 +msgid "fixed-point constants are a GCC extension" +msgstr "las constantes de coma fija son una extensin GCC" + +#: expr.c:303 +#, c-format +msgid "invalid digit \"%c\" in binary constant" +msgstr "dgito \"%c\" invlido en la constante binaria" + +#: expr.c:305 #, c-format msgid "invalid digit \"%c\" in octal constant" msgstr "dgito \"%c\" invlido en la constante octal" -#: expr.c:229 +#: expr.c:313 +msgid "invalid prefix \"0b\" for floating constant" +msgstr "prefijo \"0b\" invlido en la constante de coma flotante" + +#: expr.c:319 msgid "use of C99 hexadecimal floating constant" msgstr "uso de una constante de coma flotante hexadecimal C99" -#: expr.c:238 +#: expr.c:328 msgid "exponent has no digits" msgstr "el exponente no tiene dgitos" -#: expr.c:245 +#: expr.c:335 msgid "hexadecimal floating constants require an exponent" msgstr "las constantes de coma flotante hexadecimal requieren un exponente" -#: expr.c:251 +#: expr.c:341 #, c-format msgid "invalid suffix \"%.*s\" on floating constant" msgstr "sufijo \"%.*s\" invlido en la constante de coma flotante" -#: expr.c:261 expr.c:295 +#: expr.c:351 expr.c:393 #, c-format msgid "traditional C rejects the \"%.*s\" suffix" msgstr "C tradicional rechaza el sufijo \"%.*s\"" -#: expr.c:268 +#: expr.c:358 #, c-format msgid "invalid suffix \"%.*s\" with hexadecimal floating constant" msgstr "sufijo \"%.*s\" invlido en la constante de coma flotante hexadecimal" -#: expr.c:281 +#: expr.c:369 +msgid "decimal float constants are a GCC extension" +msgstr "las constantes de coma flotante decimal son una extensin GCC" + +#: expr.c:379 #, c-format msgid "invalid suffix \"%.*s\" on integer constant" msgstr "sufijo \"%.*s\" invlido en la constante entera" -#: expr.c:303 +#: expr.c:401 msgid "use of C99 long long integer constant" msgstr "uso de una constante entera long long C99" -#: expr.c:310 +#: expr.c:409 msgid "imaginary constants are a GCC extension" msgstr "las constantes imaginarias son una extensin GCC" -#: expr.c:396 +#: expr.c:412 +msgid "binary constants are a GCC extension" +msgstr "las constantes binarias son una extensin GCC" + +#: expr.c:505 msgid "integer constant is too large for its type" msgstr "la constante entera es demasiado grande para su tipo" -#: expr.c:408 +#: expr.c:517 msgid "integer constant is so large that it is unsigned" msgstr "la constante entera es tan grande que es unsigned" -#: expr.c:490 +#: expr.c:612 msgid "missing ')' after \"defined\"" msgstr "falta `)' despus de \"defined\"" -#: expr.c:497 +#: expr.c:619 msgid "operator \"defined\" requires an identifier" msgstr "el operador \"defined\" requiere un identificador" -#: expr.c:505 +#: expr.c:627 #, c-format msgid "(\"%s\" is an alternative token for \"%s\" in C++)" msgstr "(\"%s\" es un elemento alternativo para \"%s\" en C++)" -#: expr.c:515 +#: expr.c:637 msgid "this use of \"defined\" may not be portable" msgstr "este uso de \"defined\" puede no ser transportable" -#: expr.c:554 +#: expr.c:676 msgid "floating constant in preprocessor expression" msgstr "constante de coma flotante en una expresin del preprocesador" -#: expr.c:560 +#: expr.c:682 msgid "imaginary number in preprocessor expression" msgstr "nmero imaginario en una expresin del preprocesador" -#: expr.c:605 +#: expr.c:727 #, c-format msgid "\"%s\" is not defined" msgstr "\"%s\" no est definido" -#: expr.c:733 expr.c:762 +#: expr.c:855 expr.c:884 #, c-format msgid "missing binary operator before token \"%s\"" msgstr "falta un operador binario antes del elemento \"%s\"" -#: expr.c:753 +#: expr.c:875 #, c-format msgid "token \"%s\" is not valid in preprocessor expressions" msgstr "el elemento \"%s\" no es vlido en las expresiones del preprocesador" -#: expr.c:770 +#: expr.c:892 msgid "missing expression between '(' and ')'" msgstr "falta una expresin entre '(' y ')'" -#: expr.c:773 +#: expr.c:895 msgid "#if with no expression" msgstr "#if sin expresin" -#: expr.c:776 +#: expr.c:898 #, c-format msgid "operator '%s' has no right operand" msgstr "el operador '%s' no tiene operando derecho" -#: expr.c:781 +#: expr.c:903 #, c-format msgid "operator '%s' has no left operand" msgstr "el operador `%s' no tiene operando izquierdo" -#: expr.c:807 +#: expr.c:929 msgid " ':' without preceding '?'" msgstr " ':' sin una '?' precedente" -#: expr.c:834 +#: expr.c:956 msgid "unbalanced stack in #if" msgstr "pila desbalanceada en #if" -#: expr.c:853 +#: expr.c:975 #, c-format msgid "impossible operator '%u'" msgstr "operador '%u' imposible" -#: expr.c:943 +#: expr.c:1065 msgid "missing ')' in expression" msgstr "falta un ')' en la expresin" -#: expr.c:964 +#: expr.c:1086 msgid "'?' without following ':'" msgstr "'?' sin ':' a continuacin" -#: expr.c:974 +#: expr.c:1096 msgid "integer overflow in preprocessor expression" msgstr "desbordamiento entero en expresin del preprocesador" -#: expr.c:979 +#: expr.c:1101 msgid "missing '(' in expression" msgstr "falta un '(' en la expresin" -#: expr.c:1011 +#: expr.c:1133 #, c-format msgid "the left operand of \"%s\" changes sign when promoted" msgstr "el operando izquierdo de \"%s\" cambia el signo cuando es promovido" -#: expr.c:1016 +#: expr.c:1138 #, c-format msgid "the right operand of \"%s\" changes sign when promoted" msgstr "el operando derecho de \"%s\" cambia el signo cuando es promovido" -#: expr.c:1275 +#: expr.c:1397 msgid "traditional C rejects the unary plus operator" msgstr "C tradicional rechaza el operador unario mas" -#: expr.c:1358 +#: expr.c:1480 msgid "comma operator in operand of #if" msgstr "operador coma en operando de #if" -#: expr.c:1490 +#: expr.c:1612 msgid "division by zero in #if" msgstr "divisin por cero en #if" -#: files.c:402 +#: files.c:442 msgid "NULL directory in find_file" msgstr "directorio NULL en find_file" -#: files.c:440 +#: files.c:480 msgid "one or more PCH files were found, but they were invalid" msgstr "se encontr uno o ms ficheros PCH, pero eran invlidos" -#: files.c:443 +#: files.c:483 msgid "use -Winvalid-pch for more information" msgstr "use -Winvalid-pch para ms informacin" -#: files.c:501 +#: files.c:570 #, c-format msgid "%s is a block device" msgstr "%s es un dispositivo de bloques" -#: files.c:518 +#: files.c:587 #, c-format msgid "%s is too large" msgstr "%s es demasiado grande" -#: files.c:553 +#: files.c:622 #, c-format msgid "%s is shorter than expected" msgstr "%s es ms corto de lo esperado" -#: files.c:782 +#: files.c:852 #, c-format msgid "no include path in which to search for %s" msgstr "no hay ruta de inclusin en la cual se pueda buscar %s" -#: files.c:1071 +#: files.c:1157 msgid "Multiple include guards may be useful for:\n" msgstr "Guardias mltiples de include pueden ser tiles para:\n" -#: init.c:407 +#: init.c:426 msgid "cppchar_t must be an unsigned type" msgstr "cppchar_t debe ser de un tipo unsigned" -#: init.c:411 +#: init.c:430 #, c-format msgid "preprocessor arithmetic has maximum precision of %lu bits; target requires %lu bits" msgstr "la aritmtica del preprocesador tiene una precisin mxima de %lu bits; el objetivo requiere de %lu bits" -#: init.c:418 +#: init.c:437 msgid "CPP arithmetic must be at least as precise as a target int" msgstr "la aritmtica de CPP debe se al menos tan precisa como un int del objetivo" -#: init.c:421 +#: init.c:440 msgid "target char is less than 8 bits wide" msgstr "el char del objetivo tiene menos de 8 bits de ancho" -#: init.c:425 +#: init.c:444 msgid "target wchar_t is narrower than target char" msgstr "el wchar_t del objetivo es ms estrecho que el char del objetivo" -#: init.c:429 +#: init.c:448 msgid "target int is narrower than target char" msgstr "el int del objetivo es ms estrecho que el char del objetivo" -#: init.c:434 +#: init.c:453 msgid "CPP half-integer narrower than CPP character" msgstr "el medio-entero de CPP es ms estrecho que el carcter de CPP" -#: init.c:438 +#: init.c:457 #, 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 carcter anchas ms all de %lu bits en este objetivo, pero el objetivo requiere %lu bits" -#: lex.c:271 +#: lex.c:283 msgid "backslash and newline separated by space" msgstr "caracteres de barra invertida y fin de lnea separados por espacio" -#: lex.c:276 +#: lex.c:288 msgid "backslash-newline at end of file" msgstr "no hay caractr de barra invertida o fin de lnea al final del fichero" -#: lex.c:291 +#: lex.c:303 #, c-format msgid "trigraph ??%c converted to %c" msgstr "trigrafo ??%c convertido a %c" -#: lex.c:298 +#: lex.c:310 #, c-format msgid "trigraph ??%c ignored, use -trigraphs to enable" msgstr "se ignora el trigrafo ??%c, use -trigraphs para reconocerlo" -#: lex.c:344 +#: lex.c:356 msgid "\"/*\" within comment" msgstr "\"/*\" dentro de un comentario" -#: lex.c:402 +#: lex.c:414 #, c-format msgid "%s in preprocessing directive" msgstr "%s en la directiva de preprocesamiento" -#: lex.c:411 +#: lex.c:423 msgid "null character(s) ignored" msgstr "caracter(es) nulo(s) ignorados" -#: lex.c:448 +#: lex.c:460 #, c-format msgid "`%.*s' is not in NFKC" msgstr "`%.*s' no est en NFKC" -#: lex.c:451 +#: lex.c:463 #, c-format msgid "`%.*s' is not in NFC" msgstr "`%.*s' no est en NFC" -#: lex.c:539 +#: lex.c:551 #, c-format msgid "attempt to use poisoned \"%s\"" msgstr "intento de usar \"%s\" envenenado" -#: lex.c:547 +#: lex.c:559 msgid "__VA_ARGS__ can only appear in the expansion of a C99 variadic macro" msgstr "__VA_ARGS__ solamente puede aparecer en la expansin de una macro variadic C99" -#: lex.c:647 +#: lex.c:659 msgid "null character(s) preserved in literal" msgstr "caracter(es) nulo(s) preservados en la literal" -#: lex.c:650 +#: lex.c:662 #, c-format msgid "missing terminating %c character" msgstr "falta el carcter de terminacin %c" -#: lex.c:842 -msgid "no newline at end of file" -msgstr "no hay caractr de fin de lnea al final del fichero" - -#: lex.c:1002 traditional.c:162 -msgid "unterminated comment" -msgstr "comentario sin terminar" - -#: lex.c:1013 +#: lex.c:1027 msgid "C++ style comments are not allowed in ISO C90" msgstr "los comentarios de estilo C++ no se permiten en ISO C90" -#: lex.c:1015 +#: lex.c:1029 msgid "(this will be reported only once per input file)" msgstr "(esto se reportar solamente una vez por cada fichero de entrada)" -#: lex.c:1020 +#: lex.c:1034 msgid "multi-line comment" msgstr "comentario en mltiples lneas" -#: lex.c:1333 +#: lex.c:1347 #, c-format msgid "unspellable token %s" msgstr "elemento %s impronunciable" -#: line-map.c:313 +#: line-map.c:320 #, c-format msgid "In file included from %s:%u" msgstr "En el fichero includo de %s:%u" -#: line-map.c:331 +#: line-map.c:338 #, c-format msgid "" ",\n" @@ -728,153 +745,165 @@ msgstr "" ",\n" " de %s:%u" -#: macro.c:83 +#: macro.c:84 #, c-format msgid "macro \"%s\" is not used" msgstr "la macro \"%s\" no se utiliza" -#: macro.c:122 macro.c:312 +#: macro.c:123 macro.c:319 #, c-format msgid "invalid built-in macro \"%s\"" msgstr "macro interna \"%s\" invlida" -#: macro.c:156 +#: macro.c:157 msgid "could not determine file timestamp" msgstr "no se puede determinar la marca de fecha del fichero" -#: macro.c:253 +#: macro.c:254 msgid "could not determine date and time" msgstr "no se puede determinar la fecha y la hora" -#: macro.c:416 +#: macro.c:270 +msgid "__COUNTER__ expanded inside directive with -fdirectives-only" +msgstr "se expande __COUNTER__ dentro de una directiva con -fdirectives-only" + +#: macro.c:423 msgid "invalid string literal, ignoring final '\\'" -msgstr "cadena literal invlida, se ignora el '\\' finales" +msgstr "cadena literal invlida, se ignora el '\\' final" -#: macro.c:466 +#: macro.c:483 #, c-format msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token" msgstr "pegar \"%s\" y \"%s\" no da un elemento vlido de preprocesamiento" -#: macro.c:538 +#: macro.c:558 msgid "ISO C99 requires rest arguments to be used" msgstr "ISO C99 requiere que el resto de los argumentos sea usado" -#: macro.c:543 +#: macro.c:563 #, 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:548 +#: macro.c:568 #, c-format msgid "macro \"%s\" passed %u arguments, but takes just %u" msgstr "la macro \"%s\" recibi %u argumentos, pero solamente tom %u" -#: macro.c:659 traditional.c:675 +#: macro.c:679 traditional.c:680 #, c-format msgid "unterminated argument list invoking macro \"%s\"" msgstr "lista de argumentos sin terminar al invocar la macro \"%s\"" -#: macro.c:762 +#: macro.c:782 #, c-format msgid "function-like macro \"%s\" must be used with arguments in traditional C" msgstr "la funcin de macro \"%s\" se debe usar con argumentos en C tradicional" -#: macro.c:1278 +#: macro.c:1325 #, c-format msgid "duplicate macro parameter \"%s\"" msgstr "parmetro de macro \"%s\" duplicado" -#: macro.c:1324 +#: macro.c:1371 #, c-format msgid "\"%s\" may not appear in macro parameter list" msgstr "\"%s\" podra faltar en la lista de parmetro de macro" -#: macro.c:1332 +#: macro.c:1379 msgid "macro parameters must be comma-separated" msgstr "los parmetros de macro deben ser separados por comas" -#: macro.c:1349 +#: macro.c:1396 msgid "parameter name missing" msgstr "falta el nombre del parmetro" -#: macro.c:1366 +#: macro.c:1413 msgid "anonymous variadic macros were introduced in C99" msgstr "los macros variadic annimos se introdujeron en C99" -#: macro.c:1371 +#: macro.c:1418 msgid "ISO C does not permit named variadic macros" msgstr "ISO C no permite macros variadic nombrados" -#: macro.c:1380 +#: macro.c:1427 msgid "missing ')' in macro parameter list" msgstr "falta parntesis derecho en la lista de parmetros de macro" -#: macro.c:1458 +#: macro.c:1476 +msgid "'##' cannot appear at either end of a macro expansion" +msgstr "'##' no puede aparece en o al final de una expansin de macro" + +#: macro.c:1510 msgid "ISO C99 requires whitespace after the macro name" msgstr "ISO C99 requiere espacios en blanco despus del nombre de macro" -#: macro.c:1482 +#: macro.c:1534 msgid "missing whitespace after the macro name" msgstr "faltan espacios en blanco despus del nombre de macro" -#: macro.c:1512 +#: macro.c:1564 msgid "'#' is not followed by a macro parameter" msgstr "'#' no es seguido por un parmetro de macro" -#: macro.c:1531 -msgid "'##' cannot appear at either end of a macro expansion" -msgstr "'##' no puede aparece en o al final de una expansin de macro" - -#: macro.c:1629 +#: macro.c:1683 #, c-format msgid "\"%s\" redefined" msgstr "se redefini \"%s\"" -#: macro.c:1634 +#: macro.c:1688 msgid "this is the location of the previous definition" msgstr "esta es la ubicacin de la definicin previa" -#: macro.c:1684 +#: macro.c:1738 #, c-format msgid "macro argument \"%s\" would be stringified in traditional C" msgstr "el argumento de macro \"%s\" debera ser convertido a cadena en C tradicional" -#: macro.c:1707 +#: macro.c:1761 #, c-format msgid "invalid hash type %d in cpp_macro_definition" msgstr "tipo de hash %d invlido en cpp_macro_definition" -#: pch.c:84 pch.c:332 pch.c:354 pch.c:360 +#: pch.c:84 pch.c:332 pch.c:344 pch.c:362 pch.c:368 pch.c:377 msgid "while writing precompiled header" msgstr "al escribir el encabezado precompilado" -#: pch.c:467 +#: pch.c:485 #, c-format msgid "%s: not used because `%.*s' not defined" msgstr "%s: no se usa porque `%.*s' no est definido" -#: pch.c:479 +#: pch.c:497 #, c-format msgid "%s: not used because `%.*s' defined as `%s' not `%.*s'" msgstr "%s: no se usa porque `%.*s' est definido como `%s' no como `%.*s'" -#: pch.c:520 +#: pch.c:538 #, c-format msgid "%s: not used because `%s' is defined" msgstr "%s: no se usa porque `%s' est definido" -#: pch.c:533 pch.c:696 +#: pch.c:558 +#, c-format +msgid "%s: not used because `__COUNTER__' is invalid" +msgstr "%s: no se usa porque `__COUNTER__' es invlido" + +#: pch.c:567 pch.c:737 msgid "while reading precompiled header" msgstr "al leer el encabezado precompilado" -#: traditional.c:745 +#: traditional.c:750 #, c-format msgid "detected recursion whilst expanding macro \"%s\"" msgstr "se detect recursin al expandir la macro \"%s\"" -#: traditional.c:912 +#: traditional.c:917 msgid "syntax error in macro parameter list" msgstr "error de sintaxis en la lista de parmetros de macro" +#~ msgid "no newline at end of file" +#~ msgstr "no hay caractr de fin de lnea al final del fichero" + #~ msgid "unknown escape sequence: '\\%03o'" #~ msgstr "secuencia de escape desconocida: '\\%03o'" diff --git a/libcpp/po/fr.po b/libcpp/po/fr.po index d13dcdabfe4..313bb89da00 100644 --- a/libcpp/po/fr.po +++ b/libcpp/po/fr.po @@ -118,7 +118,7 @@ msgid "" msgstr "" "Project-Id-Version: GNU cpplib 4.0.0\n" "Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n" -"POT-Creation-Date: 2007-05-13 19:48-0700\n" +"POT-Creation-Date: 2007-11-08 21:08+0000\n" "PO-Revision-Date: 2005-06-12 08:00-0500\n" "Last-Translator: Michel Robitaille \n" "Language-Team: French \n" @@ -184,7 +184,7 @@ msgstr "nom de caract msgid "%.*s is not a valid universal character" msgstr "%.*s n'est pas un caractre universel valide" -#: charset.c:1008 lex.c:472 +#: charset.c:1008 lex.c:484 msgid "'$' in identifier or number" msgstr " $ dans un identificateur ou un nombre" @@ -262,237 +262,241 @@ msgstr "constante caract msgid "failure to convert %s to %s" msgstr "chec de conversion de %s vers %s" -#: directives.c:214 directives.c:240 +#: directives.c:215 directives.c:241 #, c-format msgid "extra tokens at end of #%s directive" msgstr "lments lexicaux superflus la fin de la directive #%s" -#: directives.c:343 +#: directives.c:344 #, c-format msgid "#%s is a GCC extension" msgstr "#%s est une extension GCC" -#: directives.c:355 +#: directives.c:356 msgid "suggest not using #elif in traditional C" msgstr "il est suggr de ne pas utiliser #elif en C traditionnel" -#: directives.c:358 +#: directives.c:359 #, c-format msgid "traditional C ignores #%s with the # indented" msgstr "le C traditionel ignore la directive #%s si le caractre # est indent" -#: directives.c:362 +#: directives.c:363 #, c-format msgid "suggest hiding #%s from traditional C with an indented #" msgstr "il est suggr de cacher #%s au C traditionel en indentant le # " -#: directives.c:388 +#: directives.c:389 msgid "embedding a directive within macro arguments is not portable" msgstr "placer une directive dans les arguments d'une macro n'est pas portable" -#: directives.c:408 +#: directives.c:409 msgid "style of line directive is a GCC extension" msgstr "la directive de style de ligne est extension GCC" -#: directives.c:458 +#: directives.c:464 #, c-format msgid "invalid preprocessing directive #%s" msgstr "directive de pr-traitement #%s invalide" -#: directives.c:524 +#: directives.c:532 msgid "\"defined\" cannot be used as a macro name" msgstr " defined ne peut tre utilis comme nom de macro" -#: directives.c:530 +#: directives.c:538 #, c-format msgid "\"%s\" cannot be used as a macro name as it is an operator in C++" msgstr " %s ne peut tre utilis comme nom de macro car c'est un oprateur en C++" -#: directives.c:533 +#: directives.c:541 #, c-format msgid "no macro name given in #%s directive" msgstr "aucun nom de macro donn dans la directive #%s" -#: directives.c:536 +#: directives.c:544 msgid "macro names must be identifiers" msgstr "les noms de macro doivent tre des identificateurs" -#: directives.c:577 +#: directives.c:585 #, c-format msgid "undefining \"%s\"" msgstr "indfinition de %s " -#: directives.c:632 +#: directives.c:640 msgid "missing terminating > character" msgstr "caractre > de terminaison manquant" -#: directives.c:687 +#: directives.c:695 #, c-format msgid "#%s expects \"FILENAME\" or " msgstr "#%s attend \"NOM_DE_FICHIER\" ou " -#: directives.c:727 +#: directives.c:739 #, c-format msgid "empty filename in #%s" msgstr "nom de fichier vide dans #%s" -#: directives.c:737 +#: directives.c:749 msgid "#include nested too deeply" msgstr "#include imbriqu trop profondment" -#: directives.c:778 +#: directives.c:790 msgid "#include_next in primary source file" msgstr "#include_next dans un fichier source primaire" -#: directives.c:804 +#: directives.c:816 #, c-format msgid "invalid flag \"%s\" in line directive" msgstr "fanion %s invalide dans la ligne de directive" -#: directives.c:856 +#: directives.c:868 #, c-format msgid "\"%s\" after #line is not a positive integer" msgstr " %s aprs #line n'est pas un nombre entier positif" -#: directives.c:862 +#: directives.c:874 msgid "line number out of range" msgstr "numro de ligne hors limite" -#: directives.c:875 directives.c:952 +#: directives.c:887 directives.c:964 #, c-format msgid "\"%s\" is not a valid filename" msgstr " %s n'est pas un nom de fichier valide" -#: directives.c:912 +#: directives.c:924 #, c-format msgid "\"%s\" after # is not a positive integer" msgstr " %s aprs # n'est pas un nombre entier positif" -#: directives.c:1014 +#: directives.c:1026 #, fuzzy, c-format msgid "invalid #%s directive" msgstr "directive #ident invalide" -#: directives.c:1077 +#: directives.c:1089 #, c-format msgid "registering pragmas in namespace \"%s\" with mismatched name expansion" msgstr "" # FIXME -#: directives.c:1086 +#: directives.c:1098 #, fuzzy, c-format msgid "registering pragma \"%s\" with name expansion and no namespace" msgstr "enregistrement de \"%s\" la fois comme une pragma et un espace de nom de pragma" # FIXME -#: directives.c:1104 +#: directives.c:1116 #, c-format msgid "registering \"%s\" as both a pragma and a pragma namespace" msgstr "enregistrement de \"%s\" la fois comme une pragma et un espace de nom de pragma" -#: directives.c:1107 +#: directives.c:1119 #, c-format msgid "#pragma %s %s is already registered" msgstr "la #pragma %s %s est dj enregistre" -#: directives.c:1110 +#: directives.c:1122 #, c-format msgid "#pragma %s is already registered" msgstr "la #pragma %s est dj enregistre" -#: directives.c:1140 +#: directives.c:1152 msgid "registering pragma with NULL handler" msgstr "" # FIXME -#: directives.c:1350 +#: directives.c:1362 msgid "#pragma once in main file" msgstr "#pragma once utilise une seule fois dans le fichier principal" # FIXME -#: directives.c:1373 +#: directives.c:1385 msgid "invalid #pragma GCC poison directive" msgstr "la directive GCC #pragma poison est invalide" # FIXME -#: directives.c:1382 +#: directives.c:1394 #, c-format msgid "poisoning existing macro \"%s\"" msgstr "limination de la macro existente %s " -#: directives.c:1403 +#: directives.c:1413 msgid "#pragma system_header ignored outside include file" msgstr "#pragma system_header ignore en dehors du fichier d'inclusion" -#: directives.c:1427 +#: directives.c:1437 #, c-format msgid "cannot find source file %s" msgstr "impossible de trouver le fichier source %s" -#: directives.c:1431 +#: directives.c:1441 #, c-format msgid "current file is older than %s" msgstr "le fichier courant est plus vieux que %s" -#: directives.c:1599 +#: directives.c:1620 msgid "_Pragma takes a parenthesized string literal" msgstr "_Pragma prend une chane entoure de parenthrese" -#: directives.c:1671 +#: directives.c:1693 msgid "#else without #if" msgstr "#else sans #if" -#: directives.c:1676 +#: directives.c:1698 msgid "#else after #else" msgstr "#else aprs #else" -#: directives.c:1678 directives.c:1711 +#: directives.c:1700 directives.c:1733 msgid "the conditional began here" msgstr "la condition dbute ici" -#: directives.c:1704 +#: directives.c:1726 msgid "#elif without #if" msgstr "#elif sans #if" -#: directives.c:1709 +#: directives.c:1731 msgid "#elif after #else" msgstr "#elif aprs #else" -#: directives.c:1739 +#: directives.c:1761 msgid "#endif without #if" msgstr "#endif sans #if" -#: directives.c:1816 +#: directives.c:1838 msgid "missing '(' after predicate" msgstr " ( manquante aprs le prdicat" -#: directives.c:1831 +#: directives.c:1853 msgid "missing ')' to complete answer" msgstr " ) manquante pour completer la rponse" -#: directives.c:1851 +#: directives.c:1873 msgid "predicate's answer is empty" msgstr "la rponse du prdicat est vide" -#: directives.c:1878 +#: directives.c:1900 msgid "assertion without predicate" msgstr "assertion sans prdicat" -#: directives.c:1880 +#: directives.c:1902 msgid "predicate must be an identifier" msgstr "le prdicat doit tre un identificateur" # FIXME -#: directives.c:1966 +#: directives.c:1988 #, c-format msgid "\"%s\" re-asserted" msgstr " %s re-asserti" -#: directives.c:2190 +#: directives.c:2271 #, c-format msgid "unterminated #%s" msgstr "#%s non termin" +#: directives-only.c:221 lex.c:1016 traditional.c:162 +msgid "unterminated comment" +msgstr "commentaire non termin" + #: errors.c:118 msgid "warning: " msgstr "attention : " @@ -514,336 +518,353 @@ msgstr "stdout" msgid "%s: %s" msgstr "%s : %s" -#: expr.c:203 +#: expr.c:261 msgid "too many decimal points in number" msgstr "trop de points dcimaux dans le nombre" -#: expr.c:223 +#: expr.c:290 expr.c:365 +#, fuzzy +msgid "fixed-point constants are a GCC extension" +msgstr "les constantes imaginaires sont une extension GCC" + +#: expr.c:303 +#, fuzzy, c-format +msgid "invalid digit \"%c\" in binary constant" +msgstr "chiffre %c invalide dans la constante en base 8" + +#: expr.c:305 #, c-format msgid "invalid digit \"%c\" in octal constant" msgstr "chiffre %c invalide dans la constante en base 8" -#: expr.c:229 +#: expr.c:313 +#, fuzzy +msgid "invalid prefix \"0b\" for floating constant" +msgstr "suffixe %.*s invalide pour une constante flottante" + +#: expr.c:319 msgid "use of C99 hexadecimal floating constant" msgstr "usage d'une constante hexadcimale constante la C99" -#: expr.c:238 +#: expr.c:328 msgid "exponent has no digits" msgstr "l'exposant n'a pas de chiffre" -#: expr.c:245 +#: expr.c:335 msgid "hexadecimal floating constants require an exponent" msgstr "la contante hexadcimale flottante require un exposant" -#: expr.c:251 +#: expr.c:341 #, c-format msgid "invalid suffix \"%.*s\" on floating constant" msgstr "suffixe %.*s invalide pour une constante flottante" -#: expr.c:261 expr.c:295 +#: expr.c:351 expr.c:393 #, c-format msgid "traditional C rejects the \"%.*s\" suffix" msgstr "le C traditionnel interdit le suffixe %.*s " -#: expr.c:268 +#: expr.c:358 #, fuzzy, c-format msgid "invalid suffix \"%.*s\" with hexadecimal floating constant" msgstr "suffixe %.*s invalide pour une constante flottante" -#: expr.c:281 +#: expr.c:369 +#, fuzzy +msgid "decimal float constants are a GCC extension" +msgstr "les constantes imaginaires sont une extension GCC" + +#: expr.c:379 #, c-format msgid "invalid suffix \"%.*s\" on integer constant" msgstr "suffixe %.*s invalide pour une constante entire" -#: expr.c:303 +#: expr.c:401 msgid "use of C99 long long integer constant" msgstr "usage d'une constante entire long long la C99" -#: expr.c:310 +#: expr.c:409 msgid "imaginary constants are a GCC extension" msgstr "les constantes imaginaires sont une extension GCC" -#: expr.c:396 +#: expr.c:412 +#, fuzzy +msgid "binary constants are a GCC extension" +msgstr "les constantes imaginaires sont une extension GCC" + +#: expr.c:505 msgid "integer constant is too large for its type" msgstr "constante entire trop grande pour tenir dans son type" -#: expr.c:408 +#: expr.c:517 msgid "integer constant is so large that it is unsigned" msgstr "cette constante entire est si grande qu'elle ne peut tre signe" -#: expr.c:490 +#: expr.c:612 msgid "missing ')' after \"defined\"" msgstr " ) manquant aprs defined " -#: expr.c:497 +#: expr.c:619 msgid "operator \"defined\" requires an identifier" msgstr "l'oprateur defined requiert un identificateur" -#: expr.c:505 +#: expr.c:627 #, c-format msgid "(\"%s\" is an alternative token for \"%s\" in C++)" msgstr "( %s est un lment lexical alternatif pour %s en C++)" -#: expr.c:515 +#: expr.c:637 msgid "this use of \"defined\" may not be portable" msgstr "cette utilisation de defined peut ne pas tre portable" -#: expr.c:554 +#: expr.c:676 msgid "floating constant in preprocessor expression" msgstr "constante flottante dans une expresion pour le prprocesseur" -#: expr.c:560 +#: expr.c:682 msgid "imaginary number in preprocessor expression" msgstr "constante complexe dans une expresion pour le prprocesseur" -#: expr.c:605 +#: expr.c:727 #, c-format msgid "\"%s\" is not defined" msgstr " %s n'est pas dfini" -#: expr.c:733 expr.c:762 +#: expr.c:855 expr.c:884 #, c-format msgid "missing binary operator before token \"%s\"" msgstr "oprateur binaire manquant avant l'lment lexical %s " -#: expr.c:753 +#: expr.c:875 #, c-format msgid "token \"%s\" is not valid in preprocessor expressions" msgstr "l'lment lexical %s n'est pas valide dans les expressions pour le prprocesseur" -#: expr.c:770 +#: expr.c:892 msgid "missing expression between '(' and ')'" msgstr "expression manquante entre '(' et ')'" -#: expr.c:773 +#: expr.c:895 msgid "#if with no expression" msgstr "#if sans expression" -#: expr.c:776 +#: expr.c:898 #, c-format msgid "operator '%s' has no right operand" msgstr "l'oprateur %s n'a pas d'oprande droite" -#: expr.c:781 +#: expr.c:903 #, c-format msgid "operator '%s' has no left operand" msgstr "oprateur %s n'a pas d'oprande gauche" -#: expr.c:807 +#: expr.c:929 msgid " ':' without preceding '?'" msgstr " : n'est pas prcd de ? " -#: expr.c:834 +#: expr.c:956 msgid "unbalanced stack in #if" msgstr "pile non balance dans #if" -#: expr.c:853 +#: expr.c:975 #, c-format msgid "impossible operator '%u'" msgstr "oprateur impossible %u " -#: expr.c:943 +#: expr.c:1065 msgid "missing ')' in expression" msgstr " ) manquante dans l'expresion" -#: expr.c:964 +#: expr.c:1086 msgid "'?' without following ':'" msgstr " ? n'est pas suivi de : " -#: expr.c:974 +#: expr.c:1096 msgid "integer overflow in preprocessor expression" msgstr "dbordement d'entier dans l'expresion pour le prprocesseur" -#: expr.c:979 +#: expr.c:1101 msgid "missing '(' in expression" msgstr " ( manquante dans l'expresion" -#: expr.c:1011 +#: expr.c:1133 #, c-format msgid "the left operand of \"%s\" changes sign when promoted" msgstr "L'oprande gauche de %s change de signe lors de sa promotion" -#: expr.c:1016 +#: expr.c:1138 #, c-format msgid "the right operand of \"%s\" changes sign when promoted" msgstr "L'oprande droite de %s change de signe lors de sa promotion" -#: expr.c:1275 +#: expr.c:1397 msgid "traditional C rejects the unary plus operator" msgstr "le C traditionnel rejette le plus unaire" -#: expr.c:1358 +#: expr.c:1480 msgid "comma operator in operand of #if" msgstr "oprateur virgule dans l'oprande de #if" -#: expr.c:1490 +#: expr.c:1612 msgid "division by zero in #if" msgstr "division par zro dans #if" -#: files.c:402 +#: files.c:442 msgid "NULL directory in find_file" msgstr "rpertoire NUL dans find_file" -#: files.c:440 +#: files.c:480 msgid "one or more PCH files were found, but they were invalid" msgstr "un ou plusieurs fichiers PCH ont t reprs, mais ils taient invalides" -#: files.c:443 +#: files.c:483 msgid "use -Winvalid-pch for more information" msgstr "utiliser -Winvalid-pch pour plus d'informations" # FIXME -#: files.c:501 +#: files.c:570 #, c-format msgid "%s is a block device" msgstr "%s est un priphrique de blocs" -#: files.c:518 +#: files.c:587 #, c-format msgid "%s is too large" msgstr "%s est trop grand" -#: files.c:553 +#: files.c:622 #, c-format msgid "%s is shorter than expected" msgstr "%s est plus petit que prvu" -#: files.c:782 +#: files.c:852 #, c-format msgid "no include path in which to search for %s" msgstr "aucun chemin d'inclusion dans lequel on pourrait reprer %s" # FIXME -#: files.c:1071 +#: files.c:1157 msgid "Multiple include guards may be useful for:\n" msgstr "De multiples balises pour les inclusions peuvent tre utiles pour:\n" -#: init.c:407 +#: init.c:426 msgid "cppchar_t must be an unsigned type" msgstr "cppchar_t doit tre d'un type non sign" -#: init.c:411 +#: init.c:430 #, c-format msgid "preprocessor arithmetic has maximum precision of %lu bits; target requires %lu bits" msgstr "l'arithmtique du prprocesseur a une prcision maximale de %lu bits ; la cible require %lu bits" -#: init.c:418 +#: init.c:437 msgid "CPP arithmetic must be at least as precise as a target int" msgstr "l'arithmtique de CPP doit tre au moins aussi prcise que le type int de la cible" -#: init.c:421 +#: init.c:440 msgid "target char is less than 8 bits wide" msgstr "sur la cible, char fait moins de 8 bits" -#: init.c:425 +#: init.c:444 msgid "target wchar_t is narrower than target char" msgstr "sur la cible, wchar_t est plus petit que char " -#: init.c:429 +#: init.c:448 msgid "target int is narrower than target char" msgstr "sur la cible, int est plus petit que char " -#: init.c:434 +#: init.c:453 msgid "CPP half-integer narrower than CPP character" msgstr "les demi-entiers de CPP sont plus petit que les caractres de CPP" -#: init.c:438 +#: init.c:457 #, 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 grer les constantes larges de caractres de plus de %lu bits, mais la cible require %lu bits" -#: lex.c:271 +#: lex.c:283 msgid "backslash and newline separated by space" msgstr " \\ et retour de chariot spars par un blanc" -#: lex.c:276 +#: lex.c:288 msgid "backslash-newline at end of file" msgstr " \\ en fin de ligne la fin du fichier" -#: lex.c:291 +#: lex.c:303 #, c-format msgid "trigraph ??%c converted to %c" msgstr "trigraphe ??%c converti en %c" -#: lex.c:298 +#: lex.c:310 #, c-format msgid "trigraph ??%c ignored, use -trigraphs to enable" msgstr "trigraphe ??%c ignor, utilisez -trigraphs pour le permettre" -#: lex.c:344 +#: lex.c:356 msgid "\"/*\" within comment" msgstr " /* l'intrieur d'un commentaire" -#: lex.c:402 +#: lex.c:414 #, c-format msgid "%s in preprocessing directive" msgstr "%s dans la directive du prprocesseur" # I18N -#: lex.c:411 +#: lex.c:423 msgid "null character(s) ignored" msgstr "caractre(s) nul(s) ignor(s)" -#: lex.c:448 +#: lex.c:460 #, fuzzy, c-format msgid "`%.*s' is not in NFKC" msgstr " %s n'est pas un canevas" -#: lex.c:451 +#: lex.c:463 #, fuzzy, c-format msgid "`%.*s' is not in NFC" msgstr " %s n'est pas un canevas" # FIXME -#: lex.c:539 +#: lex.c:551 #, c-format msgid "attempt to use poisoned \"%s\"" msgstr "tentative d'utilisation d'un %s corrompu" -#: lex.c:547 +#: lex.c:559 msgid "__VA_ARGS__ can only appear in the expansion of a C99 variadic macro" msgstr " __VA_ARGS__ peut seulement appratre dans l'expansion des macros C99 nombre variable d'arguments" -#: lex.c:647 +#: lex.c:659 msgid "null character(s) preserved in literal" msgstr "caractre(s) nul prserv(s) dans la chane" -#: lex.c:650 +#: lex.c:662 #, c-format msgid "missing terminating %c character" msgstr "caractre %c de terminaison manquant" -#: lex.c:842 -msgid "no newline at end of file" -msgstr "pas de retour chariot la fin du fichier" - -#: lex.c:1002 traditional.c:162 -msgid "unterminated comment" -msgstr "commentaire non termin" - -#: lex.c:1013 +#: lex.c:1027 msgid "C++ style comments are not allowed in ISO C90" msgstr "Les commentaires la C++ ne sont pas permis en C89 ISO" -#: lex.c:1015 +#: lex.c:1029 msgid "(this will be reported only once per input file)" msgstr "(ceci sera rapport une seule fois seulement par fichier d'entre)" -#: lex.c:1020 +#: lex.c:1034 msgid "multi-line comment" msgstr "commentaire multi-lignes" -#: lex.c:1333 +#: lex.c:1347 #, c-format msgid "unspellable token %s" msgstr "l'lment lexical %s ne peut tre pel" -#: line-map.c:313 +#: line-map.c:320 #, c-format msgid "In file included from %s:%u" msgstr "Dans le fichier inclus partir de %s:%u" -#: line-map.c:331 +#: line-map.c:338 #, c-format msgid "" ",\n" @@ -852,159 +873,171 @@ msgstr "" ",\n" " partir de %s:%u" -#: macro.c:83 +#: macro.c:84 #, c-format msgid "macro \"%s\" is not used" msgstr "la macro %s n'est pas utilise" -#: macro.c:122 macro.c:312 +#: macro.c:123 macro.c:319 #, c-format msgid "invalid built-in macro \"%s\"" msgstr "macro interne invalide %s " -#: macro.c:156 +#: macro.c:157 #, fuzzy msgid "could not determine file timestamp" msgstr "ne peut dterminer la date et l'heure" -#: macro.c:253 +#: macro.c:254 msgid "could not determine date and time" msgstr "ne peut dterminer la date et l'heure" -#: macro.c:416 +#: macro.c:270 +msgid "__COUNTER__ expanded inside directive with -fdirectives-only" +msgstr "" + +#: macro.c:423 msgid "invalid string literal, ignoring final '\\'" msgstr "chane invalide, \\ final ignor" -#: macro.c:466 +#: macro.c:483 #, 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 d'lment lexical de pr-traitement valide" -#: macro.c:538 +#: macro.c:558 msgid "ISO C99 requires rest arguments to be used" msgstr "ISO C99 requiert que tous les arguments soient utiliss" -#: macro.c:543 +#: macro.c:563 #, c-format msgid "macro \"%s\" requires %u arguments, but only %u given" msgstr "macro %s requiert %u arguments, mais seulement %u ont t passs" -#: macro.c:548 +#: macro.c:568 #, c-format msgid "macro \"%s\" passed %u arguments, but takes just %u" msgstr "la macro %s a reu %u arguments, mais elle n'en prend que %u" -#: macro.c:659 traditional.c:675 +#: macro.c:679 traditional.c:680 #, c-format msgid "unterminated argument list invoking macro \"%s\"" msgstr "liste d'arguments non termine invoquant la macro %s " -#: macro.c:762 +#: macro.c:782 #, c-format msgid "function-like macro \"%s\" must be used with arguments in traditional C" msgstr "la macro %s ressemblant une fonction doit utilise avec des arguments en C traditionnel" -#: macro.c:1278 +#: macro.c:1325 #, c-format msgid "duplicate macro parameter \"%s\"" msgstr "paramtre de macro %s en double" -#: macro.c:1324 +#: macro.c:1371 #, c-format msgid "\"%s\" may not appear in macro parameter list" msgstr " %s peut ne pas apparatre parmi les paramtres de macros" -#: macro.c:1332 +#: macro.c:1379 msgid "macro parameters must be comma-separated" msgstr "les paramtres de macro doivent tre spars par des virgules" -#: macro.c:1349 +#: macro.c:1396 msgid "parameter name missing" msgstr "nom de paramtre manquant" -#: macro.c:1366 +#: macro.c:1413 msgid "anonymous variadic macros were introduced in C99" msgstr "les macros anonymes nombre variable d'arguments ont t introduites avec le C99" -#: macro.c:1371 +#: macro.c:1418 msgid "ISO C does not permit named variadic macros" msgstr "ISO C ne permet pas les macros nommes nombre variable d'arguments" -#: macro.c:1380 +#: macro.c:1427 msgid "missing ')' in macro parameter list" msgstr " ) manquante dans la liste des paramtres de macros" -#: macro.c:1458 +# FIXME +#: macro.c:1476 +msgid "'##' cannot appear at either end of a macro expansion" +msgstr " ## ne peut apparatre chacune des fins de l'expansion de macros" + +#: macro.c:1510 msgid "ISO C99 requires whitespace after the macro name" msgstr "ISO C99 requiert un blanc aprs le nom de la macro" -#: macro.c:1482 +#: macro.c:1534 msgid "missing whitespace after the macro name" msgstr "blanc d'espacement manquant aprs le nom de la macro" -#: macro.c:1512 +#: macro.c:1564 msgid "'#' is not followed by a macro parameter" msgstr " # n'est pas suivi d'un paramtre de macro" -# FIXME -#: macro.c:1531 -msgid "'##' cannot appear at either end of a macro expansion" -msgstr " ## ne peut apparatre chacune des fins de l'expansion de macros" - -#: macro.c:1629 +#: macro.c:1683 #, c-format msgid "\"%s\" redefined" msgstr " %s redfini" -#: macro.c:1634 +#: macro.c:1688 msgid "this is the location of the previous definition" msgstr "ceci est la localisation d'une prcdente dfinition" -#: macro.c:1684 +#: macro.c:1738 #, c-format msgid "macro argument \"%s\" would be stringified in traditional C" msgstr "l'argument macro %s serait chang en chaine en C traditionnel" -#: macro.c:1707 +#: macro.c:1761 #, c-format msgid "invalid hash type %d in cpp_macro_definition" msgstr "type de hachage %d invalide dans cpp_macro_definition" -#: pch.c:84 pch.c:332 pch.c:354 pch.c:360 +#: pch.c:84 pch.c:332 pch.c:344 pch.c:362 pch.c:368 pch.c:377 msgid "while writing precompiled header" msgstr "lors de l'criture de l'en-tte pr-compile" -#: pch.c:467 +#: pch.c:485 #, c-format msgid "%s: not used because `%.*s' not defined" msgstr "%s: n'est pas utilis parce que %.*s n'est pas dfinie" -#: pch.c:479 +#: pch.c:497 #, c-format msgid "%s: not used because `%.*s' defined as `%s' not `%.*s'" msgstr "%s: n'est pas utilis parce que %.*s est dfini en tant %s et non pas %.*s " -#: pch.c:520 +#: pch.c:538 #, c-format msgid "%s: not used because `%s' is defined" msgstr "%s: non utilis parce que %s est dfini" -#: pch.c:533 pch.c:696 +#: pch.c:558 +#, fuzzy, c-format +msgid "%s: not used because `__COUNTER__' is invalid" +msgstr "%s: non utilis parce que %s est dfini" + +#: pch.c:567 pch.c:737 msgid "while reading precompiled header" msgstr "lors de la lecture de l'en-tte pr-compile" -#: traditional.c:745 +#: traditional.c:750 #, c-format msgid "detected recursion whilst expanding macro \"%s\"" msgstr "rcursion dtecte lors de l'expansion de la macro %s " -#: traditional.c:912 +#: traditional.c:917 msgid "syntax error in macro parameter list" msgstr "erreur de syntaxe dans la liste de paramtres macro" #~ msgid "unknown escape sequence: '\\%03o'" #~ msgstr "squence d'chappement \\%03o inconnue" +#~ msgid "no newline at end of file" +#~ msgstr "pas de retour chariot la fin du fichier" + #~ msgid "`%s' attribute directive ignored" #~ msgstr "attribut de directive %s ignor" diff --git a/libcpp/po/ja.po b/libcpp/po/ja.po index 35c003b6768..27f5b697125 100644 --- a/libcpp/po/ja.po +++ b/libcpp/po/ja.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: gcc 3.0\n" "Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n" -"POT-Creation-Date: 2007-05-13 19:48-0700\n" +"POT-Creation-Date: 2007-11-08 21:08+0000\n" "PO-Revision-Date: 2001-12-05 22:47+0900\n" "Last-Translator: Daisuke Yamashita \n" "Language-Team: Japanese \n" @@ -73,7 +73,7 @@ msgstr "̵ msgid "%.*s is not a valid universal character" msgstr "Ŭڤʥ˥С륭饯̾" -#: charset.c:1008 lex.c:472 +#: charset.c:1008 lex.c:484 msgid "'$' in identifier or number" msgstr "" @@ -98,7 +98,7 @@ msgstr "" #: charset.c:1132 #, fuzzy msgid "the meaning of '\\x' is different in traditional C" -msgstr "'\\a' ΰ̣ -traditional ĤȰۤʤޤ" +msgstr "`\\x' ΰ̣ -traditional ĤȰۤʤޤ" #: charset.c:1149 msgid "\\x used with no following hex digits" @@ -155,232 +155,236 @@ msgstr " msgid "failure to convert %s to %s" msgstr "" -#: directives.c:214 directives.c:240 +#: directives.c:215 directives.c:241 #, c-format msgid "extra tokens at end of #%s directive" msgstr ";ʬʥȡ #%s ǥ쥯ƥ֤νˤޤ" -#: directives.c:343 +#: directives.c:344 #, c-format msgid "#%s is a GCC extension" msgstr "#%s GCC γĥǤ" -#: directives.c:355 +#: directives.c:356 msgid "suggest not using #elif in traditional C" msgstr "Ť C Ǥ #elif ȤʤǤ" -#: directives.c:358 +#: directives.c:359 #, c-format msgid "traditional C ignores #%s with the # indented" msgstr "Ť C ǤϡǥȤ줿 # #%s ̵뤷ޤ" -#: directives.c:362 +#: directives.c:363 #, c-format msgid "suggest hiding #%s from traditional C with an indented #" msgstr "ǥȤ줿 # Ť C #%s 򱣤Ȥ򤪴ᤷޤ" -#: directives.c:388 +#: directives.c:389 msgid "embedding a directive within macro arguments is not portable" msgstr "" -#: directives.c:408 +#: directives.c:409 #, fuzzy msgid "style of line directive is a GCC extension" msgstr "#%s GCC γĥǤ" -#: directives.c:458 +#: directives.c:464 #, c-format msgid "invalid preprocessing directive #%s" msgstr "̵ʥץץǥ쥯ƥ #%s" -#: directives.c:524 +#: directives.c:532 msgid "\"defined\" cannot be used as a macro name" msgstr "\"defined\" ޥ̾ȤƤϻȤޤ" -#: directives.c:530 +#: directives.c:538 #, c-format msgid "\"%s\" cannot be used as a macro name as it is an operator in C++" msgstr "\"%s\" C++ α黻ҤǤꡢޥ̾ȤƻѤ뤳ȤϤǤޤ" -#: directives.c:533 +#: directives.c:541 #, c-format msgid "no macro name given in #%s directive" msgstr "ޥ̾ #%s ǥ쥯ƥͿƤޤ" -#: directives.c:536 +#: directives.c:544 msgid "macro names must be identifiers" msgstr "ޥ̾ϼ̻ҤǤʤƤϤʤޤ" -#: directives.c:577 +#: directives.c:585 #, c-format msgid "undefining \"%s\"" msgstr "\"%s\" undef ޤ" -#: directives.c:632 +#: directives.c:640 msgid "missing terminating > character" msgstr "üʸ > 礤Ƥޤ" -#: directives.c:687 +#: directives.c:695 #, c-format msgid "#%s expects \"FILENAME\" or " msgstr "#%s \"ե̾\" 뤤 <ե̾> ɬפȤޤ" -#: directives.c:727 +#: directives.c:739 #, fuzzy, c-format msgid "empty filename in #%s" msgstr "#%s ǤΥե̾Ǥ" -#: directives.c:737 +#: directives.c:749 msgid "#include nested too deeply" msgstr "#include ΥͥȤޤ" -#: directives.c:778 +#: directives.c:790 msgid "#include_next in primary source file" msgstr "#include_next 礿륽եˤޤ" -#: directives.c:804 +#: directives.c:816 #, c-format msgid "invalid flag \"%s\" in line directive" msgstr "\"%s\" line ǥ쥯ƥ֤Ǥ̵ʥե饰Ǥ" -#: directives.c:856 +#: directives.c:868 #, c-format msgid "\"%s\" after #line is not a positive integer" msgstr "#line θ \"%s\" ǤϤޤ" -#: directives.c:862 +#: directives.c:874 msgid "line number out of range" msgstr "ֹ椬ϰϳǤ" -#: directives.c:875 directives.c:952 +#: directives.c:887 directives.c:964 #, c-format msgid "\"%s\" is not a valid filename" msgstr "\"%s\" ʥե̾ǤϤޤ" -#: directives.c:912 +#: directives.c:924 #, fuzzy, c-format msgid "\"%s\" after # is not a positive integer" msgstr "#line θ \"%s\" ǤϤޤ" -#: directives.c:1014 +#: directives.c:1026 #, fuzzy, c-format msgid "invalid #%s directive" msgstr "̤ # ǥ쥯ƥ֤Ǥ" -#: directives.c:1077 +#: directives.c:1089 #, c-format msgid "registering pragmas in namespace \"%s\" with mismatched name expansion" msgstr "" -#: directives.c:1086 +#: directives.c:1098 #, c-format msgid "registering pragma \"%s\" with name expansion and no namespace" msgstr "" -#: directives.c:1104 +#: directives.c:1116 #, c-format msgid "registering \"%s\" as both a pragma and a pragma namespace" msgstr "" -#: directives.c:1107 +#: directives.c:1119 #, fuzzy, c-format msgid "#pragma %s %s is already registered" msgstr "饹 `%s' ϴ¸ߤޤ" -#: directives.c:1110 +#: directives.c:1122 #, c-format msgid "#pragma %s is already registered" msgstr "" -#: directives.c:1140 +#: directives.c:1152 msgid "registering pragma with NULL handler" msgstr "" -#: directives.c:1350 +#: directives.c:1362 msgid "#pragma once in main file" msgstr "#pragma once ᥤեˤޤ" -#: directives.c:1373 +#: directives.c:1385 msgid "invalid #pragma GCC poison directive" msgstr "#pragma GCC ǥ쥯ƥ̵Ǥ" -#: directives.c:1382 +#: directives.c:1394 #, c-format msgid "poisoning existing macro \"%s\"" msgstr "¸Υޥ \"%s' ޤ" -#: directives.c:1403 +#: directives.c:1413 msgid "#pragma system_header ignored outside include file" msgstr "include ե볰 #pragma system_header ̵뤵ޤ" -#: directives.c:1427 +#: directives.c:1437 #, fuzzy, c-format msgid "cannot find source file %s" msgstr " %s Ĥޤ" -#: directives.c:1431 +#: directives.c:1441 #, c-format msgid "current file is older than %s" msgstr "ߤΥե %s ŤǤ" -#: directives.c:1599 +#: directives.c:1620 msgid "_Pragma takes a parenthesized string literal" msgstr "_Pramga ̤ǰϤޤ줿ʸƥޤ" -#: directives.c:1671 +#: directives.c:1693 msgid "#else without #if" msgstr "#else #if ޤ" -#: directives.c:1676 +#: directives.c:1698 msgid "#else after #else" msgstr "#else #else θˤޤ" -#: directives.c:1678 directives.c:1711 +#: directives.c:1700 directives.c:1733 msgid "the conditional began here" msgstr "ξϤϤޤޤ" -#: directives.c:1704 +#: directives.c:1726 msgid "#elif without #if" msgstr "#elif #if ޤ" -#: directives.c:1709 +#: directives.c:1731 msgid "#elif after #else" msgstr "#elif #else θˤޤ" -#: directives.c:1739 +#: directives.c:1761 msgid "#endif without #if" msgstr "#endif #if ޤ" -#: directives.c:1816 +#: directives.c:1838 msgid "missing '(' after predicate" msgstr "Ҹθ '(' 礤Ƥޤ" -#: directives.c:1831 +#: directives.c:1853 msgid "missing ')' to complete answer" msgstr "䴰 ')' 礤Ƥޤ" -#: directives.c:1851 +#: directives.c:1873 msgid "predicate's answer is empty" msgstr "Ҹβ򤬶Ǥ" -#: directives.c:1878 +#: directives.c:1900 msgid "assertion without predicate" msgstr "ҸΤʤǤ" -#: directives.c:1880 +#: directives.c:1902 msgid "predicate must be an identifier" msgstr "Ҹϼ̻ҤǤʤФʤޤ" -#: directives.c:1966 +#: directives.c:1988 #, c-format msgid "\"%s\" re-asserted" msgstr "\"%s\" ƥȤޤ" -#: directives.c:2190 +#: directives.c:2271 #, c-format msgid "unterminated #%s" msgstr "üΤʤ #%s" +#: directives-only.c:221 lex.c:1016 traditional.c:162 +msgid "unterminated comment" +msgstr "üƤʤ" + #: errors.c:118 msgid "warning: " msgstr "ٹ: " @@ -404,347 +408,363 @@ msgstr " msgid "%s: %s" msgstr "%s: %s" -#: expr.c:203 +#: expr.c:261 #, fuzzy msgid "too many decimal points in number" msgstr "`asm' إɤ¿ޤ" -#: expr.c:223 +#: expr.c:290 expr.c:365 +msgid "fixed-point constants are a GCC extension" +msgstr "" + +#: expr.c:303 +#, fuzzy, c-format +msgid "invalid digit \"%c\" in binary constant" +msgstr " '%.*s' ˤ̵Ǥ" + +#: expr.c:305 #, fuzzy, c-format msgid "invalid digit \"%c\" in octal constant" msgstr "̵ʶ `%c' ˤޤ" -#: expr.c:229 +#: expr.c:313 +#, fuzzy +msgid "invalid prefix \"0b\" for floating constant" +msgstr " '%.*s' ˤ̵Ǥ" + +#: expr.c:319 #, fuzzy msgid "use of C99 hexadecimal floating constant" msgstr "16 ư٤ޤ" -#: expr.c:238 +#: expr.c:328 #, fuzzy msgid "exponent has no digits" msgstr "ưΤ٤ӥäƤޤ" -#: expr.c:245 +#: expr.c:335 #, fuzzy msgid "hexadecimal floating constants require an exponent" msgstr "16 ư٤ޤ" -#: expr.c:251 +#: expr.c:341 #, fuzzy, c-format msgid "invalid suffix \"%.*s\" on floating constant" msgstr " '%.*s' ˤ̵Ǥ" -#: expr.c:261 expr.c:295 +#: expr.c:351 expr.c:393 #, fuzzy, c-format msgid "traditional C rejects the \"%.*s\" suffix" msgstr "Ť C Ǥ 'f' ݤޤ" -#: expr.c:268 +#: expr.c:358 #, fuzzy, c-format msgid "invalid suffix \"%.*s\" with hexadecimal floating constant" msgstr " '%.*s' ˤ̵Ǥ" -#: expr.c:281 +#: expr.c:369 +#, fuzzy +msgid "decimal float constants are a GCC extension" +msgstr "16 ư٤ޤ" + +#: expr.c:379 #, fuzzy, c-format msgid "invalid suffix \"%.*s\" on integer constant" msgstr " '%.*s' ˤ̵Ǥ" -#: expr.c:303 +#: expr.c:401 #, fuzzy msgid "use of C99 long long integer constant" msgstr "ISO C89 Ǥ long long ؤޤ" -#: expr.c:310 +#: expr.c:409 #, fuzzy msgid "imaginary constants are a GCC extension" msgstr "#if ǤʸȤޤ" -#: expr.c:396 +#: expr.c:412 +#, fuzzy +msgid "binary constants are a GCC extension" +msgstr "#%s GCC γĥǤ" + +#: expr.c:505 #, fuzzy msgid "integer constant is too large for its type" msgstr "礭Τ unsigned ˤʤޤ" -#: expr.c:408 +#: expr.c:517 msgid "integer constant is so large that it is unsigned" msgstr "礭Τ unsigned ˤʤޤ" -#: expr.c:490 +#: expr.c:612 msgid "missing ')' after \"defined\"" msgstr "\"defined\" θ ')' 礱Ƥޤ" -#: expr.c:497 +#: expr.c:619 msgid "operator \"defined\" requires an identifier" msgstr "\"defined\" 黻Ҥϼ̻Ҥ׵ᤷޤ" -#: expr.c:505 +#: expr.c:627 #, c-format msgid "(\"%s\" is an alternative token for \"%s\" in C++)" msgstr "C++ Ǥ \"%s\" \"%s\" إȡǤ" -#: expr.c:515 +#: expr.c:637 msgid "this use of \"defined\" may not be portable" msgstr "" -#: expr.c:554 +#: expr.c:676 #, fuzzy msgid "floating constant in preprocessor expression" msgstr "ץץåǥСեޤ" -#: expr.c:560 +#: expr.c:682 #, fuzzy msgid "imaginary number in preprocessor expression" msgstr "ץץåǥСեޤ" -#: expr.c:605 +#: expr.c:727 #, c-format msgid "\"%s\" is not defined" msgstr "\"%s\" Ƥޤ" -#: expr.c:733 expr.c:762 +#: expr.c:855 expr.c:884 #, c-format msgid "missing binary operator before token \"%s\"" msgstr "" -#: expr.c:753 +#: expr.c:875 #, fuzzy, c-format msgid "token \"%s\" is not valid in preprocessor expressions" msgstr "ץץåǥСեޤ" -#: expr.c:770 +#: expr.c:892 msgid "missing expression between '(' and ')'" msgstr "" -#: expr.c:773 +#: expr.c:895 #, fuzzy msgid "#if with no expression" msgstr " throw 줿" -#: expr.c:776 +#: expr.c:898 #, fuzzy, c-format msgid "operator '%s' has no right operand" msgstr "ȿ `%s' Ǥ" -#: expr.c:781 +#: expr.c:903 #, fuzzy, c-format msgid "operator '%s' has no left operand" msgstr " `%s' ԴǤ" -#: expr.c:807 +#: expr.c:929 msgid " ':' without preceding '?'" msgstr "" -#: expr.c:834 +#: expr.c:956 #, fuzzy msgid "unbalanced stack in #if" msgstr "бƤʤ #endif" -#: expr.c:853 +#: expr.c:975 #, fuzzy, c-format msgid "impossible operator '%u'" msgstr "ꤨʤ黻 '%s'" -#: expr.c:943 +#: expr.c:1065 #, fuzzy msgid "missing ')' in expression" msgstr "礱Ƥ뤫̵Ǥ" -#: expr.c:964 +#: expr.c:1086 msgid "'?' without following ':'" msgstr "" -#: expr.c:974 +#: expr.c:1096 msgid "integer overflow in preprocessor expression" msgstr "ץץåǥСեޤ" -#: expr.c:979 +#: expr.c:1101 #, fuzzy msgid "missing '(' in expression" msgstr "礱Ƥ뤫̵Ǥ" -#: expr.c:1011 +#: expr.c:1133 #, c-format msgid "the left operand of \"%s\" changes sign when promoted" msgstr "" -#: expr.c:1016 +#: expr.c:1138 #, c-format msgid "the right operand of \"%s\" changes sign when promoted" msgstr "" -#: expr.c:1275 +#: expr.c:1397 msgid "traditional C rejects the unary plus operator" msgstr "Ť C Ǥñץ饹黻Ҥݤޤ" -#: expr.c:1358 +#: expr.c:1480 msgid "comma operator in operand of #if" msgstr "ޱ黻Ҥ #if 黻Ҥˤޤ" -#: expr.c:1490 +#: expr.c:1612 msgid "division by zero in #if" msgstr "#if ǥȯޤ" -#: files.c:402 +#: files.c:442 msgid "NULL directory in find_file" msgstr "" -#: files.c:440 +#: files.c:480 msgid "one or more PCH files were found, but they were invalid" msgstr "" -#: files.c:443 +#: files.c:483 msgid "use -Winvalid-pch for more information" msgstr "" -#: files.c:501 +#: files.c:570 #, c-format msgid "%s is a block device" msgstr "%s ϥ֥åǥХǤ" -#: files.c:518 +#: files.c:587 #, c-format msgid "%s is too large" msgstr "%s 礭ޤ" -#: files.c:553 +#: files.c:622 #, c-format msgid "%s is shorter than expected" msgstr "%s ûǤ" -#: files.c:782 +#: files.c:852 #, fuzzy, c-format msgid "no include path in which to search for %s" msgstr "%s 򸫤Ĥ뤿Υ󥯥롼ɥѥޤ" -#: files.c:1071 +#: files.c:1157 msgid "Multiple include guards may be useful for:\n" msgstr "¿ include ݸͭפȤʤǤ礦:\n" -#: init.c:407 +#: init.c:426 #, fuzzy msgid "cppchar_t must be an unsigned type" msgstr "Ҹϼ̻ҤǤʤФʤޤ" -#: init.c:411 +#: init.c:430 #, c-format msgid "preprocessor arithmetic has maximum precision of %lu bits; target requires %lu bits" msgstr "" -#: init.c:418 +#: init.c:437 msgid "CPP arithmetic must be at least as precise as a target int" msgstr "" -#: init.c:421 +#: init.c:440 msgid "target char is less than 8 bits wide" msgstr "" -#: init.c:425 +#: init.c:444 msgid "target wchar_t is narrower than target char" msgstr "" -#: init.c:429 +#: init.c:448 msgid "target int is narrower than target char" msgstr "" -#: init.c:434 +#: init.c:453 msgid "CPP half-integer narrower than CPP character" msgstr "" -#: init.c:438 +#: init.c:457 #, c-format msgid "CPP on this host cannot handle wide character constants over %lu bits, but the target requires %lu bits" msgstr "" -#: lex.c:271 +#: lex.c:283 msgid "backslash and newline separated by space" msgstr "ХååȲԤʬ䤵ޤ" -#: lex.c:276 +#: lex.c:288 msgid "backslash-newline at end of file" msgstr "եν˥Хåå-Ԥޤ" -#: lex.c:291 +#: lex.c:303 #, c-format msgid "trigraph ??%c converted to %c" msgstr "ȥ饤 ??%c %c Ѵޤ" -#: lex.c:298 +#: lex.c:310 #, fuzzy, c-format msgid "trigraph ??%c ignored, use -trigraphs to enable" msgstr "ȥ饤 ??%c ̵뤵ޤ" -#: lex.c:344 +#: lex.c:356 msgid "\"/*\" within comment" msgstr " \"/*\" ޤ" -#: lex.c:402 +#: lex.c:414 #, c-format msgid "%s in preprocessing directive" msgstr "ץץ̿ %s ޤ" -#: lex.c:411 +#: lex.c:423 msgid "null character(s) ignored" msgstr "null ʸ̵뤵ޤ" -#: lex.c:448 +#: lex.c:460 #, fuzzy, c-format msgid "`%.*s' is not in NFKC" msgstr "\"%s\" Ƥޤ" -#: lex.c:451 +#: lex.c:463 #, fuzzy, c-format msgid "`%.*s' is not in NFC" msgstr "\"%s\" Ƥޤ" -#: lex.c:539 +#: lex.c:551 #, c-format msgid "attempt to use poisoned \"%s\"" msgstr "줿 '%s' ȤȤƤޤ" -#: lex.c:547 +#: lex.c:559 msgid "__VA_ARGS__ can only appear in the expansion of a C99 variadic macro" msgstr "__VA_ARGS__ C99 ѰޥĥǤΤ߽иǤޤ" -#: lex.c:647 +#: lex.c:659 msgid "null character(s) preserved in literal" msgstr "ƥ null ʸݤޤ" -#: lex.c:650 +#: lex.c:662 #, c-format msgid "missing terminating %c character" msgstr "%c ʸǤνü礤Ƥޤ" -#: lex.c:842 -msgid "no newline at end of file" -msgstr "ե˲Ԥޤ" - -#: lex.c:1002 traditional.c:162 -msgid "unterminated comment" -msgstr "üƤʤ" - -#: lex.c:1013 +#: lex.c:1027 #, fuzzy msgid "C++ style comments are not allowed in ISO C90" msgstr "C++ ΥȤ ISO C89 Ǥϵޤ" -#: lex.c:1015 +#: lex.c:1029 msgid "(this will be reported only once per input file)" msgstr "(ϥեˤĤ𤵤ޤ)" -#: lex.c:1020 +#: lex.c:1034 msgid "multi-line comment" msgstr "ʣԤΥ" -#: lex.c:1333 +#: lex.c:1347 #, fuzzy, c-format msgid "unspellable token %s" msgstr "֤ʤȡ %s Ǥ" -#: line-map.c:313 +#: line-map.c:320 #, c-format msgid "In file included from %s:%u" msgstr "%s:%u include 줿ե" -#: line-map.c:331 +#: line-map.c:338 #, c-format msgid "" ",\n" @@ -753,155 +773,164 @@ msgstr "" ",\n" " %s:%u " -#: macro.c:83 +#: macro.c:84 #, fuzzy, c-format msgid "macro \"%s\" is not used" msgstr "\"%s\" Ƥޤ" -#: macro.c:122 macro.c:312 +#: macro.c:123 macro.c:319 #, fuzzy, c-format msgid "invalid built-in macro \"%s\"" msgstr "Ȥ߹ߥޥ \"%s\" ̵Ǥ" -#: macro.c:156 +#: macro.c:157 #, fuzzy msgid "could not determine file timestamp" -msgstr "spec ե %s 򸫤Ĥ뤳ȤǤޤǤ\n" +msgstr "ץե %s 򳫤ޤǤ" -#: macro.c:253 +#: macro.c:254 #, fuzzy msgid "could not determine date and time" msgstr "¸طפΤΥå̾ǤޤǤ" -#: macro.c:416 +#: macro.c:270 +msgid "__COUNTER__ expanded inside directive with -fdirectives-only" +msgstr "" + +#: macro.c:423 msgid "invalid string literal, ignoring final '\\'" msgstr "ʸƥ뤬̵ǤǸ '\\' ̵뤷ޤ" -#: macro.c:466 +#: macro.c:483 #, c-format msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token" msgstr "\"%s\" \"%s\" ŽդޤʥץץåȡȤʤޤ" -#: macro.c:538 +#: macro.c:558 msgid "ISO C99 requires rest arguments to be used" msgstr "ISO C99 ϻѤ٤ĤΤΰ׵ᤷޤ" -#: macro.c:543 +#: macro.c:563 #, c-format msgid "macro \"%s\" requires %u arguments, but only %u given" msgstr "ޥ \"%s\" ϰ %u ׵ᤷޤ%u ĤͿƤޤ" -#: macro.c:548 +#: macro.c:568 #, c-format msgid "macro \"%s\" passed %u arguments, but takes just %u" msgstr "ޥ \"%s\" ˰ %u Ϥޤ%u ޤ" -#: macro.c:659 traditional.c:675 +#: macro.c:679 traditional.c:680 #, c-format msgid "unterminated argument list invoking macro \"%s\"" msgstr "üƤʤꥹȤޥ \"%s\" ư褦Ȥޤ" -#: macro.c:762 +#: macro.c:782 #, c-format msgid "function-like macro \"%s\" must be used with arguments in traditional C" msgstr "Ť C ǤϡؿŪޥ \"%s\" ˰ͿͤФʤޤ" -#: macro.c:1278 +#: macro.c:1325 #, c-format msgid "duplicate macro parameter \"%s\"" msgstr "ޥ \"%s\" ʣƤޤ" -#: macro.c:1324 +#: macro.c:1371 #, c-format msgid "\"%s\" may not appear in macro parameter list" msgstr "\"%s\" ϥޥꥹȤ˸ƤϤʤޤ" -#: macro.c:1332 +#: macro.c:1379 msgid "macro parameters must be comma-separated" msgstr "ޥϥ޶ڤꤵʤФʤޤ" -#: macro.c:1349 +#: macro.c:1396 msgid "parameter name missing" msgstr "̾礤Ƥޤ" -#: macro.c:1366 +#: macro.c:1413 msgid "anonymous variadic macros were introduced in C99" msgstr "̵̾Ѱޥ C99 ǺΤޤ" -#: macro.c:1371 +#: macro.c:1418 msgid "ISO C does not permit named variadic macros" msgstr "ISO C Ǥ̾ĤѰޥޤ" -#: macro.c:1380 +#: macro.c:1427 msgid "missing ')' in macro parameter list" msgstr "ޥꥹȤǡ')' 礤Ƥޤ" -#: macro.c:1458 +#: macro.c:1476 +msgid "'##' cannot appear at either end of a macro expansion" +msgstr "'##' ϥޥŸξüˤϽиǤޤ" + +#: macro.c:1510 #, fuzzy msgid "ISO C99 requires whitespace after the macro name" msgstr "ISO C Ǥϥޥ̾θ˶׵ᤷޤ" -#: macro.c:1482 +#: macro.c:1534 #, fuzzy msgid "missing whitespace after the macro name" msgstr "ISO C Ǥϥޥ̾θ˶׵ᤷޤ" -#: macro.c:1512 +#: macro.c:1564 msgid "'#' is not followed by a macro parameter" msgstr "'#' ˥ޥ̾³Ƥޤ" -#: macro.c:1531 -msgid "'##' cannot appear at either end of a macro expansion" -msgstr "'##' ϥޥŸξüˤϽиǤޤ" - -#: macro.c:1629 +#: macro.c:1683 #, c-format msgid "\"%s\" redefined" msgstr "\"%s\" ޤ" -#: macro.c:1634 +#: macro.c:1688 msgid "this is the location of the previous definition" msgstr "֤Ǥ" -#: macro.c:1684 +#: macro.c:1738 #, fuzzy, c-format msgid "macro argument \"%s\" would be stringified in traditional C" msgstr "ޥ \"%s\" -traditional Ĥʸ󲽤줿Ǥ礦" -#: macro.c:1707 +#: macro.c:1761 #, fuzzy, c-format msgid "invalid hash type %d in cpp_macro_definition" msgstr "dump_definition ̵ʥϥå奿 %d" -#: pch.c:84 pch.c:332 pch.c:354 pch.c:360 +#: pch.c:84 pch.c:332 pch.c:344 pch.c:362 pch.c:368 pch.c:377 msgid "while writing precompiled header" msgstr "" -#: pch.c:467 +#: pch.c:485 #, fuzzy, c-format msgid "%s: not used because `%.*s' not defined" msgstr "٥ `%s' ȤޤƤޤ" -#: pch.c:479 +#: pch.c:497 #, c-format msgid "%s: not used because `%.*s' defined as `%s' not `%.*s'" msgstr "" -#: pch.c:520 +#: pch.c:538 #, fuzzy, c-format msgid "%s: not used because `%s' is defined" msgstr "`%s' Ȥޤ̤Ǥ" -#: pch.c:533 pch.c:696 +#: pch.c:558 +#, c-format +msgid "%s: not used because `__COUNTER__' is invalid" +msgstr "" + +#: pch.c:567 pch.c:737 msgid "while reading precompiled header" msgstr "" -#: traditional.c:745 +#: traditional.c:750 #, fuzzy, c-format msgid "detected recursion whilst expanding macro \"%s\"" msgstr "üƤʤꥹȤޥ \"%s\" ư褦Ȥޤ" -#: traditional.c:912 +#: traditional.c:917 #, fuzzy msgid "syntax error in macro parameter list" msgstr "\"%s\" ϥޥꥹȤ˸ƤϤʤޤ" @@ -1734,9 +1763,6 @@ msgstr "\"%s\" #~ msgid "declaration of `extern' variable `%s' in `for' loop initial declaration" #~ msgstr "`extern' ѿ `%s' `for' 롼׽ˤޤ" -#~ msgid "could not open dump file `%s'" -#~ msgstr "ץե %s 򳫤ޤǤ" - #~ msgid "ignoring `%s' at end of `-f%s'" #~ msgstr "`%s'(`-f%s' νˤ) ̵뤷ޤ" @@ -2106,9 +2132,6 @@ msgstr "\"%s\" #~ msgid "universal-character-name used for '%c'" #~ msgstr "`%c' ˥˥С륭饯̾Ȥޤ" -#~ msgid "the meaning of `\\x' varies with -traditional" -#~ msgstr "`\\x' ΰ̣ -traditional ĤȰۤʤޤ" - #~ msgid "hex escape out of range" #~ msgstr "16 ʥץ󥹤ϰϳǤ" @@ -6793,6 +6816,9 @@ msgstr "\"%s\" #~ msgid "multi-line string literals are deprecated" #~ msgstr "ʣʸƥϿ侩ޤ" +#~ msgid "no newline at end of file" +#~ msgstr "ե˲Ԥޤ" + #~ msgid "directives may not be used inside a macro argument" #~ msgstr "ޥǥǥ쥯ȥȤȤϤǤޤ" @@ -7411,6 +7437,9 @@ msgstr "\"%s\" #~ msgid "specs %%include syntax malformed after %ld characters" #~ msgstr "specs %ld ʸܰʹߤ %%include ν񼰤ѤǤ" +#~ msgid "Could not find specs file %s\n" +#~ msgstr "spec ե %s 򸫤Ĥ뤳ȤǤޤǤ\n" + #~ msgid "specs %%rename syntax malformed after %ld characters" #~ msgstr "specs %ld ʸܰʹߤ %%rename ν񼰤ѤǤ" diff --git a/libcpp/po/nl.po b/libcpp/po/nl.po index 9810bf584ca..f873b3d7246 100644 --- a/libcpp/po/nl.po +++ b/libcpp/po/nl.po @@ -4,10 +4,10 @@ # msgid "" msgstr "" -"Project-Id-Version: cpplib 4.2.0\n" +"Project-Id-Version: cpplib 4.3-b20071109\n" "Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n" -"POT-Creation-Date: 2007-05-13 19:48-0700\n" -"PO-Revision-Date: 2007-05-22 16:27+0200\n" +"POT-Creation-Date: 2007-11-08 21:08+0000\n" +"PO-Revision-Date: 2007-11-10 17:28+0100\n" "Last-Translator: Tim Van Holder \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" @@ -72,7 +72,7 @@ msgstr "onvolledige universele tekennaam %.*s" msgid "%.*s is not a valid universal character" msgstr "%.*s is geen geldige universele tekennaam" -#: charset.c:1008 lex.c:472 +#: charset.c:1008 lex.c:484 msgid "'$' in identifier or number" msgstr "'$' in naam of getal" @@ -151,242 +151,246 @@ msgstr "lege karakterconstante" msgid "failure to convert %s to %s" msgstr "fout bij omzetten van %s naar %s" -#: directives.c:214 directives.c:240 +#: directives.c:215 directives.c:241 #, c-format msgid "extra tokens at end of #%s directive" msgstr "overbodige tokens aan einde van #%s commando" -#: directives.c:343 +#: directives.c:344 #, c-format msgid "#%s is a GCC extension" msgstr "#%s is een uitbreiding van GCC" -#: directives.c:355 +#: directives.c:356 msgid "suggest not using #elif in traditional C" msgstr "gebruik liefst geen #elif in traditionele C" -#: directives.c:358 +#: directives.c:359 #, c-format msgid "traditional C ignores #%s with the # indented" msgstr "traditionele C negeert #%s wanneer de # geïndenteerd is" -#: directives.c:362 +#: directives.c:363 #, c-format msgid "suggest hiding #%s from traditional C with an indented #" msgstr "verberg #%s liefst van traditionele C via een geïndenteerde #" -#: directives.c:388 +#: directives.c:389 msgid "embedding a directive within macro arguments is not portable" msgstr "het plaatsen van een commando binnen macro-argumenten is niet portabel" -#: directives.c:408 +#: directives.c:409 msgid "style of line directive is a GCC extension" msgstr "dit soort line commando is een uitbreiding van GCC" -#: directives.c:458 +#: directives.c:464 #, c-format msgid "invalid preprocessing directive #%s" msgstr "ongeldig preprocessing-commando #%s" -#: directives.c:524 +#: directives.c:532 msgid "\"defined\" cannot be used as a macro name" msgstr "\"defined\" kan niet als macronaam gebruikt worden" -#: directives.c:530 +#: directives.c:538 #, c-format msgid "\"%s\" cannot be used as a macro name as it is an operator in C++" msgstr "\"%s\" kan niet als macronaam gebruikt worden omdat het een operator is in C++" -#: directives.c:533 +#: directives.c:541 #, c-format msgid "no macro name given in #%s directive" msgstr "geen macronaam opgegeven in #%s commando" # lap! hier heb ik het zitten... wat is verdorie een betere vertaling voor identifier? # Dit is wel langer maar zegt denk ik wel waar het om gaat. -#: directives.c:536 +#: directives.c:544 msgid "macro names must be identifiers" msgstr "macronamen moeten voldoen aan de regels voor namen in C/C++" # niet perfect, maar beter dan "wordt ongedefinieerd", "wordt geondefinieerd" of iets dergelijks... -#: directives.c:577 +#: directives.c:585 #, c-format msgid "undefining \"%s\"" msgstr "definitie van \"%s\" wordt ongedaan gemaakt" -#: directives.c:632 +#: directives.c:640 msgid "missing terminating > character" msgstr "sluitend > teken ontbreekt" -#: directives.c:687 +#: directives.c:695 #, c-format msgid "#%s expects \"FILENAME\" or " msgstr "#%s verwacht \"BESTAND\" of " -#: directives.c:727 +#: directives.c:739 #, c-format msgid "empty filename in #%s" msgstr "lege bestandsnaam in #%s" -#: directives.c:737 +#: directives.c:749 msgid "#include nested too deeply" msgstr "#include te diep genest" -#: directives.c:778 +#: directives.c:790 msgid "#include_next in primary source file" msgstr "#include_next in primair bronbestand" -#: directives.c:804 +#: directives.c:816 #, c-format msgid "invalid flag \"%s\" in line directive" msgstr "ongeldige vlag \"%s\" in #line commando" -#: directives.c:856 +#: directives.c:868 #, c-format msgid "\"%s\" after #line is not a positive integer" msgstr "\"%s\" (na #line) is geen positieve integer" -#: directives.c:862 +#: directives.c:874 msgid "line number out of range" msgstr "regelnummer buiten bereik" -#: directives.c:875 directives.c:952 +#: directives.c:887 directives.c:964 #, c-format msgid "\"%s\" is not a valid filename" msgstr "\"%s\" is geen geldige bestandsnaam" -#: directives.c:912 +#: directives.c:924 #, c-format msgid "\"%s\" after # is not a positive integer" msgstr "\"%s\" (na #) is geen positieve integer" -#: directives.c:1014 +#: directives.c:1026 #, c-format msgid "invalid #%s directive" msgstr "ongeldig #%s commando" # goede vertaling voor 'mismatched'? -#: directives.c:1077 +#: directives.c:1089 #, c-format msgid "registering pragmas in namespace \"%s\" with mismatched name expansion" msgstr "registratie van pragmas in namespace \"%s\" met niet-overeenkomstige naamexpansie" # moet namespace hier ook vertaald worden? -#: directives.c:1086 +#: directives.c:1098 #, c-format msgid "registering pragma \"%s\" with name expansion and no namespace" msgstr "registratie van pragma \"%s\" met naamexpansie maar geen namespace" # moet namespace hier ook vertaald worden? -#: directives.c:1104 +#: directives.c:1116 #, c-format msgid "registering \"%s\" as both a pragma and a pragma namespace" msgstr "registratie van \"%s\" zowel als pragma en als pragma-namespace" -#: directives.c:1107 +#: directives.c:1119 #, c-format msgid "#pragma %s %s is already registered" msgstr "#pragma %s %s is reeds geregistreerd" -#: directives.c:1110 +#: directives.c:1122 #, c-format msgid "#pragma %s is already registered" msgstr "#pragma %s is reeds geregistreerd" # betere vertaling voor 'handler'? -#: directives.c:1140 +#: directives.c:1152 msgid "registering pragma with NULL handler" msgstr "registratie van pragma met NULL als afhandelingsroutine" -#: directives.c:1350 +#: directives.c:1362 msgid "#pragma once in main file" msgstr "#pragma once in hoofdbestand" -#: directives.c:1373 +#: directives.c:1385 msgid "invalid #pragma GCC poison directive" msgstr "ongeldig #pragma GCC poison commando" -#: directives.c:1382 +#: directives.c:1394 #, c-format msgid "poisoning existing macro \"%s\"" msgstr "bestaande macro \"%s\" wordt 'vergiftigd'" -#: directives.c:1403 +#: directives.c:1413 msgid "#pragma system_header ignored outside include file" msgstr "#pragma system_header wordt genegeerd buiten een invoegbestand" -#: directives.c:1427 +#: directives.c:1437 #, c-format msgid "cannot find source file %s" msgstr "kan bronbestand %s niet vinden" -#: directives.c:1431 +#: directives.c:1441 #, c-format msgid "current file is older than %s" msgstr "huidig bestand is ouder dan %s" -#: directives.c:1599 +#: directives.c:1620 msgid "_Pragma takes a parenthesized string literal" msgstr "_Pragma verwacht een stringconstante tussen haakjes als argument" -#: directives.c:1671 +#: directives.c:1693 msgid "#else without #if" msgstr "#else zonder #if" -#: directives.c:1676 +#: directives.c:1698 msgid "#else after #else" msgstr "#else na #else" # of gewoon "de conditie"? -#: directives.c:1678 directives.c:1711 +#: directives.c:1700 directives.c:1733 msgid "the conditional began here" msgstr "het conditionele blok begon hier" -#: directives.c:1704 +#: directives.c:1726 msgid "#elif without #if" msgstr "#elif zonder #if" -#: directives.c:1709 +#: directives.c:1731 msgid "#elif after #else" msgstr "#elif na #else" -#: directives.c:1739 +#: directives.c:1761 msgid "#endif without #if" msgstr "#endif zonder #if" -#: directives.c:1816 +#: directives.c:1838 msgid "missing '(' after predicate" msgstr "'(' ontbreekt na predicaat" -#: directives.c:1831 +#: directives.c:1853 msgid "missing ')' to complete answer" msgstr "')' ontbreekt als afronding van het antwoord" -#: directives.c:1851 +#: directives.c:1873 msgid "predicate's answer is empty" msgstr "antwoord van het predicaat is leeg" # dit moet beter kunnen... -#: directives.c:1878 +#: directives.c:1900 msgid "assertion without predicate" msgstr "assertie zonder predicaat" # ... dit klinkt echt niet - maar wat is hier een beter vertaling voor identifier? -#: directives.c:1880 +#: directives.c:1902 msgid "predicate must be an identifier" msgstr "predicaat moet een naam zijn" # is "asserteren" wel een echt woord? -#: directives.c:1966 +#: directives.c:1988 #, c-format msgid "\"%s\" re-asserted" msgstr "\"%s\" opnieuw geasserteerd" -#: directives.c:2190 +#: directives.c:2271 #, c-format msgid "unterminated #%s" msgstr "niet-beëindigde #%s" +#: directives-only.c:221 lex.c:1016 traditional.c:162 +msgid "unterminated comment" +msgstr "niet-beëindigde commentaar" + # Dit zou misschien beter 'warning' blijven #: errors.c:118 msgid "warning: " @@ -411,335 +415,348 @@ msgid "%s: %s" msgstr "%s: %s" # betere vertaling voor decimal point? -#: expr.c:203 +#: expr.c:261 msgid "too many decimal points in number" msgstr "teveel komma's in getal" -#: expr.c:223 +#: expr.c:290 expr.c:365 +msgid "fixed-point constants are a GCC extension" +msgstr "fixed-point constantes zijn een uitbreiding van GCC" + +#: expr.c:303 +#, c-format +msgid "invalid digit \"%c\" in binary constant" +msgstr "ongeldig cijfer \"%c\" in binaire constante" + +#: expr.c:305 #, c-format msgid "invalid digit \"%c\" in octal constant" msgstr "ongeldig cijfer \"%c\" in octale constante" -#: expr.c:229 +#: expr.c:313 +msgid "invalid prefix \"0b\" for floating constant" +msgstr "ongeldige prefix \"0b\" voor floating-point constante" + +#: expr.c:319 msgid "use of C99 hexadecimal floating constant" msgstr "gebruik van C99 hexadecimale floating-point constante" -#: expr.c:238 +#: expr.c:328 msgid "exponent has no digits" msgstr "exponent heeft geen cijfers" -#: expr.c:245 +#: expr.c:335 msgid "hexadecimal floating constants require an exponent" msgstr "hexadecimale floating-point constante vereist een exponent" -#: expr.c:251 +#: expr.c:341 #, c-format msgid "invalid suffix \"%.*s\" on floating constant" msgstr "ongeldige suffix \"%.*s\" aan floating-point constante" -#: expr.c:261 expr.c:295 +#: expr.c:351 expr.c:393 #, c-format msgid "traditional C rejects the \"%.*s\" suffix" msgstr "traditionele C aanvaardt de \"%.*s\" suffix niet" -#: expr.c:268 +#: expr.c:358 #, c-format msgid "invalid suffix \"%.*s\" with hexadecimal floating constant" msgstr "ongeldige suffix \"%.*s\" bij hexadecimale floating-point constante" -#: expr.c:281 +#: expr.c:369 +msgid "decimal float constants are a GCC extension" +msgstr "decimale float-constantes zijn een uitbreiding van GCC" + +#: expr.c:379 #, c-format msgid "invalid suffix \"%.*s\" on integer constant" msgstr "ongeldige suffix \"%.*s\" aan integerconstante" -#: expr.c:303 +#: expr.c:401 msgid "use of C99 long long integer constant" msgstr "gebruik van C99 long long integerconstantes" -#: expr.c:310 +#: expr.c:409 msgid "imaginary constants are a GCC extension" msgstr "imaginaire constantes zijn een uitbreiding van GCC" -#: expr.c:396 +#: expr.c:412 +msgid "binary constants are a GCC extension" +msgstr "binaire constantes zijn een uitbreiding van GCC" + +#: expr.c:505 msgid "integer constant is too large for its type" msgstr "integerconstante is te groot voor zijn type" -#: expr.c:408 +#: expr.c:517 msgid "integer constant is so large that it is unsigned" msgstr "integerconstante is zo groot dat hij tekenloos is" -#: expr.c:490 +#: expr.c:612 msgid "missing ')' after \"defined\"" msgstr "')' ontbreekt na \"defined\"" -#: expr.c:497 +#: expr.c:619 msgid "operator \"defined\" requires an identifier" msgstr "de \"defined\" operator verwacht een naam als argument" -#: expr.c:505 +#: expr.c:627 #, c-format msgid "(\"%s\" is an alternative token for \"%s\" in C++)" msgstr "(\"%s\" is een alternatieve schrijfwijze voor \"%s\" in C++)" # betere vertaling voor "portable"? -#: expr.c:515 +#: expr.c:637 msgid "this use of \"defined\" may not be portable" msgstr "dit gebruik van \"define\" is mogelijk niet portabel" -#: expr.c:554 +#: expr.c:676 msgid "floating constant in preprocessor expression" msgstr "floating-point constante in preprocessor-expressie" -#: expr.c:560 +#: expr.c:682 msgid "imaginary number in preprocessor expression" msgstr "imaginair getal in preprocessor-expressie" -#: expr.c:605 +#: expr.c:727 #, c-format msgid "\"%s\" is not defined" msgstr "\"%s\" is niet gedefinieerd" -#: expr.c:733 expr.c:762 +#: expr.c:855 expr.c:884 #, c-format msgid "missing binary operator before token \"%s\"" msgstr "binaire operator ontbreekt voor het \"%s\" token" -#: expr.c:753 +#: expr.c:875 #, c-format msgid "token \"%s\" is not valid in preprocessor expressions" msgstr "token \"%s\" is niet geldig in preprocessor-expressies" -#: expr.c:770 +#: expr.c:892 msgid "missing expression between '(' and ')'" msgstr "expressie ontbreekt tussen '(' en ')'" -#: expr.c:773 +#: expr.c:895 msgid "#if with no expression" msgstr "#if zonder expressie" -#: expr.c:776 +#: expr.c:898 #, c-format msgid "operator '%s' has no right operand" msgstr "operator '%s' heeft geen rechtse operand" -#: expr.c:781 +#: expr.c:903 #, c-format msgid "operator '%s' has no left operand" msgstr "operator '%s' heeft geen linkse operand" -#: expr.c:807 +#: expr.c:929 msgid " ':' without preceding '?'" msgstr " ':' zonder voorafgaande '?'" -#: expr.c:834 +#: expr.c:956 msgid "unbalanced stack in #if" msgstr "niet-gebalanceerde stack in #if" -#: expr.c:853 +#: expr.c:975 #, c-format msgid "impossible operator '%u'" msgstr "operator '%u' is onmogelijk" -#: expr.c:943 +#: expr.c:1065 msgid "missing ')' in expression" msgstr "')' ontbreekt in expressie" -#: expr.c:964 +#: expr.c:1086 msgid "'?' without following ':'" msgstr "'?' zonder daaropvolgende ':'" -#: expr.c:974 +#: expr.c:1096 msgid "integer overflow in preprocessor expression" msgstr "integer-overflow in preprocessor-expressie" -#: expr.c:979 +#: expr.c:1101 msgid "missing '(' in expression" msgstr "'(' ontbreekt in expressie" -#: expr.c:1011 +#: expr.c:1133 #, 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:1016 +#: expr.c:1138 #, 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:1275 +#: expr.c:1397 msgid "traditional C rejects the unary plus operator" msgstr "traditionele C verwerpt de unaire plus-operator" -#: expr.c:1358 +#: expr.c:1480 msgid "comma operator in operand of #if" msgstr "comma operator in operand van #if" -#: expr.c:1490 +#: expr.c:1612 msgid "division by zero in #if" msgstr "deling door nul in `#if'" -#: files.c:402 +#: files.c:442 msgid "NULL directory in find_file" msgstr "directory is NULL in find_file" -#: files.c:440 +#: files.c:480 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:443 +#: files.c:483 msgid "use -Winvalid-pch for more information" msgstr "gebruik -Winvalid-pch voor meer informatie" -#: files.c:501 +#: files.c:570 #, c-format msgid "%s is a block device" msgstr "%s is een blokapparaat" -#: files.c:518 +#: files.c:587 #, c-format msgid "%s is too large" msgstr "%s is te groot" -#: files.c:553 +#: files.c:622 #, c-format msgid "%s is shorter than expected" msgstr "%s is korter dan verwacht" -#: files.c:782 +#: files.c:852 #, 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:1071 +#: files.c:1157 msgid "Multiple include guards may be useful for:\n" msgstr "Meerdere invoegbeschermingen zouden nuttig kunnen zijn voor:\n" -#: init.c:407 +#: init.c:426 msgid "cppchar_t must be an unsigned type" msgstr "cppchar_t moet een tekenloos type zijn" -#: init.c:411 +#: init.c:430 #, 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; doelomgeving vereist %lu bits" -#: init.c:418 +#: init.c:437 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:421 +#: init.c:440 msgid "target char is less than 8 bits wide" msgstr "char is minder dan 8 bits breed in de doelomgeving" -#: init.c:425 +#: init.c:444 msgid "target wchar_t is narrower than target char" msgstr "wchar_t is smaller dan char in de doelomgeving" -#: init.c:429 +#: init.c:448 msgid "target int is narrower than target char" msgstr "int is smaller dan char in de doelomgeving" -#: init.c:434 +#: init.c:453 msgid "CPP half-integer narrower than CPP character" msgstr "CPP half-integer is smaller dan een CPP character" -#: init.c:438 +#: init.c:457 #, 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 karakterconstantes aan van meer dan %lu bits, maar de doelomgeving vereist %lu bits" -#: lex.c:271 +#: lex.c:283 msgid "backslash and newline separated by space" msgstr "backslash en newline gescheiden door spatie(s)" -#: lex.c:276 +#: lex.c:288 msgid "backslash-newline at end of file" msgstr "backslash-newline aan einde van bestand" -#: lex.c:291 +#: lex.c:303 #, c-format msgid "trigraph ??%c converted to %c" msgstr "trigraph ??%c omgezet naar %c" -#: lex.c:298 +#: lex.c:310 #, c-format msgid "trigraph ??%c ignored, use -trigraphs to enable" msgstr "trigraph ??%c genegeerd, gebruik -trigraphs om ondersteuning in te schakelen" -#: lex.c:344 +#: lex.c:356 msgid "\"/*\" within comment" msgstr "\"/*\" binnen commentaar" -#: lex.c:402 +#: lex.c:414 #, c-format msgid "%s in preprocessing directive" msgstr "%s binnen preprocessor-commando" -#: lex.c:411 +#: lex.c:423 msgid "null character(s) ignored" msgstr "nulkarakter(s) worden genegeerd" -#: lex.c:448 +#: lex.c:460 #, c-format msgid "`%.*s' is not in NFKC" msgstr "`%.*s' zit niet in NFKC" -#: lex.c:451 +#: lex.c:463 #, c-format msgid "`%.*s' is not in NFC" msgstr "`%.*s' zit niet in NFC" -#: lex.c:539 +#: lex.c:551 #, c-format msgid "attempt to use poisoned \"%s\"" msgstr "poging tot gebruik van 'vergiftigde' \"%s\"" -#: lex.c:547 +#: lex.c:559 msgid "__VA_ARGS__ can only appear in the expansion of a C99 variadic macro" msgstr "__VA_ARGS__ mag enkel voorkomen in de expansie van een C99 variadische macro" -#: lex.c:647 +#: lex.c:659 msgid "null character(s) preserved in literal" msgstr "nulkarakter(s) in een constante worden behouden" -#: lex.c:650 +#: lex.c:662 #, c-format msgid "missing terminating %c character" msgstr "sluitend %c teken ontbreekt" -#: lex.c:842 -msgid "no newline at end of file" -msgstr "geen newline aan einde van bestand" - -#: lex.c:1002 traditional.c:162 -msgid "unterminated comment" -msgstr "niet-beëindigde commentaar" - -#: lex.c:1013 +#: lex.c:1027 msgid "C++ style comments are not allowed in ISO C90" msgstr "commentaar in C++ stijl is niet toegestaan in ISO C90" -#: lex.c:1015 +#: lex.c:1029 msgid "(this will be reported only once per input file)" msgstr "(dit wordt maar een keer gemeld per invoerbestand)" -#: lex.c:1020 +#: lex.c:1034 msgid "multi-line comment" msgstr "commentaar gespreid over meerdere lijnen" # lijkt een vreemde boodschap... -#: lex.c:1333 +#: lex.c:1347 #, c-format msgid "unspellable token %s" msgstr "kan token %s niet spellen" -#: line-map.c:313 +#: line-map.c:320 #, c-format msgid "In file included from %s:%u" msgstr "In bestand ingevoegd vanuit %s:%u" -#: line-map.c:331 +#: line-map.c:338 #, c-format msgid "" ",\n" @@ -748,153 +765,162 @@ msgstr "" ",\n" " vanuit %s:%u" -#: macro.c:83 +#: macro.c:84 #, c-format msgid "macro \"%s\" is not used" msgstr "macro \"%s\" wordt nergens gebruikt" -#: macro.c:122 macro.c:312 +#: macro.c:123 macro.c:319 #, c-format msgid "invalid built-in macro \"%s\"" msgstr "ongeldige ingebouwde macro \"%s\"" # betere vertaling voor 'timestamp'? -#: macro.c:156 +#: macro.c:157 msgid "could not determine file timestamp" msgstr "kan tijdsinformatie van bestand niet bepalen" -#: macro.c:253 +#: macro.c:254 msgid "could not determine date and time" msgstr "kan datum en tijd niet bepalen" -#: macro.c:416 +#: macro.c:270 +msgid "__COUNTER__ expanded inside directive with -fdirectives-only" +msgstr "expansie van __COUNTER__ binnenin commando terwijl -fdirectives-only opgegeven is" + +#: macro.c:423 msgid "invalid string literal, ignoring final '\\'" msgstr "ongeldige stringconstante, laatste '\\' wordt genegeerd" -#: macro.c:466 +#: macro.c:483 #, c-format msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token" msgstr "\"%s\" en \"%s\" aan elkaar plakken levert geen geldig preprocessing token op" # "rest arguments"? -#: macro.c:538 +#: macro.c:558 msgid "ISO C99 requires rest arguments to be used" msgstr "ISO C99 verplicht het gebruik van restargumenten" -#: macro.c:543 +#: macro.c:563 #, 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:548 +#: macro.c:568 #, 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:659 traditional.c:675 +#: macro.c:679 traditional.c:680 #, c-format msgid "unterminated argument list invoking macro \"%s\"" msgstr "niet-beëindigde argumentenlijst bij oproep van macro \"%s\"" -#: macro.c:762 +#: macro.c:782 #, c-format msgid "function-like macro \"%s\" must be used with arguments in traditional C" msgstr "functie-achtige macro \"%s\" moet in traditionele C altijd met argumenten gebruikt worden" -#: macro.c:1278 +#: macro.c:1325 #, c-format msgid "duplicate macro parameter \"%s\"" msgstr "herhaalde macro-parameter \"%s\"" -#: macro.c:1324 +#: macro.c:1371 #, c-format msgid "\"%s\" may not appear in macro parameter list" msgstr "\"%s\" mag niet voorkomen in lijst van macro-parameters" -#: macro.c:1332 +#: macro.c:1379 msgid "macro parameters must be comma-separated" msgstr "macro-parameters moet door komma's gescheiden worden" -#: macro.c:1349 +#: macro.c:1396 msgid "parameter name missing" msgstr "parameternaam weggelaten" -#: macro.c:1366 +#: macro.c:1413 msgid "anonymous variadic macros were introduced in C99" msgstr "anonieme variadische macros werden door C99 ingevoerd" # variadic? " met variabele argumentenlijst" is nogal lang... -#: macro.c:1371 +#: macro.c:1418 msgid "ISO C does not permit named variadic macros" msgstr "ISO C staat het gebruik benoemde variadische macro's niet toe" -#: macro.c:1380 +#: macro.c:1427 msgid "missing ')' in macro parameter list" msgstr "')' ontbreekt in lijst van macro-parameters" -#: macro.c:1458 +#: macro.c:1476 +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:1510 msgid "ISO C99 requires whitespace after the macro name" msgstr "ISO C99 vereist witruimte na de macronaam" -#: macro.c:1482 +#: macro.c:1534 msgid "missing whitespace after the macro name" msgstr "witruimte ontbreekt na de macronaam" -#: macro.c:1512 +#: macro.c:1564 msgid "'#' is not followed by a macro parameter" msgstr "'#' wordt niet gevolgd door de naam van een macro-parameter" -#: macro.c:1531 -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:1629 +#: macro.c:1683 #, c-format msgid "\"%s\" redefined" msgstr "\"%s\" opnieuw gedefinieerd" -#: macro.c:1634 +#: macro.c:1688 msgid "this is the location of the previous definition" msgstr "dit is de locatie van de eerdere definitie" -#: macro.c:1684 +#: macro.c:1738 #, c-format msgid "macro argument \"%s\" would be stringified in traditional C" msgstr "macro-argument \"%s\" zou string gemaakt worden in traditionele C" -#: macro.c:1707 +#: macro.c:1761 #, c-format msgid "invalid hash type %d in cpp_macro_definition" msgstr "ongeldig hashtype %d in cpp_macro_definition" -#: pch.c:84 pch.c:332 pch.c:354 pch.c:360 +#: pch.c:84 pch.c:332 pch.c:344 pch.c:362 pch.c:368 pch.c:377 msgid "while writing precompiled header" msgstr "bij het schrijven van een voorgecompileerde header" -#: pch.c:467 +#: pch.c:485 #, c-format msgid "%s: not used because `%.*s' not defined" msgstr "%s: niet gebruikt omdat \"%.*s\" niet gedefinieerd werd" -#: pch.c:479 +#: pch.c:497 #, c-format msgid "%s: not used because `%.*s' defined as `%s' not `%.*s'" msgstr "%s: niet gebruikt omdat \"%.*s\" als \"%s\" (en niet als \"%.*s\") gedefinieerd werd" -#: pch.c:520 +#: pch.c:538 #, c-format msgid "%s: not used because `%s' is defined" msgstr "%s: niet gebruikt omdat \"%s\" gedefinieerd is" -#: pch.c:533 pch.c:696 +#: pch.c:558 +#, c-format +msgid "%s: not used because `__COUNTER__' is invalid" +msgstr "%s: niet gebruikt omdat \"__COUNTER__\" ongeldig is" + +#: pch.c:567 pch.c:737 msgid "while reading precompiled header" msgstr "bij het lezen van een voorgecompileerde header" -#: traditional.c:745 +#: traditional.c:750 #, c-format msgid "detected recursion whilst expanding macro \"%s\"" msgstr "recursie gedetecteerd bij uitbreiden van macro \"%s\"" -#: traditional.c:912 +#: traditional.c:917 msgid "syntax error in macro parameter list" msgstr "syntaxfout in lijst van macro-parameters" diff --git a/libcpp/po/sv.po b/libcpp/po/sv.po index 57f36b3380e..225c39cb87c 100644 --- a/libcpp/po/sv.po +++ b/libcpp/po/sv.po @@ -1,16 +1,17 @@ +# This file is distributed under the same license as the gcc package. # Swedish messages for cpplib. -# Copyright 2000, 2005, 2006 Free Software Foundation, Inc. +# Copyright 2000, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. # Dennis Bjrklund , 2000, 2001, 2002. -# Gran Uddeborg , 2005, 2006. +# Gran Uddeborg , 2005, 2006, 2007, 2008. # # Remember: GCC team does not want RCS keywords in the header! # msgid "" msgstr "" -"Project-Id-Version: cpplib 4.1.1\n" +"Project-Id-Version: cpplib 4.3-b20071109\n" "Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n" -"POT-Creation-Date: 2007-05-13 19:48-0700\n" -"PO-Revision-Date: 2006-06-24 19:07+0200\n" +"POT-Creation-Date: 2007-11-08 21:08+0000\n" +"PO-Revision-Date: 2008-01-20 15:24+0100\n" "Last-Translator: Gran Uddeborg \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" @@ -73,7 +74,7 @@ msgstr "ofullst msgid "%.*s is not a valid universal character" msgstr "%.*s r inte ett giltigt universellt tecken" -#: charset.c:1008 lex.c:472 +#: charset.c:1008 lex.c:484 msgid "'$' in identifier or number" msgstr "\"$\" i identifierare eller tal" @@ -151,231 +152,235 @@ msgstr "tom teckenkonstant" msgid "failure to convert %s to %s" msgstr "misslyckades att konvertera %s till %s" -#: directives.c:214 directives.c:240 +#: directives.c:215 directives.c:241 #, c-format msgid "extra tokens at end of #%s directive" msgstr "extra symboler vid slutet av direktivet #%s" -#: directives.c:343 +#: directives.c:344 #, c-format msgid "#%s is a GCC extension" msgstr "#%s r en GCC-utvidgning" -#: directives.c:355 +#: directives.c:356 msgid "suggest not using #elif in traditional C" msgstr "freslr att inte anvnda #elif i traditionell C" -#: directives.c:358 +#: directives.c:359 #, c-format msgid "traditional C ignores #%s with the # indented" msgstr "traditionell C ignorerar #%s dr tecknet # r indenterat" -#: directives.c:362 +#: directives.c:363 #, c-format msgid "suggest hiding #%s from traditional C with an indented #" msgstr "freslr att dlja #%s frn traditionell C med en indenterad #" -#: directives.c:388 +#: directives.c:389 msgid "embedding a directive within macro arguments is not portable" msgstr "att bdda in ett direktiv i makroargument r inte portabelt" -#: directives.c:408 +#: directives.c:409 msgid "style of line directive is a GCC extension" msgstr "stil p raddirektiv r en GCC-utvidgning" -#: directives.c:458 +#: directives.c:464 #, c-format msgid "invalid preprocessing directive #%s" msgstr "ogiltigt preprocessordirektiv #%s" -#: directives.c:524 +#: directives.c:532 msgid "\"defined\" cannot be used as a macro name" msgstr "\"defined\" kan inte anvndas som ett makronamn" -#: directives.c:530 +#: directives.c:538 #, c-format msgid "\"%s\" cannot be used as a macro name as it is an operator in C++" msgstr "\"%s\" kan inte anvndas som ett makronamn eftersom det r en operator i C++" -#: directives.c:533 +#: directives.c:541 #, c-format msgid "no macro name given in #%s directive" msgstr "inget makronamn angivet i direktivet #%s" -#: directives.c:536 +#: directives.c:544 msgid "macro names must be identifiers" msgstr "makronamn mste vara identifierare" -#: directives.c:577 +#: directives.c:585 #, c-format msgid "undefining \"%s\"" msgstr "avdefinierar \"%s\"" -#: directives.c:632 +#: directives.c:640 msgid "missing terminating > character" msgstr "saknar avslutande tecken >" -#: directives.c:687 +#: directives.c:695 #, c-format msgid "#%s expects \"FILENAME\" or " msgstr "#%s frvntar \"FILNAMN\" eller " -#: directives.c:727 +#: directives.c:739 #, c-format msgid "empty filename in #%s" msgstr "tomt filnamn i #%s" -#: directives.c:737 +#: directives.c:749 msgid "#include nested too deeply" msgstr "#include nstlad fr djupt" -#: directives.c:778 +#: directives.c:790 msgid "#include_next in primary source file" msgstr "#include_next i primr kllkodsfil" -#: directives.c:804 +#: directives.c:816 #, c-format msgid "invalid flag \"%s\" in line directive" msgstr "ogiltigt flagga \"%s\" i line-direktiv" -#: directives.c:856 +#: directives.c:868 #, c-format msgid "\"%s\" after #line is not a positive integer" msgstr "\"%s\" efter #line r inte ett positivt heltal" -#: directives.c:862 +#: directives.c:874 msgid "line number out of range" msgstr "radnummer utanfr mjligt intervall" -#: directives.c:875 directives.c:952 +#: directives.c:887 directives.c:964 #, c-format msgid "\"%s\" is not a valid filename" msgstr "\"%s\" r inte ett giltigt filnamn" -#: directives.c:912 +#: directives.c:924 #, c-format msgid "\"%s\" after # is not a positive integer" msgstr "\"%s\" efter # r inte ett positivt heltal" -#: directives.c:1014 +#: directives.c:1026 #, c-format msgid "invalid #%s directive" msgstr "ogiltigt #%s-direktiv" -#: directives.c:1077 +#: directives.c:1089 #, c-format msgid "registering pragmas in namespace \"%s\" with mismatched name expansion" -msgstr "" +msgstr "registrerar pragman i namnrymden \"%s\" med namnexpansion som inte passar ihop" -#: directives.c:1086 -#, fuzzy, c-format +#: directives.c:1098 +#, c-format msgid "registering pragma \"%s\" with name expansion and no namespace" -msgstr "registrerar \"%s\" bde som ett pragma och ett pragma namespace" +msgstr "registrerar pragma \"%s\" med namnexpansion och utan namnrymd" -#: directives.c:1104 +#: directives.c:1116 #, c-format msgid "registering \"%s\" as both a pragma and a pragma namespace" msgstr "registrerar \"%s\" bde som ett pragma och ett pragma namespace" -#: directives.c:1107 +#: directives.c:1119 #, c-format msgid "#pragma %s %s is already registered" msgstr "#pragma %s %s r redan registrerat" -#: directives.c:1110 +#: directives.c:1122 #, c-format msgid "#pragma %s is already registered" msgstr "#pragma %s r redan registrerat" -#: directives.c:1140 +#: directives.c:1152 msgid "registering pragma with NULL handler" -msgstr "" +msgstr "registrerar pragma med NULL-hanterare" -#: directives.c:1350 +#: directives.c:1362 msgid "#pragma once in main file" msgstr "#pragma once i huvudfil" -#: directives.c:1373 +#: directives.c:1385 msgid "invalid #pragma GCC poison directive" -msgstr "ogiltigt GCC-direktiv #pragma poison" +msgstr "ogiltigt direktiv #pragma GCC poison" -#: directives.c:1382 +#: directives.c:1394 #, c-format msgid "poisoning existing macro \"%s\"" msgstr "frgiftar existerande makro \"%s\"" -#: directives.c:1403 +#: directives.c:1413 msgid "#pragma system_header ignored outside include file" msgstr "#pragma system_header ignorerat utanfr huvudfil" -#: directives.c:1427 +#: directives.c:1437 #, c-format msgid "cannot find source file %s" msgstr "kan inte hitta kllfil %s" -#: directives.c:1431 +#: directives.c:1441 #, c-format msgid "current file is older than %s" msgstr "aktuell fil r ldre n %s" -#: directives.c:1599 +#: directives.c:1620 msgid "_Pragma takes a parenthesized string literal" msgstr "_Pragma tar en strngkonstant inom parenteser" -#: directives.c:1671 +#: directives.c:1693 msgid "#else without #if" msgstr "#else utan #if" -#: directives.c:1676 +#: directives.c:1698 msgid "#else after #else" msgstr "#else efter #else" -#: directives.c:1678 directives.c:1711 +#: directives.c:1700 directives.c:1733 msgid "the conditional began here" msgstr "villkorssatsen brjade hr" -#: directives.c:1704 +#: directives.c:1726 msgid "#elif without #if" msgstr "#elif utan #if" -#: directives.c:1709 +#: directives.c:1731 msgid "#elif after #else" msgstr "#elif efter #else" -#: directives.c:1739 +#: directives.c:1761 msgid "#endif without #if" msgstr "#endif utan #if" -#: directives.c:1816 +#: directives.c:1838 msgid "missing '(' after predicate" msgstr "saknas '(' efter predikat" -#: directives.c:1831 +#: directives.c:1853 msgid "missing ')' to complete answer" msgstr "saknas ')' fr att avsluta svaret" -#: directives.c:1851 +#: directives.c:1873 msgid "predicate's answer is empty" msgstr "predikatets svar r tomt" -#: directives.c:1878 +#: directives.c:1900 msgid "assertion without predicate" msgstr "frskran utan predikat" -#: directives.c:1880 +#: directives.c:1902 msgid "predicate must be an identifier" msgstr "predikat mste vara en identifierare" -#: directives.c:1966 +#: directives.c:1988 #, c-format msgid "\"%s\" re-asserted" msgstr "\"%s\" omfrskrat" -#: directives.c:2190 +#: directives.c:2271 #, c-format msgid "unterminated #%s" msgstr "oavslutad #%s" +#: directives-only.c:221 lex.c:1016 traditional.c:162 +msgid "unterminated comment" +msgstr "ej avslutad kommentar" + #: errors.c:118 msgid "warning: " msgstr "varning: " @@ -397,332 +402,345 @@ msgstr "standard ut" msgid "%s: %s" msgstr "%s: %s" -#: expr.c:203 +#: expr.c:261 msgid "too many decimal points in number" msgstr "fr mnga decimalpunker i tal" -#: expr.c:223 +#: expr.c:290 expr.c:365 +msgid "fixed-point constants are a GCC extension" +msgstr "fastdecimalskonstanter r en GCC-utvidgning" + +#: expr.c:303 +#, c-format +msgid "invalid digit \"%c\" in binary constant" +msgstr "ogiltig siffra \"%c\" i binr konstant" + +#: expr.c:305 #, c-format msgid "invalid digit \"%c\" in octal constant" msgstr "ogiltigt siffra \"%c\" i oktal konstant" -#: expr.c:229 +#: expr.c:313 +msgid "invalid prefix \"0b\" for floating constant" +msgstr "ogiltigt prefix \"0b\" p flyttalskonstant" + +#: expr.c:319 msgid "use of C99 hexadecimal floating constant" msgstr "anvndning av hexadecimal flyttalskonstant enligt C99" -#: expr.c:238 +#: expr.c:328 msgid "exponent has no digits" msgstr "exponenten har inga siffror" -#: expr.c:245 +#: expr.c:335 msgid "hexadecimal floating constants require an exponent" msgstr "hexadecimala flyttalskonstanter mste ha en exponent" -#: expr.c:251 +#: expr.c:341 #, c-format msgid "invalid suffix \"%.*s\" on floating constant" msgstr "ogiltigt suffix \"%.*s\" p flyttalskonstant" -#: expr.c:261 expr.c:295 +#: expr.c:351 expr.c:393 #, c-format msgid "traditional C rejects the \"%.*s\" suffix" msgstr "traditionell C tillter inte suffixet \"%.*s\"" -#: expr.c:268 -#, fuzzy, c-format +#: expr.c:358 +#, c-format msgid "invalid suffix \"%.*s\" with hexadecimal floating constant" -msgstr "ogiltigt suffix \"%.*s\" p flyttalskonstant" +msgstr "ogiltigt suffix \"%.*s\" p hexadecimal flyttalskonstant" -#: expr.c:281 +#: expr.c:369 +msgid "decimal float constants are a GCC extension" +msgstr "decimala flyttalskonstanter r en GCC-utvidgning" + +#: expr.c:379 #, c-format msgid "invalid suffix \"%.*s\" on integer constant" msgstr "ogiltig ndelse \"%.*s\" p heltalskonstant" -#: expr.c:303 +#: expr.c:401 msgid "use of C99 long long integer constant" msgstr "anvndning av long long heltalskonstant enligt C99" -#: expr.c:310 +#: expr.c:409 msgid "imaginary constants are a GCC extension" msgstr "imaginra konstanter r en GCC-utvidgning" -#: expr.c:396 +#: expr.c:412 +msgid "binary constants are a GCC extension" +msgstr "binra konstanter r en GCC-utvidgning" + +#: expr.c:505 msgid "integer constant is too large for its type" msgstr "heltalskonstant r fr stor fr sin typ" -#: expr.c:408 +#: expr.c:517 msgid "integer constant is so large that it is unsigned" msgstr "heltalskonstant r s stor att den r teckenls" -#: expr.c:490 +#: expr.c:612 msgid "missing ')' after \"defined\"" msgstr "saknar ')' efter \"defined\"" -#: expr.c:497 +#: expr.c:619 msgid "operator \"defined\" requires an identifier" msgstr "operatorn \"defined\" mste ha en identiferare" -#: expr.c:505 +#: expr.c:627 #, c-format msgid "(\"%s\" is an alternative token for \"%s\" in C++)" msgstr "(\"%s\" r en alternativ symbol fr \"%s\" i C++)" -#: expr.c:515 +#: expr.c:637 msgid "this use of \"defined\" may not be portable" msgstr "denna anvndning av \"defined\" r kanske inte portabel" -#: expr.c:554 +#: expr.c:676 msgid "floating constant in preprocessor expression" msgstr "flyttalskonstant i preprocessoruttryck" -#: expr.c:560 +#: expr.c:682 msgid "imaginary number in preprocessor expression" msgstr "imaginrt tal i preprocessoruttryck" -#: expr.c:605 +#: expr.c:727 #, c-format msgid "\"%s\" is not defined" msgstr "\"%s\" r inte definierad" -#: expr.c:733 expr.c:762 +#: expr.c:855 expr.c:884 #, c-format msgid "missing binary operator before token \"%s\"" msgstr "saknad binr operator fre symbolen \"%s\"" -#: expr.c:753 +#: expr.c:875 #, c-format msgid "token \"%s\" is not valid in preprocessor expressions" msgstr "symbolen \"%s\" r inte ett giltigt preprocessoruttryck" -#: expr.c:770 +#: expr.c:892 msgid "missing expression between '(' and ')'" msgstr "saknat uttryck mellan \"(\" och \")\"" -#: expr.c:773 +#: expr.c:895 msgid "#if with no expression" msgstr "#if utan uttryck" -#: expr.c:776 +#: expr.c:898 #, c-format msgid "operator '%s' has no right operand" msgstr "operatorn \"%s\" har ingen hgra operand" -#: expr.c:781 +#: expr.c:903 #, c-format msgid "operator '%s' has no left operand" msgstr "operatorn \"%s\" har ingen vnstra operand" -#: expr.c:807 +#: expr.c:929 msgid " ':' without preceding '?'" msgstr "\":\" utan fregende \"?\"" -#: expr.c:834 +#: expr.c:956 msgid "unbalanced stack in #if" msgstr "obalanserad stack i #if" -#: expr.c:853 +#: expr.c:975 #, c-format msgid "impossible operator '%u'" msgstr "omjlig operator \"%u\"" -#: expr.c:943 +#: expr.c:1065 msgid "missing ')' in expression" msgstr "saknad \")\" i uttryck" -#: expr.c:964 +#: expr.c:1086 msgid "'?' without following ':'" msgstr "\"?\" utan fljande \":\"" -#: expr.c:974 +#: expr.c:1096 msgid "integer overflow in preprocessor expression" msgstr "heltalsspill i preprocessoruttryck" -#: expr.c:979 +#: expr.c:1101 msgid "missing '(' in expression" msgstr "saknad \"(\" i uttryck" -#: expr.c:1011 +#: expr.c:1133 #, c-format msgid "the left operand of \"%s\" changes sign when promoted" msgstr "vnsteroperanden till \"%s\" byter tecken vid befodran" -#: expr.c:1016 +#: expr.c:1138 #, c-format msgid "the right operand of \"%s\" changes sign when promoted" msgstr "hgeroperanden till \"%s\" byter tecken vid befodran" -#: expr.c:1275 +#: expr.c:1397 msgid "traditional C rejects the unary plus operator" msgstr "traditionell C hanterar inte operatorn unrt plus" -#: expr.c:1358 +#: expr.c:1480 msgid "comma operator in operand of #if" msgstr "kommaoperator i operand till #if" -#: expr.c:1490 +#: expr.c:1612 msgid "division by zero in #if" msgstr "division med noll i #if" -#: files.c:402 +#: files.c:442 msgid "NULL directory in find_file" msgstr "NOLL-katalog i find_file" -#: files.c:440 +#: files.c:480 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:443 +#: files.c:483 msgid "use -Winvalid-pch for more information" msgstr "anvnd -Winvalid-pch fr mer information" -#: files.c:501 +#: files.c:570 #, c-format msgid "%s is a block device" msgstr "%s r en blockenhet" -#: files.c:518 +#: files.c:587 #, c-format msgid "%s is too large" msgstr "%s r fr stor" -#: files.c:553 +#: files.c:622 #, c-format msgid "%s is shorter than expected" msgstr "%s r kortare n frvntat" -#: files.c:782 +#: files.c:852 #, c-format msgid "no include path in which to search for %s" msgstr "ingen huvudfilsskvg att leta efter %s i" -#: files.c:1071 +#: files.c:1157 msgid "Multiple include guards may be useful for:\n" msgstr "Multipla inkluderingsvakter kan vara anvndbart fr:\n" -#: init.c:407 +#: init.c:426 msgid "cppchar_t must be an unsigned type" msgstr "cppchar_t mste vare en teckenls typ" -#: init.c:411 +#: init.c:430 #, c-format msgid "preprocessor arithmetic has maximum precision of %lu bits; target requires %lu bits" msgstr "preprocessoraretmetik har en hgsta precision p %lu bitar; mlet krver %lu bitar" -#: init.c:418 +#: init.c:437 msgid "CPP arithmetic must be at least as precise as a target int" msgstr "CPP-aritmetik mste vara tminstone s precis som mlets int" -#: init.c:421 +#: init.c:440 msgid "target char is less than 8 bits wide" msgstr "mlets char r mindre n 8 bitar bred" -#: init.c:425 +#: init.c:444 msgid "target wchar_t is narrower than target char" msgstr "mlets wchar_t r smalare n mlets char" -#: init.c:429 +#: init.c:448 msgid "target int is narrower than target char" msgstr "mlets int r smalare n mlets char" -#: init.c:434 +#: init.c:453 msgid "CPP half-integer narrower than CPP character" msgstr "CPP:s halva heltal r smalare n CPP:s tecken" -#: init.c:438 +#: init.c:457 #, 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 vrd kan inte hantera breda teckenkonstanter ver %lu bitar, men mlet krver %lu bitar" -#: lex.c:271 +#: lex.c:283 msgid "backslash and newline separated by space" msgstr "baktstreck och nyrad skiljda av mellanrum" -#: lex.c:276 +#: lex.c:288 msgid "backslash-newline at end of file" msgstr "baktstreck-nyrad vid filslut" -#: lex.c:291 +#: lex.c:303 #, c-format msgid "trigraph ??%c converted to %c" msgstr "trigraph ??%c konverterad till %c" -#: lex.c:298 +#: lex.c:310 #, c-format msgid "trigraph ??%c ignored, use -trigraphs to enable" msgstr "trigraph ??%c ingorerad, anvnd -trigraphs fr att aktivera" -#: lex.c:344 +#: lex.c:356 msgid "\"/*\" within comment" msgstr "\"/*\" i kommentar" -#: lex.c:402 +#: lex.c:414 #, c-format msgid "%s in preprocessing directive" msgstr "%s i preprocessordirektiv" -#: lex.c:411 +#: lex.c:423 msgid "null character(s) ignored" msgstr "nolltecken ignorerat" -#: lex.c:448 +#: lex.c:460 #, c-format msgid "`%.*s' is not in NFKC" msgstr "\"%.*s\" r inte i NFKC" -#: lex.c:451 +#: lex.c:463 #, c-format msgid "`%.*s' is not in NFC" msgstr "\"%.*s\" r inte i NFC" -#: lex.c:539 +#: lex.c:551 #, c-format msgid "attempt to use poisoned \"%s\"" msgstr "frsk att anvnda frgiftad \"%s\"" -#: lex.c:547 +#: lex.c:559 msgid "__VA_ARGS__ can only appear in the expansion of a C99 variadic macro" msgstr "__VA_ARGS__ kan endast dyka upp i expansionen av ett C99-makro med variabelt argumentantal" -#: lex.c:647 +#: lex.c:659 msgid "null character(s) preserved in literal" msgstr "nolltecken bevarade i konstant" -#: lex.c:650 -#, fuzzy, c-format +#: lex.c:662 +#, c-format msgid "missing terminating %c character" -msgstr "saknar avslutande tecken >" +msgstr "avslutande %c-tecken saknas" -#: lex.c:842 -msgid "no newline at end of file" -msgstr "inget nyradstecken vid slutet av filen" - -#: lex.c:1002 traditional.c:162 -msgid "unterminated comment" -msgstr "ej avslutad kommentar" - -#: lex.c:1013 +#: lex.c:1027 msgid "C++ style comments are not allowed in ISO C90" msgstr "C++ kommentarer tillts inte i ISO C90" -#: lex.c:1015 +#: lex.c:1029 msgid "(this will be reported only once per input file)" msgstr "(detta rapporteras bara en gng per infil)" -#: lex.c:1020 +#: lex.c:1034 msgid "multi-line comment" msgstr "flerradskommentar" -#: lex.c:1333 +#: lex.c:1347 #, c-format msgid "unspellable token %s" msgstr "ostavbar symbol %s" -#: line-map.c:313 +#: line-map.c:320 #, c-format msgid "In file included from %s:%u" msgstr "I fil inkluderad frn %s:%u" -#: line-map.c:331 +#: line-map.c:338 #, c-format msgid "" ",\n" @@ -731,151 +749,159 @@ msgstr "" ",\n" " frn %s:%u" -#: macro.c:83 +#: macro.c:84 #, c-format msgid "macro \"%s\" is not used" msgstr "makrot \"%s\" r inte anvnt" -#: macro.c:122 macro.c:312 +#: macro.c:123 macro.c:319 #, c-format msgid "invalid built-in macro \"%s\"" msgstr "ogiltigt inbyggt makro \"%s\"" -#: macro.c:156 -#, fuzzy +#: macro.c:157 msgid "could not determine file timestamp" -msgstr "kunde inte bstmma datum och tid" +msgstr "det gick inte att avgra fils tidsstmpel" -#: macro.c:253 +#: macro.c:254 msgid "could not determine date and time" -msgstr "kunde inte bstmma datum och tid" +msgstr "det gick inte att avgra datum och tid" -#: macro.c:416 +#: macro.c:270 +msgid "__COUNTER__ expanded inside directive with -fdirectives-only" +msgstr "__COUNTER__ expanderad inuti direktiv med -fdirectives-only" + +#: macro.c:423 msgid "invalid string literal, ignoring final '\\'" msgstr "ogiltig strngkonstant, inorerar avslutande \"\\\"" -#: macro.c:466 +#: macro.c:483 #, c-format msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token" msgstr "att stta ihop \"%s\" och \"%s\" ger inte en giltigt preprocessorsymbol" -#: macro.c:538 +#: macro.c:558 msgid "ISO C99 requires rest arguments to be used" msgstr "ISO C99 krver att restargument anvnds" -#: macro.c:543 +#: macro.c:563 #, c-format msgid "macro \"%s\" requires %u arguments, but only %u given" msgstr "makrot \"%s\" krver %u argument, men endast %u anges" -#: macro.c:548 +#: macro.c:568 #, 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:659 traditional.c:675 +#: macro.c:679 traditional.c:680 #, c-format msgid "unterminated argument list invoking macro \"%s\"" msgstr "oavslutad argumentlista vid anrop av makrot \"%s\"" -#: macro.c:762 +#: macro.c:782 #, c-format msgid "function-like macro \"%s\" must be used with arguments in traditional C" msgstr "funktionsliknande makrot \"%s\" mste anvndas med ett argument i traditionell C" -#: macro.c:1278 +#: macro.c:1325 #, c-format msgid "duplicate macro parameter \"%s\"" msgstr "dubblerad makroparameter \"%s\"" -#: macro.c:1324 +#: macro.c:1371 #, c-format msgid "\"%s\" may not appear in macro parameter list" msgstr "\"%s\" fr inte frekomma i en makroparameterlista" -#: macro.c:1332 +#: macro.c:1379 msgid "macro parameters must be comma-separated" msgstr "makroparametrar mste avdelas av komman" -#: macro.c:1349 +#: macro.c:1396 msgid "parameter name missing" msgstr "parameternamn saknas" -#: macro.c:1366 +#: macro.c:1413 msgid "anonymous variadic macros were introduced in C99" msgstr "anonyma variabla makron introducerades i C99" -#: macro.c:1371 +#: macro.c:1418 msgid "ISO C does not permit named variadic macros" msgstr "ISO C tillter inte namngivna variabla makron" -#: macro.c:1380 +#: macro.c:1427 msgid "missing ')' in macro parameter list" msgstr "saknad \")\" i makroparameterlista" -#: macro.c:1458 +#: macro.c:1476 +msgid "'##' cannot appear at either end of a macro expansion" +msgstr "\"##\" kan inte frekomma vid ngon av ndarna av makroexpansionen" + +#: macro.c:1510 msgid "ISO C99 requires whitespace after the macro name" msgstr "ISO C99 krver mellanrum efter makronamnet" -#: macro.c:1482 +#: macro.c:1534 msgid "missing whitespace after the macro name" msgstr "mellanrum saknas efter makronamn" -#: macro.c:1512 +#: macro.c:1564 msgid "'#' is not followed by a macro parameter" msgstr "\"#\" fljs inte av en makroparameter" -#: macro.c:1531 -msgid "'##' cannot appear at either end of a macro expansion" -msgstr "\"##\" kan inte frekomma vid ngon av ndarna av makroexpansionen" - -#: macro.c:1629 +#: macro.c:1683 #, c-format msgid "\"%s\" redefined" msgstr "\"%s\" omdefinierad" -#: macro.c:1634 +#: macro.c:1688 msgid "this is the location of the previous definition" msgstr "detta r platsen fr den tidigare definitionen" -#: macro.c:1684 +#: macro.c:1738 #, c-format msgid "macro argument \"%s\" would be stringified in traditional C" msgstr "makroargumentet \"%s\" skulle bli gjort till strng i traditionell C" -#: macro.c:1707 +#: macro.c:1761 #, c-format msgid "invalid hash type %d in cpp_macro_definition" msgstr "ogiltig hash-typ %d i cpp_macro_definition" -#: pch.c:84 pch.c:332 pch.c:354 pch.c:360 +#: pch.c:84 pch.c:332 pch.c:344 pch.c:362 pch.c:368 pch.c:377 msgid "while writing precompiled header" msgstr "vid skrivning av frkompilerat huvud" -#: pch.c:467 +#: pch.c:485 #, c-format msgid "%s: not used because `%.*s' not defined" msgstr "%s: inte anvnd fr att \"%.*s\" inte r definierad" -#: pch.c:479 +#: pch.c:497 #, c-format msgid "%s: not used because `%.*s' defined as `%s' not `%.*s'" msgstr "%s: anvnds inte fr att \"%.*s\" definieras som \"%s\" inte \"%.*s\"" -#: pch.c:520 +#: pch.c:538 #, c-format msgid "%s: not used because `%s' is defined" msgstr "%s: inte anvnd fr att \"%s\" r definierad" -#: pch.c:533 pch.c:696 +#: pch.c:558 +#, c-format +msgid "%s: not used because `__COUNTER__' is invalid" +msgstr "%s: inte anvnd fr att \"__COUNTER__\" r ogiltig" + +#: pch.c:567 pch.c:737 msgid "while reading precompiled header" msgstr "vid lsning av frkompilerat huvud" -#: traditional.c:745 +#: traditional.c:750 #, c-format msgid "detected recursion whilst expanding macro \"%s\"" msgstr "upptckte rekursion vid under expansion av makrot \"%s\"" -#: traditional.c:912 +#: traditional.c:917 msgid "syntax error in macro parameter list" msgstr "syntaxfel i makroparameterlista" diff --git a/libcpp/po/tr.po b/libcpp/po/tr.po index 8563d81d4e1..ab84b9f55f5 100644 --- a/libcpp/po/tr.po +++ b/libcpp/po/tr.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: cpplib 4.2.0\n" "Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n" -"POT-Creation-Date: 2007-05-13 19:48-0700\n" +"POT-Creation-Date: 2007-11-08 21:08+0000\n" "PO-Revision-Date: 2007-05-23 01:17+0300\n" "Last-Translator: Nilgün Belma Bugüner \n" "Language-Team: Turkish \n" @@ -72,7 +72,7 @@ msgstr "evrensel karakter ismi %.*s tamamlanmamış" msgid "%.*s is not a valid universal character" msgstr "%.*s geçerli bir evrensel karakter değil" -#: charset.c:1008 lex.c:472 +#: charset.c:1008 lex.c:484 msgid "'$' in identifier or number" msgstr "belirteç ya da sayı içinde '$'" @@ -150,231 +150,235 @@ msgstr "karakter sabit boş" msgid "failure to convert %s to %s" msgstr "`%s' ile `%s' arasında dönüşüm başarısız" -#: directives.c:214 directives.c:240 +#: directives.c:215 directives.c:241 #, c-format msgid "extra tokens at end of #%s directive" msgstr "#%s yönergesinin sonunda fazladan dizgecikler" -#: directives.c:343 +#: directives.c:344 #, c-format msgid "#%s is a GCC extension" msgstr "#%s bir GCC uzantısıdır" -#: directives.c:355 +#: directives.c:356 msgid "suggest not using #elif in traditional C" msgstr "geleneksel C'de #elif kullanılmıyor varsayılır" -#: directives.c:358 +#: directives.c:359 #, c-format msgid "traditional C ignores #%s with the # indented" msgstr "geleneksel C'de girintili # ile #%s yoksayılır" -#: directives.c:362 +#: directives.c:363 #, c-format msgid "suggest hiding #%s from traditional C with an indented #" msgstr "geleneksel C'den #%s in saklanması için bir girintili # kullanılmış farzedilir" -#: directives.c:388 +#: directives.c:389 msgid "embedding a directive within macro arguments is not portable" msgstr "bir yönergenin makro argümanlarla gömülmesi uyarlanabilir değil" -#: directives.c:408 +#: directives.c:409 msgid "style of line directive is a GCC extension" msgstr "satır yönergesinin tarzı bir GCC özelliğidir" -#: directives.c:458 +#: directives.c:464 #, c-format msgid "invalid preprocessing directive #%s" msgstr "önişlem yönergesi #%s geçersiz" -#: directives.c:524 +#: directives.c:532 msgid "\"defined\" cannot be used as a macro name" msgstr "\"defined\" makro ismi olarak kullanılamaz" -#: directives.c:530 +#: directives.c:538 #, c-format msgid "\"%s\" cannot be used as a macro name as it is an operator in C++" msgstr "\"%s\" C++'da bir işleç olduğundan makro ismi olarak kullanılamaz" -#: directives.c:533 +#: directives.c:541 #, c-format msgid "no macro name given in #%s directive" msgstr "#%s yönergesinde makro ismi verilmemiş" -#: directives.c:536 +#: directives.c:544 msgid "macro names must be identifiers" msgstr "makro isimleri tanımlayıcılar olmalı" -#: directives.c:577 +#: directives.c:585 #, c-format msgid "undefining \"%s\"" msgstr "tanımsız yapılan \"%s\"" -#: directives.c:632 +#: directives.c:640 msgid "missing terminating > character" msgstr "sonlandıran > karakteri eksik" -#: directives.c:687 +#: directives.c:695 #, c-format msgid "#%s expects \"FILENAME\" or " msgstr "#%s \"DOSYA\" ya da gerektirir" -#: directives.c:727 +#: directives.c:739 #, c-format msgid "empty filename in #%s" msgstr "#%s ile belirtilen dosya boş" -#: directives.c:737 +#: directives.c:749 msgid "#include nested too deeply" msgstr "#include iç içeliği çok derin" -#: directives.c:778 +#: directives.c:790 msgid "#include_next in primary source file" msgstr "birncil kaynak dosyasında #include_next" -#: directives.c:804 +#: directives.c:816 #, c-format msgid "invalid flag \"%s\" in line directive" msgstr "satır yönergesinde geçersiz \"%s\" seçeneği" -#: directives.c:856 +#: directives.c:868 #, c-format msgid "\"%s\" after #line is not a positive integer" msgstr "#line'dan sonraki \"%s\" bir pozitif tamsayı değil" -#: directives.c:862 +#: directives.c:874 msgid "line number out of range" msgstr "satır numarası kapsam dışı" -#: directives.c:875 directives.c:952 +#: directives.c:887 directives.c:964 #, c-format msgid "\"%s\" is not a valid filename" msgstr "\"%s\" geçerli bir dosya ismi değil" -#: directives.c:912 +#: directives.c:924 #, c-format msgid "\"%s\" after # is not a positive integer" msgstr "#'dan sonraki \"%s\" bir pozitif tamsayı değil" -#: directives.c:1014 +#: directives.c:1026 #, c-format msgid "invalid #%s directive" msgstr "#%s yönergesi geçersiz" -#: directives.c:1077 +#: directives.c:1089 #, 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:1086 +#: directives.c:1098 #, 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:1104 +#: directives.c:1116 #, 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:1107 +#: directives.c:1119 #, c-format msgid "#pragma %s %s is already registered" msgstr "#pragma %s %s zaten kayıtlı" -#: directives.c:1110 +#: directives.c:1122 #, c-format msgid "#pragma %s is already registered" msgstr "#pragma %s zaten kayıtlı" -#: directives.c:1140 +#: directives.c:1152 msgid "registering pragma with NULL handler" msgstr "pragma NULL eylemci ile kaydediliyor" -#: directives.c:1350 +#: directives.c:1362 msgid "#pragma once in main file" msgstr "main dosyasında '#pragma once'" -#: directives.c:1373 +#: directives.c:1385 msgid "invalid #pragma GCC poison directive" msgstr "geçersiz #pragma GCC poison yönergesi" -#: directives.c:1382 +#: directives.c:1394 #, c-format msgid "poisoning existing macro \"%s\"" msgstr "zehirlenen mevcut makro \"%s\"" -#: directives.c:1403 +#: directives.c:1413 msgid "#pragma system_header ignored outside include file" msgstr "başlık dosyasının dışındaki '#pragma system_header' yoksayıldı" -#: directives.c:1427 +#: directives.c:1437 #, c-format msgid "cannot find source file %s" msgstr "%s kaynak dosyası bulunamıyor" -#: directives.c:1431 +#: directives.c:1441 #, c-format msgid "current file is older than %s" msgstr "mevcut dosya %s den daha eski" -#: directives.c:1599 +#: directives.c:1620 msgid "_Pragma takes a parenthesized string literal" msgstr "_Pragma bir parantezli dizge sabiti alır" -#: directives.c:1671 +#: directives.c:1693 msgid "#else without #if" msgstr "#if siz #else" -#: directives.c:1676 +#: directives.c:1698 msgid "#else after #else" msgstr "#else den sonra #else" -#: directives.c:1678 directives.c:1711 +#: directives.c:1700 directives.c:1733 msgid "the conditional began here" msgstr "koşul başlangıcı burası" -#: directives.c:1704 +#: directives.c:1726 msgid "#elif without #if" msgstr "#if siz #elif " -#: directives.c:1709 +#: directives.c:1731 msgid "#elif after #else" msgstr "#else den sonra #elif" -#: directives.c:1739 +#: directives.c:1761 msgid "#endif without #if" msgstr "#if siz #endif" -#: directives.c:1816 +#: directives.c:1838 msgid "missing '(' after predicate" msgstr "dayanaktan sonra '(' eksik" -#: directives.c:1831 +#: directives.c:1853 msgid "missing ')' to complete answer" msgstr "yanıtı tamamlayacak ')' eksik" -#: directives.c:1851 +#: directives.c:1873 msgid "predicate's answer is empty" msgstr "dayanakların cevabı boş" -#: directives.c:1878 +#: directives.c:1900 msgid "assertion without predicate" msgstr "dayanaksız olumlama" -#: directives.c:1880 +#: directives.c:1902 msgid "predicate must be an identifier" msgstr "dayanak bir tanımlayıcı olmalı" -#: directives.c:1966 +#: directives.c:1988 #, c-format msgid "\"%s\" re-asserted" msgstr "\"%s\" tekrar olumlanmış" -#: directives.c:2190 +#: directives.c:2271 #, c-format msgid "unterminated #%s" msgstr "sonlandırılmamış #%s" +#: directives-only.c:221 lex.c:1016 traditional.c:162 +msgid "unterminated comment" +msgstr "sonlandırılmamış açıklama" + #: errors.c:118 msgid "warning: " msgstr "uyarı: " @@ -396,334 +400,351 @@ msgstr "stdÇ" msgid "%s: %s" msgstr "%s: %s" -#: expr.c:203 +#: expr.c:261 msgid "too many decimal points in number" msgstr "sayı içindeki ondalık nokta sayısı çok fazla" -#: expr.c:223 +#: expr.c:290 expr.c:365 +#, fuzzy +msgid "fixed-point constants are a GCC extension" +msgstr "sanal sabitler bir GCC genişletmesidir" + +#: expr.c:303 +#, fuzzy, c-format +msgid "invalid digit \"%c\" in binary constant" +msgstr "sekizlik sabit içindeki \"%c\" geçersiz" + +#: expr.c:305 #, c-format msgid "invalid digit \"%c\" in octal constant" msgstr "sekizlik sabit içindeki \"%c\" geçersiz" -#: expr.c:229 +#: expr.c:313 +#, fuzzy +msgid "invalid prefix \"0b\" for floating constant" +msgstr "gerçel sabitin \"%.*s\" soneki geçersiz" + +#: expr.c:319 msgid "use of C99 hexadecimal floating constant" msgstr "C99 onaltılık gerçel sayı sabit kullanımı" -#: expr.c:238 +#: expr.c:328 msgid "exponent has no digits" msgstr "üs rakam içermiyor" -#: expr.c:245 +#: expr.c:335 msgid "hexadecimal floating constants require an exponent" msgstr "onaltılık gerçel sabitler bir üs gerektirir" -#: expr.c:251 +#: expr.c:341 #, c-format msgid "invalid suffix \"%.*s\" on floating constant" msgstr "gerçel sabitin \"%.*s\" soneki geçersiz" -#: expr.c:261 expr.c:295 +#: expr.c:351 expr.c:393 #, c-format msgid "traditional C rejects the \"%.*s\" suffix" msgstr "geleneksel C \"%.*s\" sonekini kullanmaz" -#: expr.c:268 +#: expr.c:358 #, c-format msgid "invalid suffix \"%.*s\" with hexadecimal floating constant" msgstr "onaltılık kayan sabitli \"%.*s\" soneki geçersiz" -#: expr.c:281 +#: expr.c:369 +#, fuzzy +msgid "decimal float constants are a GCC extension" +msgstr "sanal sabitler bir GCC genişletmesidir" + +#: expr.c:379 #, c-format msgid "invalid suffix \"%.*s\" on integer constant" msgstr "tamsayı sabitte sonek \"%.*s\" soneki geçersiz" -#: expr.c:303 +#: expr.c:401 msgid "use of C99 long long integer constant" msgstr "ISO C99 long long tamsayı sabitleri yasaklar" -#: expr.c:310 +#: expr.c:409 msgid "imaginary constants are a GCC extension" msgstr "sanal sabitler bir GCC genişletmesidir" -#: expr.c:396 +#: expr.c:412 +#, fuzzy +msgid "binary constants are a GCC extension" +msgstr "sanal sabitler bir GCC genişletmesidir" + +#: expr.c:505 msgid "integer constant is too large for its type" msgstr "tamsayı sabit, türü için oldukça büyük" -#: expr.c:408 +#: expr.c:517 msgid "integer constant is so large that it is unsigned" msgstr "tamsayı sabit unsigned olarak oldukça büyük" -#: expr.c:490 +#: expr.c:612 msgid "missing ')' after \"defined\"" msgstr "\"defined\" dan sonra ')' eksik" -#: expr.c:497 +#: expr.c:619 msgid "operator \"defined\" requires an identifier" msgstr "\"defined\" işleci bir tanımlayıcı gerektirir" -#: expr.c:505 +#: expr.c:627 #, c-format msgid "(\"%s\" is an alternative token for \"%s\" in C++)" msgstr "(C++'da \"%s\" \"%s\" için bir alternatif dizgeciktir)" -#: expr.c:515 +#: expr.c:637 msgid "this use of \"defined\" may not be portable" msgstr "\"defined\" bu kullanımıyla uyarlanabilir olmayabilir" -#: expr.c:554 +#: expr.c:676 msgid "floating constant in preprocessor expression" msgstr "önişlemci ifadesinde gerçel sayı taşması" -#: expr.c:560 +#: expr.c:682 msgid "imaginary number in preprocessor expression" msgstr "önişlemci ifadesinde sanal sayı" -#: expr.c:605 +#: expr.c:727 #, c-format msgid "\"%s\" is not defined" msgstr "\"%s\" tanımlı değil" -#: expr.c:733 expr.c:762 +#: expr.c:855 expr.c:884 #, c-format msgid "missing binary operator before token \"%s\"" msgstr "\"%s\" dizgeciğinden önceki iki terimli işleç eksik" -#: expr.c:753 +#: expr.c:875 #, c-format msgid "token \"%s\" is not valid in preprocessor expressions" msgstr "\"%s\" dizgeciği önişlemci ifadelerinde geçersizdir" -#: expr.c:770 +#: expr.c:892 msgid "missing expression between '(' and ')'" msgstr "'(' ve ')' arasında ifade eksik" -#: expr.c:773 +#: expr.c:895 msgid "#if with no expression" msgstr "#if ifadesiz" -#: expr.c:776 +#: expr.c:898 #, c-format msgid "operator '%s' has no right operand" msgstr "`%s' işlecinin sağ tarafı yok" -#: expr.c:781 +#: expr.c:903 #, c-format msgid "operator '%s' has no left operand" msgstr "`%s' işlecinin sol terimi yok" -#: expr.c:807 +#: expr.c:929 msgid " ':' without preceding '?'" msgstr "':' den önce '?' yok" -#: expr.c:834 +#: expr.c:956 msgid "unbalanced stack in #if" msgstr "#if ifadesinde karşılıksız yığın" -#: expr.c:853 +#: expr.c:975 #, c-format msgid "impossible operator '%u'" msgstr "işleç '%u' imkansız" -#: expr.c:943 +#: expr.c:1065 msgid "missing ')' in expression" msgstr "ifadede ')' eksik" -#: expr.c:964 +#: expr.c:1086 msgid "'?' without following ':'" msgstr "'?' dan sonra ':' yok" -#: expr.c:974 +#: expr.c:1096 msgid "integer overflow in preprocessor expression" msgstr "önişlemci ifadesinde tamsayı taşması" -#: expr.c:979 +#: expr.c:1101 msgid "missing '(' in expression" msgstr "ifadede '(' eksik" -#: expr.c:1011 +#: expr.c:1133 #, 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:1016 +#: expr.c:1138 #, 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:1275 +#: expr.c:1397 msgid "traditional C rejects the unary plus operator" msgstr "geleneksel C tekil artı işlecini dışlar" -#: expr.c:1358 +#: expr.c:1480 msgid "comma operator in operand of #if" msgstr "#if'in teriminde virgül" -#: expr.c:1490 +#: expr.c:1612 msgid "division by zero in #if" msgstr "#if içinde sıfırla bölme" -#: files.c:402 +#: files.c:442 msgid "NULL directory in find_file" msgstr "find_file içinde boş dizin" -#: files.c:440 +#: files.c:480 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:443 +#: files.c:483 msgid "use -Winvalid-pch for more information" msgstr "daha fazla bilgi almak için -Winvalid-pch kullanın" -#: files.c:501 +#: files.c:570 #, c-format msgid "%s is a block device" msgstr "%s bir blok aygıtıdır" -#: files.c:518 +#: files.c:587 #, c-format msgid "%s is too large" msgstr "%s çok büyük" -#: files.c:553 +#: files.c:622 #, c-format msgid "%s is shorter than expected" msgstr "%s beklenenden daha kısa" -#: files.c:782 +#: files.c:852 #, 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:1071 +#: files.c:1157 msgid "Multiple include guards may be useful for:\n" msgstr "Çoklu include önlemleri aşağıdakiler için kullanışlı olabilir:\n" -#: init.c:407 +#: init.c:426 msgid "cppchar_t must be an unsigned type" msgstr "cppchar_t bir usigned tür olmalı" -#: init.c:411 +#: init.c:430 #, 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:418 +#: init.c:437 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:421 +#: init.c:440 msgid "target char is less than 8 bits wide" msgstr "hedef char 8bitlik genişlikten küçük" -#: init.c:425 +#: init.c:444 msgid "target wchar_t is narrower than target char" msgstr "hedef wchar_t hedef char'dan daha dar" -#: init.c:429 +#: init.c:448 msgid "target int is narrower than target char" msgstr "hedef int hedef char'dan daha dar" -#: init.c:434 +#: init.c:453 msgid "CPP half-integer narrower than CPP character" msgstr "CPP half-integer'ı CPP character'dan daha dar" -#: init.c:438 +#: init.c:457 #, 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" -#: lex.c:271 +#: lex.c:283 msgid "backslash and newline separated by space" msgstr "ters bölü ve satırsonu arasında boşluk var" -#: lex.c:276 +#: lex.c:288 msgid "backslash-newline at end of file" msgstr "dosyanın sonunda tersbölülü satırsonu" -#: lex.c:291 +#: lex.c:303 #, c-format msgid "trigraph ??%c converted to %c" msgstr "??%c üçlü harfi %c olarak dönüştürüldü" -#: lex.c:298 +#: lex.c:310 #, c-format msgid "trigraph ??%c ignored, use -trigraphs to enable" msgstr "??%c üçlü harfi yoksayıldı, yoksayılmaması için -trigraphs kullanın" -#: lex.c:344 +#: lex.c:356 msgid "\"/*\" within comment" msgstr "açıklama içinde \"/*\" bulundu" -#: lex.c:402 +#: lex.c:414 #, c-format msgid "%s in preprocessing directive" msgstr "önişlem yönergesi içinde %s" -#: lex.c:411 +#: lex.c:423 msgid "null character(s) ignored" msgstr "null karakter(ler) yoksayıldı" -#: lex.c:448 +#: lex.c:460 #, c-format msgid "`%.*s' is not in NFKC" msgstr "`%.*s' NFKC'de yok" -#: lex.c:451 +#: lex.c:463 #, c-format msgid "`%.*s' is not in NFC" msgstr "`%.*s' NFC'de yok" -#: lex.c:539 +#: lex.c:551 #, c-format msgid "attempt to use poisoned \"%s\"" msgstr "zehirli \"%s\" kullanılmaya çalışılıyor" -#: lex.c:547 +#: lex.c:559 msgid "__VA_ARGS__ can only appear in the expansion of a C99 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:647 +#: lex.c:659 msgid "null character(s) preserved in literal" msgstr "null karakter(ler) sabit içinde saklanmış" -#: lex.c:650 +#: lex.c:662 #, c-format msgid "missing terminating %c character" msgstr "sonlandıran %c karakteri eksik" -#: lex.c:842 -msgid "no newline at end of file" -msgstr "dosya sonunda satırsonu karakteri yok" - -#: lex.c:1002 traditional.c:162 -msgid "unterminated comment" -msgstr "sonlandırılmamış açıklama" - -#: lex.c:1013 +#: lex.c:1027 msgid "C++ style comments are not allowed in ISO C90" msgstr "C++ tarzı açıklamalara ISO C90'da izin verilmez" -#: lex.c:1015 +#: lex.c:1029 msgid "(this will be reported only once per input file)" msgstr "(her girdi dosyasında sadece bir kere raporlanacaktır)" -#: lex.c:1020 +#: lex.c:1034 msgid "multi-line comment" msgstr "çok satırlı açıklama" -#: lex.c:1333 +#: lex.c:1347 #, c-format msgid "unspellable token %s" msgstr "dizgecik %s okunabilir değil" -#: line-map.c:313 +#: line-map.c:320 #, c-format msgid "In file included from %s:%u" msgstr "" "Sırayla bir altındaki dosyada içerilerek:\n" "\t\t%s:%u" -#: line-map.c:331 +#: line-map.c:338 #, c-format msgid "" ",\n" @@ -732,150 +753,162 @@ msgstr "" ",\n" "\t\t%s:%u" -#: macro.c:83 +#: macro.c:84 #, c-format msgid "macro \"%s\" is not used" msgstr "\"%s\" makrosu kullanılmadı" -#: macro.c:122 macro.c:312 +#: macro.c:123 macro.c:319 #, c-format msgid "invalid built-in macro \"%s\"" msgstr "geçersiz yerleşik makro \"%s\"" -#: macro.c:156 +#: macro.c:157 msgid "could not determine file timestamp" msgstr "dosya tarih damgası saptanamadı" -#: macro.c:253 +#: macro.c:254 msgid "could not determine date and time" msgstr "tarih ve saat saptanamadı" -#: macro.c:416 +#: macro.c:270 +msgid "__COUNTER__ expanded inside directive with -fdirectives-only" +msgstr "" + +#: macro.c:423 msgid "invalid string literal, ignoring final '\\'" msgstr "geçersiz dizge sabit, son '\\' yoksayılıyor" -#: macro.c:466 +#: macro.c:483 #, 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:538 +#: macro.c:558 msgid "ISO C99 requires rest arguments to be used" msgstr "ISO C kalan argümanların kullanılmış olmasını gerektirir" -#: macro.c:543 +#: macro.c:563 #, 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:548 +#: macro.c:568 #, 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:659 traditional.c:675 +#: macro.c:679 traditional.c:680 #, c-format msgid "unterminated argument list invoking macro \"%s\"" msgstr "sonlandırılmamış argüman listesi çağıran makro \"%s\"" -#: macro.c:762 +#: macro.c:782 #, 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:1278 +#: macro.c:1325 #, c-format msgid "duplicate macro parameter \"%s\"" msgstr "yinelenmiş makro parametresi \"%s\"" -#: macro.c:1324 +#: macro.c:1371 #, c-format msgid "\"%s\" may not appear in macro parameter list" msgstr "\"%s\" makro parametre listesinde görünmeyebilir" -#: macro.c:1332 +#: macro.c:1379 msgid "macro parameters must be comma-separated" msgstr "makro parametreleri virgüllerle ayrılmış olmalı" -#: macro.c:1349 +#: macro.c:1396 msgid "parameter name missing" msgstr "parametre ismi eksik" -#: macro.c:1366 +#: macro.c:1413 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:1371 +#: macro.c:1418 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:1380 +#: macro.c:1427 msgid "missing ')' in macro parameter list" msgstr "makro parametre listesinde ')' eksik" -#: macro.c:1458 +#: macro.c:1476 +msgid "'##' cannot appear at either end of a macro expansion" +msgstr "'##' bir makronun her iki ucunda da görünemez" + +#: macro.c:1510 msgid "ISO C99 requires whitespace after the macro name" msgstr "ISO C99 makro isminden sonra boşluk gerektirir" -#: macro.c:1482 +#: macro.c:1534 msgid "missing whitespace after the macro name" msgstr "makro isminden sonra boşluk gerekir" -#: macro.c:1512 +#: macro.c:1564 msgid "'#' is not followed by a macro parameter" msgstr "'#' işaretinden sonra bir makro parametresi yok" -#: macro.c:1531 -msgid "'##' cannot appear at either end of a macro expansion" -msgstr "'##' bir makronun her iki ucunda da görünemez" - -#: macro.c:1629 +#: macro.c:1683 #, c-format msgid "\"%s\" redefined" msgstr "\"%s\" yeniden tanımlanmış" -#: macro.c:1634 +#: macro.c:1688 msgid "this is the location of the previous definition" msgstr "burası evvelki tanımın yapıldığı yer" -#: macro.c:1684 +#: macro.c:1738 #, c-format msgid "macro argument \"%s\" would be stringified in traditional C" msgstr "makro argümanı \"%s\" geleneksel C'de dizgelenmiş olmalıydı" -#: macro.c:1707 +#: macro.c:1761 #, c-format msgid "invalid hash type %d in cpp_macro_definition" msgstr "cpp_macro_definition içindeki isimli yapı türü %d geçersiz" -#: pch.c:84 pch.c:332 pch.c:354 pch.c:360 +#: pch.c:84 pch.c:332 pch.c:344 pch.c:362 pch.c:368 pch.c:377 msgid "while writing precompiled header" msgstr "önderlemeli başlık yazılırken" -#: pch.c:467 +#: pch.c:485 #, c-format msgid "%s: not used because `%.*s' not defined" msgstr "%s: `%.*s' tanımlı olmadığından kullanılmadı" -#: pch.c:479 +#: pch.c:497 #, c-format msgid "%s: not used because `%.*s' defined as `%s' not `%.*s'" msgstr "%s: `%.*s' kullanılmadı çünkü `%s' olarak tanımlı, `%.*s' değil" -#: pch.c:520 +#: pch.c:538 #, c-format msgid "%s: not used because `%s' is defined" msgstr "%s: `%s' tanımlı olduğundan kullanılmadı" -#: pch.c:533 pch.c:696 +#: pch.c:558 +#, fuzzy, c-format +msgid "%s: not used because `__COUNTER__' is invalid" +msgstr "%s: `%s' tanımlı olduğundan kullanılmadı" + +#: pch.c:567 pch.c:737 msgid "while reading precompiled header" msgstr "önderlemeli başlık okunurken" -#: traditional.c:745 +#: traditional.c:750 #, c-format msgid "detected recursion whilst expanding macro \"%s\"" msgstr "makro \"%s\" genişletilirken iç içelik saptandı" -#: traditional.c:912 +#: traditional.c:917 msgid "syntax error in macro parameter list" msgstr "makro parametre listesinde sözdizimi hatası" + +#~ msgid "no newline at end of file" +#~ msgstr "dosya sonunda satırsonu karakteri yok" diff --git a/libcpp/po/uk.po b/libcpp/po/uk.po new file mode 100644 index 00000000000..1509ca2ef96 --- /dev/null +++ b/libcpp/po/uk.po @@ -0,0 +1,911 @@ +# Ukrainian translation of cpplib. +# Copyright (C) 2007 Free Software Foundation, Inc. +# Maxim V. Dziumanenko , 2007. +# +msgid "" +msgstr "" +"Project-Id-Version: cpplib 4.2.1\n" +"Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n" +"POT-Creation-Date: 2007-11-08 21:08+0000\n" +"PO-Revision-Date: 2007-08-17 11:23+0300\n" +"Last-Translator: Maxim V. Dziumanenko \n" +"Language-Team: Ukrainian \n" +"MIME-Version: 1.0\n" +"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" + +#: charset.c:654 +#, c-format +msgid "conversion from %s to %s not supported by iconv" +msgstr "перетворення з %s у %s не підтримується iconv" + +#: charset.c:657 +msgid "iconv_open" +msgstr "iconv_open" + +#: charset.c:665 +#, c-format +msgid "no iconv implementation, cannot convert from %s to %s" +msgstr "відсутня реалізація iconv, не вдається перетворити з %s на %s" + +#: charset.c:742 +#, c-format +msgid "character 0x%lx is not in the basic source character set\n" +msgstr "символ 0x%lx відсутній у базовому первинному наборі символів\n" + +#: charset.c:759 charset.c:1352 +msgid "converting to execution character set" +msgstr "перетворення на виконуваний набір символів" + +#: charset.c:765 +#, c-format +msgid "character 0x%lx is not unibyte in execution character set" +msgstr "символ 0x%lx не однобайтовий у виконуваному наборі символів" + +#: charset.c:889 +#, c-format +msgid "Character %x might not be NFKC" +msgstr "Символ %x може не бути NFKC" + +#: charset.c:949 +msgid "universal character names are only valid in C++ and C99" +msgstr "універсальні назви символів допустимі лише у C++ та C99" + +#: charset.c:952 +#, c-format +msgid "the meaning of '\\%c' is different in traditional C" +msgstr "сенс '\\%c' відрізняється від традиційної мови C" + +#: charset.c:961 +msgid "In _cpp_valid_ucn but not a UCN" +msgstr "У _cpp_valid_ucn але не UCN" + +#: charset.c:986 +#, c-format +msgid "incomplete universal character name %.*s" +msgstr "неповна універсальна назва символу %.*s" + +#: charset.c:998 +#, c-format +msgid "%.*s is not a valid universal character" +msgstr "%.*s не є допустимим універсальним символом" + +#: charset.c:1008 lex.c:484 +msgid "'$' in identifier or number" +msgstr "'$' у ідентифікаторі чи числі" + +#: charset.c:1018 +#, c-format +msgid "universal character %.*s is not valid in an identifier" +msgstr "універсальний символ %.*s не є допустимим у ідентифікаторі" + +#: charset.c:1022 +#, c-format +msgid "universal character %.*s is not valid at the start of an identifier" +msgstr "універсальний символ %.*s не є допустимим на початку ідентифікатора" + +#: charset.c:1056 charset.c:1571 +msgid "converting UCN to source character set" +msgstr "перетворення UCN на первинний набір символів" + +#: charset.c:1060 +msgid "converting UCN to execution character set" +msgstr "перетворення UCN на виконуваний набір символів" + +#: charset.c:1132 +msgid "the meaning of '\\x' is different in traditional C" +msgstr "сенс '\\x' відрізняється від традиційної мови C" + +#: charset.c:1149 +msgid "\\x used with no following hex digits" +msgstr "\\x використовується з наступними шістнадцятковими цифрами" + +#: charset.c:1156 +msgid "hex escape sequence out of range" +msgstr "шістнадцяткова escape-послідовність поза межами діапазону" + +#: charset.c:1195 +msgid "octal escape sequence out of range" +msgstr "вісімкова escape-послідовність поза межами діапазону" + +#: charset.c:1263 +msgid "the meaning of '\\a' is different in traditional C" +msgstr "сенс '\\a' відрізняється від традиційної мови C" + +#: charset.c:1270 +#, c-format +msgid "non-ISO-standard escape sequence, '\\%c'" +msgstr "escape-послідовність не за стандартом ISO, '\\%c'" + +#: charset.c:1278 +#, c-format +msgid "unknown escape sequence '\\%c'" +msgstr "Невідома escape-послідовність '\\%c'" + +#: charset.c:1286 +#, c-format +msgid "unknown escape sequence: '\\%s'" +msgstr "Невідома escape-послідовність: '\\%s'" + +#: charset.c:1293 +msgid "converting escape sequence to execution character set" +msgstr "escape-послідовність перетворюється на виконуваний набір символів" + +#: charset.c:1415 charset.c:1478 +msgid "character constant too long for its type" +msgstr "символьна константа надто довга для вказаного типу" + +#: charset.c:1418 +msgid "multi-character character constant" +msgstr "багатосимвольна символьна константа" + +#: charset.c:1510 +msgid "empty character constant" +msgstr "порожня символьна константа" + +#: charset.c:1612 +#, c-format +msgid "failure to convert %s to %s" +msgstr "помилка при перетворені %s на %s" + +#: directives.c:215 directives.c:241 +#, c-format +msgid "extra tokens at end of #%s directive" +msgstr "зайві лексеми наприкінці директиви #%s" + +#: directives.c:344 +#, c-format +msgid "#%s is a GCC extension" +msgstr "#%s є розширенням GCC" + +#: directives.c:356 +msgid "suggest not using #elif in traditional C" +msgstr "рекомендується не використовувати #elif у традиційній мові C" + +#: directives.c:359 +#, c-format +msgid "traditional C ignores #%s with the # indented" +msgstr "у традиційній мові C ігноруються #%s, якщо # з відступом" + +#: directives.c:363 +#, c-format +msgid "suggest hiding #%s from traditional C with an indented #" +msgstr "рекомендується приховувати #%s у традиційній мові C використовуючи відступ перед #" + +#: directives.c:389 +msgid "embedding a directive within macro arguments is not portable" +msgstr "вбудована директива з макро-аргументами не є переносимою" + +#: directives.c:409 +msgid "style of line directive is a GCC extension" +msgstr "стиль директиви line є розширенням GCC" + +#: directives.c:464 +#, c-format +msgid "invalid preprocessing directive #%s" +msgstr "неправильна директива препроцесора #%s" + +#: directives.c:532 +msgid "\"defined\" cannot be used as a macro name" +msgstr "\"defined\" не може використовуватись як назва макросу" + +#: directives.c:538 +#, c-format +msgid "\"%s\" cannot be used as a macro name as it is an operator in C++" +msgstr "\"%s\" не може використовуватись як назва макросу, оскільки це - оператор у C++" + +#: directives.c:541 +#, c-format +msgid "no macro name given in #%s directive" +msgstr "не вказаний макрос у директиві #%s" + +#: directives.c:544 +msgid "macro names must be identifiers" +msgstr "назви макросів повинні бути ідентифікаторами" + +#: directives.c:585 +#, c-format +msgid "undefining \"%s\"" +msgstr "скасовується визначення \"%s\"" + +#: directives.c:640 +msgid "missing terminating > character" +msgstr "відсутній завершальний символ >" + +#: directives.c:695 +#, c-format +msgid "#%s expects \"FILENAME\" or " +msgstr "#%s очікує \"FILENAME\" або " + +#: directives.c:739 +#, c-format +msgid "empty filename in #%s" +msgstr "порожня назва файлу у #%s" + +#: directives.c:749 +msgid "#include nested too deeply" +msgstr "надто глибоке вкладання #include" + +#: directives.c:790 +msgid "#include_next in primary source file" +msgstr "#include_next у первинному файлі тексту програми" + +#: directives.c:816 +#, c-format +msgid "invalid flag \"%s\" in line directive" +msgstr "некоректна ознака \"%s\" у директиві line" + +#: directives.c:868 +#, c-format +msgid "\"%s\" after #line is not a positive integer" +msgstr "\"%s\" після #line не є додатнім цілим числом" + +#: directives.c:874 +msgid "line number out of range" +msgstr "номер рядка за межами діапазону" + +#: directives.c:887 directives.c:964 +#, c-format +msgid "\"%s\" is not a valid filename" +msgstr "\"%s\" не є коректною назвою файлу" + +#: directives.c:924 +#, c-format +msgid "\"%s\" after # is not a positive integer" +msgstr "\"%s\" після # не є додатнім цілим числом" + +#: directives.c:1026 +#, c-format +msgid "invalid #%s directive" +msgstr "некоректна директива #%s" + +#: directives.c:1089 +#, c-format +msgid "registering pragmas in namespace \"%s\" with mismatched name expansion" +msgstr "прагми реєструються у просторі назв \"%s\" за відсутності розширення назв" + +#: directives.c:1098 +#, c-format +msgid "registering pragma \"%s\" with name expansion and no namespace" +msgstr "прагма \"%s\" реєструється з розширенням назви але без простору назви" + +#: directives.c:1116 +#, c-format +msgid "registering \"%s\" as both a pragma and a pragma namespace" +msgstr "\"%s\" реєструється як прагма та як прострі назв прагм" + +#: directives.c:1119 +#, c-format +msgid "#pragma %s %s is already registered" +msgstr "#pragma %s %s вже зареєстровано" + +#: directives.c:1122 +#, c-format +msgid "#pragma %s is already registered" +msgstr "#pragma %s вже зареєстровано" + +#: directives.c:1152 +msgid "registering pragma with NULL handler" +msgstr "реєструється pragma з NULL-обробником" + +#: directives.c:1362 +msgid "#pragma once in main file" +msgstr "#pragma один раз у головному файлі" + +#: directives.c:1385 +msgid "invalid #pragma GCC poison directive" +msgstr "некоректна #pragma GCC poison директива" + +#: directives.c:1394 +#, c-format +msgid "poisoning existing macro \"%s\"" +msgstr "poisoning існуючих макросів \"%s\"" + +#: directives.c:1413 +msgid "#pragma system_header ignored outside include file" +msgstr "#pragma system_header проігноровано за межами включеного файлу" + +#: directives.c:1437 +#, c-format +msgid "cannot find source file %s" +msgstr "не вдається знайти первинний файл %s" + +#: directives.c:1441 +#, c-format +msgid "current file is older than %s" +msgstr "поточний файл старіший ніж %s" + +#: directives.c:1620 +msgid "_Pragma takes a parenthesized string literal" +msgstr "_Pragma охоплює дужками символьний літерал" + +#: directives.c:1693 +msgid "#else without #if" +msgstr "#else без #if" + +#: directives.c:1698 +msgid "#else after #else" +msgstr "#else після #else" + +#: directives.c:1700 directives.c:1733 +msgid "the conditional began here" +msgstr "умова починається тут" + +#: directives.c:1726 +msgid "#elif without #if" +msgstr "#elif без #if" + +#: directives.c:1731 +msgid "#elif after #else" +msgstr "#elif після #else" + +#: directives.c:1761 +msgid "#endif without #if" +msgstr "#endif беp #if" + +#: directives.c:1838 +msgid "missing '(' after predicate" +msgstr "відсутня '(' після предикату" + +#: directives.c:1853 +msgid "missing ')' to complete answer" +msgstr "відсутня ')' для завершення відповіді" + +#: directives.c:1873 +msgid "predicate's answer is empty" +msgstr "відповідь предиката порожня" + +#: directives.c:1900 +msgid "assertion without predicate" +msgstr "твердження без предикату" + +#: directives.c:1902 +msgid "predicate must be an identifier" +msgstr "предикат має бути ідентифікатором" + +#: directives.c:1988 +#, c-format +msgid "\"%s\" re-asserted" +msgstr "\"%s\" повторне ствердження" + +#: directives.c:2271 +#, c-format +msgid "unterminated #%s" +msgstr "незавершене #%s" + +#: directives-only.c:221 lex.c:1016 traditional.c:162 +msgid "unterminated comment" +msgstr "незавершений коментар" + +#: errors.c:118 +msgid "warning: " +msgstr "попередження: " + +#: errors.c:120 +msgid "internal error: " +msgstr "внутрішня помилка: " + +#: errors.c:122 +msgid "error: " +msgstr "error: " + +#: errors.c:186 +msgid "stdout" +msgstr "stdout" + +#: errors.c:188 +#, c-format +msgid "%s: %s" +msgstr "%s: %s" + +#: expr.c:261 +msgid "too many decimal points in number" +msgstr "надто багато десяткових точок у числі" + +#: expr.c:290 expr.c:365 +#, fuzzy +msgid "fixed-point constants are a GCC extension" +msgstr "уявні константи є розширенням GCC" + +#: expr.c:303 +#, fuzzy, c-format +msgid "invalid digit \"%c\" in binary constant" +msgstr "некоректна цифра \"%c\" у вісімковій константі" + +#: expr.c:305 +#, c-format +msgid "invalid digit \"%c\" in octal constant" +msgstr "некоректна цифра \"%c\" у вісімковій константі" + +#: expr.c:313 +#, fuzzy +msgid "invalid prefix \"0b\" for floating constant" +msgstr "некоректний суфікс \"%.*s\" у константі з плаваючою комою" + +#: expr.c:319 +msgid "use of C99 hexadecimal floating constant" +msgstr "використовуйте десятково-шістнадцяткову константу з плаваючою комою мови C99" + +#: expr.c:328 +msgid "exponent has no digits" +msgstr "експонента не має цифр" + +#: expr.c:335 +msgid "hexadecimal floating constants require an exponent" +msgstr "для десятково-шістнадцяткової константи з плаваючою комою потрібна експонента" + +#: expr.c:341 +#, c-format +msgid "invalid suffix \"%.*s\" on floating constant" +msgstr "некоректний суфікс \"%.*s\" у константі з плаваючою комою" + +#: expr.c:351 expr.c:393 +#, c-format +msgid "traditional C rejects the \"%.*s\" suffix" +msgstr "традиційною мовою C не сприймається суфікс \"%.*s\"" + +#: expr.c:358 +#, c-format +msgid "invalid suffix \"%.*s\" with hexadecimal floating constant" +msgstr "некоректний суфікс \"%.*s\" з десятково-шістнадцятковою константою з плаваючою комою" + +#: expr.c:369 +#, fuzzy +msgid "decimal float constants are a GCC extension" +msgstr "уявні константи є розширенням GCC" + +#: expr.c:379 +#, c-format +msgid "invalid suffix \"%.*s\" on integer constant" +msgstr "некоректний суфікс \"%.*s\" у цілій константі" + +#: expr.c:401 +msgid "use of C99 long long integer constant" +msgstr "використовуйте цілу константу long long з C99" + +#: expr.c:409 +msgid "imaginary constants are a GCC extension" +msgstr "уявні константи є розширенням GCC" + +#: expr.c:412 +#, fuzzy +msgid "binary constants are a GCC extension" +msgstr "уявні константи є розширенням GCC" + +#: expr.c:505 +msgid "integer constant is too large for its type" +msgstr "ціла константа надто велика для вказаного типу" + +#: expr.c:517 +msgid "integer constant is so large that it is unsigned" +msgstr "ціла константа така велика, що вона не матиме знаку" + +#: expr.c:612 +msgid "missing ')' after \"defined\"" +msgstr "відсутня ')' після \"defined\"" + +#: expr.c:619 +msgid "operator \"defined\" requires an identifier" +msgstr "для оператора \"defined\" потрібен ідентифікатор" + +#: expr.c:627 +#, c-format +msgid "(\"%s\" is an alternative token for \"%s\" in C++)" +msgstr "(\"%s\" - альтернативна лексема для \"%s\" у C++)" + +#: expr.c:637 +msgid "this use of \"defined\" may not be portable" +msgstr "використання \"defined\" може бути непереносимим" + +#: expr.c:676 +msgid "floating constant in preprocessor expression" +msgstr "константа з плаваючою комою у виразі препроцесора" + +#: expr.c:682 +msgid "imaginary number in preprocessor expression" +msgstr "уявне число у виразі препроцесора" + +#: expr.c:727 +#, c-format +msgid "\"%s\" is not defined" +msgstr "\"%s\" не визначено" + +#: expr.c:855 expr.c:884 +#, c-format +msgid "missing binary operator before token \"%s\"" +msgstr "відсутній двійковий оператор перед лексемою \"%s\"" + +#: expr.c:875 +#, c-format +msgid "token \"%s\" is not valid in preprocessor expressions" +msgstr "лексема \"%s\" не є допустимим у виразі препроцесора" + +#: expr.c:892 +msgid "missing expression between '(' and ')'" +msgstr "відсутній вираз між '(' та ')'" + +#: expr.c:895 +msgid "#if with no expression" +msgstr "відсутній вираз після #if" + +#: expr.c:898 +#, c-format +msgid "operator '%s' has no right operand" +msgstr "оператор '%s' не містить коректного операнду" + +#: expr.c:903 +#, c-format +msgid "operator '%s' has no left operand" +msgstr "оператор '%s' не містить лівого операнду" + +#: expr.c:929 +msgid " ':' without preceding '?'" +msgstr " ':' без подовження '?'" + +#: expr.c:956 +msgid "unbalanced stack in #if" +msgstr "незбалансований стек у #if" + +#: expr.c:975 +#, c-format +msgid "impossible operator '%u'" +msgstr "неможливий оператор '%u'" + +#: expr.c:1065 +msgid "missing ')' in expression" +msgstr "відсутня ')' у виразі" + +#: expr.c:1086 +msgid "'?' without following ':'" +msgstr "'?' без наступного ':'" + +#: expr.c:1096 +msgid "integer overflow in preprocessor expression" +msgstr "переповнення цілого числа у виразі препроцесора" + +#: expr.c:1101 +msgid "missing '(' in expression" +msgstr "відсутня '(' у виразі" + +#: expr.c:1133 +#, c-format +msgid "the left operand of \"%s\" changes sign when promoted" +msgstr "лівий операнд \"%s\" змінює знак при підвищенні" + +#: expr.c:1138 +#, c-format +msgid "the right operand of \"%s\" changes sign when promoted" +msgstr "правий оператор \"%s\" змінює знак при підвищенні" + +#: expr.c:1397 +msgid "traditional C rejects the unary plus operator" +msgstr "у традиційній мові C не допускається унарний оператор плюс" + +#: expr.c:1480 +msgid "comma operator in operand of #if" +msgstr "оператор кома у операнді #if" + +#: expr.c:1612 +msgid "division by zero in #if" +msgstr "ділення на нуль у #if" + +#: files.c:442 +msgid "NULL directory in find_file" +msgstr "значення каталогу NULL у find_file" + +#: files.c:480 +msgid "one or more PCH files were found, but they were invalid" +msgstr "знайдено один або більше файлів PCH, але вони некоректні" + +#: files.c:483 +msgid "use -Winvalid-pch for more information" +msgstr "докладніша інформація виводиться, якщо вказати -Winvalid-pch" + +#: files.c:570 +#, c-format +msgid "%s is a block device" +msgstr "%s є блочним пристроєм" + +#: files.c:587 +#, c-format +msgid "%s is too large" +msgstr "%s надто великий" + +#: files.c:622 +#, c-format +msgid "%s is shorter than expected" +msgstr "%s коротший ніж очікувалося" + +#: files.c:852 +#, c-format +msgid "no include path in which to search for %s" +msgstr "відсутні шлях включення у якому ведеться пошук для %s" + +#: files.c:1157 +msgid "Multiple include guards may be useful for:\n" +msgstr "Декілька include guards можуть бути корисні для:\n" + +#: init.c:426 +msgid "cppchar_t must be an unsigned type" +msgstr "cppchar_t має бути беззнакового типу" + +#: init.c:430 +#, c-format +msgid "preprocessor arithmetic has maximum precision of %lu bits; target requires %lu bits" +msgstr "арифметика препроцесора має максимальну точність %lu біт; ціль вимагає %lu біт" + +#: init.c:437 +msgid "CPP arithmetic must be at least as precise as a target int" +msgstr "арифметика CPP повинна мати принаймні таку ж точність я у цільового цілого числа" + +#: init.c:440 +msgid "target char is less than 8 bits wide" +msgstr "ширина цільового типу char менша за 8 біт" + +#: init.c:444 +msgid "target wchar_t is narrower than target char" +msgstr "цільовий wchar_t є вужчим за цільовий char" + +#: init.c:448 +msgid "target int is narrower than target char" +msgstr "цільовий тип int є вужчим ніж цільовий char" + +#: init.c:453 +msgid "CPP half-integer narrower than CPP character" +msgstr "CPP half-integer є вужчим за CPP character" + +#: init.c:457 +#, 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 біт" + +#: lex.c:283 +msgid "backslash and newline separated by space" +msgstr "зворотна коса риска та символ нового рядка відділяються пробілом" + +#: lex.c:288 +msgid "backslash-newline at end of file" +msgstr "зворотна коса риска та символ нового рядка наприкінці файлу" + +#: lex.c:303 +#, c-format +msgid "trigraph ??%c converted to %c" +msgstr "тристоронній ??%c перетворено на %c" + +#: lex.c:310 +#, c-format +msgid "trigraph ??%c ignored, use -trigraphs to enable" +msgstr "тристоронній ??%c проігноровано, використовуйте -trigraphs, щоб увімкнути" + +#: lex.c:356 +msgid "\"/*\" within comment" +msgstr "\"/*\" всередині коментаря" + +#: lex.c:414 +#, c-format +msgid "%s in preprocessing directive" +msgstr "%s в директиві препроцесора" + +#: lex.c:423 +msgid "null character(s) ignored" +msgstr "null-символи проігноровані" + +#: lex.c:460 +#, c-format +msgid "`%.*s' is not in NFKC" +msgstr "`%.*s' не у NFKC" + +#: lex.c:463 +#, c-format +msgid "`%.*s' is not in NFC" +msgstr "`%.*s' не у NFC" + +#: lex.c:551 +#, c-format +msgid "attempt to use poisoned \"%s\"" +msgstr "спроба використати poisoned \"%s\"" + +#: lex.c:559 +msgid "__VA_ARGS__ can only appear in the expansion of a C99 variadic macro" +msgstr "__VA_ARGS__ може з'являтися лише у розширенні макросу variadic з мови C99" + +#: lex.c:659 +msgid "null character(s) preserved in literal" +msgstr "null-символи збережені буквально" + +#: lex.c:662 +#, c-format +msgid "missing terminating %c character" +msgstr "відсутній завершальний символ %c" + +#: lex.c:1027 +msgid "C++ style comments are not allowed in ISO C90" +msgstr "Коментарі у стилі C++ неприпустимі згідно ISO C90" + +#: lex.c:1029 +msgid "(this will be reported only once per input file)" +msgstr "(повідомлення про це з'явиться лише один для вхідного файлу)" + +#: lex.c:1034 +msgid "multi-line comment" +msgstr "багаторядковий коментар" + +#: lex.c:1347 +#, c-format +msgid "unspellable token %s" +msgstr "неможливо розібрати лексему %s" + +#: line-map.c:320 +#, c-format +msgid "In file included from %s:%u" +msgstr "У файлі включеному з %s:%u" + +#: line-map.c:338 +#, c-format +msgid "" +",\n" +" from %s:%u" +msgstr "" +",\n" +" з %s:%u" + +#: macro.c:84 +#, c-format +msgid "macro \"%s\" is not used" +msgstr "макрос \"%s\" не використовується" + +#: macro.c:123 macro.c:319 +#, c-format +msgid "invalid built-in macro \"%s\"" +msgstr "некоректний вбудований макрос \"%s\"" + +#: macro.c:157 +msgid "could not determine file timestamp" +msgstr "не вдається визначити часову мітку файлу" + +#: macro.c:254 +msgid "could not determine date and time" +msgstr "не вдається визначити дату та час" + +#: macro.c:270 +msgid "__COUNTER__ expanded inside directive with -fdirectives-only" +msgstr "" + +#: macro.c:423 +msgid "invalid string literal, ignoring final '\\'" +msgstr "некоректний символьний літерал, ігнорується завершальний символ '\\'" + +#: macro.c:483 +#, c-format +msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token" +msgstr "вставка \"%s\" та \"%s\" не призводить до коректної лексеми препроцесора" + +#: macro.c:558 +msgid "ISO C99 requires rest arguments to be used" +msgstr "ISO C99 вимагає, щоб використовувались решта аргументів" + +#: macro.c:563 +#, c-format +msgid "macro \"%s\" requires %u arguments, but only %u given" +msgstr "для макросу \"%s\" потрібно вказати %u аргументів, але вказано лише %u" + +#: macro.c:568 +#, c-format +msgid "macro \"%s\" passed %u arguments, but takes just %u" +msgstr "макросу \"%s\" передано %u аргументів, але з них використано лише %u" + +#: macro.c:679 traditional.c:680 +#, c-format +msgid "unterminated argument list invoking macro \"%s\"" +msgstr "незавершений список аргументів у виклику макросу \"%s\"" + +#: macro.c:782 +#, c-format +msgid "function-like macro \"%s\" must be used with arguments in traditional C" +msgstr "подібний до функції макрос \"%s\" має використовуватися з аргументами у традиційній мові C" + +#: macro.c:1325 +#, c-format +msgid "duplicate macro parameter \"%s\"" +msgstr "дублікат параметра макросу \"%s\"" + +#: macro.c:1371 +#, c-format +msgid "\"%s\" may not appear in macro parameter list" +msgstr "\"%s\" не може з'являтися у списку параметрів макросу" + +#: macro.c:1379 +msgid "macro parameters must be comma-separated" +msgstr "параметри макросу мають бути розділені комами" + +#: macro.c:1396 +msgid "parameter name missing" +msgstr "відсутня назва параметра" + +#: macro.c:1413 +msgid "anonymous variadic macros were introduced in C99" +msgstr "анонімні макроси variadic започатковані у C99" + +#: macro.c:1418 +msgid "ISO C does not permit named variadic macros" +msgstr "ISO C не припускає іменовані макроси variadic" + +#: macro.c:1427 +msgid "missing ')' in macro parameter list" +msgstr "відсутня ')' у списку параметрів макросу" + +#: macro.c:1476 +msgid "'##' cannot appear at either end of a macro expansion" +msgstr "'##' не може з'являтися з обох кінців макро-розширення" + +#: macro.c:1510 +msgid "ISO C99 requires whitespace after the macro name" +msgstr "у ISO C99 має бути пробіл після назви маросу" + +#: macro.c:1534 +msgid "missing whitespace after the macro name" +msgstr "відсутні пробіл після назви макросу" + +#: macro.c:1564 +msgid "'#' is not followed by a macro parameter" +msgstr "'#' не супроводжується параметром макросу" + +#: macro.c:1683 +#, c-format +msgid "\"%s\" redefined" +msgstr "повторне визначення \"%s\"" + +#: macro.c:1688 +msgid "this is the location of the previous definition" +msgstr "...це місце першого визначення" + +#: macro.c:1738 +#, c-format +msgid "macro argument \"%s\" would be stringified in traditional C" +msgstr "аргумент макросу \"%s\" був би перетворений на рядок у традиційній мові C" + +#: macro.c:1761 +#, c-format +msgid "invalid hash type %d in cpp_macro_definition" +msgstr "некоректний типу хешу %d у cpp_macro_definition" + +#: pch.c:84 pch.c:332 pch.c:344 pch.c:362 pch.c:368 pch.c:377 +msgid "while writing precompiled header" +msgstr "при записі попередньо скомпільованих заголовків" + +#: pch.c:485 +#, c-format +msgid "%s: not used because `%.*s' not defined" +msgstr "%s: не використовується оскільки `%.*s' не визначено" + +#: pch.c:497 +#, c-format +msgid "%s: not used because `%.*s' defined as `%s' not `%.*s'" +msgstr "%s: не використовується, оскільки `%.*s' визначено як `%s' не `%.*s'" + +#: pch.c:538 +#, c-format +msgid "%s: not used because `%s' is defined" +msgstr "%s: не використовується, оскільки визначено `%s'" + +#: pch.c:558 +#, fuzzy, c-format +msgid "%s: not used because `__COUNTER__' is invalid" +msgstr "%s: не використовується, оскільки визначено `%s'" + +#: pch.c:567 pch.c:737 +msgid "while reading precompiled header" +msgstr "при читанні попередньо скомпільованого заголовка" + +#: traditional.c:750 +#, c-format +msgid "detected recursion whilst expanding macro \"%s\"" +msgstr "при розширенні макросу \"%s\" виявлено рекурсію" + +#: traditional.c:917 +msgid "syntax error in macro parameter list" +msgstr "синтаксична помилка у списку параметрів макросу" + +#~ msgid "no newline at end of file" +#~ msgstr "відсутній символ нового рядка наприкінці файлу" diff --git a/libcpp/po/vi.po b/libcpp/po/vi.po index c8b4e821388..80b1aff11a3 100644 --- a/libcpp/po/vi.po +++ b/libcpp/po/vi.po @@ -3,17 +3,17 @@ # Clytie Siddall , 2005-2007. msgid "" msgstr "" -"Project-Id-Version: cpplib 4.2.0\n" +"Project-Id-Version: cpplib 4.3-b20071109\n" "Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n" -"POT-Creation-Date: 2007-05-13 19:48-0700\n" -"PO-Revision-Date: 2007-05-28 21:25+0930\n" +"POT-Creation-Date: 2007-11-08 21:08+0000\n" +"PO-Revision-Date: 2007-11-30 23:15+1030\n" "Last-Translator: Clytie Siddall \n" "Language-Team: Vietnamese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=1; plural=0\n" -"X-Generator: LocFactoryEditor 1.6.3b1\n" +"X-Generator: LocFactoryEditor 1.7b1\n" #: charset.c:654 #, c-format @@ -71,7 +71,7 @@ msgstr "tên ký tự chung %.*s chưa hoàn thành" msgid "%.*s is not a valid universal character" msgstr "%.*s không phải là ký tự chung hợp lệ" -#: charset.c:1008 lex.c:472 +#: charset.c:1008 lex.c:484 msgid "'$' in identifier or number" msgstr "gặp « $ » trong bộ nhận hiện hay con số" @@ -149,231 +149,235 @@ msgstr "hằng ký tự trống" msgid "failure to convert %s to %s" msgstr "lỗi chuyển đổi %s sang %s" -#: directives.c:214 directives.c:240 +#: directives.c:215 directives.c:241 #, c-format msgid "extra tokens at end of #%s directive" msgstr "gặp hiệu bài thêm tại kết thúc của chỉ thị #%s" -#: directives.c:343 +#: directives.c:344 #, c-format msgid "#%s is a GCC extension" msgstr "#%s là phần mở rộng kiểu GCC" -#: directives.c:355 +#: directives.c:356 msgid "suggest not using #elif in traditional C" msgstr "khuyên bạn không dùng #elif trong ngôn ngữ C truyền thống" -#: directives.c:358 +#: directives.c:359 #, c-format msgid "traditional C ignores #%s with the # indented" msgstr "ngôn ngữ C truyền thống bỏ qua #%s với # được thụt lề" -#: directives.c:362 +#: directives.c:363 #, 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ề" -#: directives.c:388 +#: directives.c:389 msgid "embedding a directive within macro arguments is not portable" msgstr "khả năng nhúng chỉ thị vào đối số vĩ lệnh không thể mạng theo" -#: directives.c:408 +#: directives.c:409 msgid "style of line directive is a GCC extension" msgstr "kiểu chỉ thị dòng là phần mở rộng GCC" -#: directives.c:458 +#: directives.c:464 #, c-format msgid "invalid preprocessing directive #%s" msgstr "chỉ thị tiền xử lý không hợp lệ #%s" -#: directives.c:524 +#: directives.c:532 msgid "\"defined\" cannot be used as a macro name" msgstr "không thể dùng « defined » (đã xác định) như là tên vĩ lệnh" -#: directives.c:530 +#: directives.c:538 #, c-format msgid "\"%s\" cannot be used as a macro name as it is an operator in C++" msgstr "không thể dùng « %s » như là tên vĩ lệnh vì nó là toán tử trong ngôn ngữ C++" -#: directives.c:533 +#: directives.c:541 #, c-format msgid "no macro name given in #%s directive" msgstr "chỉ thị #%s không chứa tên vĩ lệnh" -#: directives.c:536 +#: directives.c:544 msgid "macro names must be identifiers" msgstr "mọi tên vĩ lệnh phải là bộ nhận diện" -#: directives.c:577 +#: directives.c:585 #, c-format msgid "undefining \"%s\"" msgstr "đang hủy xác định « %s »" -#: directives.c:632 +#: directives.c:640 msgid "missing terminating > character" msgstr "thiếu ký tự « > » chấm dứt" -#: directives.c:687 +#: directives.c:695 #, c-format msgid "#%s expects \"FILENAME\" or " msgstr "#%s ngờ \"TÊN_TẬP_TIN\" hoặc " -#: directives.c:727 +#: directives.c:739 #, c-format msgid "empty filename in #%s" msgstr "#%s chứa tên tập tin trống" -#: directives.c:737 +#: directives.c:749 msgid "#include nested too deeply" msgstr "« #include » (bao gồm) lồng nhau quá sâu" -#: directives.c:778 +#: directives.c:790 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:804 +#: directives.c:816 #, 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:856 +#: directives.c:868 #, 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:862 +#: directives.c:874 msgid "line number out of range" msgstr "số hiệu dòng ở ngoài phạm vi" -#: directives.c:875 directives.c:952 +#: directives.c:887 directives.c:964 #, 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:912 +#: directives.c:924 #, 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:1014 +#: directives.c:1026 #, c-format msgid "invalid #%s directive" msgstr "chỉ thị #%s không hợp lệ" -#: directives.c:1077 +#: directives.c:1089 #, 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 " -#: directives.c:1086 +#: directives.c:1098 #, 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:1104 +#: directives.c:1116 #, 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." -#: directives.c:1107 +#: directives.c:1119 #, c-format msgid "#pragma %s %s is already registered" msgstr "« #pragma %s %s » đã được đăng ký" -#: directives.c:1110 +#: directives.c:1122 #, c-format msgid "#pragma %s is already registered" msgstr "« #pragma %s » đã được đăng ký" -#: directives.c:1140 +#: directives.c:1152 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:1350 +#: directives.c:1362 msgid "#pragma once in main file" msgstr "Có « #pragma » một lần trong tập tin chính" -#: directives.c:1373 +#: directives.c:1385 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:1382 +#: directives.c:1394 #, c-format msgid "poisoning existing macro \"%s\"" msgstr "đang vô hiệu hóa vĩ lệnh tồn tại « %s »" -#: directives.c:1403 +#: directives.c:1413 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:1427 +#: directives.c:1437 #, c-format msgid "cannot find source file %s" msgstr "không tìm thấy tập tin nguồn %s" -#: directives.c:1431 +#: directives.c:1441 #, c-format msgid "current file is older than %s" msgstr "tập tin hiện thời là cũ hơn %s" -#: directives.c:1599 +#: directives.c:1620 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:1671 +#: directives.c:1693 msgid "#else without #if" msgstr "#else (nếu không) không có #if (nếu)" -#: directives.c:1676 +#: directives.c:1698 msgid "#else after #else" msgstr "#else (nếu không) nằm sau #else" -#: directives.c:1678 directives.c:1711 +#: directives.c:1700 directives.c:1733 msgid "the conditional began here" msgstr "bộ điều kiện đã bắt đầu ở đây" -#: directives.c:1704 +#: directives.c:1726 msgid "#elif without #if" msgstr "#elif (nếu không thì nếu) không có #if (nếu)" -#: directives.c:1709 +#: directives.c:1731 msgid "#elif after #else" msgstr "#elif (nếu không thì nếu) nằm sau #else (nếu không)" -#: directives.c:1739 +#: directives.c:1761 msgid "#endif without #if" msgstr "#endif (thôi nếu) không có #if (nếu)" -#: directives.c:1816 +#: directives.c:1838 msgid "missing '(' after predicate" msgstr "thiếu « ( » nằm sau vị ngữ" -#: directives.c:1831 +#: directives.c:1853 msgid "missing ')' to complete answer" msgstr "thiếu « ) » để xong trả lời" -#: directives.c:1851 +#: directives.c:1873 msgid "predicate's answer is empty" msgstr "vị ngữ chứa trả lời trống" -#: directives.c:1878 +#: directives.c:1900 msgid "assertion without predicate" msgstr "sự khẳng định không có vị ngữ" -#: directives.c:1880 +#: directives.c:1902 msgid "predicate must be an identifier" msgstr "vị ngữ phải là bộ nhận diện" -#: directives.c:1966 +#: directives.c:1988 #, c-format msgid "\"%s\" re-asserted" msgstr "« %s » được khẳng định lại" -#: directives.c:2190 +#: directives.c:2271 #, c-format msgid "unterminated #%s" msgstr "#%s chưa chấm dứt" +#: directives-only.c:221 lex.c:1016 traditional.c:162 +msgid "unterminated comment" +msgstr "gặp chú thích chưa được chấm dứt" + #: errors.c:118 msgid "warning: " msgstr "cảnh báo : " @@ -395,332 +399,345 @@ msgstr "thiết bị xuất chuẩn" msgid "%s: %s" msgstr "%s: %s" -#: expr.c:203 +#: expr.c:261 msgid "too many decimal points in number" msgstr "con số chứa quá nhiều dấu thập phân" -#: expr.c:223 +#: expr.c:290 expr.c:365 +msgid "fixed-point constants are a GCC extension" +msgstr "hằng định điểm là phần mở rộng GCC" + +#: expr.c:303 +#, c-format +msgid "invalid digit \"%c\" in binary constant" +msgstr "gặp chữ số không hợp lệ « %c » trong hằng nhị phân" + +#: expr.c:305 #, c-format msgid "invalid digit \"%c\" in octal constant" msgstr "gặp chữ số không hợp lệ « %c » trong hằng bát phân" -#: expr.c:229 +#: expr.c:313 +msgid "invalid prefix \"0b\" for floating constant" +msgstr "gặp tiền tố không hợp lệ « 0b » cho hằng trôi nổi" + +#: expr.c:319 msgid "use of C99 hexadecimal floating constant" msgstr "dùng hằng trôi nổi thập lục C99" -#: expr.c:238 +#: expr.c:328 msgid "exponent has no digits" msgstr "số mũ không co chữ số nào" -#: expr.c:245 +#: expr.c:335 msgid "hexadecimal floating constants require an exponent" msgstr "mỗi hằng trôi nổi thập lục cần đến một số mũ" -#: expr.c:251 +#: expr.c:341 #, 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 trôi nổi" -#: expr.c:261 expr.c:295 +#: expr.c:351 expr.c:393 #, 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:268 +#: expr.c:358 #, 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 trôi nổi thập lục" -#: expr.c:281 +#: expr.c:369 +msgid "decimal float constants are a GCC extension" +msgstr "hằng trôi nổi thập lục là phần mở rộng GCC" + +#: expr.c:379 #, 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:303 +#: expr.c:401 msgid "use of C99 long long integer constant" msgstr "dùng hằng số nguyên dài dài C99" -#: expr.c:310 +#: expr.c:409 msgid "imaginary constants are a GCC extension" msgstr "hằng ảo là phần mở rộng GCC" -#: expr.c:396 +#: expr.c:412 +msgid "binary constants are a GCC extension" +msgstr "hằng nhị phân là phần mở rộng GCC" + +#: expr.c:505 msgid "integer constant is too large for its type" msgstr "hằng số nguyên quá lớn cho kiểu nó" -#: expr.c:408 +#: expr.c:517 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:490 +#: expr.c:612 msgid "missing ')' after \"defined\"" msgstr "thiếu « ) » nằm sau « defined » (đã xác định)" -#: expr.c:497 +#: expr.c:619 msgid "operator \"defined\" requires an identifier" msgstr "toán tử « defined » (đã xác định) cần đến bộ nhận diện" -#: expr.c:505 +#: expr.c:627 #, c-format msgid "(\"%s\" is an alternative token for \"%s\" in C++)" msgstr "(« %s » là một hiệu bài thay thế cho « %s » trong ngôn ngữ C++)" -#: expr.c:515 +#: expr.c:637 msgid "this use of \"defined\" may not be portable" msgstr "khả năng dùng « defined » (đã xác định) có lẽ không thể mạng theo" -#: expr.c:554 +#: expr.c:676 msgid "floating constant in preprocessor expression" msgstr "gặp hằng trôi nổi nằm trong biểu thức tiền xử lý" -#: expr.c:560 +#: expr.c:682 msgid "imaginary number in preprocessor expression" msgstr "gặp số ảo nằm trong biểu thức tiền xử lý" -#: expr.c:605 +#: expr.c:727 #, c-format msgid "\"%s\" is not defined" msgstr "chưa xác định « %s »" -#: expr.c:733 expr.c:762 +#: expr.c:855 expr.c:884 #, c-format msgid "missing binary operator before token \"%s\"" msgstr "thiếu toán từ nhị phân nằm trước hiệu bài « %s »" -#: expr.c:753 +#: expr.c:875 #, c-format msgid "token \"%s\" is not valid in preprocessor expressions" msgstr "hiệu bài « %s » không hợp lệ trong biểu thức tiền xử lý" -#: expr.c:770 +#: expr.c:892 msgid "missing expression between '(' and ')'" msgstr "thiếu biểu thức nằm giữa « ( » và « ) »" -#: expr.c:773 +#: expr.c:895 msgid "#if with no expression" msgstr "#if (nếu) không có biểu thức" -#: expr.c:776 +#: expr.c:898 #, c-format msgid "operator '%s' has no right operand" msgstr "toán tử « %s » không có tác tử bên phải" -#: expr.c:781 +#: expr.c:903 #, c-format msgid "operator '%s' has no left operand" msgstr "toán tử « %s » không có tác từ bên trái" -#: expr.c:807 +#: expr.c:929 msgid " ':' without preceding '?'" msgstr " Dấu hai chấm « : » không có dấu hỏi « ? » đi trước" -#: expr.c:834 +#: expr.c:956 msgid "unbalanced stack in #if" msgstr "có đống không cân bằng trong #if (nếu)" -#: expr.c:853 +#: expr.c:975 #, c-format msgid "impossible operator '%u'" msgstr "toán từ không thể « %u »" -#: expr.c:943 +#: expr.c:1065 msgid "missing ')' in expression" msgstr "thiếu « ) » nằm trong biểu thức" -#: expr.c:964 +#: expr.c:1086 msgid "'?' without following ':'" msgstr "Dấu hỏi « ? » không có dấu hai chấm « : » đi sau" -#: expr.c:974 +#: expr.c:1096 msgid "integer overflow in preprocessor expression" msgstr "tràn số nguyên trong biểu thức tiền xử lý" -#: expr.c:979 +#: expr.c:1101 msgid "missing '(' in expression" msgstr "thiếu « ( » nằm trong biểu thức" -#: expr.c:1011 +#: expr.c:1133 #, c-format msgid "the left operand of \"%s\" changes sign when promoted" msgstr "tác tử bên trái của « %s » thay đổi dấu (dương/âm) khi được tăng cấp" -#: expr.c:1016 +#: expr.c:1138 #, c-format msgid "the right operand of \"%s\" changes sign when promoted" msgstr "tác tử bên phai của « %s » thay đổi dấu (dương/âm) khi đươc tăng cấp" -#: expr.c:1275 +#: expr.c:1397 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 tác tử" -#: expr.c:1358 +#: expr.c:1480 msgid "comma operator in operand of #if" msgstr "toán tử dấu phẩy nằm trong tác tử của #if (nếu)" -#: expr.c:1490 +#: expr.c:1612 msgid "division by zero in #if" msgstr "chia số không trong #if (nếu)" -#: files.c:402 +#: files.c:442 msgid "NULL directory in find_file" msgstr "thư mục RỖNG trong « find_file » (tìm tập tin)" -#: files.c:440 +#: files.c:480 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:443 +#: files.c:483 msgid "use -Winvalid-pch for more information" msgstr "hãy thử lệnh « -Winvalid-pch » để tìm thấy thông tin thêm" -#: files.c:501 +#: files.c:570 #, c-format msgid "%s is a block device" msgstr "%s là một thiết bị khối" -#: files.c:518 +#: files.c:587 #, c-format msgid "%s is too large" msgstr "%s quá lớn" -#: files.c:553 +#: files.c:622 #, c-format msgid "%s is shorter than expected" msgstr "ngờ %s dài hơn" -#: files.c:782 +#: files.c:852 #, 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 kíếm %s" -#: files.c:1071 +#: files.c:1157 msgid "Multiple include guards may be useful for:\n" msgstr "Nhiều điều bảo vệ bao gồm có lẽ hiệu ích cho :\n" -#: init.c:407 +#: init.c:426 msgid "cppchar_t must be an unsigned type" msgstr "« cppchar_t » phải là kiểu không có dấu dương/âm" -#: init.c:411 +#: init.c:430 #, c-format msgid "preprocessor arithmetic has maximum precision of %lu bits; target requires %lu bits" msgstr "toán thuật 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:418 +#: init.c:437 msgid "CPP arithmetic must be at least as precise as a target int" msgstr "toán thuật CPP phải là ít nhất cùng chính xác với « int » đích" -#: init.c:421 +#: init.c:440 msgid "target char is less than 8 bits wide" msgstr "« char » đích có độ rộng ít hơn 8 bit" -#: init.c:425 +#: init.c:444 msgid "target wchar_t is narrower than target char" msgstr "« wchar_t » đích có độ rộng ít hơn « char » đích" -#: init.c:429 +#: init.c:448 msgid "target int is narrower than target char" msgstr "« int » đích có độ rộng ít hơn « char » đích" -#: init.c:434 +#: init.c:453 msgid "CPP half-integer narrower than CPP character" msgstr "nữa số nguyên CPP có độ rộng ít hơn ký tự CPP" -#: init.c:438 +#: init.c:457 #, 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 cần thiết %lu bit" -#: lex.c:271 +#: lex.c:283 msgid "backslash and newline separated by space" msgstr "xuyệc ngược và ký tự dòng mới phân cách nhau bởi dấu cách" -#: lex.c:276 +#: lex.c:288 msgid "backslash-newline at end of file" msgstr "gặp xuyệc ngược-ký tự dòng mới tại kết thúc của tập tin" -#: lex.c:291 +#: lex.c:303 #, c-format msgid "trigraph ??%c converted to %c" msgstr "chữ ba « ??%c » đã được chuyển đổi thành « %c »" -#: lex.c:298 +#: lex.c:310 #, c-format msgid "trigraph ??%c ignored, use -trigraphs to enable" msgstr "chữ ba « ??%c » bị bỏ qua nên hãy sư dụng tùy chon « -trigraphs » (chữ ba) để hiệu lực nó" -#: lex.c:344 +#: lex.c:356 msgid "\"/*\" within comment" msgstr "gặp « /* » nằm trong chú thích" -#: lex.c:402 +#: lex.c:414 #, c-format msgid "%s in preprocessing directive" msgstr "gặp %s nằm trong chỉ thị tiền xử lý" -#: lex.c:411 +#: lex.c:423 msgid "null character(s) ignored" msgstr "(mọi) ký tự rỗng bị bỏ qua" -#: lex.c:448 +#: lex.c:460 #, c-format msgid "`%.*s' is not in NFKC" msgstr "« %.*s » không phải nằm trong NFKC" -#: lex.c:451 +#: lex.c:463 #, c-format msgid "`%.*s' is not in NFC" msgstr "« %.*s » không phải nằm trong NFC" -#: lex.c:539 +#: lex.c:551 #, c-format msgid "attempt to use poisoned \"%s\"" msgstr "đã cố gắng dùng « %s » bị vô hiệu hóa" -#: lex.c:547 +#: lex.c:559 msgid "__VA_ARGS__ can only appear in the expansion of a C99 variadic macro" msgstr "« __VA_ARGS__ » chỉ có thể xuất hiện trong sự mở rộng của vĩ lệnh biến thiên C99" -#: lex.c:647 +#: lex.c:659 msgid "null character(s) preserved in literal" msgstr "(các) ký tự rỗng được giữ lại trong điều nghĩa chữ" -#: lex.c:650 +#: lex.c:662 #, c-format msgid "missing terminating %c character" msgstr "thiếu ký tự « %c » chấm dứt" -#: lex.c:842 -msgid "no newline at end of file" -msgstr "không có ký tự dòng mới tại kêt thúc của tập tin" - -#: lex.c:1002 traditional.c:162 -msgid "unterminated comment" -msgstr "gặp chú thích chưa được chấm dứt" - -#: lex.c:1013 +#: lex.c:1027 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" -#: lex.c:1015 +#: lex.c:1029 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 nhập)" -#: lex.c:1020 +#: lex.c:1034 msgid "multi-line comment" msgstr "gặp chú thích đa dòng" -#: lex.c:1333 +#: lex.c:1347 #, c-format msgid "unspellable token %s" msgstr "gặp hiệu bài không thể chính tả %s" -#: line-map.c:313 +#: line-map.c:320 #, c-format msgid "In file included from %s:%u" msgstr "Trong tập tin được bao gồm từ %s:%u" -#: line-map.c:331 +#: line-map.c:338 #, c-format msgid "" ",\n" @@ -729,150 +746,159 @@ msgstr "" ",\n" " từ %s:%u" -#: macro.c:83 +#: macro.c:84 #, c-format msgid "macro \"%s\" is not used" msgstr "bộ đối số « %s » không được dùng" -#: macro.c:122 macro.c:312 +#: macro.c:123 macro.c:319 #, c-format msgid "invalid built-in macro \"%s\"" msgstr "vĩ lệnh có sẳn không hợp lệ « %s »" -#: macro.c:156 +#: macro.c:157 msgid "could not determine file timestamp" msgstr "không thể quyết định nhãn giờ của tập tin" -#: macro.c:253 +#: macro.c:254 msgid "could not determine date and time" msgstr "không thể quyết định ngày và giờ" -#: macro.c:416 +#: macro.c:270 +msgid "__COUNTER__ expanded inside directive with -fdirectives-only" +msgstr "__COUNTER__ đã mở rộng bên trong chỉ thị với « -fdirectives-only »" + +#: macro.c:423 msgid "invalid string literal, ignoring final '\\'" msgstr "điều nghĩa chữ chuỗi không hợp lệ nên bỏ qua « \\ » cuối cùng" -#: macro.c:466 +#: macro.c:483 #, 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 hiệu bài tiền xử lý hợp lệ" -#: macro.c:538 +#: macro.c:558 msgid "ISO C99 requires rest arguments to be used" msgstr "ISO C99 cần đến đối số còn lại trong khối được dùng" -#: macro.c:543 +#: macro.c:563 #, 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:548 +#: macro.c:568 #, c-format msgid "macro \"%s\" passed %u arguments, but takes just %u" msgstr "vĩ lệnh « %s » đã gởi %u đối số, nhưng nhận chỉ %u thôi" -#: macro.c:659 traditional.c:675 +#: macro.c:679 traditional.c:680 #, 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:762 +#: macro.c:782 #, 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:1278 +#: macro.c:1325 #, c-format msgid "duplicate macro parameter \"%s\"" msgstr "tham số vĩ lệnh trùng « %s »" -#: macro.c:1324 +#: macro.c:1371 #, c-format msgid "\"%s\" may not appear in macro parameter list" msgstr "không cho phép « %s » xuất hiện trong danh sách tham số vĩ lệnh" -#: macro.c:1332 +#: macro.c:1379 msgid "macro parameters must be comma-separated" msgstr "các tham số bộ đối số phải được ngăn cách bởi dấu phẩy" -#: macro.c:1349 +#: macro.c:1396 msgid "parameter name missing" msgstr "thiếu tên tham số" -#: macro.c:1366 +#: macro.c:1413 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:1371 +#: macro.c:1418 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:1380 +#: macro.c:1427 msgid "missing ')' in macro parameter list" msgstr "thiếu « ) » trong danh sách tham số bộ đối số" -#: macro.c:1458 +#: macro.c:1476 +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:1510 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:1482 +#: macro.c:1534 msgid "missing whitespace after the macro name" msgstr "thiếu khoảng trắng nằm sau tên vĩ lệnh" -#: macro.c:1512 +#: macro.c:1564 msgid "'#' is not followed by a macro parameter" msgstr "« # » không có tham số vĩ lệnh đi theo" -#: macro.c:1531 -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:1629 +#: macro.c:1683 #, c-format msgid "\"%s\" redefined" msgstr "« %s » đã được xác định lại" -#: macro.c:1634 +#: macro.c:1688 msgid "this is the location of the previous definition" msgstr "đây là vị trí của lời xác định trước" -#: macro.c:1684 +#: macro.c:1738 #, 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" -#: macro.c:1707 +#: macro.c:1761 #, c-format msgid "invalid hash type %d in cpp_macro_definition" msgstr "gặp kiểu băm không hợp lệ %d trong « cpp_macro_definition » (lời xác định vĩ lệnh)" -#: pch.c:84 pch.c:332 pch.c:354 pch.c:360 +#: pch.c:84 pch.c:332 pch.c:344 pch.c:362 pch.c:368 pch.c:377 msgid "while writing precompiled header" msgstr "trong khi ghi đầu trang biên dịch sẵn" -#: pch.c:467 +#: pch.c:485 #, c-format msgid "%s: not used because `%.*s' not defined" msgstr "%s: không được dùng vì chưa xác định « %.*s »" -#: pch.c:479 +#: pch.c:497 #, c-format msgid "%s: not used because `%.*s' defined as `%s' not `%.*s'" msgstr "%s: không được dùng vì « %.*s » đã được xác định là « %s » không phải « %.*s »" -#: pch.c:520 +#: pch.c:538 #, c-format msgid "%s: not used because `%s' is defined" msgstr "%s: không được dùng vì « %s » đã được xác định" -#: pch.c:533 pch.c:696 +#: pch.c:558 +#, c-format +msgid "%s: not used because `__COUNTER__' is invalid" +msgstr "%s: không được dùng vì « __COUNTER__ » không hợp lệ" + +#: pch.c:567 pch.c:737 msgid "while reading precompiled header" msgstr "trong khi đọc đầu trang biên dịch sẵn" -#: traditional.c:745 +#: traditional.c:750 #, 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:912 +#: traditional.c:917 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 0831eab9805..6b57691ff44 100644 --- a/libcpp/po/zh_CN.po +++ b/libcpp/po/zh_CN.po @@ -5,10 +5,10 @@ # msgid "" msgstr "" -"Project-Id-Version: cpplib 4.2.0\n" +"Project-Id-Version: cpplib 4.3-b20071109\n" "Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n" -"POT-Creation-Date: 2007-05-13 19:48-0700\n" -"PO-Revision-Date: 2007-06-03 23:21+0800\n" +"POT-Creation-Date: 2007-11-08 21:08+0000\n" +"PO-Revision-Date: 2007-11-11 17:29+0800\n" "Last-Translator: Meng Jie \n" "Language-Team: Chinese (simplified) \n" "MIME-Version: 1.0\n" @@ -71,7 +71,7 @@ msgstr "不完全的 Unicode 字符名 %.*s" msgid "%.*s is not a valid universal character" msgstr "%.*s 不是一个有效的 Unicode 字符" -#: charset.c:1008 lex.c:472 +#: charset.c:1008 lex.c:484 msgid "'$' in identifier or number" msgstr "‘$’出现在标识符或数字中" @@ -149,231 +149,235 @@ msgstr "空的字符常量" msgid "failure to convert %s to %s" msgstr "无法从 %s 转换到 %s" -#: directives.c:214 directives.c:240 +#: directives.c:215 directives.c:241 #, c-format msgid "extra tokens at end of #%s directive" msgstr "#%s 指示的末尾有多余的标识符" -#: directives.c:343 +#: directives.c:344 #, c-format msgid "#%s is a GCC extension" msgstr "#%s 是一个 GCC 扩展" -#: directives.c:355 +#: directives.c:356 msgid "suggest not using #elif in traditional C" msgstr "建议在传统 C 中不使用 #elif" -#: directives.c:358 +#: directives.c:359 #, c-format msgid "traditional C ignores #%s with the # indented" msgstr "当 # 有缩进时传统 C 忽略 #%s" -#: directives.c:362 +#: directives.c:363 #, c-format msgid "suggest hiding #%s from traditional C with an indented #" msgstr "建议使用缩进的 # 以让 #%s 对传统 C 不可见" -#: directives.c:388 +#: directives.c:389 msgid "embedding a directive within macro arguments is not portable" msgstr "将一个指示嵌入宏参数中是不可移植的" -#: directives.c:408 +#: directives.c:409 msgid "style of line directive is a GCC extension" msgstr "line 指示的风格是一个 GCC 扩展" -#: directives.c:458 +#: directives.c:464 #, c-format msgid "invalid preprocessing directive #%s" msgstr "无效的预处理指示 #%s" -#: directives.c:524 +#: directives.c:532 msgid "\"defined\" cannot be used as a macro name" msgstr "“defined”不能被用作宏名" -#: directives.c:530 +#: directives.c:538 #, c-format msgid "\"%s\" cannot be used as a macro name as it is an operator in C++" msgstr "“%s”不能被用作宏名，因为它是 C++ 中的一个操作符" -#: directives.c:533 +#: directives.c:541 #, c-format msgid "no macro name given in #%s directive" msgstr "#%s 指示中未给出宏名" -#: directives.c:536 +#: directives.c:544 msgid "macro names must be identifiers" msgstr "宏名必须是标识符" -#: directives.c:577 +#: directives.c:585 #, c-format msgid "undefining \"%s\"" msgstr "取消对“%s”的定义" -#: directives.c:632 +#: directives.c:640 msgid "missing terminating > character" msgstr "缺少结尾的 > 字符" -#: directives.c:687 +#: directives.c:695 #, c-format msgid "#%s expects \"FILENAME\" or " msgstr "#%s 需要 \"FILENAME\" 或 " -#: directives.c:727 +#: directives.c:739 #, c-format msgid "empty filename in #%s" msgstr "#%s 中文件名为空" -#: directives.c:737 +#: directives.c:749 msgid "#include nested too deeply" msgstr "#include 嵌套过深" -#: directives.c:778 +#: directives.c:790 msgid "#include_next in primary source file" msgstr "#include_next 出现在主源文件中" -#: directives.c:804 +#: directives.c:816 #, c-format msgid "invalid flag \"%s\" in line directive" msgstr "line 指示中有无效的标记“%s”" -#: directives.c:856 +#: directives.c:868 #, c-format msgid "\"%s\" after #line is not a positive integer" msgstr "#line 后的“%s”不是一个正整数" -#: directives.c:862 +#: directives.c:874 msgid "line number out of range" msgstr "行号超出范围" -#: directives.c:875 directives.c:952 +#: directives.c:887 directives.c:964 #, c-format msgid "\"%s\" is not a valid filename" msgstr "“%s”不是一个有效的文件名" -#: directives.c:912 +#: directives.c:924 #, c-format msgid "\"%s\" after # is not a positive integer" msgstr "# 后的“%s”不是一个正整数" -#: directives.c:1014 +#: directives.c:1026 #, c-format msgid "invalid #%s directive" msgstr "无效的 #%s 指示" -#: directives.c:1077 +#: directives.c:1089 #, c-format msgid "registering pragmas in namespace \"%s\" with mismatched name expansion" msgstr "在命名空间“%s”中注册 pragma 时名称扩展不匹配" -#: directives.c:1086 +#: directives.c:1098 #, c-format msgid "registering pragma \"%s\" with name expansion and no namespace" msgstr "pragma “%s”被注册为一个命名扩展，而没有命名空间" -#: directives.c:1104 +#: directives.c:1116 #, c-format msgid "registering \"%s\" as both a pragma and a pragma namespace" msgstr "“%s”既被注册为一个pragma 又被注册为一个 pragma 命名空间" -#: directives.c:1107 +#: directives.c:1119 #, c-format msgid "#pragma %s %s is already registered" msgstr "#pragma %s %s 已经被注册" -#: directives.c:1110 +#: directives.c:1122 #, c-format msgid "#pragma %s is already registered" msgstr "#pragma %s 已经被注册" -#: directives.c:1140 +#: directives.c:1152 msgid "registering pragma with NULL handler" msgstr "pragma 注册为被 NULL 处理" -#: directives.c:1350 +#: directives.c:1362 msgid "#pragma once in main file" msgstr "#pragma once 出现在主文件中" -#: directives.c:1373 +#: directives.c:1385 msgid "invalid #pragma GCC poison directive" msgstr "无效的 #pragma GCC poison 指示" -#: directives.c:1382 +#: directives.c:1394 #, c-format msgid "poisoning existing macro \"%s\"" msgstr "对已存在的宏“%s”投毒" -#: directives.c:1403 +#: directives.c:1413 msgid "#pragma system_header ignored outside include file" msgstr "#pragma system_heade 在包含文件外被忽略" -#: directives.c:1427 +#: directives.c:1437 #, c-format msgid "cannot find source file %s" msgstr "找不到源文件 %s" -#: directives.c:1431 +#: directives.c:1441 #, c-format msgid "current file is older than %s" msgstr "当前文件早于 %s" -#: directives.c:1599 +#: directives.c:1620 msgid "_Pragma takes a parenthesized string literal" msgstr "_Pragma 需要一个括起的字符串字面常量" -#: directives.c:1671 +#: directives.c:1693 msgid "#else without #if" msgstr "#else 没有匹配的 #if" -#: directives.c:1676 +#: directives.c:1698 msgid "#else after #else" msgstr "#else 出现在 #else 后" -#: directives.c:1678 directives.c:1711 +#: directives.c:1700 directives.c:1733 msgid "the conditional began here" msgstr "条件自此开始" -#: directives.c:1704 +#: directives.c:1726 msgid "#elif without #if" msgstr "#elif 没有匹配的 #if" -#: directives.c:1709 +#: directives.c:1731 msgid "#elif after #else" msgstr "#elif 出现在 #else 后" -#: directives.c:1739 +#: directives.c:1761 msgid "#endif without #if" msgstr "#endif 没有匹配的 #if" -#: directives.c:1816 +#: directives.c:1838 msgid "missing '(' after predicate" msgstr "谓词后缺少‘(’" -#: directives.c:1831 +#: directives.c:1853 msgid "missing ')' to complete answer" msgstr "完整的答案缺少‘)’" -#: directives.c:1851 +#: directives.c:1873 msgid "predicate's answer is empty" msgstr "谓词的答案为空" -#: directives.c:1878 +#: directives.c:1900 msgid "assertion without predicate" msgstr "断言后没有谓词" -#: directives.c:1880 +#: directives.c:1902 msgid "predicate must be an identifier" msgstr "谓词必须是一个标识符" -#: directives.c:1966 +#: directives.c:1988 #, c-format msgid "\"%s\" re-asserted" msgstr "重断言“%s”" -#: directives.c:2190 +#: directives.c:2271 #, c-format msgid "unterminated #%s" msgstr "未终止的 #%s" +#: directives-only.c:221 lex.c:1016 traditional.c:162 +msgid "unterminated comment" +msgstr "未结束的注释" + #: errors.c:118 msgid "warning: " msgstr "警告：" @@ -395,332 +399,345 @@ msgstr "stdout" msgid "%s: %s" msgstr "%s：%s" -#: expr.c:203 +#: expr.c:261 msgid "too many decimal points in number" msgstr "数字中有太多小数点" -#: expr.c:223 +#: expr.c:290 expr.c:365 +msgid "fixed-point constants are a GCC extension" +msgstr "定点常量是一个 GCC 扩展" + +#: expr.c:303 +#, c-format +msgid "invalid digit \"%c\" in binary constant" +msgstr "二进制常量中有无效数字“%c”" + +#: expr.c:305 #, c-format msgid "invalid digit \"%c\" in octal constant" msgstr "8 进制常量中有非法字符“%c”" -#: expr.c:229 +#: expr.c:313 +msgid "invalid prefix \"0b\" for floating constant" +msgstr "浮点常量的“0b”前缀无效" + +#: expr.c:319 msgid "use of C99 hexadecimal floating constant" msgstr "使用 C99 式的 16 进制浮点常量" -#: expr.c:238 +#: expr.c:328 msgid "exponent has no digits" msgstr "指数部分没有数字" -#: expr.c:245 +#: expr.c:335 msgid "hexadecimal floating constants require an exponent" msgstr "16 进制浮点常量需要指数部分" -#: expr.c:251 +#: expr.c:341 #, c-format msgid "invalid suffix \"%.*s\" on floating constant" msgstr "浮点常量的“%.*s”后缀无效" -#: expr.c:261 expr.c:295 +#: expr.c:351 expr.c:393 #, c-format msgid "traditional C rejects the \"%.*s\" suffix" msgstr "传统 C 不接受“%.*s”后缀" -#: expr.c:268 +#: expr.c:358 #, c-format msgid "invalid suffix \"%.*s\" with hexadecimal floating constant" msgstr "十六进制浮点常量的“%.*s”后缀无效" -#: expr.c:281 +#: expr.c:369 +msgid "decimal float constants are a GCC extension" +msgstr "十进制浮点常量是一个 GCC 扩展" + +#: expr.c:379 #, c-format msgid "invalid suffix \"%.*s\" on integer constant" msgstr "整数常量的“%.*s”后缀无效" -#: expr.c:303 +#: expr.c:401 msgid "use of C99 long long integer constant" msgstr "使用 C99 long long 整数常量" -#: expr.c:310 +#: expr.c:409 msgid "imaginary constants are a GCC extension" msgstr "虚数常量是一个 GCC 扩展" -#: expr.c:396 +#: expr.c:412 +msgid "binary constants are a GCC extension" +msgstr "二进制常量是一个 GCC 扩展" + +#: expr.c:505 msgid "integer constant is too large for its type" msgstr "整数常量值超出其类型" -#: expr.c:408 +#: expr.c:517 msgid "integer constant is so large that it is unsigned" msgstr "整数常量太大，认定为 unsigned" -#: expr.c:490 +#: expr.c:612 msgid "missing ')' after \"defined\"" msgstr "“defined” 后出现‘)’" -#: expr.c:497 +#: expr.c:619 msgid "operator \"defined\" requires an identifier" msgstr "操作符“defined”需要一个标识符" -#: expr.c:505 +#: expr.c:627 #, c-format msgid "(\"%s\" is an alternative token for \"%s\" in C++)" msgstr "(在 C++ 中“%s”会是“%s”的替代标识符)" -#: expr.c:515 +#: expr.c:637 msgid "this use of \"defined\" may not be portable" msgstr "使用“defined”可能不利于移植" -#: expr.c:554 +#: expr.c:676 msgid "floating constant in preprocessor expression" msgstr "浮点常量出现在预处理表达式中" -#: expr.c:560 +#: expr.c:682 msgid "imaginary number in preprocessor expression" msgstr "预处理表达式中出现虚数" -#: expr.c:605 +#: expr.c:727 #, c-format msgid "\"%s\" is not defined" msgstr "“%s”未定义" -#: expr.c:733 expr.c:762 +#: expr.c:855 expr.c:884 #, c-format msgid "missing binary operator before token \"%s\"" msgstr "标识符“%s”前缺少二元运算符" -#: expr.c:753 +#: expr.c:875 #, c-format msgid "token \"%s\" is not valid in preprocessor expressions" msgstr "标识符“%s”在预处理表达式中无效" -#: expr.c:770 +#: expr.c:892 msgid "missing expression between '(' and ')'" msgstr "‘(’与‘)’之间缺少表达式" -#: expr.c:773 +#: expr.c:895 msgid "#if with no expression" msgstr "#if 后没有表达式" -#: expr.c:776 +#: expr.c:898 #, c-format msgid "operator '%s' has no right operand" msgstr "操作符‘%s’没有右操作数" -#: expr.c:781 +#: expr.c:903 #, c-format msgid "operator '%s' has no left operand" msgstr "操作符‘%s’没有左操作数" -#: expr.c:807 +#: expr.c:929 msgid " ':' without preceding '?'" msgstr "‘:’前没有‘?’" -#: expr.c:834 +#: expr.c:956 msgid "unbalanced stack in #if" msgstr "#if 中不平衡的堆栈" -#: expr.c:853 +#: expr.c:975 #, c-format msgid "impossible operator '%u'" msgstr "不可能的操作‘%u’" -#: expr.c:943 +#: expr.c:1065 msgid "missing ')' in expression" msgstr "表达式中缺少‘)’" -#: expr.c:964 +#: expr.c:1086 msgid "'?' without following ':'" msgstr "‘?’后没有‘:’" -#: expr.c:974 +#: expr.c:1096 msgid "integer overflow in preprocessor expression" msgstr "预处理表达式中整数溢出" -#: expr.c:979 +#: expr.c:1101 msgid "missing '(' in expression" msgstr "表达式中缺少‘(’" -#: expr.c:1011 +#: expr.c:1133 #, c-format msgid "the left operand of \"%s\" changes sign when promoted" msgstr "“%s”的左操作数在提升时变换了符号" -#: expr.c:1016 +#: expr.c:1138 #, c-format msgid "the right operand of \"%s\" changes sign when promoted" msgstr "“%s”的右操作数在提升时变换了符号" -#: expr.c:1275 +#: expr.c:1397 msgid "traditional C rejects the unary plus operator" msgstr "传统 C 不接受单目 + 运算符" -#: expr.c:1358 +#: expr.c:1480 msgid "comma operator in operand of #if" msgstr "#if 操作数中出现逗号" -#: expr.c:1490 +#: expr.c:1612 msgid "division by zero in #if" msgstr "#if 中用零做除数" -#: files.c:402 +#: files.c:442 msgid "NULL directory in find_file" msgstr "find_file 中有 NULL 目录" -#: files.c:440 +#: files.c:480 msgid "one or more PCH files were found, but they were invalid" msgstr "找到一个或多个 PCH 文件，但它们是无效的" -#: files.c:443 +#: files.c:483 msgid "use -Winvalid-pch for more information" msgstr "使用 -Winvalid-pch 以获得更多信息" -#: files.c:501 +#: files.c:570 #, c-format msgid "%s is a block device" msgstr "%s 是一个块设备" -#: files.c:518 +#: files.c:587 #, c-format msgid "%s is too large" msgstr "%s 过大" -#: files.c:553 +#: files.c:622 #, c-format msgid "%s is shorter than expected" msgstr "%s 短于预期" -#: files.c:782 +#: files.c:852 #, c-format msgid "no include path in which to search for %s" msgstr "没有包含路径可供搜索 %s" -#: files.c:1071 +#: files.c:1157 msgid "Multiple include guards may be useful for:\n" msgstr "多个防止重包含可能对其有用：\n" -#: init.c:407 +#: init.c:426 msgid "cppchar_t must be an unsigned type" msgstr "cppchar_t 必须是无符号型" -#: init.c:411 +#: init.c:430 #, c-format msgid "preprocessor arithmetic has maximum precision of %lu bits; target requires %lu bits" msgstr "预处理算术的最高精度为 %lu 位；目标需要 %lu 位" -#: init.c:418 +#: init.c:437 msgid "CPP arithmetic must be at least as precise as a target int" msgstr "CPP 算术必须至少具有目标 int 的精度" -#: init.c:421 +#: init.c:440 msgid "target char is less than 8 bits wide" msgstr "目标 char 短于 8 位" -#: init.c:425 +#: init.c:444 msgid "target wchar_t is narrower than target char" msgstr "目录 wchar_t 短于目标 char" -#: init.c:429 +#: init.c:448 msgid "target int is narrower than target char" msgstr "目标 int 短于目标 char" -#: init.c:434 +#: init.c:453 msgid "CPP half-integer narrower than CPP character" msgstr "CPP 半整数短于 CPP 字符" -#: init.c:438 +#: init.c:457 #, 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 位" -#: lex.c:271 +#: lex.c:283 msgid "backslash and newline separated by space" msgstr "反斜杠和换行为空格所分隔" -#: lex.c:276 +#: lex.c:288 msgid "backslash-newline at end of file" msgstr "反斜杠续行出现在文件末尾" -#: lex.c:291 +#: lex.c:303 #, c-format msgid "trigraph ??%c converted to %c" msgstr "三元符 ??%c 转换为 %c" -#: lex.c:298 +#: lex.c:310 #, c-format msgid "trigraph ??%c ignored, use -trigraphs to enable" msgstr "三元符 ??%c 被忽略，请使用 -trigraphs 来启用" -#: lex.c:344 +#: lex.c:356 msgid "\"/*\" within comment" msgstr "“/*”出现在注释中" -#: lex.c:402 +#: lex.c:414 #, c-format msgid "%s in preprocessing directive" msgstr "预处理指示中出现 %s" -#: lex.c:411 +#: lex.c:423 msgid "null character(s) ignored" msgstr "忽略空字符" -#: lex.c:448 +#: lex.c:460 #, c-format msgid "`%.*s' is not in NFKC" msgstr "‘%.*s’不在 NFKC 中" -#: lex.c:451 +#: lex.c:463 #, c-format msgid "`%.*s' is not in NFC" msgstr "‘%.*s’不在 NFC 中" -#: lex.c:539 +#: lex.c:551 #, c-format msgid "attempt to use poisoned \"%s\"" msgstr "试图使用有毒的“%s”" -#: lex.c:547 +#: lex.c:559 msgid "__VA_ARGS__ can only appear in the expansion of a C99 variadic macro" msgstr "__VA_ARGS__ 只能出现在 C99 可变参数宏的展开中" -#: lex.c:647 +#: lex.c:659 msgid "null character(s) preserved in literal" msgstr "空字符将保留在字面字符串中" -#: lex.c:650 +#: lex.c:662 #, c-format msgid "missing terminating %c character" msgstr "缺少结尾的 %c 字符" -#: lex.c:842 -msgid "no newline at end of file" -msgstr "文件未以空白行结束" - -#: lex.c:1002 traditional.c:162 -msgid "unterminated comment" -msgstr "未结束的注释" - -#: lex.c:1013 +#: lex.c:1027 msgid "C++ style comments are not allowed in ISO C90" msgstr "C++ 风格的注释在 ISO C90 中不被允许" -#: lex.c:1015 +#: lex.c:1029 msgid "(this will be reported only once per input file)" msgstr "(此警告为每个输入文件只报告一次)" -#: lex.c:1020 +#: lex.c:1034 msgid "multi-line comment" msgstr "多行注释" -#: lex.c:1333 +#: lex.c:1347 #, c-format msgid "unspellable token %s" msgstr "无法拼出的标识符 %s" -#: line-map.c:313 +#: line-map.c:320 #, c-format msgid "In file included from %s:%u" msgstr "在包含自 %s：%u 的文件中" -#: line-map.c:331 +#: line-map.c:338 #, c-format msgid "" ",\n" @@ -729,150 +746,162 @@ msgstr "" "，\n" " 从 %s：%u" -#: macro.c:83 +#: macro.c:84 #, c-format msgid "macro \"%s\" is not used" msgstr "宏“%s”未被使用" -#: macro.c:122 macro.c:312 +#: macro.c:123 macro.c:319 #, c-format msgid "invalid built-in macro \"%s\"" msgstr "无效的内建宏“%s”" -#: macro.c:156 +#: macro.c:157 msgid "could not determine file timestamp" msgstr "无法决定文件的时间戳" -#: macro.c:253 +#: macro.c:254 msgid "could not determine date and time" msgstr "无法决定日期与时间" -#: macro.c:416 +#: macro.c:270 +msgid "__COUNTER__ expanded inside directive with -fdirectives-only" +msgstr "带 -fdirectives-only 时 __COUNTER__ 在指示中扩展" + +#: macro.c:423 msgid "invalid string literal, ignoring final '\\'" msgstr "无效的字面字符串，忽略最后的‘\\’" -#: macro.c:466 +#: macro.c:483 #, c-format msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token" msgstr "毗连“%s”和“%s”不能给出一个有效的预处理标识符" -#: macro.c:538 +#: macro.c:558 msgid "ISO C99 requires rest arguments to be used" msgstr "ISO C99 需要使用剩余的参数" -#: macro.c:543 +#: macro.c:563 #, c-format msgid "macro \"%s\" requires %u arguments, but only %u given" msgstr "宏“%s”需要 %u 个参数，但只给出了 %u 个" -#: macro.c:548 +#: macro.c:568 #, c-format msgid "macro \"%s\" passed %u arguments, but takes just %u" msgstr "宏“%s”传递了 %u 个参数，但只需要 %u 个" -#: macro.c:659 traditional.c:675 +#: macro.c:679 traditional.c:680 #, c-format msgid "unterminated argument list invoking macro \"%s\"" msgstr "调用宏“%s”时参数列表未终止" -#: macro.c:762 +#: macro.c:782 #, c-format msgid "function-like macro \"%s\" must be used with arguments in traditional C" msgstr "类似函数的宏“%s”在传统 C 中必须与参数一起使用" -#: macro.c:1278 +#: macro.c:1325 #, c-format msgid "duplicate macro parameter \"%s\"" msgstr "重复的宏参数“%s”" -#: macro.c:1324 +#: macro.c:1371 #, c-format msgid "\"%s\" may not appear in macro parameter list" msgstr "“%s”不能出现在宏参数列表中" -#: macro.c:1332 +#: macro.c:1379 msgid "macro parameters must be comma-separated" msgstr "宏参数必须由逗号隔开" -#: macro.c:1349 +#: macro.c:1396 msgid "parameter name missing" msgstr "缺少形参名" -#: macro.c:1366 +#: macro.c:1413 msgid "anonymous variadic macros were introduced in C99" msgstr "匿名可变参数宏在 C99 中被引入" -#: macro.c:1371 +#: macro.c:1418 msgid "ISO C does not permit named variadic macros" msgstr "ISO C 不允许有名的可变参数宏" -#: macro.c:1380 +#: macro.c:1427 msgid "missing ')' in macro parameter list" msgstr "在宏参数表中缺少‘)’" -#: macro.c:1458 +#: macro.c:1476 +msgid "'##' cannot appear at either end of a macro expansion" +msgstr "‘##’不能出现在宏展开的两端" + +#: macro.c:1510 msgid "ISO C99 requires whitespace after the macro name" msgstr "ISO C99 要求宏名后必须有空白" -#: macro.c:1482 +#: macro.c:1534 msgid "missing whitespace after the macro name" msgstr "宏名后缺少空白" -#: macro.c:1512 +#: macro.c:1564 msgid "'#' is not followed by a macro parameter" msgstr "‘#’后没有宏参数" -#: macro.c:1531 -msgid "'##' cannot appear at either end of a macro expansion" -msgstr "‘##’不能出现在宏展开的两端" - -#: macro.c:1629 +#: macro.c:1683 #, c-format msgid "\"%s\" redefined" msgstr "“%s”重定义" -#: macro.c:1634 +#: macro.c:1688 msgid "this is the location of the previous definition" msgstr "这是先前定义的位置" -#: macro.c:1684 +#: macro.c:1738 #, c-format msgid "macro argument \"%s\" would be stringified in traditional C" msgstr "宏参数“%s”将在传统 C 中被字符串化" -#: macro.c:1707 +#: macro.c:1761 #, c-format msgid "invalid hash type %d in cpp_macro_definition" msgstr "cpp_macro_definition 中有无效的散列类型 %d" -#: pch.c:84 pch.c:332 pch.c:354 pch.c:360 +#: pch.c:84 pch.c:332 pch.c:344 pch.c:362 pch.c:368 pch.c:377 msgid "while writing precompiled header" msgstr "在写入预编译头时" -#: pch.c:467 +#: pch.c:485 #, c-format msgid "%s: not used because `%.*s' not defined" msgstr "%s：未使用因为‘%.*s’未定义" -#: pch.c:479 +#: pch.c:497 #, c-format msgid "%s: not used because `%.*s' defined as `%s' not `%.*s'" msgstr "%s：未使用因为‘%.*s’被定义为‘%s’而非‘%*.s’" -#: pch.c:520 +#: pch.c:538 #, c-format msgid "%s: not used because `%s' is defined" msgstr "%s：未使用因为‘%s’已定义" -#: pch.c:533 pch.c:696 +#: pch.c:558 +#, c-format +msgid "%s: not used because `__COUNTER__' is invalid" +msgstr "%s：未使用因为‘__COUNTER__’无效" + +#: pch.c:567 pch.c:737 msgid "while reading precompiled header" msgstr "在读取预编译头时" -#: traditional.c:745 +#: traditional.c:750 #, c-format msgid "detected recursion whilst expanding macro \"%s\"" msgstr "展开宏“%s”时检测到递归" -#: traditional.c:912 +#: traditional.c:917 msgid "syntax error in macro parameter list" msgstr "宏参数列表语法错误" + +#~ msgid "no newline at end of file" +#~ msgstr "文件未以空白行结束" diff --git a/libcpp/po/zh_TW.po b/libcpp/po/zh_TW.po index 4c78a81ef95..0747f55a779 100644 --- a/libcpp/po/zh_TW.po +++ b/libcpp/po/zh_TW.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: cpplib 4.1.0\n" "Report-Msgid-Bugs-To: http://gcc.gnu.org/bugs.html\n" -"POT-Creation-Date: 2007-05-13 19:48-0700\n" +"POT-Creation-Date: 2007-11-08 21:08+0000\n" "PO-Revision-Date: 2006-03-09 12:37+0800\n" "Last-Translator: Wei-Lun Chao \n" "Language-Team: Chinese (traditional) \n" @@ -73,7 +73,7 @@ msgstr "不完整的萬國碼字元名稱 %.*s" msgid "%.*s is not a valid universal character" msgstr "%.*s 不是一個有效的萬國碼字元" -#: charset.c:1008 lex.c:472 +#: charset.c:1008 lex.c:484 msgid "'$' in identifier or number" msgstr "「$」出現在識別字或數字中" @@ -151,231 +151,235 @@ msgstr "空的字元常數" msgid "failure to convert %s to %s" msgstr "無法從 %s 轉換到 %s" -#: directives.c:214 directives.c:240 +#: directives.c:215 directives.c:241 #, c-format msgid "extra tokens at end of #%s directive" msgstr "#%s 指令的末尾有多餘的符記" -#: directives.c:343 +#: directives.c:344 #, c-format msgid "#%s is a GCC extension" msgstr "#%s 是 GCC 擴充功能" -#: directives.c:355 +#: directives.c:356 msgid "suggest not using #elif in traditional C" msgstr "建議在傳統 C 中不要使用 #elif" -#: directives.c:358 +#: directives.c:359 #, c-format msgid "traditional C ignores #%s with the # indented" msgstr "當 # 有縮排時傳統 C 忽略 #%s" -#: directives.c:362 +#: directives.c:363 #, c-format msgid "suggest hiding #%s from traditional C with an indented #" msgstr "建議使用縮排的 # 以讓 #%s 對傳統 C 不可見" -#: directives.c:388 +#: directives.c:389 msgid "embedding a directive within macro arguments is not portable" msgstr "將一個指令內嵌於巨集參數中是不可移植的" -#: directives.c:408 +#: directives.c:409 msgid "style of line directive is a GCC extension" msgstr "line 指令的風格是 GCC 擴充功能" -#: directives.c:458 +#: directives.c:464 #, c-format msgid "invalid preprocessing directive #%s" msgstr "無效的預先處理指令 #%s" -#: directives.c:524 +#: directives.c:532 msgid "\"defined\" cannot be used as a macro name" msgstr "「defined」不能做為巨集名" -#: directives.c:530 +#: directives.c:538 #, c-format msgid "\"%s\" cannot be used as a macro name as it is an operator in C++" msgstr "「%s」不能做為巨集名，因為它是 C++ 中的一個運算子" -#: directives.c:533 +#: directives.c:541 #, c-format msgid "no macro name given in #%s directive" msgstr "#%s 指令中未給出巨集名" -#: directives.c:536 +#: directives.c:544 msgid "macro names must be identifiers" msgstr "巨集名必須是識別字" -#: directives.c:577 +#: directives.c:585 #, c-format msgid "undefining \"%s\"" msgstr "取消對「%s」的定義" -#: directives.c:632 +#: directives.c:640 msgid "missing terminating > character" msgstr "缺少結尾的 > 字元" -#: directives.c:687 +#: directives.c:695 #, c-format msgid "#%s expects \"FILENAME\" or " msgstr "#%s 需要 \"FILENAME\" 或 " -#: directives.c:727 +#: directives.c:739 #, c-format msgid "empty filename in #%s" msgstr "#%s 中檔案名稱為空" -#: directives.c:737 +#: directives.c:749 msgid "#include nested too deeply" msgstr "#include 巢狀過深" -#: directives.c:778 +#: directives.c:790 msgid "#include_next in primary source file" msgstr "#include_next 出現在主來源檔案中" -#: directives.c:804 +#: directives.c:816 #, c-format msgid "invalid flag \"%s\" in line directive" msgstr "line 指令中有無效的標記「%s」" -#: directives.c:856 +#: directives.c:868 #, c-format msgid "\"%s\" after #line is not a positive integer" msgstr "#line 後的「%s」不是一個正整數" -#: directives.c:862 +#: directives.c:874 msgid "line number out of range" msgstr "列號超出範圍" -#: directives.c:875 directives.c:952 +#: directives.c:887 directives.c:964 #, c-format msgid "\"%s\" is not a valid filename" msgstr "「%s」不是一個有效的檔案名稱" -#: directives.c:912 +#: directives.c:924 #, c-format msgid "\"%s\" after # is not a positive integer" msgstr "# 後的「%s」不是一個正整數" -#: directives.c:1014 +#: directives.c:1026 #, c-format msgid "invalid #%s directive" msgstr "無效的 #%s 指令" -#: directives.c:1077 +#: directives.c:1089 #, c-format msgid "registering pragmas in namespace \"%s\" with mismatched name expansion" msgstr "" -#: directives.c:1086 +#: directives.c:1098 #, fuzzy, c-format msgid "registering pragma \"%s\" with name expansion and no namespace" msgstr "「%s」既被註冊為一個 pragma 又被註冊為一個 pragma 命名空間" -#: directives.c:1104 +#: directives.c:1116 #, c-format msgid "registering \"%s\" as both a pragma and a pragma namespace" msgstr "「%s」既被註冊為一個 pragma 又被註冊為一個 pragma 命名空間" -#: directives.c:1107 +#: directives.c:1119 #, c-format msgid "#pragma %s %s is already registered" msgstr "#pragma %s %s 已經被註冊" -#: directives.c:1110 +#: directives.c:1122 #, c-format msgid "#pragma %s is already registered" msgstr "#pragma %s 已經被註冊" -#: directives.c:1140 +#: directives.c:1152 msgid "registering pragma with NULL handler" msgstr "" -#: directives.c:1350 +#: directives.c:1362 msgid "#pragma once in main file" msgstr "#pragma once 出現在主檔案中" -#: directives.c:1373 +#: directives.c:1385 msgid "invalid #pragma GCC poison directive" msgstr "無效的 #pragma GCC poison 指令" -#: directives.c:1382 +#: directives.c:1394 #, c-format msgid "poisoning existing macro \"%s\"" msgstr "對已存在的巨集「%s」加料" -#: directives.c:1403 +#: directives.c:1413 msgid "#pragma system_header ignored outside include file" msgstr "#pragma system_header 在包含檔案外被忽略" -#: directives.c:1427 +#: directives.c:1437 #, c-format msgid "cannot find source file %s" msgstr "找不到來源檔案 %s" -#: directives.c:1431 +#: directives.c:1441 #, c-format msgid "current file is older than %s" msgstr "目前檔案早於 %s" -#: directives.c:1599 +#: directives.c:1620 msgid "_Pragma takes a parenthesized string literal" msgstr "_Pragma 需要一個括起的字串原文" -#: directives.c:1671 +#: directives.c:1693 msgid "#else without #if" msgstr "#else 沒有匹配的 #if" -#: directives.c:1676 +#: directives.c:1698 msgid "#else after #else" msgstr "#else 出現在 #else 後" -#: directives.c:1678 directives.c:1711 +#: directives.c:1700 directives.c:1733 msgid "the conditional began here" msgstr "條件自此開始" -#: directives.c:1704 +#: directives.c:1726 msgid "#elif without #if" msgstr "#elif 沒有匹配的 #if" -#: directives.c:1709 +#: directives.c:1731 msgid "#elif after #else" msgstr "#elif 出現在 #else 後" -#: directives.c:1739 +#: directives.c:1761 msgid "#endif without #if" msgstr "#endif 沒有匹配的 #if" -#: directives.c:1816 +#: directives.c:1838 msgid "missing '(' after predicate" msgstr "述語後缺少「(」" -#: directives.c:1831 +#: directives.c:1853 msgid "missing ')' to complete answer" msgstr "完整的答案缺少「)」" -#: directives.c:1851 +#: directives.c:1873 msgid "predicate's answer is empty" msgstr "述語的答案為空" -#: directives.c:1878 +#: directives.c:1900 msgid "assertion without predicate" msgstr "判定語後沒有述語" -#: directives.c:1880 +#: directives.c:1902 msgid "predicate must be an identifier" msgstr "述語必須是一個識別字" -#: directives.c:1966 +#: directives.c:1988 #, c-format msgid "\"%s\" re-asserted" msgstr "已再判定「%s」" -#: directives.c:2190 +#: directives.c:2271 #, c-format msgid "unterminated #%s" msgstr "未終止的 #%s" +#: directives-only.c:221 lex.c:1016 traditional.c:162 +msgid "unterminated comment" +msgstr "未終結的註釋" + #: errors.c:118 msgid "warning: " msgstr "警告：" @@ -397,332 +401,349 @@ msgstr "stdout" msgid "%s: %s" msgstr "%s：%s" -#: expr.c:203 +#: expr.c:261 msgid "too many decimal points in number" msgstr "數字中有太多小數點" -#: expr.c:223 +#: expr.c:290 expr.c:365 +#, fuzzy +msgid "fixed-point constants are a GCC extension" +msgstr "虛數常數是一個 GCC 擴充功能" + +#: expr.c:303 +#, fuzzy, c-format +msgid "invalid digit \"%c\" in binary constant" +msgstr "八進位常數中有無效字元「%c」" + +#: expr.c:305 #, c-format msgid "invalid digit \"%c\" in octal constant" msgstr "八進位常數中有無效字元「%c」" -#: expr.c:229 +#: expr.c:313 +#, fuzzy +msgid "invalid prefix \"0b\" for floating constant" +msgstr "浮點常數的「%.*s」字尾無效" + +#: expr.c:319 msgid "use of C99 hexadecimal floating constant" msgstr "使用 C99 式的十六進位浮點常數" -#: expr.c:238 +#: expr.c:328 msgid "exponent has no digits" msgstr "指數部分沒有數字" -#: expr.c:245 +#: expr.c:335 msgid "hexadecimal floating constants require an exponent" msgstr "十六進位浮點常數需要指數部分" -#: expr.c:251 +#: expr.c:341 #, c-format msgid "invalid suffix \"%.*s\" on floating constant" msgstr "浮點常數的「%.*s」字尾無效" -#: expr.c:261 expr.c:295 +#: expr.c:351 expr.c:393 #, c-format msgid "traditional C rejects the \"%.*s\" suffix" msgstr "傳統 C 不接受「%.*s」字尾" -#: expr.c:268 +#: expr.c:358 #, fuzzy, c-format msgid "invalid suffix \"%.*s\" with hexadecimal floating constant" msgstr "浮點常數的「%.*s」字尾無效" -#: expr.c:281 +#: expr.c:369 +#, fuzzy +msgid "decimal float constants are a GCC extension" +msgstr "虛數常數是一個 GCC 擴充功能" + +#: expr.c:379 #, c-format msgid "invalid suffix \"%.*s\" on integer constant" msgstr "整數常數的「%.*s」字尾無效" -#: expr.c:303 +#: expr.c:401 msgid "use of C99 long long integer constant" msgstr "使用 C99 long long 整數常數" -#: expr.c:310 +#: expr.c:409 msgid "imaginary constants are a GCC extension" msgstr "虛數常數是一個 GCC 擴充功能" -#: expr.c:396 +#: expr.c:412 +#, fuzzy +msgid "binary constants are a GCC extension" +msgstr "虛數常數是一個 GCC 擴充功能" + +#: expr.c:505 msgid "integer constant is too large for its type" msgstr "整數常數值超出其類型" -#: expr.c:408 +#: expr.c:517 msgid "integer constant is so large that it is unsigned" msgstr "整數常數太大，認定為 unsigned" -#: expr.c:490 +#: expr.c:612 msgid "missing ')' after \"defined\"" msgstr "「defined」 後缺少「)」" -#: expr.c:497 +#: expr.c:619 msgid "operator \"defined\" requires an identifier" msgstr "運算子「defined」需要一個識別字" -#: expr.c:505 +#: expr.c:627 #, c-format msgid "(\"%s\" is an alternative token for \"%s\" in C++)" msgstr "(在 C++ 中「%s」會是「%s」的替代識別字)" -#: expr.c:515 +#: expr.c:637 msgid "this use of \"defined\" may not be portable" msgstr "使用「defined」可能不利於移植" -#: expr.c:554 +#: expr.c:676 msgid "floating constant in preprocessor expression" msgstr "浮點常數出現在預先處理運算式中" -#: expr.c:560 +#: expr.c:682 msgid "imaginary number in preprocessor expression" msgstr "預先處理運算式中出現虛數" -#: expr.c:605 +#: expr.c:727 #, c-format msgid "\"%s\" is not defined" msgstr "「%s」未定義" -#: expr.c:733 expr.c:762 +#: expr.c:855 expr.c:884 #, c-format msgid "missing binary operator before token \"%s\"" msgstr "識別字「%s」前缺少二元運算子" -#: expr.c:753 +#: expr.c:875 #, c-format msgid "token \"%s\" is not valid in preprocessor expressions" msgstr "識別字「%s」在預先處理運算式中無效" -#: expr.c:770 +#: expr.c:892 msgid "missing expression between '(' and ')'" msgstr "「(」與「)」之間缺少運算式" -#: expr.c:773 +#: expr.c:895 msgid "#if with no expression" msgstr "#if 後沒有運算式" -#: expr.c:776 +#: expr.c:898 #, c-format msgid "operator '%s' has no right operand" msgstr "運算子「%s」沒有右運算元" -#: expr.c:781 +#: expr.c:903 #, c-format msgid "operator '%s' has no left operand" msgstr "運算子「%s」沒有左運算元" -#: expr.c:807 +#: expr.c:929 msgid " ':' without preceding '?'" msgstr "「:」前沒有「?」" -#: expr.c:834 +#: expr.c:956 msgid "unbalanced stack in #if" msgstr "#if 中不平衡的堆疊" -#: expr.c:853 +#: expr.c:975 #, c-format msgid "impossible operator '%u'" msgstr "不可能的運算子「%u」" -#: expr.c:943 +#: expr.c:1065 msgid "missing ')' in expression" msgstr "運算式中缺少「)」" -#: expr.c:964 +#: expr.c:1086 msgid "'?' without following ':'" msgstr "「?」後沒有「:」" -#: expr.c:974 +#: expr.c:1096 msgid "integer overflow in preprocessor expression" msgstr "預先處理運算式中整數溢出" -#: expr.c:979 +#: expr.c:1101 msgid "missing '(' in expression" msgstr "運算式中缺少「(」" -#: expr.c:1011 +#: expr.c:1133 #, c-format msgid "the left operand of \"%s\" changes sign when promoted" msgstr "「%s」的左運算元在提升時變換了符號" -#: expr.c:1016 +#: expr.c:1138 #, c-format msgid "the right operand of \"%s\" changes sign when promoted" msgstr "「%s」的右運算元在提升時變換了符號" -#: expr.c:1275 +#: expr.c:1397 msgid "traditional C rejects the unary plus operator" msgstr "傳統 C 不接受單元 + 運算子" -#: expr.c:1358 +#: expr.c:1480 msgid "comma operator in operand of #if" msgstr "#if 運算元中出現逗號" -#: expr.c:1490 +#: expr.c:1612 msgid "division by zero in #if" msgstr "#if 中用零做除數" -#: files.c:402 +#: files.c:442 msgid "NULL directory in find_file" msgstr "find_file 中有 NULL 目錄" -#: files.c:440 +#: files.c:480 msgid "one or more PCH files were found, but they were invalid" msgstr "找到一個或多個 PCH 檔案，但它們是無效的" -#: files.c:443 +#: files.c:483 msgid "use -Winvalid-pch for more information" msgstr "使用 -Winvalid-pch 以獲得更多資訊" -#: files.c:501 +#: files.c:570 #, c-format msgid "%s is a block device" msgstr "%s 是一個區塊裝置" -#: files.c:518 +#: files.c:587 #, c-format msgid "%s is too large" msgstr "%s 過大" -#: files.c:553 +#: files.c:622 #, c-format msgid "%s is shorter than expected" msgstr "%s 短於預期" -#: files.c:782 +#: files.c:852 #, c-format msgid "no include path in which to search for %s" msgstr "沒有包含路徑可供搜尋 %s" -#: files.c:1071 +#: files.c:1157 msgid "Multiple include guards may be useful for:\n" msgstr "多個防止重包含可能對其有用：\n" -#: init.c:407 +#: init.c:426 msgid "cppchar_t must be an unsigned type" msgstr "cppchar_t 必須是無號類型" -#: init.c:411 +#: init.c:430 #, c-format msgid "preprocessor arithmetic has maximum precision of %lu bits; target requires %lu bits" msgstr "預先處理算術的最高精度為 %lu 位；目標需要 %lu 位" -#: init.c:418 +#: init.c:437 msgid "CPP arithmetic must be at least as precise as a target int" msgstr "CPP 算術必須至少具有目標 int 的精度" -#: init.c:421 +#: init.c:440 msgid "target char is less than 8 bits wide" msgstr "目標 char 短於 8 位" -#: init.c:425 +#: init.c:444 msgid "target wchar_t is narrower than target char" msgstr "目標 wchar_t 短於目標 char" -#: init.c:429 +#: init.c:448 msgid "target int is narrower than target char" msgstr "目標 int 短於目標 char" -#: init.c:434 +#: init.c:453 msgid "CPP half-integer narrower than CPP character" msgstr "CPP 半整數短於 CPP 字元" -#: init.c:438 +#: init.c:457 #, 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 位" -#: lex.c:271 +#: lex.c:283 msgid "backslash and newline separated by space" msgstr "反斜線和換列為空格所分隔" -#: lex.c:276 +#: lex.c:288 msgid "backslash-newline at end of file" msgstr "反斜線-換列出現在檔案末尾" -#: lex.c:291 +#: lex.c:303 #, c-format msgid "trigraph ??%c converted to %c" msgstr "三元符 ??%c 轉換為 %c" -#: lex.c:298 +#: lex.c:310 #, c-format msgid "trigraph ??%c ignored, use -trigraphs to enable" msgstr "三元符 ??%c 被忽略，請使用 -trigraphs 來啟用" -#: lex.c:344 +#: lex.c:356 msgid "\"/*\" within comment" msgstr "「/*」出現在註釋中" -#: lex.c:402 +#: lex.c:414 #, c-format msgid "%s in preprocessing directive" msgstr "預先處理指令中出現 %s" -#: lex.c:411 +#: lex.c:423 msgid "null character(s) ignored" msgstr "忽略空字元" -#: lex.c:448 +#: lex.c:460 #, c-format msgid "`%.*s' is not in NFKC" msgstr "「%.*s」不在 NFKC 中" -#: lex.c:451 +#: lex.c:463 #, c-format msgid "`%.*s' is not in NFC" msgstr "「%.*s」不在 NFC 中" -#: lex.c:539 +#: lex.c:551 #, c-format msgid "attempt to use poisoned \"%s\"" msgstr "試圖使用已加料的「%s」" -#: lex.c:547 +#: lex.c:559 msgid "__VA_ARGS__ can only appear in the expansion of a C99 variadic macro" msgstr "__VA_ARGS__ 只能出現在 C99 可變參數巨集的展開中" -#: lex.c:647 +#: lex.c:659 msgid "null character(s) preserved in literal" msgstr "空字元將保留在原文中" -#: lex.c:650 +#: lex.c:662 #, fuzzy, c-format msgid "missing terminating %c character" msgstr "缺少結尾的 > 字元" -#: lex.c:842 -msgid "no newline at end of file" -msgstr "檔案未以空白列結束" - -#: lex.c:1002 traditional.c:162 -msgid "unterminated comment" -msgstr "未終結的註釋" - -#: lex.c:1013 +#: lex.c:1027 msgid "C++ style comments are not allowed in ISO C90" msgstr "C++ 風格的註釋在 ISO C90 中不被允許" -#: lex.c:1015 +#: lex.c:1029 msgid "(this will be reported only once per input file)" msgstr "(此警告為每個輸入檔案只報告一次)" -#: lex.c:1020 +#: lex.c:1034 msgid "multi-line comment" msgstr "多列註釋" -#: lex.c:1333 +#: lex.c:1347 #, c-format msgid "unspellable token %s" msgstr "無法拼出的識別字 %s" -#: line-map.c:313 +#: line-map.c:320 #, c-format msgid "In file included from %s:%u" msgstr "在包含自 %s：%u 的檔案中" -#: line-map.c:331 +#: line-map.c:338 #, c-format msgid "" ",\n" @@ -731,151 +752,163 @@ msgstr "" "，\n" " 從 %s：%u" -#: macro.c:83 +#: macro.c:84 #, c-format msgid "macro \"%s\" is not used" msgstr "巨集「%s」未被使用" -#: macro.c:122 macro.c:312 +#: macro.c:123 macro.c:319 #, c-format msgid "invalid built-in macro \"%s\"" msgstr "無效的內建巨集「%s」" -#: macro.c:156 +#: macro.c:157 #, fuzzy msgid "could not determine file timestamp" msgstr "無法決定日期與時間" -#: macro.c:253 +#: macro.c:254 msgid "could not determine date and time" msgstr "無法決定日期與時間" -#: macro.c:416 +#: macro.c:270 +msgid "__COUNTER__ expanded inside directive with -fdirectives-only" +msgstr "" + +#: macro.c:423 msgid "invalid string literal, ignoring final '\\'" msgstr "無效的原文字串，忽略最後的「\\」" -#: macro.c:466 +#: macro.c:483 #, c-format msgid "pasting \"%s\" and \"%s\" does not give a valid preprocessing token" msgstr "粘貼「%s」和「%s」不能給出一個有效的預先處理識別字" -#: macro.c:538 +#: macro.c:558 msgid "ISO C99 requires rest arguments to be used" msgstr "ISO C99 需要使用剩餘的引數" -#: macro.c:543 +#: macro.c:563 #, c-format msgid "macro \"%s\" requires %u arguments, but only %u given" msgstr "巨集「%s」需要 %u 個引數，但只給出了 %u 個" -#: macro.c:548 +#: macro.c:568 #, c-format msgid "macro \"%s\" passed %u arguments, but takes just %u" msgstr "巨集「%s」傳遞了 %u 個引數，但只需要 %u 個" -#: macro.c:659 traditional.c:675 +#: macro.c:679 traditional.c:680 #, c-format msgid "unterminated argument list invoking macro \"%s\"" msgstr "呼叫巨集「%s」時引數清單未終止" -#: macro.c:762 +#: macro.c:782 #, c-format msgid "function-like macro \"%s\" must be used with arguments in traditional C" msgstr "類似函式的巨集「%s」在傳統 C 中必須與引數一起使用" -#: macro.c:1278 +#: macro.c:1325 #, c-format msgid "duplicate macro parameter \"%s\"" msgstr "重複的巨集參數「%s」" -#: macro.c:1324 +#: macro.c:1371 #, c-format msgid "\"%s\" may not appear in macro parameter list" msgstr "「%s」不能出現在巨集參數清單中" -#: macro.c:1332 +#: macro.c:1379 msgid "macro parameters must be comma-separated" msgstr "巨集參數必須由逗號隔開" -#: macro.c:1349 +#: macro.c:1396 msgid "parameter name missing" msgstr "缺少參數名" -#: macro.c:1366 +#: macro.c:1413 msgid "anonymous variadic macros were introduced in C99" msgstr "匿名可變參數巨集在 C99 中被引入" -#: macro.c:1371 +#: macro.c:1418 msgid "ISO C does not permit named variadic macros" msgstr "ISO C 不允許具名的可變參數巨集" -#: macro.c:1380 +#: macro.c:1427 msgid "missing ')' in macro parameter list" msgstr "在巨集參數表中缺少「)」" -#: macro.c:1458 +#: macro.c:1476 +msgid "'##' cannot appear at either end of a macro expansion" +msgstr "「##」不能出現在巨集展開的兩端" + +#: macro.c:1510 msgid "ISO C99 requires whitespace after the macro name" msgstr "ISO C99 要求巨集名後必須有空白" -#: macro.c:1482 +#: macro.c:1534 msgid "missing whitespace after the macro name" msgstr "巨集名後缺少空白" -#: macro.c:1512 +#: macro.c:1564 msgid "'#' is not followed by a macro parameter" msgstr "「#」後沒有巨集參數" -#: macro.c:1531 -msgid "'##' cannot appear at either end of a macro expansion" -msgstr "「##」不能出現在巨集展開的兩端" - -#: macro.c:1629 +#: macro.c:1683 #, c-format msgid "\"%s\" redefined" msgstr "「%s」重定義" -#: macro.c:1634 +#: macro.c:1688 msgid "this is the location of the previous definition" msgstr "這是先前定義的位置" -#: macro.c:1684 +#: macro.c:1738 #, c-format msgid "macro argument \"%s\" would be stringified in traditional C" msgstr "巨集引數「%s」將在傳統 C 中被字串化" -#: macro.c:1707 +#: macro.c:1761 #, c-format msgid "invalid hash type %d in cpp_macro_definition" msgstr "cpp_macro_definition 中有無效的雜湊類型 %d" -#: pch.c:84 pch.c:332 pch.c:354 pch.c:360 +#: pch.c:84 pch.c:332 pch.c:344 pch.c:362 pch.c:368 pch.c:377 msgid "while writing precompiled header" msgstr "在寫入預先編譯標頭時" -#: pch.c:467 +#: pch.c:485 #, c-format msgid "%s: not used because `%.*s' not defined" msgstr "%s：未使用，因為「%.*s」未定義" -#: pch.c:479 +#: pch.c:497 #, c-format msgid "%s: not used because `%.*s' defined as `%s' not `%.*s'" msgstr "%s：未使用，因為「%.*s」被定義為「%s」而非「%*.s」" -#: pch.c:520 +#: pch.c:538 #, c-format msgid "%s: not used because `%s' is defined" msgstr "%s：未使用，因為「%s」已定義" -#: pch.c:533 pch.c:696 +#: pch.c:558 +#, fuzzy, c-format +msgid "%s: not used because `__COUNTER__' is invalid" +msgstr "%s：未使用，因為「%s」已定義" + +#: pch.c:567 pch.c:737 msgid "while reading precompiled header" msgstr "在讀取預先編譯標頭時" -#: traditional.c:745 +#: traditional.c:750 #, c-format msgid "detected recursion whilst expanding macro \"%s\"" msgstr "展開巨集「%s」時偵測到遞迴" -#: traditional.c:912 +#: traditional.c:917 msgid "syntax error in macro parameter list" msgstr "巨集參數清單語法錯誤" + +#~ msgid "no newline at end of file" +#~ msgstr "檔案未以空白列結束" diff --git a/libcpp/traditional.c b/libcpp/traditional.c index 7ca3cfd9296..6c4dda1a9f3 100644 --- a/libcpp/traditional.c +++ b/libcpp/traditional.c @@ -1,5 +1,5 @@ /* CPP Library - traditional lexical analysis and macro expansion. - Copyright (C) 2002, 2004, 2005, 2007 Free Software Foundation, Inc. + Copyright (C) 2002, 2004, 2005, 2007, 2008 Free Software Foundation, Inc. Contributed by Neil Booth, May 2002 This program is free software; you can redistribute it and/or modify it @@ -832,8 +832,11 @@ replace_args_and_push (cpp_reader *pfile, struct fun_macro *fmacro) uchar *p; _cpp_buff *buff; size_t len = 0; + int cxtquote = 0; - /* Calculate the length of the argument-replaced text. */ + /* Get an estimate of the length of the argument-replaced text. + This is a worst case estimate, assuming that every replacement + text character needs quoting. */ for (exp = macro->exp.text;;) { struct block *b = (struct block *) exp; @@ -841,8 +844,8 @@ replace_args_and_push (cpp_reader *pfile, struct fun_macro *fmacro) len += b->text_len; if (b->arg_index == 0) break; - len += (fmacro->args[b->arg_index] - - fmacro->args[b->arg_index - 1] - 1); + len += 2 * (fmacro->args[b->arg_index] + - fmacro->args[b->arg_index - 1] - 1); exp += BLOCK_LEN (b->text_len); } @@ -850,21 +853,69 @@ replace_args_and_push (cpp_reader *pfile, struct fun_macro *fmacro) buff = _cpp_get_buff (pfile, len + 1); /* Copy the expansion and replace arguments. */ + /* Accumulate actual length, including quoting as necessary */ p = BUFF_FRONT (buff); + len = 0; for (exp = macro->exp.text;;) { struct block *b = (struct block *) exp; size_t arglen; + int argquote; + uchar *base; + uchar *in; - memcpy (p, b->text, b->text_len); - p += b->text_len; + len += b->text_len; + /* Copy the non-argument text literally, keeping + track of whether matching quotes have been seen. */ + for (arglen = b->text_len, in = b->text; arglen > 0; arglen--) + { + if (*in == '"') + cxtquote = ! cxtquote; + *p++ = *in++; + } + /* Done if no more arguments */ if (b->arg_index == 0) break; arglen = (fmacro->args[b->arg_index] - fmacro->args[b->arg_index - 1] - 1); - memcpy (p, pfile->out.base + fmacro->args[b->arg_index - 1], - arglen); - p += arglen; + base = pfile->out.base + fmacro->args[b->arg_index - 1]; + in = base; +#if 0 + /* Skip leading whitespace in the text for the argument to + be substituted. To be compatible with gcc 2.95, we would + also need to trim trailing whitespace. Gcc 2.95 trims + leading and trailing whitespace, which may be a bug. The + current gcc testsuite explicitly checks that this leading + and trailing whitespace in actual arguments is + preserved. */ + while (arglen > 0 && is_space (*in)) + { + in++; + arglen--; + } +#endif + for (argquote = 0; arglen > 0; arglen--) + { + if (cxtquote && *in == '"') + { + if (in > base && *(in-1) != '\\') + argquote = ! argquote; + /* Always add backslash before double quote if argument + is expanded in a quoted context */ + *p++ = '\\'; + len++; + } + else if (cxtquote && argquote && *in == '\\') + { + /* Always add backslash before a backslash in an argument + that is expanded in a quoted context and also in the + range of a quoted context in the argument itself. */ + *p++ = '\\'; + len++; + } + *p++ = *in++; + len++; + } exp += BLOCK_LEN (b->text_len); } -- cgit v1.2.3