Update.

2003-11-25  Ulrich Drepper  <drepper@redhat.com>

	* 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  <jakub@redhat.com>

	* 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.

19 files changed, 4601 insertions, 4133 deletions

diff --git a/ChangeLog b/ChangeLog
index 969692626e..f70b66ccc8 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,34 @@
+2003-11-25  Ulrich Drepper  <drepper@redhat.com>
+
+	* 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  <jakub@redhat.com>
+
+	* 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  <jakub@redhat.com>
 
 	* 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,1081 +1,1710 @@
 # Japanese Messages for GNU libc.
 # Copyright (C) 1996 Free Software Foundation, Inc.
-# GOTO Masanori <gotom@debian.or.jp>, 2000-2001.
+# GOTO Masanori <gotom@debian.or.jp>, 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 <gotom@debian.or.jp>\n"
-"Language-Team: Japanese <ja@li.org>\n"
+"Language-Team: Japanese <translation-team-ja@lists.sourceforge.net>\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 の範囲になければなりません"
+#: sysdeps/generic/siglist.h:29 stdio-common/../sysdeps/unix/siglist.c:27
+msgid "Hangup"
+msgstr "ハングアップ"
 
-#: nis/nis_print.c:277
-msgid "\t\tAccess Rights : "
-msgstr "\t\tアクセス権限  : "
+#: sysdeps/generic/siglist.h:30 stdio-common/../sysdeps/unix/siglist.c:28
+msgid "Interrupt"
+msgstr "割り込み"
 
-#: nis/nis_print.c:275
-msgid "\t\tAttributes    : "
-msgstr "\t\t属性          : "
+#: sysdeps/generic/siglist.h:31 stdio-common/../sysdeps/unix/siglist.c:29
+msgid "Quit"
+msgstr "終了"
+
+#: sysdeps/generic/siglist.h:32 stdio-common/../sysdeps/unix/siglist.c:30
+msgid "Illegal instruction"
+msgstr "不正な命令です"
+
+#: sysdeps/generic/siglist.h:33 stdio-common/../sysdeps/unix/siglist.c:31
+msgid "Trace/breakpoint trap"
+msgstr "トレース/ブレイクポイント トラップ"
+
+#: sysdeps/generic/siglist.h:34
+msgid "Aborted"
+msgstr "アボートしました"
+
+#: sysdeps/generic/siglist.h:35 stdio-common/../sysdeps/unix/siglist.c:34
+msgid "Floating point exception"
+msgstr "浮動小数点演算例外です"
+
+#: sysdeps/generic/siglist.h:36 stdio-common/../sysdeps/unix/siglist.c:35
+msgid "Killed"
+msgstr "強制終了"
+
+#: sysdeps/generic/siglist.h:37 stdio-common/../sysdeps/unix/siglist.c:36
+msgid "Bus error"
+msgstr "バスエラー"
+
+#: sysdeps/generic/siglist.h:38 stdio-common/../sysdeps/unix/siglist.c:37
+msgid "Segmentation fault"
+msgstr "セグメンテーション違反です"
+
+#. 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 "パイプが切断されました"
+
+#: sysdeps/generic/siglist.h:40 stdio-common/../sysdeps/unix/siglist.c:40
+msgid "Alarm clock"
+msgstr "アラームクロック"
+
+#: sysdeps/generic/siglist.h:41 stdio-common/../sysdeps/unix/siglist.c:41
+msgid "Terminated"
+msgstr "終了しました"
+
+#: sysdeps/generic/siglist.h:42 stdio-common/../sysdeps/unix/siglist.c:42
+msgid "Urgent I/O condition"
+msgstr "緊急のI/O状況です"
+
+#: sysdeps/generic/siglist.h:43 stdio-common/../sysdeps/unix/siglist.c:43
+msgid "Stopped (signal)"
+msgstr "停止しました (シグナル)"
+
+#: sysdeps/generic/siglist.h:44 stdio-common/../sysdeps/unix/siglist.c:44
+msgid "Stopped"
+msgstr "停止しました"
+
+#: sysdeps/generic/siglist.h:45 stdio-common/../sysdeps/unix/siglist.c:45
+msgid "Continued"
+msgstr "継続"
+
+#: sysdeps/generic/siglist.h:46 stdio-common/../sysdeps/unix/siglist.c:46
+msgid "Child exited"
+msgstr "子プロセスが終了しました"
+
+#: sysdeps/generic/siglist.h:47 stdio-common/../sysdeps/unix/siglist.c:47
+msgid "Stopped (tty input)"
+msgstr "停止しました (端末入力)"
+
+#: sysdeps/generic/siglist.h:48 stdio-common/../sysdeps/unix/siglist.c:48
+msgid "Stopped (tty output)"
+msgstr "停止しました (端末出力)"
+
+#: sysdeps/generic/siglist.h:49 stdio-common/../sysdeps/unix/siglist.c:49
+msgid "I/O possible"
+msgstr "I/O可能です"
+
+#: sysdeps/generic/siglist.h:50 stdio-common/../sysdeps/unix/siglist.c:50
+msgid "CPU time limit exceeded"
+msgstr "CPU時間制限を超過しました"
+
+#: sysdeps/generic/siglist.h:51 stdio-common/../sysdeps/unix/siglist.c:51
+msgid "File size limit exceeded"
+msgstr "ファイルサイズ制限を超過しました"
+
+#: sysdeps/generic/siglist.h:52 stdio-common/../sysdeps/unix/siglist.c:52
+msgid "Virtual timer expired"
+msgstr "仮想タイマが終了しました"
+
+#: sysdeps/generic/siglist.h:53 stdio-common/../sysdeps/unix/siglist.c:53
+msgid "Profiling timer expired"
+msgstr "プロファイリングタイマが破棄されました"
+
+#: sysdeps/generic/siglist.h:54 stdio-common/../sysdeps/unix/siglist.c:54
+msgid "Window changed"
+msgstr "ウィンドウが変更されました"
+
+#: sysdeps/generic/siglist.h:55 stdio-common/../sysdeps/unix/siglist.c:56
+msgid "User defined signal 1"
+msgstr "ユーザ定義シグナル 1"
+
+#: sysdeps/generic/siglist.h:56 stdio-common/../sysdeps/unix/siglist.c:57
+msgid "User defined signal 2"
+msgstr "ユーザ定義シグナル 2"
+
+#: sysdeps/generic/siglist.h:60 stdio-common/../sysdeps/unix/siglist.c:33
+msgid "EMT trap"
+msgstr "EMT トラップ"
+
+#: sysdeps/generic/siglist.h:63 stdio-common/../sysdeps/unix/siglist.c:38
+msgid "Bad system call"
+msgstr "不正なシステムコールです"
 
