From 97fd3a3003b9eb980395417ffb104e02bf315fe8 Mon Sep 17 00:00:00 2001 From: Ulrich Drepper Date: Wed, 26 Nov 2003 03:24:15 +0000 Subject: Update. 2003-11-25 Ulrich Drepper * posix/runptests.c (main): Make errors fatal. * posix/PTESTS: One test in GA135 and GA136 check functionality which seems not guaranteed. 2003-11-25 Jakub Jelinek * posix/regexec.c (re_search_internal): If prune_impossible_nodes returned REG_NOMATCH, set match_last to -1. Don't initialize pmatch[0] needlessly. Fix comment. (prune_impossible_nodes): Don't segfault on NULL state_log entry. (set_regs): Fix comment. * posix/regcomp.c (parse_bracket_exp): Only set has_plural_match if adding both SIMPLE_BRACKET and COMPLEX_BRACKET. (build_charclass_op): Set has_plural_match if adding both SIMPLE_BRACKET and COMPLEX_BRACKET. * posix/bug-regex11.c (tests): Fix register values for one commented out test. Add new tests. * posix/regex_internal.c (re_string_allocate): Make sure init_len is at least dfa->mb_cur_max. (re_string_reconstruct): If is_utf8, don't fall back into re_string_skip_chars just because idx points into a middle of valid UTF-8 character. Instead, set the wcs bytes which correspond to the partial character bytes to WEOF. * posix/regexec.c (re_search_internal): Allocate input.bufs_len + 1 instead of dfa->nodes_len + 1 state_log entries initially. * posix/bug-regex20.c (main): Uncomment backwards case insensitive tests. --- ChangeLog | 31 + NEWS | 11 +- elf/dl-load.c | 3 +- elf/dl-support.c | 1 + elf/rtld.c | 18 + math/libm-test.inc | 4 + po/ja.po | 8713 +++++++++++++++------------- posix/PTESTS | 13 +- posix/bug-regex11.c | 11 +- posix/bug-regex20.c | 3 +- posix/ptestcases.h | 13 +- posix/regcomp.c | 3 +- posix/regex_internal.c | 25 +- posix/regexec.c | 13 +- posix/runptests.c | 5 +- sysdeps/generic/ldsodefs.h | 5 + sysdeps/generic/unsecvars.h | 1 + sysdeps/unix/sysv/linux/dl-librecon.h | 12 +- sysdeps/unix/sysv/linux/i386/dl-librecon.h | 5 +- 19 files changed, 4679 insertions(+), 4211 deletions(-) diff --git a/ChangeLog b/ChangeLog index 969692626e..f70b66ccc8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,34 @@ +2003-11-25 Ulrich Drepper + + * posix/runptests.c (main): Make errors fatal. + * posix/PTESTS: One test in GA135 and GA136 check functionality + which seems not guaranteed. + +2003-11-25 Jakub Jelinek + + * posix/regexec.c (re_search_internal): If prune_impossible_nodes + returned REG_NOMATCH, set match_last to -1. Don't initialize + pmatch[0] needlessly. Fix comment. + (prune_impossible_nodes): Don't segfault on NULL state_log entry. + (set_regs): Fix comment. + * posix/regcomp.c (parse_bracket_exp): Only set has_plural_match + if adding both SIMPLE_BRACKET and COMPLEX_BRACKET. + (build_charclass_op): Set has_plural_match if adding both + SIMPLE_BRACKET and COMPLEX_BRACKET. + * posix/bug-regex11.c (tests): Fix register values for one commented + out test. Add new tests. + + * posix/regex_internal.c (re_string_allocate): Make sure init_len + is at least dfa->mb_cur_max. + (re_string_reconstruct): If is_utf8, don't fall back into + re_string_skip_chars just because idx points into a middle of + valid UTF-8 character. Instead, set the wcs bytes which correspond + to the partial character bytes to WEOF. + * posix/regexec.c (re_search_internal): Allocate input.bufs_len + 1 + instead of dfa->nodes_len + 1 state_log entries initially. + * posix/bug-regex20.c (main): Uncomment backwards case insensitive + tests. + 2003-11-24 Jakub Jelinek * posix/regex_internal.h (re_token_t): Add word_char bit. Add diff --git a/NEWS b/NEWS index b10c6f0bdc..8a16f07a9e 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -GNU C Library NEWS -- history of user-visible changes. 2003-4-24 +GNU C Library NEWS -- history of user-visible changes. 2003-11-17 Copyright (C) 1992-2002,2003 Free Software Foundation, Inc. See the end for copying conditions. @@ -18,6 +18,15 @@ Version 2.3.3 * getaddrinfo now implements AI_V4MAPPED, AI_ALL, and AI_ADDRCONF. Implemented by Ulrich Drepper. + +* support for non-executable stacks on x86 has been added. Changes mostly + by Roland McGrath. + +* regex is now much faster for multibyte locaes. Changes by Jakub Jelinek + and Ulrich Drepper. + +* getaddrinfo now performs destination address selection according to + RFC 3484. Version 2.3.2 diff --git a/elf/dl-load.c b/elf/dl-load.c index ecf2ee87eb..c7e3716cb6 100644 --- a/elf/dl-load.c +++ b/elf/dl-load.c @@ -1096,7 +1096,8 @@ cannot allocate TLS data structures for initial thread"); prefer to map such objects at; but this is only a preference, the OS can do whatever it likes. */ ElfW(Addr) mappref; - mappref = (ELF_PREFERRED_ADDRESS (loader, maplength, c->mapstart) + mappref = (ELF_PREFERRED_ADDRESS (loader, maplength, + c->mapstart & GL(dl_use_load_bias)) - MAP_BASE_ADDR (l)); /* Remember which part of the address space this object uses. */ diff --git a/elf/dl-support.c b/elf/dl-support.c index 448f4c6848..f13fd058a3 100644 --- a/elf/dl-support.c +++ b/elf/dl-support.c @@ -41,6 +41,7 @@ size_t _dl_platformlen; int _dl_debug_mask; int _dl_lazy; +ElfW(Addr) _dl_use_load_bias = -2; int _dl_dynamic_weak; /* If nonzero print warnings about problematic situations. */ diff --git a/elf/rtld.c b/elf/rtld.c index e92149a667..82f7ed3fc2 100644 --- a/elf/rtld.c +++ b/elf/rtld.c @@ -95,6 +95,7 @@ struct rtld_global _rtld_global = ._dl_sysinfo = DL_SYSINFO_DEFAULT, #endif ._dl_lazy = 1, + ._dl_use_load_bias = -2, ._dl_fpu_control = _FPU_DEFAULT, ._dl_correct_cache_id = _DL_CACHE_DEFAULT_ID, ._dl_hwcap_mask = HWCAP_IMPORTANT, @@ -996,6 +997,12 @@ of this helper program; chances are you did not intend to run this program.\n\ GL(dl_rtld_map).l_prev = GL(dl_loaded); ++GL(dl_nloaded); + /* If LD_USE_LOAD_BIAS env variable has not been seen, default + to not using bias for non-prelinked PIEs and libraries + and using it for executables or prelinked PIEs or libraries. */ + if (GL(dl_use_load_bias) == (ElfW(Addr)) -2) + GL(dl_use_load_bias) = (GL(dl_loaded)->l_addr == 0) ? -1 : 0; + /* Set up the program header information for the dynamic linker itself. It is needed in the dl_iterate_phdr() callbacks. */ ElfW(Ehdr) *rtld_ehdr = (ElfW(Ehdr) *) GL(dl_rtld_map).l_map_start; @@ -1992,6 +1999,17 @@ process_envvars (enum mode *modep) GL(dl_dynamic_weak) = 1; break; + case 13: + /* We might have some extra environment variable with length 13 + to handle. */ +#ifdef EXTRA_LD_ENVVARS_13 + EXTRA_LD_ENVVARS_13 +#endif + if (!INTUSE(__libc_enable_secure) + && memcmp (envline, "USE_LOAD_BIAS", 13) == 0) + GL(dl_use_load_bias) = envline[14] == '1' ? -1 : 0; + break; + case 14: /* Where to place the profiling data file. */ if (!INTUSE(__libc_enable_secure) diff --git a/math/libm-test.inc b/math/libm-test.inc index 8aa9aaaccc..d06dd5afa1 100644 --- a/math/libm-test.inc +++ b/math/libm-test.inc @@ -1626,6 +1626,7 @@ ceil_test (void) TEST_f_f (ceil, M_PIl, 4.0); TEST_f_f (ceil, -M_PIl, -3.0); TEST_f_f (ceil, 0.25, 1.0); + TEST_f_f (ceil, -0.25, minus_zero); END (ceil); } @@ -2572,6 +2573,9 @@ floor_test (void) TEST_f_f (floor, M_PIl, 3.0); TEST_f_f (floor, -M_PIl, -4.0); + TEST_f_f (floor, 0.25, 0.0); + TEST_f_f (floor, -0.25, -1.0); + END (floor); } diff --git a/po/ja.po b/po/ja.po index 64d7eaaa05..7a0d0aca40 100644 --- a/po/ja.po +++ b/po/ja.po @@ -1,5526 +1,5897 @@ # Japanese Messages for GNU libc. # Copyright (C) 1996 Free Software Foundation, Inc. -# GOTO Masanori , 2000-2001. +# GOTO Masanori , 2000-2003. # msgid "" msgstr "" -"Project-Id-Version: libc 2.2.4\n" -"POT-Creation-Date: 2001-08-13 15:08-0700\n" -"PO-Revision-Date: 2001-08-24 00:31+09:00\n" +"Project-Id-Version: libc 2.3.2\n" +"POT-Creation-Date: 2003-02-22 15:34-0800\n" +"PO-Revision-Date: 2003-11-25 00:31+09:00\n" "Last-Translator: GOTO Masanori \n" -"Language-Team: Japanese \n" +"Language-Team: Japanese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=EUC-JP\n" "Content-Transfer-Encoding: 8bit\n" -#: locale/programs/ld-monetary.c:278 -#, c-format -msgid "\t\t\t\t\t\t\t %s: value for field `%s' must be in range %d...%d" -msgstr "\t\t\t\t\t\t\t %s: フィールド`%s'の値は %d...%d の範囲になければなりません" - -#: nis/nis_print.c:277 -msgid "\t\tAccess Rights : " -msgstr "\t\tアクセス権限 : " - -#: nis/nis_print.c:275 -msgid "\t\tAttributes : " -msgstr "\t\t属性 : " - -#: sunrpc/rpc_main.c:1427 -#, c-format -msgid "\t%s [-abkCLNTM][-Dname[=value]] [-i size] [-I [-K seconds]] [-Y path] infile\n" -msgstr "\t%s [-abkCLNTM][-D名前[=値]] [-i サイズ] [-I [-K 秒数]] [-Y パス] 入力ファイル\n" - -#: sunrpc/rpc_main.c:1429 -#, c-format -msgid "\t%s [-c | -h | -l | -m | -t | -Sc | -Ss | -Sm] [-o outfile] [infile]\n" -msgstr "\t%s [-c | -h | -l | -m | -t | -Sc | -Ss | -Sm] [-o 出力ファイル] [入力ファイル]\n" +#: sysdeps/generic/siglist.h:29 stdio-common/../sysdeps/unix/siglist.c:27 +msgid "Hangup" +msgstr "ハングアップ" -#: sunrpc/rpc_main.c:1432 -#, c-format -msgid "\t%s [-n netid]* [-o outfile] [infile]\n" -msgstr "\t%s [-n netid]* [-o 出力ファイル] [入力ファイル]\n" +#: sysdeps/generic/siglist.h:30 stdio-common/../sysdeps/unix/siglist.c:28 +msgid "Interrupt" +msgstr "割り込み" -#: sunrpc/rpc_main.c:1431 -#, c-format -msgid "\t%s [-s nettype]* [-o outfile] [infile]\n" -msgstr "\t%s [-s ネットタイプ]* [-o 出力ファイル] [入力ファイル]\n" +#: sysdeps/generic/siglist.h:31 stdio-common/../sysdeps/unix/siglist.c:29 +msgid "Quit" +msgstr "終了" -#: nis/nis_print.c:239 -msgid "\tAccess rights: " -msgstr "\tアクセス権限 : " +#: sysdeps/generic/siglist.h:32 stdio-common/../sysdeps/unix/siglist.c:30 +msgid "Illegal instruction" +msgstr "不正な命令です" -#: nis/nis_print.c:297 -#, c-format -msgid "\tEntry data of type %s\n" -msgstr "\tエントリデータの型 %s\n" +#: sysdeps/generic/siglist.h:33 stdio-common/../sysdeps/unix/siglist.c:31 +msgid "Trace/breakpoint trap" +msgstr "トレース/ブレイクポイント トラップ" -#: nis/nis_print.c:175 -#, c-format -msgid "\tName : %s\n" -msgstr "\t名前 : %s\n" +#: sysdeps/generic/siglist.h:34 +msgid "Aborted" +msgstr "アボートしました" -#: nis/nis_print.c:176 -msgid "\tPublic Key : " -msgstr "\t公開鍵 : " +#: sysdeps/generic/siglist.h:35 stdio-common/../sysdeps/unix/siglist.c:34 +msgid "Floating point exception" +msgstr "浮動小数点演算例外です" -#: nis/nis_print.c:238 -#, c-format -msgid "\tType : %s\n" -msgstr "\t型 : %s\n" +#: sysdeps/generic/siglist.h:36 stdio-common/../sysdeps/unix/siglist.c:35 +msgid "Killed" +msgstr "強制終了" -#: nis/nis_print.c:205 -#, c-format -msgid "\tUniversal addresses (%u)\n" -msgstr "\tユニバーサルアドレス (%u)\n" +#: sysdeps/generic/siglist.h:37 stdio-common/../sysdeps/unix/siglist.c:36 +msgid "Bus error" +msgstr "バスエラー" -#: nis/nis_print.c:273 -#, c-format -msgid "\t[%d]\tName : %s\n" -msgstr "\t[%d]\t名前 : %s\n" +#: sysdeps/generic/siglist.h:38 stdio-common/../sysdeps/unix/siglist.c:37 +msgid "Segmentation fault" +msgstr "セグメンテーション違反です" -#: nis/nis_print.c:300 -#, c-format -msgid "\t[%u] - [%u bytes] " -msgstr "\t[%u] - [%uバイト] " +#. TRANS Broken pipe; there is no process reading from the other end of a pipe. +#. TRANS Every library function that returns this error code also generates a +#. TRANS @code{SIGPIPE} signal; this signal terminates the program if not handled +#. TRANS or blocked. Thus, your program will never actually see @code{EPIPE} +#. TRANS unless it has handled or blocked @code{SIGPIPE}. +#: sysdeps/generic/siglist.h:39 stdio-common/../sysdeps/gnu/errlist.c:351 +#: stdio-common/../sysdeps/unix/siglist.c:39 +#: stdio-common/../sysdeps/unix/sysv/sysv4/solaris2/sparc/errlist.c:62 +msgid "Broken pipe" +msgstr "パイプが切断されました" -#: nscd/nscd_stat.c:154 -#, c-format -msgid "" -"\n" -"%s cache:\n" -"\n" -"%15s cache is enabled\n" -"%15Zd suggested size\n" -"%15ld seconds time to live for positive entries\n" -"%15ld seconds time to live for negative entries\n" -"%15ld cache hits on positive entries\n" -"%15ld cache hits on negative entries\n" -"%15ld cache misses on positive entries\n" -"%15ld cache misses on negative entries\n" -"%15ld%% cache hit rate\n" -"%15s check /etc/%s for changes\n" -msgstr "" -"\n" -"%s キャッシュ:\n" -"\n" -"%15s キャッシュは有効\n" -"%15Zd 推奨されているサイズ\n" -"%15ld ポジティブエントリが有効な秒数\n" -"%15ld ネガティブエントリが有効な秒数\n" -"%15ld ポジティブエントリのキャッシュヒット数\n" -"%15ld ネガティブエントリのキャッシュヒット数\n" -"%15ld ポジティブエントリのキャッシュミス数\n" -"%15ld ネガティブエントリのキャッシュミス数\n" -"%15ld%% キャッシュのヒット率\n" -"%15s /etc/%sの変更をチェックする\n" +#: sysdeps/generic/siglist.h:40 stdio-common/../sysdeps/unix/siglist.c:40 +msgid "Alarm clock" +msgstr "アラームクロック" -#: nis/nis_print.c:255 -msgid "\nGroup Members :\n" -msgstr "\nグループメンバ :\n" +#: sysdeps/generic/siglist.h:41 stdio-common/../sysdeps/unix/siglist.c:41 +msgid "Terminated" +msgstr "終了しました" -#: nis/nis_print.c:326 -msgid "\nTime to Live : " -msgstr "\n生存時間 : " +#: sysdeps/generic/siglist.h:42 stdio-common/../sysdeps/unix/siglist.c:42 +msgid "Urgent I/O condition" +msgstr "緊急のI/O状況です" -#: sunrpc/rpcinfo.c:679 -msgid " rpcinfo -b prognum versnum\n" -msgstr " rpcinfo -b prognum versnum\n" +#: sysdeps/generic/siglist.h:43 stdio-common/../sysdeps/unix/siglist.c:43 +msgid "Stopped (signal)" +msgstr "停止しました (シグナル)" -#: sunrpc/rpcinfo.c:680 -msgid " rpcinfo -d prognum versnum\n" -msgstr " rpcinfo -d prognum versnum\n" +#: sysdeps/generic/siglist.h:44 stdio-common/../sysdeps/unix/siglist.c:44 +msgid "Stopped" +msgstr "停止しました" -#: sunrpc/rpcinfo.c:678 -msgid " rpcinfo -p [ host ]\n" -msgstr " rpcinfo -p [ ホスト ]\n" +#: sysdeps/generic/siglist.h:45 stdio-common/../sysdeps/unix/siglist.c:45 +msgid "Continued" +msgstr "継続" -#: sunrpc/rpcinfo.c:676 -msgid " rpcinfo [ -n portnum ] -t host prognum [ versnum ]\n" -msgstr " rpcinfo [ -n portnum ] -t ホスト prognum [ versnum ]\n" +#: sysdeps/generic/siglist.h:46 stdio-common/../sysdeps/unix/siglist.c:46 +msgid "Child exited" +msgstr "子プロセスが終了しました" -#: nscd/nscd_stat.c:146 nscd/nscd_stat.c:148 -msgid " no" -msgstr " いいえ" +#: sysdeps/generic/siglist.h:47 stdio-common/../sysdeps/unix/siglist.c:47 +msgid "Stopped (tty input)" +msgstr "停止しました (端末入力)" -#: nscd/nscd_stat.c:146 nscd/nscd_stat.c:148 -msgid " yes" -msgstr " はい" +#: sysdeps/generic/siglist.h:48 stdio-common/../sysdeps/unix/siglist.c:48 +msgid "Stopped (tty output)" +msgstr "停止しました (端末出力)" -#: nis/nis_print.c:352 -#, c-format -msgid " Data Length = %u\n" -msgstr " データ長 = %u\n" +#: sysdeps/generic/siglist.h:49 stdio-common/../sysdeps/unix/siglist.c:49 +msgid "I/O possible" +msgstr "I/O可能です" -#: nis/nis_print_group_entry.c:123 -msgid " Explicit members:\n" -msgstr " 明示的メンバ:\n" +#: sysdeps/generic/siglist.h:50 stdio-common/../sysdeps/unix/siglist.c:50 +msgid "CPU time limit exceeded" +msgstr "CPU時間制限を超過しました" -#: nis/nis_print_group_entry.c:147 nis/nis_print_group_entry.c:163 -msgid " Explicit nonmembers:\n" -msgstr " 明示的非メンバ:\n" +#: sysdeps/generic/siglist.h:51 stdio-common/../sysdeps/unix/siglist.c:51 +msgid "File size limit exceeded" +msgstr "ファイルサイズ制限を超過しました" -#: nis/nis_print_group_entry.c:131 -msgid " Implicit members:\n" -msgstr " 暗黙的メンバ:\n" +#: sysdeps/generic/siglist.h:52 stdio-common/../sysdeps/unix/siglist.c:52 +msgid "Virtual timer expired" +msgstr "仮想タイマが終了しました" -#: nis/nis_print_group_entry.c:155 -msgid " Implicit nonmembers:\n" -msgstr " 暗黙的非メンバ:\n" +#: sysdeps/generic/siglist.h:53 stdio-common/../sysdeps/unix/siglist.c:53 +msgid "Profiling timer expired" +msgstr "プロファイリングタイマが破棄されました" -#: nis/nis_print_group_entry.c:128 -msgid " No explicit members\n" -msgstr " 非明示的メンバ\n" +#: sysdeps/generic/siglist.h:54 stdio-common/../sysdeps/unix/siglist.c:54 +msgid "Window changed" +msgstr "ウィンドウが変更されました" -#: nis/nis_print_group_entry.c:152 -msgid " No explicit nonmembers\n" -msgstr " 非明示的非メンバ\n" +#: sysdeps/generic/siglist.h:55 stdio-common/../sysdeps/unix/siglist.c:56 +msgid "User defined signal 1" +msgstr "ユーザ定義シグナル 1" -#: nis/nis_print_group_entry.c:136 -msgid " No implicit members\n" -msgstr " 非暗黙的メンバ\n" +#: sysdeps/generic/siglist.h:56 stdio-common/../sysdeps/unix/siglist.c:57 +msgid "User defined signal 2" +msgstr "ユーザ定義シグナル 2" -#: nis/nis_print_group_entry.c:160 -msgid " No implicit nonmembers\n" -msgstr " 非暗黙的非メンバ\n" +#: sysdeps/generic/siglist.h:60 stdio-common/../sysdeps/unix/siglist.c:33 +msgid "EMT trap" +msgstr "EMT トラップ" -#: nis/nis_print_group_entry.c:144 -msgid " No recursive members\n" -msgstr " 非再帰的メンバ\n" +#: sysdeps/generic/siglist.h:63 stdio-common/../sysdeps/unix/siglist.c:38 +msgid "Bad system call" +msgstr "不正なシステムコールです" -#: nis/nis_print_group_entry.c:168 -msgid " No recursive nonmembers\n" -msgstr " 非再帰的非メンバ\n" +#: sysdeps/generic/siglist.h:66 +msgid "Stack fault" +msgstr "スタック失敗" -#: nis/nis_print_group_entry.c:139 -msgid " Recursive members:\n" -msgstr " 再帰的メンバ:\n" +#: sysdeps/generic/siglist.h:69 +msgid "Information request" +msgstr "情報要求" -#: sunrpc/rpcinfo.c:574 -msgid " program vers proto port\n" -msgstr " プログラム バージョン プロトコル ポート\n" +#: sysdeps/generic/siglist.h:71 +msgid "Power failure" +msgstr "電源故障" -#: argp/argp-help.c:1572 -msgid " or: " -msgstr " 又は: " +#: sysdeps/generic/siglist.h:74 stdio-common/../sysdeps/unix/siglist.c:55 +msgid "Resource lost" +msgstr "リソースが失われました" -#: elf/ldconfig.c:457 -msgid " (SKIPPED)\n" -msgstr " (スキップ)\n" +#: sysdeps/mach/hurd/mips/dl-machine.c:68 +#: string/../sysdeps/mach/_strerror.c:57 +msgid "Error in unknown error system: " +msgstr "不明なエラーシステムでのエラー:" -#: elf/ldconfig.c:455 -msgid " (changed)\n" -msgstr " (変更)\n" +#: sysdeps/mach/hurd/mips/dl-machine.c:83 +#: string/../sysdeps/generic/_strerror.c:44 +#: string/../sysdeps/mach/_strerror.c:87 +msgid "Unknown error " +msgstr "未知のエラー " -#: timezone/zic.c:427 +#: sysdeps/unix/sysv/linux/lddlibc4.c:64 #, c-format -msgid " (rule from \"%s\", line %d)" -msgstr " (\"%s\"からの規則, %d行)" - -#: argp/argp-help.c:1584 -msgid " [OPTION...]" -msgstr " [オプション...]" +msgid "cannot open `%s'" +msgstr "`%s'を開けません" -#: timezone/zic.c:424 +#: sysdeps/unix/sysv/linux/lddlibc4.c:68 #, c-format -msgid "\"%s\", line %d: %s" -msgstr "\"%s\", %d行: %s" +msgid "cannot read header from `%s'" +msgstr "`%s'のヘッダを読めません" -#: timezone/zic.c:989 +#: iconv/iconv_charmap.c:159 iconv/iconv_prog.c:293 catgets/gencat.c:288 #, c-format -msgid "\"Zone %s\" line and -l option are mutually exclusive" -msgstr "\"Zone %s\"行と -l オプションは同時指定できません" +msgid "cannot open input file `%s'" +msgstr "入力ファイル`%s'を開けません" -#: timezone/zic.c:997 +#: iconv/iconv_charmap.c:177 iconv/iconv_prog.c:311 #, c-format -msgid "\"Zone %s\" line and -p option are mutually exclusive" -msgstr "\"Zone %s\"行と -p オプションは同時指定できません" - -#: sunrpc/rpc_main.c:1412 -msgid "\"infile\" is required for template generation flags.\n" -msgstr "テンプレート生成フラグには\"入力ファイル\"が必要です.\n" +msgid "error while closing input `%s'" +msgstr "入力ファイル `%s' を閉じている間のエラー" -#: argp/argp-help.c:209 +#: iconv/iconv_charmap.c:443 #, c-format -msgid "%.*s: ARGP_HELP_FMT parameter requires a value" -msgstr "%.*s: ARGP_HELP_FMT パラメータには値が必要です" +msgid "illegal input sequence at position %Zd" +msgstr "位置 %Zd で不正な入力シーケンスがありました" -#: argp/argp-help.c:218 -#, c-format -msgid "%.*s: Unknown ARGP_HELP_FMT parameter" -msgstr "%.*s: 不明な ARGP_HELP_FMT パラメータ" +#: iconv/iconv_charmap.c:462 iconv/iconv_prog.c:503 +msgid "incomplete character or shift sequence at end of buffer" +msgstr "バッファの最後での一致しない文字またはシフトシーケンスです" -#: locale/programs/ld-address.c:581 locale/programs/ld-collate.c:2612 -#: locale/programs/ld-collate.c:3740 locale/programs/ld-ctype.c:2112 -#: locale/programs/ld-ctype.c:2849 locale/programs/ld-identification.c:448 -#: locale/programs/ld-measurement.c:237 locale/programs/ld-messages.c:331 -#: locale/programs/ld-monetary.c:936 locale/programs/ld-name.c:305 -#: locale/programs/ld-numeric.c:375 locale/programs/ld-paper.c:238 -#: locale/programs/ld-telephone.c:313 locale/programs/ld-time.c:1199 -#, c-format -msgid "%1$s: definition does not end with `END %1$s'" -msgstr "%1$s: 定義が `END %1$s' で終っていません" +#: iconv/iconv_charmap.c:507 iconv/iconv_charmap.c:543 iconv/iconv_prog.c:546 +#: iconv/iconv_prog.c:582 +msgid "error while reading the input" +msgstr "入力読み込み中のエラー" -#: elf/cache.c:190 elf/cache.c:200 -#, c-format -msgid "%d libs found in cache `%s'\n" -msgstr "%d ライブラリがキャッシュ `%s で見つかりました\n" +#: iconv/iconv_charmap.c:525 iconv/iconv_prog.c:564 +msgid "unable to allocate buffer for input" +msgstr "入力用バッファを割り当てることができません" -#: timezone/zic.c:799 -#, c-format -msgid "%s in ruleless zone" -msgstr "%s in ruleless zone" +#: iconv/iconv_prog.c:61 +msgid "Input/Output format specification:" +msgstr "入力/出力フォーマットの仕様:" -#: elf/../sysdeps/generic/readelflib.c:67 -#, c-format -msgid "%s is a 32 bit ELF file.\n" -msgstr "%s は32ビットELFファイルです.\n" +#: iconv/iconv_prog.c:62 +msgid "encoding of original text" +msgstr "元のテキストのエンコーディング" -#: elf/../sysdeps/generic/readelflib.c:69 -#, c-format -msgid "%s is a 64 bit ELF file.\n" -msgstr "%s は64ビットELFファイルです.\n" +#: iconv/iconv_prog.c:63 +msgid "encoding for output" +msgstr "出力時のエンコーディング" -#: elf/../sysdeps/unix/sysv/linux/i386/readelflib.c:49 -#, c-format -msgid "%s is for unknown machine %d.\n" -msgstr "%s は未知のマシン %d に対するものです.\n" +#: iconv/iconv_prog.c:64 +msgid "Information:" +msgstr "情報:" -#: elf/ldconfig.c:326 -#, c-format -msgid "%s is not a known library type" -msgstr "%s は未知のライブラリタイプです" +#: iconv/iconv_prog.c:65 +msgid "list all known coded character sets" +msgstr "既知の全キャラクタセットを表示する" -#: elf/../sysdeps/generic/readelflib.c:78 -#, c-format -msgid "%s is not a shared object file (Type: %d).\n" -msgstr "%s は共有オブジェクトファイルではありません (タイプ: %d).\n" +#: iconv/iconv_prog.c:66 locale/programs/localedef.c:128 +msgid "Output control:" +msgstr "出力制御:" -#: elf/ldconfig.c:424 -#, c-format -msgid "%s is not a symbolic link\n" -msgstr "%s はシンボリックリンクではありません\n" +#: iconv/iconv_prog.c:67 +msgid "omit invalid characters from output" +msgstr "出力から不正な文字を抜かしました" -#: elf/readlib.c:155 -#, c-format -msgid "%s is not an ELF file - it has the wrong magic bytes at the start.\n" -msgstr "%s はELFファイルではありません - 間違ったmagicバイトをファイルの先頭に持っています.\n" +#: iconv/iconv_prog.c:68 +msgid "output file" +msgstr "出力ファイル" -#: assert/assert.c:52 -#, c-format -msgid "%s%s%s:%u: %s%sAssertion `%s' failed.\n" -msgstr "%s%s%s:%u: %s%sAssertion `%s' が失敗しました.\n" +#: iconv/iconv_prog.c:69 +msgid "suppress warnings" +msgstr "警告の抑制" -#: assert/assert-perr.c:54 -#, c-format -msgid "%s%s%s:%u: %s%sUnexpected error: %s.\n" -msgstr "%s%s%s:%u: %s%s予期しないエラー: %s.\n" +#: iconv/iconv_prog.c:70 +msgid "print progress information" +msgstr "経過情報の表示" -#: stdio-common/psignal.c:48 -#, c-format -msgid "%s%sUnknown signal %d\n" -msgstr "%s%s未知のシグナル %d です\n" +#: iconv/iconv_prog.c:75 +msgid "Convert encoding of given files from one encoding to another." +msgstr "与えられたファイルのエンコーディングを変換する." -#: timezone/zic.c:2234 -#, c-format -msgid "%s: %d did not sign extend correctly\n" -msgstr "%s: %d は正しく記号を拡張しませんでした\n" +#: iconv/iconv_prog.c:79 +msgid "[FILE...]" +msgstr "[ファイル...]" -#: locale/programs/charmap.c:331 -#, c-format -msgid "%s: must be greater than \n" -msgstr "%s: はより大きくなければなりません\n" +#: iconv/iconv_prog.c:199 +msgid "cannot open output file" +msgstr "出力ファイルを開けません" -#: sunrpc/rpc_main.c:423 +#: iconv/iconv_prog.c:241 #, c-format -msgid "%s: C preprocessor failed with exit code %d\n" -msgstr "%s: C プリプロセッサは終了コード %d で失敗しました\n" +msgid "conversion from `%s' and to `%s' are not supported" +msgstr "`%s'からの変換と`%s'への変換はどちらもサポートされていません" -#: sunrpc/rpc_main.c:420 +#: iconv/iconv_prog.c:246 #, c-format -msgid "%s: C preprocessor failed with signal %d\n" -msgstr "%s: C プリプロセッサはシグナル %d で失敗しました\n" +msgid "conversion from `%s' is not supported" +msgstr "`%s'からの変換はサポートされていません" -#: timezone/zic.c:1500 +#: iconv/iconv_prog.c:253 #, c-format -msgid "%s: Can't create %s: %s\n" -msgstr "%s: %sを作成できません: %s\n" +msgid "conversion to `%s' is not supported" +msgstr "`%s'への変換はサポートされていません" -#: timezone/zic.c:2212 +#: iconv/iconv_prog.c:257 #, c-format -msgid "%s: Can't create directory %s: %s\n" -msgstr "%s: ディレクトリ%sを作成できません: %s\n" +msgid "conversion from `%s' to `%s' is not supported" +msgstr "`%s'から`%s'への変換はサポートされていません" -#: timezone/zic.c:651 -#, c-format -msgid "%s: Can't link from %s to %s: %s\n" -msgstr "%s: %sから%sへリンクを張れません: %s\n" +#: iconv/iconv_prog.c:263 +msgid "failed to start conversion processing" +msgstr "変換処理の開始に失敗しました" -#: timezone/zic.c:825 -#, c-format -msgid "%s: Can't open %s: %s\n" -msgstr "%s: %sを開けません: %s\n" +#: iconv/iconv_prog.c:358 +msgid "error while closing output file" +msgstr "出力ファイルを閉じている間のエラー" -#: timezone/zic.c:1490 -#, c-format -msgid "%s: Can't remove %s: %s\n" -msgstr "%s: %sを削除できません: %s\n" +#: iconv/iconv_prog.c:407 iconv/iconvconfig.c:357 locale/programs/locale.c:274 +#: locale/programs/localedef.c:372 catgets/gencat.c:233 +#: malloc/memusagestat.c:602 debug/pcprofiledump.c:199 +msgid "Report bugs using the `glibcbug' script to .\n" +msgstr "バグはスクリプト`glibcbug'を用いてまで報告してください.\n" -#: timezone/zic.c:636 +#: iconv/iconv_prog.c:421 iconv/iconvconfig.c:371 locale/programs/locale.c:287 +#: locale/programs/localedef.c:386 catgets/gencat.c:246 posix/getconf.c:910 +#: nss/getent.c:74 nscd/nscd.c:330 nscd/nscd_nischeck.c:90 elf/ldconfig.c:271 +#: elf/sprof.c:349 #, c-format -msgid "%s: Can't unlink %s: %s\n" -msgstr "%s: %sをアンリンクできません: %s\n" +msgid "" +"Copyright (C) %s Free Software Foundation, Inc.\n" +"This is free software; see the source for copying conditions. There is NO\n" +"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" +msgstr "" +"Copyright (C) %s Free Software Foundation, Inc.\n" +"This is free software; see the source for copying conditions. There is NO\n" +"warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.\n" +"これはフリーソフトウェアです。利用許諾についてはソースをご覧ください。\n" +"商業性や特定の目的への適合性の如何に関わらず、無保証です。 \n" -#: timezone/zic.c:894 +#: iconv/iconv_prog.c:426 iconv/iconvconfig.c:376 locale/programs/locale.c:292 +#: locale/programs/localedef.c:391 catgets/gencat.c:251 posix/getconf.c:915 +#: nss/getent.c:79 nscd/nscd.c:335 nscd/nscd_nischeck.c:95 elf/ldconfig.c:276 +#: elf/sprof.c:355 #, c-format -msgid "%s: Error closing %s: %s\n" -msgstr "%s: %sをクローズ中にエラー: %s\n" +msgid "Written by %s.\n" +msgstr "%sによる書き込み.\n" -#: timezone/zic.c:887 -#, c-format -msgid "%s: Error reading %s\n" -msgstr "%s: %sの読み込みエラー\n" +#: iconv/iconv_prog.c:456 iconv/iconv_prog.c:482 +msgid "conversion stopped due to problem in writing the output" +msgstr "出力書き出し中に問題があったため変換を中止しました" -#: timezone/zic.c:1566 +#: iconv/iconv_prog.c:499 #, c-format -msgid "%s: Error writing %s\n" -msgstr "%s: %sの書き込みエラーです\n" +msgid "illegal input sequence at position %ld" +msgstr "位置 %ld で不正な入力シーケンスがありました" -#: timezone/zic.c:872 -#, c-format -msgid "%s: Leap line in non leap seconds file %s\n" -msgstr "%s: 閏秒ファイルでないファイル %s に Leap 行があります\n" +#: iconv/iconv_prog.c:507 +msgid "internal error (illegal descriptor)" +msgstr "内部エラー (不正な記述子です)" -#: timezone/zic.c:365 +#: iconv/iconv_prog.c:510 #, c-format -msgid "%s: Memory exhausted: %s\n" -msgstr "%s: メモリが足りません: %s\n" +msgid "unknown iconv() error %d" +msgstr "不明な iconv() エラー %d" -#: timezone/zic.c:531 -#, c-format -msgid "%s: More than one -L option specified\n" -msgstr "%s: -L オプションが複数指定されています\n" +#: iconv/iconv_prog.c:753 +msgid "" +"The following list contain all the coded character sets known. This does\n" +"not necessarily mean that all combinations of these names can be used for\n" +"the FROM and TO command line parameters. One coded character set can be\n" +"listed with several different names (aliases).\n" +"\n" +" " +msgstr "" +"以下のリストには、知られているすべてのキャラクタコードが含まれています.\n" +"これは、これらの名前はコマンドラインパラメータのFROMとTOで使われる全ての\n" +"組合せを意味しているわけではありません. あるキャラクタセットは、\n" +"いくつかの異なる名前(エイリアス)と共にリストされます.\n" +"\n" +" " -#: timezone/zic.c:491 -#, c-format -msgid "%s: More than one -d option specified\n" -msgstr "%s: -d オプションが複数指定されています\n" +#: iconv/iconvconfig.c:110 +msgid "Create fastloading iconv module configuration file." +msgstr "高速読込み用 iconv モジュール設定ファイルを作成します." -#: timezone/zic.c:501 -#, c-format -msgid "%s: More than one -l option specified\n" -msgstr "%s: -l オプションが複数指定されています\n" +#: iconv/iconvconfig.c:114 +msgid "[DIR...]" +msgstr "[ディレクトリ...]" -#: timezone/zic.c:511 -#, c-format -msgid "%s: More than one -p option specified\n" -msgstr "%s: -p オプションが複数指定されています\n" +#: iconv/iconvconfig.c:126 +msgid "Prefix used for all file accesses" +msgstr "全ファイルのアクセスにプレフィックスを使用します" -#: timezone/zic.c:521 -#, c-format -msgid "%s: More than one -y option specified\n" -msgstr "%s: -y オプションが複数指定されています\n" +#: iconv/iconvconfig.c:327 locale/programs/localedef.c:292 +msgid "no output file produced because warning were issued" +msgstr "警告が出されたためファイルに出力されませんでした" -#: argp/argp-parse.c:646 -#, c-format -msgid "%s: Too many arguments\n" -msgstr "%s: 引数が多すぎます\n" +#: iconv/iconvconfig.c:405 +msgid "while inserting in search tree" +msgstr "検索木へ挿入中です" -#: locale/programs/ld-collate.c:457 locale/programs/ld-collate.c:483 -#: locale/programs/ld-collate.c:499 -#, c-format -msgid "%s: `%s' mentioned more than once in definition of weight %d" -msgstr "%s: `%s'は重み定義 %d 中で複数回使われています" +#: iconv/iconvconfig.c:1204 +msgid "cannot generate output file" +msgstr "出力ファイルを生成できません" -#: locale/programs/ld-collate.c:1336 +#: locale/programs/charmap-dir.c:59 #, c-format -msgid "%s: `%s' must be a character" -msgstr "%s: `%s'は単一のキャラクタでなければいけません" +msgid "cannot read character map directory `%s'" +msgstr "キャラクタマップディレクトリ`%s'を読み込めません" -#: locale/programs/ld-address.c:248 locale/programs/ld-address.c:276 -#: locale/programs/ld-address.c:309 locale/programs/ld-address.c:321 +#: locale/programs/charmap.c:135 #, c-format -msgid "%s: `%s' value does not match `%s' value" -msgstr "%s: `%s'値は`%s'の値にマッチしません" +msgid "character map file `%s' not found" +msgstr "キャラクタマップファイル `%s' が見つかりません" -#: locale/programs/ld-monetary.c:837 locale/programs/ld-numeric.c:318 +#: locale/programs/charmap.c:193 #, c-format -msgid "%s: `-1' must be last entry in `%s' field" -msgstr "%s: `-1'は`%s'フィールドの、最後の項目でなければいけません" +msgid "default character map file `%s' not found" +msgstr "標準キャラクタマップファイル`%s'が見つかりません" -#: locale/programs/ld-collate.c:447 locale/programs/ld-collate.c:473 +#: locale/programs/charmap.c:255 #, c-format -msgid "%s: `forward' and `backward' are mutually excluding each other" -msgstr "%s: `forward' と `backward' は排他的です" +msgid "character map `%s' is not ASCII compatible, locale not ISO C compliant\n" +msgstr "キャラクタマップ `%s' は ASCII 互換ではありません, ロケールは ISO C に従っていません\n" -#: locale/programs/ld-collate.c:1528 +#: locale/programs/charmap.c:332 #, c-format -msgid "%s: `position' must be used for a specific level in all sections or none" -msgstr "%s: `position'は特定レベルに対し、全セクションで使用か未使用かのどちらかです" +msgid "%s: must be greater than \n" +msgstr "%s: はより大きくなければなりません\n" -#: locale/programs/ld-ctype.c:2637 locale/programs/ld-ctype.c:2777 +#: locale/programs/charmap.c:352 locale/programs/charmap.c:369 +#: locale/programs/repertoire.c:175 #, c-format -msgid "%s: `translit_start' section does not end with `translit_end'" -msgstr "%s: `translit_start' セクションが `translit_end' で終っていません" +msgid "syntax error in prolog: %s" +msgstr "prolog 中で文法エラーです: %s" -#: locale/programs/ld-collate.c:1136 -#, c-format -msgid "%s: byte sequence of first character of sequence is not lower than that of the last character" -msgstr "%s: シーケンス中の最初の文字のバイトシーケンスは最後の文字のよりもlowerではありません" +#: locale/programs/charmap.c:353 +msgid "invalid definition" +msgstr "不正な定義です" -#: locale/programs/ld-collate.c:1094 -#, c-format -msgid "%s: byte sequences of first and last character must have the same length" -msgstr "%s: 最初と最後の文字のバイトシーケンスは同一長でなければなりません" +#: locale/programs/charmap.c:370 locale/programs/locfile.c:126 +#: locale/programs/locfile.c:153 locale/programs/repertoire.c:176 +msgid "bad argument" +msgstr "不正な引数です" -#: locale/programs/ld-collate.c:3663 +#: locale/programs/charmap.c:398 #, c-format -msgid "%s: cannot have `%s' as end of ellipsis range" -msgstr "%s: 省略記号の範囲の終わりに`%s'がありません" +msgid "duplicate definition of <%s>" +msgstr "<%s> の定義が重複しています" -#: locale/programs/ld-collate.c:3327 +#: locale/programs/charmap.c:405 #, c-format -msgid "%s: cannot reorder after %.*s: symbol not known" -msgstr "%s: %.*sの後で再並び替えができません: 未知のシンボルです" +msgid "value for <%s> must be 1 or greater" +msgstr "<%s> の値は1以上でなければなりません" -#: locale/programs/ld-ctype.c:2912 locale/programs/ld-ctype.c:2996 -#: locale/programs/ld-ctype.c:3016 locale/programs/ld-ctype.c:3037 -#: locale/programs/ld-ctype.c:3058 locale/programs/ld-ctype.c:3079 -#: locale/programs/ld-ctype.c:3100 locale/programs/ld-ctype.c:3140 -#: locale/programs/ld-ctype.c:3161 locale/programs/ld-ctype.c:3228 +#: locale/programs/charmap.c:417 #, c-format -msgid "%s: character `%s' in charmap not representable with one byte" -msgstr "%s: キャラクタマップ中の文字`%s'は1バイトで表現できません" - -#: locale/programs/ld-ctype.c:3272 locale/programs/ld-ctype.c:3297 -#, c-format -msgid "%s: character `%s' needed as default value not representable with one byte" -msgstr "%s: デフォルト値として必要なキャラクタ`%s'は1バイトで表現できません" +msgid "value of <%s> must be greater or equal than the value of <%s>" +msgstr "<%s> の値は <%s> の値以上でなければいけません" -#: locale/programs/ld-ctype.c:2907 +#: locale/programs/charmap.c:440 locale/programs/repertoire.c:184 #, c-format -msgid "%s: character `%s' not defined in charmap while needed as default value" -msgstr "%s: キャラクタマップ中で文字`%s'が未定義ですがデフォルト値として必要です" +msgid "argument to <%s> must be a single character" +msgstr "引数 <%s> はシングルキャラクタでなければいけません" -#: locale/programs/ld-ctype.c:2991 locale/programs/ld-ctype.c:3011 -#: locale/programs/ld-ctype.c:3053 locale/programs/ld-ctype.c:3074 -#: locale/programs/ld-ctype.c:3095 locale/programs/ld-ctype.c:3135 -#: locale/programs/ld-ctype.c:3156 locale/programs/ld-ctype.c:3223 -#: locale/programs/ld-ctype.c:3265 locale/programs/ld-ctype.c:3290 -#, c-format -msgid "%s: character `%s' not defined while needed as default value" -msgstr "%s: キャラクタ`%s'が定義されていませんが、デフォルト値として必要です" +#: locale/programs/charmap.c:466 +msgid "character sets with locking states are not supported" +msgstr "ロック状態を持つキャラクタ集合がサポートされていません" -#: timezone/zic.c:1933 +#: locale/programs/charmap.c:493 locale/programs/charmap.c:547 +#: locale/programs/charmap.c:579 locale/programs/charmap.c:673 +#: locale/programs/charmap.c:728 locale/programs/charmap.c:769 +#: locale/programs/charmap.c:810 #, c-format -msgid "%s: command was '%s', result was %d\n" -msgstr "%s: コマンドは'%s', 結果は %dでした\n" +msgid "syntax error in %s definition: %s" +msgstr "%sの定義中に文法エラーがあります: %s" -#: locale/programs/ld-time.c:246 -#, c-format -msgid "%s: direction flag in string %Zd in `era' field is not '+' nor '-'" -msgstr "%s: `era'フィールド中の文字列 %Zd 内の方向フラグが'+'でも'-'でもありません" +#: locale/programs/charmap.c:494 locale/programs/charmap.c:674 +#: locale/programs/charmap.c:770 locale/programs/repertoire.c:231 +msgid "no symbolic name given" +msgstr "シンボル名が与えられていません" -#: locale/programs/ld-time.c:258 -#, c-format -msgid "%s: direction flag in string %Zd in `era' field is not a single character" -msgstr "%s: `era'フィールド内の文字列 %Zd の方向フラグが単一文字ではありません" +#: locale/programs/charmap.c:548 +msgid "invalid encoding given" +msgstr "不正なエンコーディングが与えられました" -#: locale/programs/ld-ctype.c:2729 -#, c-format -msgid "%s: duplicate `default_missing' definition" -msgstr "%s: `default_missing'定義が重複しています" +#: locale/programs/charmap.c:557 +msgid "too few bytes in character encoding" +msgstr "文字エンコーディング中でのバイト数が少なすぎます" -#: locale/programs/ld-identification.c:431 -#, c-format -msgid "%s: duplicate category version definition" -msgstr "%s: カテゴリバージョンの定義が重複しています" +#: locale/programs/charmap.c:559 +msgid "too many bytes in character encoding" +msgstr "文字エンコーディング中でのバイト数が多すぎます" -#: locale/programs/ld-collate.c:2730 -#, c-format -msgid "%s: duplicate declaration of section `%s'" -msgstr "%s: セクション`%s'の記述が重複しています" +#: locale/programs/charmap.c:581 locale/programs/charmap.c:729 +#: locale/programs/charmap.c:812 locale/programs/repertoire.c:297 +msgid "no symbolic name given for end of range" +msgstr "領域の最後にシンボル名が与えられていません" -#: locale/programs/ld-collate.c:2694 +#: locale/programs/charmap.c:605 locale/programs/locfile.h:96 +#: locale/programs/repertoire.c:314 #, c-format -msgid "%s: duplicate definition of `%s'" -msgstr "%s: `%s'の定義が重複しています" +msgid "`%1$s' definition does not end with `END %1$s'" +msgstr "定義`%1$s' が `END %1$s' で終っていません" -#: locale/programs/ld-collate.c:3712 -#, c-format -msgid "%s: empty category description not allowed" -msgstr "%s: 空のカテゴリ記述は許されてません" +#: locale/programs/charmap.c:638 +msgid "only WIDTH definitions are allowed to follow the CHARMAP definition" +msgstr "WIDTH 定義は CHARMAP 定義に従うことのみ許されます" -#: locale/programs/ld-collate.c:755 +#: locale/programs/charmap.c:646 locale/programs/charmap.c:709 #, c-format -msgid "%s: empty weight string not allowed" -msgstr "%s: 空の重み文字列は許されていません" +msgid "value for %s must be an integer" +msgstr "%sの値は整数でなければなりません" -#: locale/programs/charmap.c:836 +#: locale/programs/charmap.c:837 #, c-format msgid "%s: error in state machine" msgstr "%s: 状態機械中でエラー" -#: locale/programs/ld-address.c:489 locale/programs/ld-address.c:526 -#: locale/programs/ld-address.c:564 locale/programs/ld-ctype.c:2485 -#: locale/programs/ld-identification.c:360 -#: locale/programs/ld-measurement.c:220 locale/programs/ld-messages.c:300 -#: locale/programs/ld-monetary.c:694 locale/programs/ld-monetary.c:729 -#: locale/programs/ld-monetary.c:770 locale/programs/ld-name.c:278 -#: locale/programs/ld-numeric.c:263 locale/programs/ld-paper.c:221 -#: locale/programs/ld-telephone.c:288 locale/programs/ld-time.c:1104 -#: locale/programs/ld-time.c:1146 +#: locale/programs/charmap.c:845 locale/programs/ld-address.c:605 +#: locale/programs/ld-collate.c:2635 locale/programs/ld-collate.c:3793 +#: locale/programs/ld-ctype.c:2216 locale/programs/ld-ctype.c:2977 +#: locale/programs/ld-identification.c:469 +#: locale/programs/ld-measurement.c:255 locale/programs/ld-messages.c:349 +#: locale/programs/ld-monetary.c:952 locale/programs/ld-name.c:324 +#: locale/programs/ld-numeric.c:392 locale/programs/ld-paper.c:258 +#: locale/programs/ld-telephone.c:330 locale/programs/ld-time.c:1217 +#: locale/programs/locfile.h:103 locale/programs/repertoire.c:325 #, c-format -msgid "%s: field `%s' declared more than once" -msgstr "%s: フィールド`%s'が複数回宣言されています" +msgid "%s: premature end of file" +msgstr "%s ファイル終端が早すぎます" -#: locale/programs/ld-ctype.c:1526 locale/programs/ld-ctype.c:1651 -#: locale/programs/ld-ctype.c:1757 locale/programs/ld-ctype.c:2348 -#: locale/programs/ld-ctype.c:3331 +#: locale/programs/charmap.c:864 locale/programs/charmap.c:875 #, c-format -msgid "%s: field `%s' does not contain exactly ten entries" -msgstr "%s: フィールド`%s'はきっかり10項目分含んでいません" +msgid "unknown character `%s'" +msgstr "不明な文字`%s'" -#: locale/programs/ld-address.c:154 locale/programs/ld-address.c:205 -#: locale/programs/ld-address.c:230 locale/programs/ld-address.c:259 -#: locale/programs/ld-name.c:115 locale/programs/ld-telephone.c:117 +#: locale/programs/charmap.c:883 #, c-format -msgid "%s: field `%s' must not be empty" -msgstr "%s: フィールド`%s'は空ではいけません" +msgid "number of bytes for byte sequence of beginning and end of range not the same: %d vs %d" +msgstr "バイトシーケンスの開始から終了までのバイト数と、範囲の終わりとが一致しません: %d vs %d" -#: locale/programs/ld-address.c:142 locale/programs/ld-address.c:180 -#: locale/programs/ld-address.c:197 locale/programs/ld-address.c:224 -#: locale/programs/ld-address.c:284 locale/programs/ld-address.c:303 -#: locale/programs/ld-address.c:315 locale/programs/ld-identification.c:145 -#: locale/programs/ld-measurement.c:104 locale/programs/ld-monetary.c:206 -#: locale/programs/ld-monetary.c:244 locale/programs/ld-monetary.c:260 -#: locale/programs/ld-monetary.c:272 locale/programs/ld-name.c:104 -#: locale/programs/ld-name.c:141 locale/programs/ld-numeric.c:113 -#: locale/programs/ld-numeric.c:127 locale/programs/ld-paper.c:101 -#: locale/programs/ld-paper.c:109 locale/programs/ld-telephone.c:105 -#: locale/programs/ld-telephone.c:163 locale/programs/ld-time.c:175 -#: locale/programs/ld-time.c:195 -#, c-format -msgid "%s: field `%s' not defined" -msgstr "%s: フィールド`%s'は定義されていません" +#: locale/programs/charmap.c:987 locale/programs/ld-collate.c:2915 +#: locale/programs/repertoire.c:420 +msgid "invalid names for character range" +msgstr "キャラクタ範囲として不正な名前" -#: locale/programs/ld-messages.c:115 locale/programs/ld-messages.c:148 -#, c-format -msgid "%s: field `%s' undefined" -msgstr "%s: フィールド`%s'は未定義です" +#: locale/programs/charmap.c:999 locale/programs/repertoire.c:432 +msgid "hexadecimal range format should use only capital characters" +msgstr "16進数の範囲フォーマットは英大文字でのみ使用すべきです" -#: locale/programs/ld-time.c:279 +#: locale/programs/charmap.c:1017 #, c-format -msgid "%s: garbage at end of offset value in string %Zd in `era' field" -msgstr "%s: `era'フィールド中の文字列 %Zd 内のオフセット値の最後にゴミがあります" +msgid "<%s> and <%s> are illegal names for range" +msgstr "<%s> と <%s> は範囲として不正な名前です" -#: locale/programs/ld-time.c:339 -#, c-format -msgid "%s: garbage at end of starting date in string %Zd in `era' field " -msgstr "%s: `era'フィールド中の文字列 %Zd 内の開始日付の最後にゴミがあります" +#: locale/programs/charmap.c:1023 +msgid "upper limit in range is not higher then lower limit" +msgstr "範囲内の上限は下限より大きくありません" + +#: locale/programs/charmap.c:1081 +msgid "resulting bytes for range not representable." +msgstr "範囲内の結果バイトは表現可能ではありません." -#: locale/programs/ld-time.c:416 +#: locale/programs/ld-address.c:134 locale/programs/ld-collate.c:1519 +#: locale/programs/ld-ctype.c:416 locale/programs/ld-identification.c:134 +#: locale/programs/ld-measurement.c:95 locale/programs/ld-messages.c:98 +#: locale/programs/ld-monetary.c:194 locale/programs/ld-name.c:95 +#: locale/programs/ld-numeric.c:99 locale/programs/ld-paper.c:92 +#: locale/programs/ld-telephone.c:95 locale/programs/ld-time.c:160 #, c-format -msgid "%s: garbage at end of stopping date in string %Zd in `era' field" -msgstr "%s: `era'フィールド中の文字列 %Zd 内の終了日付の最後にゴミがあります" +msgid "No definition for %s category found" +msgstr "%s カテゴリに対する定義が見つかりません" -#: posix/getopt.c:788 +#: locale/programs/ld-address.c:145 locale/programs/ld-address.c:183 +#: locale/programs/ld-address.c:201 locale/programs/ld-address.c:228 +#: locale/programs/ld-address.c:290 locale/programs/ld-address.c:309 +#: locale/programs/ld-address.c:322 locale/programs/ld-identification.c:147 +#: locale/programs/ld-measurement.c:106 locale/programs/ld-monetary.c:206 +#: locale/programs/ld-monetary.c:244 locale/programs/ld-monetary.c:260 +#: locale/programs/ld-monetary.c:272 locale/programs/ld-name.c:106 +#: locale/programs/ld-name.c:143 locale/programs/ld-numeric.c:113 +#: locale/programs/ld-numeric.c:127 locale/programs/ld-paper.c:103 +#: locale/programs/ld-paper.c:112 locale/programs/ld-telephone.c:106 +#: locale/programs/ld-telephone.c:163 locale/programs/ld-time.c:176 +#: locale/programs/ld-time.c:197 #, c-format -msgid "%s: illegal option -- %c\n" -msgstr "%s: 不正なオプションです -- %c\n" +msgid "%s: field `%s' not defined" +msgstr "%s: フィールド`%s'は定義されていません" -#: locale/programs/ld-address.c:578 locale/programs/ld-collate.c:3738 -#: locale/programs/ld-ctype.c:2846 locale/programs/ld-identification.c:445 -#: locale/programs/ld-measurement.c:234 locale/programs/ld-messages.c:329 -#: locale/programs/ld-monetary.c:934 locale/programs/ld-name.c:303 -#: locale/programs/ld-numeric.c:373 locale/programs/ld-paper.c:236 -#: locale/programs/ld-telephone.c:311 locale/programs/ld-time.c:1197 +#: locale/programs/ld-address.c:157 locale/programs/ld-address.c:209 +#: locale/programs/ld-address.c:235 locale/programs/ld-address.c:265 +#: locale/programs/ld-name.c:118 locale/programs/ld-telephone.c:118 #, c-format -msgid "%s: incomplete `END' line" -msgstr "%s: 不完全な`END'行です" +msgid "%s: field `%s' must not be empty" +msgstr "%s: フィールド`%s'は空ではいけません" -#: locale/programs/ld-address.c:166 +#: locale/programs/ld-address.c:169 #, c-format msgid "%s: invalid escape `%%%c' sequence in field `%s'" msgstr "%s: 不正なエスケープシーケンス`%%%c'がフィールド`%s'中にあります" -#: locale/programs/ld-name.c:127 locale/programs/ld-telephone.c:126 -#: locale/programs/ld-telephone.c:150 +#: locale/programs/ld-address.c:220 #, c-format -msgid "%s: invalid escape sequence in field `%s'" -msgstr "%s: フィールド`%s'中の不正なエスケープシーケンスです" +msgid "%s: terminology language code `%s' not defined" +msgstr "%s: terminology言語コード`%s'は定義されていません" -#: locale/programs/ld-time.c:271 +#: locale/programs/ld-address.c:247 locale/programs/ld-address.c:276 #, c-format -msgid "%s: invalid number for offset in string %Zd in `era' field" -msgstr "%s: `era'フィールド内の文字列 %Zd 内のオフセットに対する番号が不正です" +msgid "%s: language abbreviation `%s' not defined" +msgstr "%s: 言語名省略形 `%s'が定義されていません" -#: locale/programs/ld-collate.c:3162 +#: locale/programs/ld-address.c:254 locale/programs/ld-address.c:282 +#: locale/programs/ld-address.c:316 locale/programs/ld-address.c:328 #, c-format -msgid "%s: invalid number of sorting rules" -msgstr "%s: 並び替え規則の番号が不正です" +msgid "%s: `%s' value does not match `%s' value" +msgstr "%s: `%s'値は`%s'の値にマッチしません" -#: posix/getopt.c:791 +#: locale/programs/ld-address.c:301 #, c-format -msgid "%s: invalid option -- %c\n" -msgstr "%s: オプションが違います -- %c\n" +msgid "%s: numeric country code `%d' not valid" +msgstr "%s: 国コード番号`%d'は不正です" -#: locale/programs/ld-time.c:330 +#: locale/programs/ld-address.c:497 locale/programs/ld-address.c:534 +#: locale/programs/ld-address.c:572 locale/programs/ld-ctype.c:2592 +#: locale/programs/ld-identification.c:365 +#: locale/programs/ld-measurement.c:222 locale/programs/ld-messages.c:302 +#: locale/programs/ld-monetary.c:694 locale/programs/ld-monetary.c:729 +#: locale/programs/ld-monetary.c:770 locale/programs/ld-name.c:281 +#: locale/programs/ld-numeric.c:264 locale/programs/ld-paper.c:225 +#: locale/programs/ld-telephone.c:289 locale/programs/ld-time.c:1106 +#: locale/programs/ld-time.c:1148 #, c-format -msgid "%s: invalid starting date in string %Zd in `era' field" -msgstr "%s: `era'フィールド中にある文字列 %Zd 内の開始日付が不正です" +msgid "%s: field `%s' declared more than once" +msgstr "%s: フィールド`%s'が複数回宣言されています" -#: locale/programs/ld-time.c:407 +#: locale/programs/ld-address.c:501 locale/programs/ld-address.c:539 +#: locale/programs/ld-identification.c:369 locale/programs/ld-messages.c:312 +#: locale/programs/ld-monetary.c:698 locale/programs/ld-monetary.c:733 +#: locale/programs/ld-name.c:285 locale/programs/ld-numeric.c:268 +#: locale/programs/ld-telephone.c:293 locale/programs/ld-time.c:1000 +#: locale/programs/ld-time.c:1069 locale/programs/ld-time.c:1111 #, c-format -msgid "%s: invalid stopping date in string %Zd in `era' field" -msgstr "%s: `era'フィールドにある文字列 %Zd 内の終了日付が不正です" +msgid "%s: unknown character in field `%s'" +msgstr "%s: フィールド`%s'中に未知の文字があります" -#: locale/programs/ld-measurement.c:112 +#: locale/programs/ld-address.c:586 locale/programs/ld-collate.c:3775 +#: locale/programs/ld-ctype.c:2957 locale/programs/ld-identification.c:450 +#: locale/programs/ld-measurement.c:236 locale/programs/ld-messages.c:331 +#: locale/programs/ld-monetary.c:934 locale/programs/ld-name.c:306 +#: locale/programs/ld-numeric.c:374 locale/programs/ld-paper.c:240 +#: locale/programs/ld-telephone.c:312 locale/programs/ld-time.c:1199 #, c-format -msgid "%s: invalid value for field `%s'" -msgstr "%s: フィールド`%s'に対する不正な値です" +msgid "%s: incomplete `END' line" +msgstr "%s: 不完全な`END'行です" -#: locale/programs/ld-address.c:242 locale/programs/ld-address.c:270 +#: locale/programs/ld-address.c:589 locale/programs/ld-collate.c:2638 +#: locale/programs/ld-collate.c:3777 locale/programs/ld-ctype.c:2219 +#: locale/programs/ld-ctype.c:2960 locale/programs/ld-identification.c:453 +#: locale/programs/ld-measurement.c:239 locale/programs/ld-messages.c:333 +#: locale/programs/ld-monetary.c:936 locale/programs/ld-name.c:308 +#: locale/programs/ld-numeric.c:376 locale/programs/ld-paper.c:242 +#: locale/programs/ld-telephone.c:314 locale/programs/ld-time.c:1201 #, c-format -msgid "%s: language abbreviation `%s' not defined" -msgstr "%s: 言語名省略形 `%s'が定義されていません" +msgid "%1$s: definition does not end with `END %1$s'" +msgstr "%1$s: 定義が `END %1$s' で終っていません" -#: locale/programs/ld-collate.c:3242 locale/programs/ld-collate.c:3365 -#: locale/programs/ld-collate.c:3716 +#: locale/programs/ld-address.c:596 locale/programs/ld-collate.c:520 +#: locale/programs/ld-collate.c:572 locale/programs/ld-collate.c:869 +#: locale/programs/ld-collate.c:882 locale/programs/ld-collate.c:2625 +#: locale/programs/ld-collate.c:3784 locale/programs/ld-ctype.c:1947 +#: locale/programs/ld-ctype.c:2206 locale/programs/ld-ctype.c:2782 +#: locale/programs/ld-ctype.c:2968 locale/programs/ld-identification.c:460 +#: locale/programs/ld-measurement.c:246 locale/programs/ld-messages.c:340 +#: locale/programs/ld-monetary.c:943 locale/programs/ld-name.c:315 +#: locale/programs/ld-numeric.c:383 locale/programs/ld-paper.c:249 +#: locale/programs/ld-telephone.c:321 locale/programs/ld-time.c:1208 #, c-format -msgid "%s: missing `order_end' keyword" -msgstr "%s: `order_end'キーワードが見つかりません" +msgid "%s: syntax error" +msgstr "%s: 文法エラー" -#: locale/programs/ld-collate.c:3379 locale/programs/ld-collate.c:3728 +#: locale/programs/ld-collate.c:395 #, c-format -msgid "%s: missing `reorder-end' keyword" -msgstr "%s: `reorder-end'キーワードが見つかりません" +msgid "`%.*s' already defined in charmap" +msgstr "`%.*s'は既に charmap 中で定義されています" -#: locale/programs/ld-collate.c:3731 +#: locale/programs/ld-collate.c:404 #, c-format -msgid "%s: missing `reorder-sections-end' keyword" -msgstr "%s: `reorder-sections-end'キーワードが見つかりません" +msgid "`%.*s' already defined in repertoire" +msgstr "`%.*s' は既にレパートリ中で定義されています" -#: locale/programs/ld-time.c:456 +#: locale/programs/ld-collate.c:411 #, c-format -msgid "%s: missing era format in string %Zd in `era' field" -msgstr "%s: `era'フィールドにある文字列 %Zd 内のeraフォーマットが見つかりません" +msgid "`%.*s' already defined as collating symbol" +msgstr "`%.*s' は既に照合シンボルとして定義されています" -#: locale/programs/ld-time.c:444 +#: locale/programs/ld-collate.c:418 #, c-format -msgid "%s: missing era name in string %Zd in `era' field" -msgstr "%s: `era'フィールドにある文字列 %Zd 内のera名が見つかりません" +msgid "`%.*s' already defined as collating element" +msgstr "`%.*s' は既に照合要素として定義されています" -#: locale/programs/ld-collate.c:3138 +#: locale/programs/ld-collate.c:449 locale/programs/ld-collate.c:475 #, c-format -msgid "%s: multiple order definitions for section `%s'" -msgstr "%s: セクション`%s'に対する並び替え定義が複数あります" +msgid "%s: `forward' and `backward' are mutually excluding each other" +msgstr "%s: `forward' と `backward' は排他的です" -#: locale/programs/ld-collate.c:3188 +#: locale/programs/ld-collate.c:459 locale/programs/ld-collate.c:485 +#: locale/programs/ld-collate.c:501 #, c-format -msgid "%s: multiple order definitions for unnamed section" -msgstr "%s: 名前のないセクションに対する並び替え定義が複数あります" +msgid "%s: `%s' mentioned more than once in definition of weight %d" +msgstr "%s: `%s'は重み定義 %d 中で複数回使われています" -#: locale/programs/ld-messages.c:137 locale/programs/ld-messages.c:170 +#: locale/programs/ld-collate.c:557 #, c-format -msgid "%s: no correct regular expression for field `%s': %s" -msgstr "%s: フィールド`%s'に対する正規表現は正しくありません: %s" +msgid "%s: too many rules; first entry only had %d" +msgstr "%s: 規則が多すぎます; 最初のエントリは %d を持っています" -#: locale/programs/ld-identification.c:169 +#: locale/programs/ld-collate.c:593 #, c-format -msgid "%s: no identification for category `%s'" -msgstr "%s: カテゴリ`%s'に対するidentificationがありません" +msgid "%s: not enough sorting rules" +msgstr "%s: 並び替え規則が不十分です" -#: locale/programs/ld-ctype.c:2755 +#: locale/programs/ld-collate.c:759 #, c-format -msgid "%s: no representable `default_missing' definition found" -msgstr "%s: 表現可能な`default_missing'定義が見つかりません" +msgid "%s: empty weight string not allowed" +msgstr "%s: 空の重み文字列は許されていません" -#: locale/programs/ld-collate.c:591 +#: locale/programs/ld-collate.c:854 #, c-format -msgid "%s: not enough sorting rules" -msgstr "%s: 並び替え規則が不十分です" +msgid "%s: weights must use the same ellipsis symbol as the name" +msgstr "%s: 重みはその名称として同じ省略シンボルを使用しなければなりません" -#: locale/programs/ld-address.c:295 +#: locale/programs/ld-collate.c:910 #, c-format -msgid "%s: numeric country code `%d' not valid" -msgstr "%s: 国コード番号`%d'は不正です" +msgid "%s: too many values" +msgstr "%s: 引数が多すぎます" -#: posix/getopt.c:711 +#: locale/programs/ld-collate.c:1023 locale/programs/ld-collate.c:1194 #, c-format -msgid "%s: option `%c%s' doesn't allow an argument\n" -msgstr "%s: オプション`%c%s'は引数をとりません\n" +msgid "order for `%.*s' already defined at %s:%Zu" +msgstr "`%.*s'に対するオーダーは %s:%Zu で既に定義されています" -#: posix/getopt.c:681 +#: locale/programs/ld-collate.c:1073 #, c-format -msgid "%s: option `%s' is ambiguous\n" -msgstr "%s: オプション`%s'は曖昧です\n" +msgid "%s: the start and the end symbol of a range must stand for characters" +msgstr "%s: ある範囲の開始・終了シンボルはキャラクタに基づかなければなりません" -#: posix/getopt.c:729 posix/getopt.c:902 +#: locale/programs/ld-collate.c:1100 #, c-format -msgid "%s: option `%s' requires an argument\n" -msgstr "%s: オプション`%s'には引数が必要です\n" +msgid "%s: byte sequences of first and last character must have the same length" +msgstr "%s: 最初と最後の文字のバイトシーケンスは同一長でなければなりません" -#: posix/getopt.c:706 +#: locale/programs/ld-collate.c:1142 #, c-format -msgid "%s: option `--%s' doesn't allow an argument\n" -msgstr "%s: オプション`--%s'は引数をとりません\n" +msgid "%s: byte sequence of first character of sequence is not lower than that of the last character" +msgstr "%s: シーケンス中の最初の文字のバイトシーケンスは最後の文字のよりもlowerではありません" -#: posix/getopt.c:886 +#: locale/programs/ld-collate.c:1263 #, c-format -msgid "%s: option `-W %s' doesn't allow an argument\n" -msgstr "%s: オプション`-W %s'は引数をとりません\n" +msgid "%s: symbolic range ellipsis must not directly follow `order_start'" +msgstr "%s: シンボルの範囲の省略は`order_start'のすぐ後に置いてはいけません" -#: posix/getopt.c:868 +#: locale/programs/ld-collate.c:1267 #, c-format -msgid "%s: option `-W %s' is ambiguous\n" -msgstr "%s: オプション `-W %s' が曖昧です\n" +msgid "%s: symbolic range ellipsis must not be directly followed by `order_end'" +msgstr "%s: シンボル範囲省略記号は`order_end'のすぐ後に続いてはいけません" -#: posix/getopt.c:821 posix/getopt.c:951 +#: locale/programs/ld-collate.c:1287 locale/programs/ld-ctype.c:1467 #, c-format -msgid "%s: option requires an argument -- %c\n" -msgstr "%s: オプションには引数が必要です -- %c\n" +msgid "`%s' and `%.*s' are no valid names for symbolic range" +msgstr "`%s' と `%.*s' はシンボルの範囲として不正な名前です" -#: locale/programs/ld-collate.c:1327 locale/programs/ld-collate.c:3675 +#: locale/programs/ld-collate.c:1333 locale/programs/ld-collate.c:3712 #, c-format msgid "%s: order for `%.*s' already defined at %s:%Zu" msgstr "%s: `%.*s'に対する並べ替えはすでに %s:%Zu で定義されています" -#: locale/programs/ld-collate.c:3316 +#: locale/programs/ld-collate.c:1342 #, c-format -msgid "%s: order for collating element %.*s not yet defined" -msgstr "%s: 照合要素 %.*s に対する並べ替えがまだ定義されていません" +msgid "%s: `%s' must be a character" +msgstr "%s: `%s'は単一のキャラクタでなければいけません" -#: locale/programs/ld-collate.c:3300 +#: locale/programs/ld-collate.c:1535 #, c-format -msgid "%s: order for collating symbol %.*s not yet defined" -msgstr "%s: 照合シンボル %.*s に対する並べ替えがまだ定義されていません" +msgid "%s: `position' must be used for a specific level in all sections or none" +msgstr "%s: `position'は特定レベルに対し、全セクションで使用か未使用かのどちらかです" -#: sunrpc/rpc_main.c:289 +#: locale/programs/ld-collate.c:1560 #, c-format -msgid "%s: output would overwrite %s\n" -msgstr "%s: 出力は %s を上書きしてしまうかもしれません\n" +msgid "symbol `%s' not defined" +msgstr "シンボル`%s'が定義されていません" -#: timezone/zic.c:879 timezone/zic.c:1293 timezone/zic.c:1318 +#: locale/programs/ld-collate.c:1636 locale/programs/ld-collate.c:1742 #, c-format -msgid "%s: panic: Invalid l_value %d\n" -msgstr "%s: パニック: 不当な l_value(%d)です\n" +msgid "symbol `%s' has the same encoding as" +msgstr "シンボル `%s' は以下と同じエンコーディングを持っています" -#: locale/programs/charmap.c:843 locale/programs/ld-address.c:597 -#: locale/programs/ld-collate.c:2609 locale/programs/ld-collate.c:3756 -#: locale/programs/ld-ctype.c:2109 locale/programs/ld-ctype.c:2866 -#: locale/programs/ld-identification.c:464 -#: locale/programs/ld-measurement.c:253 locale/programs/ld-messages.c:347 -#: locale/programs/ld-monetary.c:952 locale/programs/ld-name.c:321 -#: locale/programs/ld-numeric.c:391 locale/programs/ld-paper.c:254 -#: locale/programs/ld-telephone.c:329 locale/programs/ld-time.c:1215 -#: locale/programs/locfile.h:103 locale/programs/repertoire.c:325 +#: locale/programs/ld-collate.c:1640 locale/programs/ld-collate.c:1746 #, c-format -msgid "%s: premature end of file" -msgstr "%s ファイル終端が早すぎます" +msgid "symbol `%s'" +msgstr "シンボル `%s'" -#: locale/programs/ld-collate.c:3413 locale/programs/ld-collate.c:3601 -#, c-format -msgid "%s: section `%.*s' not known" -msgstr "%s: セクション`%.*s'は未知です" +#: locale/programs/ld-collate.c:1788 +msgid "no definition of `UNDEFINED'" +msgstr "`UNDEFINED'は定義されていません" -#: locale/programs/ld-time.c:358 +#: locale/programs/ld-collate.c:1817 +msgid "too many errors; giving up" +msgstr "エラーが多すぎます; 処理をあきらめます" + +#: locale/programs/ld-collate.c:2720 #, c-format -msgid "%s: starting date is invalid in string %Zd in `era' field" -msgstr "%s: `era'フィールドにある文字列 %Zd 中の開始日は不正です" +msgid "%s: duplicate definition of `%s'" +msgstr "%s: `%s'の定義が重複しています" -#: locale/programs/ld-time.c:435 +#: locale/programs/ld-collate.c:2756 #, c-format -msgid "%s: stopping date is invalid in string %Zd in `era' field" -msgstr "%s: `era'フィールドにある文字列 %Zd 中の終了年は不正です" +msgid "%s: duplicate declaration of section `%s'" +msgstr "%s: セクション`%s'の記述が重複しています" -#: locale/programs/ld-collate.c:1261 +#: locale/programs/ld-collate.c:2895 #, c-format -msgid "%s: symbolic range ellipsis must not be directly followed by `order_end'" -msgstr "%s: シンボル範囲省略記号は`order_end'のすぐ後に続いてはいけません" +msgid "%s: unknown character in collating symbol name" +msgstr "%s: 照合シンボル名中に未知の文字があります" -#: locale/programs/ld-collate.c:1257 +#: locale/programs/ld-collate.c:3027 #, c-format -msgid "%s: symbolic range ellipsis must not directly follow `order_start'" -msgstr "%s: シンボルの範囲の省略は`order_start'のすぐ後に置いてはいけません" +msgid "%s: unknown character in equivalent definition name" +msgstr "%s: 等価な定義名中に未知の文字があります" -#: locale/programs/ld-address.c:588 locale/programs/ld-collate.c:518 -#: locale/programs/ld-collate.c:570 locale/programs/ld-collate.c:865 -#: locale/programs/ld-collate.c:878 locale/programs/ld-collate.c:2599 -#: locale/programs/ld-collate.c:3747 locale/programs/ld-ctype.c:1841 -#: locale/programs/ld-ctype.c:2099 locale/programs/ld-ctype.c:2675 -#: locale/programs/ld-ctype.c:2857 locale/programs/ld-identification.c:455 -#: locale/programs/ld-measurement.c:244 locale/programs/ld-messages.c:338 -#: locale/programs/ld-monetary.c:943 locale/programs/ld-name.c:312 -#: locale/programs/ld-numeric.c:382 locale/programs/ld-paper.c:245 -#: locale/programs/ld-telephone.c:320 locale/programs/ld-time.c:1206 +#: locale/programs/ld-collate.c:3040 #, c-format -msgid "%s: syntax error" -msgstr "%s: 文法エラー" +msgid "%s: unknown character in equivalent definition value" +msgstr "%s: 等価な定義値中に未知の文字があります" -#: locale/programs/ld-ctype.c:2180 +#: locale/programs/ld-collate.c:3050 #, c-format -msgid "%s: syntax error in definition of new character class" -msgstr "%s: 新しいキャラクタクラスの定義中に文法エラーがあります" +msgid "%s: unknown symbol `%s' in equivalent definition" +msgstr "%s: 等価な定義中で未知の