-#: sunrpc/rpc_main.c:1427
+#: sysdeps/generic/siglist.h:66
+msgid "Stack fault"
+msgstr "スタック失敗"
+
+#: sysdeps/generic/siglist.h:69
+msgid "Information request"
+msgstr "情報要求"
+
+#: sysdeps/generic/siglist.h:71
+msgid "Power failure"
+msgstr "電源故障"
+
+#: sysdeps/generic/siglist.h:74 stdio-common/../sysdeps/unix/siglist.c:55
+msgid "Resource lost"
+msgstr "リソースが失われました"
+
+#: sysdeps/mach/hurd/mips/dl-machine.c:68
+#: string/../sysdeps/mach/_strerror.c:57
+msgid "Error in unknown error system: "
+msgstr "不明なエラーシステムでのエラー:"
+
+#: sysdeps/mach/hurd/mips/dl-machine.c:83
+#: string/../sysdeps/generic/_strerror.c:44
+#: string/../sysdeps/mach/_strerror.c:87
+msgid "Unknown error "
+msgstr "未知のエラー "
+
+#: sysdeps/unix/sysv/linux/lddlibc4.c:64
 #, 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"
+msgid "cannot open `%s'"
+msgstr "`%s'を開けません"
 
-#: sunrpc/rpc_main.c:1429
+#: sysdeps/unix/sysv/linux/lddlibc4.c:68
 #, 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"
+msgid "cannot read header from `%s'"
+msgstr "`%s'のヘッダを読めません"
 
-#: sunrpc/rpc_main.c:1432
+#: iconv/iconv_charmap.c:159 iconv/iconv_prog.c:293 catgets/gencat.c:288
 #, c-format
-msgid "\t%s [-n netid]* [-o outfile] [infile]\n"
-msgstr "\t%s [-n netid]* [-o 出力ファイル] [入力ファイル]\n"
+msgid "cannot open input file `%s'"
+msgstr "入力ファイル`%s'を開けません"
 
-#: sunrpc/rpc_main.c:1431
+#: iconv/iconv_charmap.c:177 iconv/iconv_prog.c:311
 #, c-format
-msgid "\t%s [-s nettype]* [-o outfile] [infile]\n"
-msgstr "\t%s [-s ネットタイプ]* [-o 出力ファイル] [入力ファイル]\n"
+msgid "error while closing input `%s'"
+msgstr "入力ファイル `%s' を閉じている間のエラー"
 
-#: nis/nis_print.c:239
-msgid "\tAccess rights: "
-msgstr "\tアクセス権限 : "
+#: iconv/iconv_charmap.c:443
+#, c-format
+msgid "illegal input sequence at position %Zd"
+msgstr "位置 %Zd で不正な入力シーケンスがありました"
 
-#: nis/nis_print.c:297
+#: iconv/iconv_charmap.c:462 iconv/iconv_prog.c:503
+msgid "incomplete character or shift sequence at end of buffer"
+msgstr "バッファの最後での一致しない文字またはシフトシーケンスです"
+
+#: 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 "入力読み込み中のエラー"
+
+#: iconv/iconv_charmap.c:525 iconv/iconv_prog.c:564
+msgid "unable to allocate buffer for input"
+msgstr "入力用バッファを割り当てることができません"
+
+#: iconv/iconv_prog.c:61
+msgid "Input/Output format specification:"
+msgstr "入力/出力フォーマットの仕様:"
+
+#: iconv/iconv_prog.c:62
+msgid "encoding of original text"
+msgstr "元のテキストのエンコーディング"
+
+#: iconv/iconv_prog.c:63
+msgid "encoding for output"
+msgstr "出力時のエンコーディング"
+
+#: iconv/iconv_prog.c:64
+msgid "Information:"
+msgstr "情報:"
+
+#: iconv/iconv_prog.c:65
+msgid "list all known coded character sets"
+msgstr "既知の全キャラクタセットを表示する"
+
+#: iconv/iconv_prog.c:66 locale/programs/localedef.c:128
+msgid "Output control:"
+msgstr "出力制御:"
+
+#: iconv/iconv_prog.c:67
+msgid "omit invalid characters from output"
+msgstr "出力から不正な文字を抜かしました"
+
+#: iconv/iconv_prog.c:68
+msgid "output file"
+msgstr "出力ファイル"
+
+#: iconv/iconv_prog.c:69
+msgid "suppress warnings"
+msgstr "警告の抑制"
+
+#: iconv/iconv_prog.c:70
+msgid "print progress information"
+msgstr "経過情報の表示"
+
+#: iconv/iconv_prog.c:75
+msgid "Convert encoding of given files from one encoding to another."
+msgstr "与えられたファイルのエンコーディングを変換する."
+
+#: iconv/iconv_prog.c:79
+msgid "[FILE...]"
+msgstr "[ファイル...]"
+
+#: iconv/iconv_prog.c:199
+msgid "cannot open output file"
+msgstr "出力ファイルを開けません"
+
+#: iconv/iconv_prog.c:241
 #, c-format
-msgid "\tEntry data of type %s\n"
-msgstr "\tエントリデータの型 %s\n"
+msgid "conversion from `%s' and to `%s' are not supported"
+msgstr "`%s'からの変換と`%s'への変換はどちらもサポートされていません"
 
-#: nis/nis_print.c:175
+#: iconv/iconv_prog.c:246
 #, c-format
-msgid "\tName       : %s\n"
-msgstr "\t名前       : %s\n"
+msgid "conversion from `%s' is not supported"
+msgstr "`%s'からの変換はサポートされていません"
 
-#: nis/nis_print.c:176
-msgid "\tPublic Key : "
-msgstr "\t公開鍵     : "
+#: iconv/iconv_prog.c:253
+#, c-format
+msgid "conversion to `%s' is not supported"
+msgstr "`%s'への変換はサポートされていません"
 
-#: nis/nis_print.c:238
+#: iconv/iconv_prog.c:257
 #, c-format
-msgid "\tType         : %s\n"
-msgstr "\t型           : %s\n"
+msgid "conversion from `%s' to `%s' is not supported"
+msgstr "`%s'から`%s'への変換はサポートされていません"
 
-#: nis/nis_print.c:205
+#: iconv/iconv_prog.c:263
+msgid "failed to start conversion processing"
+msgstr "変換処理の開始に失敗しました"
+
+#: iconv/iconv_prog.c:358
+msgid "error while closing output file"
+msgstr "出力ファイルを閉じている間のエラー"
+
+#: 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 <bugs@gnu.org>.\n"
+msgstr "バグはスクリプト`glibcbug'を用いて<bugs@gnu.org>まで報告してください.\n"
+
+#: 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 "\tUniversal addresses (%u)\n"
-msgstr "\tユニバーサルアドレス (%u)\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"
 
-#: nis/nis_print.c:273
+#: 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 "\t[%d]\tName          : %s\n"
-msgstr "\t[%d]\t名前          : %s\n"
+msgid "Written by %s.\n"
+msgstr "%sによる書き込み.\n"
 
-#: nis/nis_print.c:300
+#: iconv/iconv_prog.c:456 iconv/iconv_prog.c:482
+msgid "conversion stopped due to problem in writing the output"
+msgstr "出力書き出し中に問題があったため変換を中止しました"
+
+#: iconv/iconv_prog.c:499
 #, c-format
-msgid "\t[%u] - [%u bytes] "
-msgstr "\t[%u] - [%uバイト] "
+msgid "illegal input sequence at pos