[gawk-diffs] [SCM] gawk branch, porting, updated. gawk-4.1.0-3692-g62cfd95

[Arnold Robbins]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "gawk".

The branch, porting has been updated
       via  62cfd95df87f1fc65181dd276a5677caa5315954 (commit)
       via  09ce389a9866c74873fbddd1e873bb2e9e0fd1d2 (commit)
      from  0e65b67b0dc50b9f33b3d685fc82d06114d1540b (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.sv.gnu.org/cgit/gawk.git/commit/?id=62cfd95df87f1fc65181dd276a5677caa5315954

commit 62cfd95df87f1fc65181dd276a5677caa5315954
Author: Arnold D. Robbins <address@hidden>
Date:   Fri Mar 22 11:58:05 2019 +0200

    Update config.guess files.

diff --git a/ChangeLog b/ChangeLog
index c56b479..37de791 100755
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2019-03-22         Arnold D. Robbins     <address@hidden>
+
+       * config.guess: Updated from GNULIB.
+
 2019-03-17         Arnold D. Robbins     <address@hidden>
 
        * configure.ac: Fix test for ZOS_FAIL.
diff --git a/config.guess b/config.guess
index 8ef92de..79d1317 100755
--- a/config.guess
+++ b/config.guess
@@ -2,7 +2,7 @@
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2019 Free Software Foundation, Inc.
 
-timestamp='2019-02-19'
+timestamp='2019-03-04'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -985,22 +985,50 @@ EOF
        exit ;;
     mips:Linux:*:* | mips64:Linux:*:*)
        set_cc_for_build
+       IS_GLIBC=0
+       test x"${LIBC}" = xgnu && IS_GLIBC=1
        sed 's/^        //' << EOF > "$dummy.c"
        #undef CPU
-       #undef ${UNAME_MACHINE}
-       #undef ${UNAME_MACHINE}el
+       #undef mips
+       #undef mipsel
+       #undef mips64
+       #undef mips64el
+       #if ${IS_GLIBC} && defined(_ABI64)
+       LIBCABI=gnuabi64
+       #else
+       #if ${IS_GLIBC} && defined(_ABIN32)
+       LIBCABI=gnuabin32
+       #else
+       LIBCABI=${LIBC}
+       #endif
+       #endif
+
+       #if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && 
__mips_isa_rev>=6
+       CPU=mipsisa64r6
+       #else
+       #if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && 
__mips_isa_rev>=6
+       CPU=mipsisa32r6
+       #else
+       #if defined(__mips64)
+       CPU=mips64
+       #else
+       CPU=mips
+       #endif
+       #endif
+       #endif
+
        #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || 
defined(MIPSEL)
-       CPU=${UNAME_MACHINE}el
+       MIPS_ENDIAN=el
        #else
        #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || 
defined(MIPSEB)
-       CPU=${UNAME_MACHINE}
+       MIPS_ENDIAN=
        #else
-       CPU=
+       MIPS_ENDIAN=
        #endif
        #endif
 EOF
-       eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"
-       test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
+       eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep 
'^CPU\|^MIPS_ENDIAN\|^LIBCABI'`"
+       test "x$CPU" != x && { echo 
"$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; }
        ;;
     mips64el:Linux:*:*)
        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
@@ -1433,6 +1461,130 @@ EOF
        exit ;;
 esac
 
+# No uname command or uname output not recognized.
+set_cc_for_build
+cat > "$dummy.c" <<EOF
+#ifdef _SEQUENT_
+#include <sys/types.h>
+#include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+     I don't know....  */
+  printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+  printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+  "4"
+#else
+  ""
+#endif
+  ); exit (0);
+#endif
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+  int version;
+  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+  exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+  printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+  printf ("ns32k-encore-mach\n"); exit (0);
+#else
+  printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+  printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+  printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+  printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+  struct utsname un;
+
+  uname(&un);
+  if (strncmp(un.version, "V2", 2) == 0) {
+    printf ("i386-sequent-ptx2\n"); exit (0);
+  }
+  if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+    printf ("i386-sequent-ptx1\n"); exit (0);
+  }
+  printf ("i386-sequent-ptx\n"); exit (0);
+#endif
+
+#if defined (vax)
+#if !defined (ultrix)
+#include <sys/param.h>
+#if defined (BSD)
+#if BSD == 43
+  printf ("vax-dec-bsd4.3\n"); exit (0);
+#else
+#if BSD == 199006
+  printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#else
+  printf ("vax-dec-bsd\n"); exit (0);
+#endif
+#endif
+#else
+  printf ("vax-dec-bsd\n"); exit (0);
+#endif
+#else
+  printf ("vax-dec-ultrix\n"); exit (0);
+#endif
+#endif
+#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || 
defined(__ultrix__)
+#if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || 
defined(__MIPS__)
+#include <signal.h>
+#if defined(_SIZE_T_) /* >= ULTRIX4 */
+  printf ("mips-dec-ultrix4\n"); exit (0);
+#else
+#if defined(ULTRIX3) || defined(ultrix3) || defined(SIGLOST)
+  printf ("mips-dec-ultrix3\n"); exit (0);
+#endif
+#endif
+#endif
+#endif
+
+#if defined (alliant) && defined (i860)
+  printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+  exit (1);
+}
+EOF
+
+$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+       { echo "$SYSTEM_NAME"; exit; }
+
+# Apollos put the system type in the environment.
+test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; }
+
 echo "$0: unable to guess system type" >&2
 
 case "$UNAME_MACHINE:$UNAME_SYSTEM" in
diff --git a/extension/build-aux/ChangeLog b/extension/build-aux/ChangeLog
index 9353536..2b4f26a 100644
--- a/extension/build-aux/ChangeLog
+++ b/extension/build-aux/ChangeLog
@@ -1,3 +1,7 @@
+2019-03-22         Arnold D. Robbins     <address@hidden>
+
+       * config.guess: Updated from GNULIB.
+
 2019-02-25         Arnold D. Robbins     <address@hidden>
 
        * config.guess: Updated from GNULIB.
diff --git a/extension/build-aux/config.guess b/extension/build-aux/config.guess
index 8ef92de..79d1317 100755
--- a/extension/build-aux/config.guess
+++ b/extension/build-aux/config.guess
@@ -2,7 +2,7 @@
 # Attempt to guess a canonical system name.
 #   Copyright 1992-2019 Free Software Foundation, Inc.
 
-timestamp='2019-02-19'
+timestamp='2019-03-04'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -985,22 +985,50 @@ EOF
        exit ;;
     mips:Linux:*:* | mips64:Linux:*:*)
        set_cc_for_build
+       IS_GLIBC=0
+       test x"${LIBC}" = xgnu && IS_GLIBC=1
        sed 's/^        //' << EOF > "$dummy.c"
        #undef CPU
-       #undef ${UNAME_MACHINE}
-       #undef ${UNAME_MACHINE}el
+       #undef mips
+       #undef mipsel
+       #undef mips64
+       #undef mips64el
+       #if ${IS_GLIBC} && defined(_ABI64)
+       LIBCABI=gnuabi64
+       #else
+       #if ${IS_GLIBC} && defined(_ABIN32)
+       LIBCABI=gnuabin32
+       #else
+       LIBCABI=${LIBC}
+       #endif
+       #endif
+
+       #if ${IS_GLIBC} && defined(__mips64) && defined(__mips_isa_rev) && 
__mips_isa_rev>=6
+       CPU=mipsisa64r6
+       #else
+       #if ${IS_GLIBC} && !defined(__mips64) && defined(__mips_isa_rev) && 
__mips_isa_rev>=6
+       CPU=mipsisa32r6
+       #else
+       #if defined(__mips64)
+       CPU=mips64
+       #else
+       CPU=mips
+       #endif
+       #endif
+       #endif
+
        #if defined(__MIPSEL__) || defined(__MIPSEL) || defined(_MIPSEL) || 
defined(MIPSEL)
-       CPU=${UNAME_MACHINE}el
+       MIPS_ENDIAN=el
        #else
        #if defined(__MIPSEB__) || defined(__MIPSEB) || defined(_MIPSEB) || 
defined(MIPSEB)
-       CPU=${UNAME_MACHINE}
+       MIPS_ENDIAN=
        #else
-       CPU=
+       MIPS_ENDIAN=
        #endif
        #endif
 EOF
-       eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep '^CPU'`"
-       test "x$CPU" != x && { echo "$CPU-unknown-linux-$LIBC"; exit; }
+       eval "`$CC_FOR_BUILD -E "$dummy.c" 2>/dev/null | grep 
'^CPU\|^MIPS_ENDIAN\|^LIBCABI'`"
+       test "x$CPU" != x && { echo 
"$CPU${MIPS_ENDIAN}-unknown-linux-$LIBCABI"; exit; }
        ;;
     mips64el:Linux:*:*)
        echo "$UNAME_MACHINE"-unknown-linux-"$LIBC"
@@ -1433,6 +1461,130 @@ EOF
        exit ;;
 esac
 
+# No uname command or uname output not recognized.
+set_cc_for_build
+cat > "$dummy.c" <<EOF
+#ifdef _SEQUENT_
+#include <sys/types.h>
+#include <sys/utsname.h>
+#endif
+main ()
+{
+#if defined (sony)
+#if defined (MIPSEB)
+  /* BFD wants "bsd" instead of "newsos".  Perhaps BFD should be changed,
+     I don't know....  */
+  printf ("mips-sony-bsd\n"); exit (0);
+#else
+#include <sys/param.h>
+  printf ("m68k-sony-newsos%s\n",
+#ifdef NEWSOS4
+  "4"
+#else
+  ""
+#endif
+  ); exit (0);
+#endif
+#endif
+
+#if defined (NeXT)
+#if !defined (__ARCHITECTURE__)
+#define __ARCHITECTURE__ "m68k"
+#endif
+  int version;
+  version=`(hostinfo | sed -n 's/.*NeXT Mach \([0-9]*\).*/\1/p') 2>/dev/null`;
+  if (version < 4)
+    printf ("%s-next-nextstep%d\n", __ARCHITECTURE__, version);
+  else
+    printf ("%s-next-openstep%d\n", __ARCHITECTURE__, version);
+  exit (0);
+#endif
+
+#if defined (MULTIMAX) || defined (n16)
+#if defined (UMAXV)
+  printf ("ns32k-encore-sysv\n"); exit (0);
+#else
+#if defined (CMU)
+  printf ("ns32k-encore-mach\n"); exit (0);
+#else
+  printf ("ns32k-encore-bsd\n"); exit (0);
+#endif
+#endif
+#endif
+
+#if defined (__386BSD__)
+  printf ("i386-pc-bsd\n"); exit (0);
+#endif
+
+#if defined (sequent)
+#if defined (i386)
+  printf ("i386-sequent-dynix\n"); exit (0);
+#endif
+#if defined (ns32000)
+  printf ("ns32k-sequent-dynix\n"); exit (0);
+#endif
+#endif
+
+#if defined (_SEQUENT_)
+  struct utsname un;
+
+  uname(&un);
+  if (strncmp(un.version, "V2", 2) == 0) {
+    printf ("i386-sequent-ptx2\n"); exit (0);
+  }
+  if (strncmp(un.version, "V1", 2) == 0) { /* XXX is V1 correct? */
+    printf ("i386-sequent-ptx1\n"); exit (0);
+  }
+  printf ("i386-sequent-ptx\n"); exit (0);
+#endif
+
+#if defined (vax)
+#if !defined (ultrix)
+#include <sys/param.h>
+#if defined (BSD)
+#if BSD == 43
+  printf ("vax-dec-bsd4.3\n"); exit (0);
+#else
+#if BSD == 199006
+  printf ("vax-dec-bsd4.3reno\n"); exit (0);
+#else
+  printf ("vax-dec-bsd\n"); exit (0);
+#endif
+#endif
+#else
+  printf ("vax-dec-bsd\n"); exit (0);
+#endif
+#else
+  printf ("vax-dec-ultrix\n"); exit (0);
+#endif
+#endif
+#if defined(ultrix) || defined(_ultrix) || defined(__ultrix) || 
defined(__ultrix__)
+#if defined(mips) || defined(__mips) || defined(__mips__) || defined(MIPS) || 
defined(__MIPS__)
+#include <signal.h>
+#if defined(_SIZE_T_) /* >= ULTRIX4 */
+  printf ("mips-dec-ultrix4\n"); exit (0);
+#else
+#if defined(ULTRIX3) || defined(ultrix3) || defined(SIGLOST)
+  printf ("mips-dec-ultrix3\n"); exit (0);
+#endif
+#endif
+#endif
+#endif
+
+#if defined (alliant) && defined (i860)
+  printf ("i860-alliant-bsd\n"); exit (0);
+#endif
+
+  exit (1);
+}
+EOF
+
+$CC_FOR_BUILD -o "$dummy" "$dummy.c" 2>/dev/null && SYSTEM_NAME=`$dummy` &&
+       { echo "$SYSTEM_NAME"; exit; }
+
+# Apollos put the system type in the environment.
+test -d /usr/apollo && { echo "$ISP-apollo-$SYSTYPE"; exit; }
+
 echo "$0: unable to guess system type" >&2
 
 case "$UNAME_MACHINE:$UNAME_SYSTEM" in

http://git.sv.gnu.org/cgit/gawk.git/commit/?id=09ce389a9866c74873fbddd1e873bb2e9e0fd1d2

commit 09ce389a9866c74873fbddd1e873bb2e9e0fd1d2
Author: Arnold D. Robbins <address@hidden>
Date:   Fri Mar 22 11:56:55 2019 +0200

    Update zh_CN.po.

diff --git a/po/ChangeLog b/po/ChangeLog
index a43c781..da08114 100644
--- a/po/ChangeLog
+++ b/po/ChangeLog
@@ -1,3 +1,7 @@
+2019-03-22         Arnold D. Robbins     <address@hidden>
+
+       * zh_CN.po: Updated.
+
 2019-03-10         Arnold D. Robbins     <address@hidden>
 
        * sv.po: Updated.
diff --git a/po/zh_CN.po b/po/zh_CN.po
index 8021538..a87e8a4 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -5,15 +5,14 @@
 # LI Daobing <address@hidden>, 2007, 2009.
 # Aron Xu <address@hidden>, 2010.
 # Tianze Wang <address@hidden>, 2016.
-# Boyuan Yang <address@hidden>, 2019.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gawk 4.2.63\n"
 "Report-Msgid-Bugs-To: address@hidden"
-"POT-Creation-Date: 2019-03-15 10:13+0200\n"
-"PO-Revision-Date: 2019-03-01 14:19-0500\n"
-"Last-Translator: Boyuan Yang <address@hidden>\n"
+"POT-Creation-Date: 2019-03-01 11:47+0200\n"
+"PO-Revision-Date: 2019-03-19 17:46+0100\n"
+"Last-Translator: Tianze Wang <address@hidden>\n"
 "Language-Team: Chinese (simplified) <address@hidden>\n"
 "Language: zh_CN\n"
 "MIME-Version: 1.0\n"
@@ -21,7 +20,7 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Bugs: Report translation errors to the Language-Team address.\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Poedit 2.2.1\n"
+"X-Generator: Poedit 2.0.7\n"
 
 #: array.c:247
 #, c-format
@@ -185,7 +184,7 @@ msgstr "å¤šé˜¶åŒå‘ç®¡é“æ— æ³•å·¥ä½œ"
 
 #: awkgram.y:1416
 msgid "concatenation as I/O `>' redirection target is ambiguous"
-msgstr ""
+msgstr "输入输出重定向符“>â€ï¼ˆåˆå¹¶å†…å®¹ï¼‰çš„ç›®æ ‡æœ‰æ­§ä¹‰"
 
 #: awkgram.y:1620
 msgid "regular expression on right of assignment"
@@ -240,7 +239,7 @@ msgstr "æ— æ•ˆçš„ä¸‹æ ‡è¡¨è¾¾å¼"
 
 #: awkgram.y:2477 awkgram.y:2497 gawkapi.c:273 gawkapi.c:290 msg.c:130
 msgid "warning: "
-msgstr "警告:"
+msgstr "警告："
 
 #: awkgram.y:2495 gawkapi.c:245 gawkapi.c:288 msg.c:162
 msgid "fatal: "
@@ -251,10 +250,8 @@ msgid "unexpected newline or end of string"
 msgstr "未预期的新行或字符串结束"
 
 #: awkgram.y:2569
-msgid ""
-"source files / command-line arguments must contain complete functions or "
-"rules"
-msgstr "æºä»£ç æ–‡ä»¶/命令行参数必须包含完整的函数或规则"
+msgid "source files / command-line arguments must contain complete functions 
or rules"
+msgstr "源文件 / 命令行中的参数必须包含完整的函数或规则"
 
 #: awkgram.y:2851 awkgram.y:2929 awkgram.y:3167 debug.c:536 debug.c:552
 #: debug.c:2829 debug.c:5194
@@ -389,11 +386,11 @@ msgstr "未结束的字符串"
 
 #: awkgram.y:4048 main.c:1198
 msgid "POSIX does not allow physical newlines in string values"
-msgstr "POSIX 不允许出现在字符串值中的物理换行符"
+msgstr "POSIX 不允许字符串的值中包含换行符"
 
 #: awkgram.y:4050 node.c:453
 msgid "backslash string continuation is not portable"
-msgstr "ä½¿ç”¨åæ–œæ æ¥ç»­è¡Œçš„å¯ç§»æ¤æ€§ä¸ä½³"
+msgstr "使用“\\ #...â€æ¥ç»­è¡Œä¼šå¯¼è‡´ä»£ç ç¼ºä¹å…
¼å®¹æ€§ï¼ˆå¯ç§»æ¤æ€§ï¼‰"
 
 #: awkgram.y:4288
 #, c-format
@@ -417,7 +414,7 @@ msgstr "老 awk 不支持“%s”"
 
 #: awkgram.y:4494
 msgid "`goto' considered harmful!"
-msgstr "“goto”有害！"
+msgstr "“goto”有害，请慎用！"
 
 #: awkgram.y:4563
 #, c-format
@@ -499,7 +496,7 @@ msgstr "函数“%sâ€ï¼šæ— 
法使用特殊变量“%s”作为函数参数"
 #: awkgram.y:5092
 #, c-format
 msgid "function `%s': parameter `%s' cannot contain a namespace"
-msgstr "函数“%s”：参数“%s”不能包含命名空间"
+msgstr "函数“%s”：参数“%s”中不允许包
含命名空间（namespace）"
 
 #: awkgram.y:5099
 #, c-format
@@ -540,8 +537,7 @@ msgid "division by zero attempted in `%%'"
 msgstr "在“%%”中试图除 0"
 
 #: awkgram.y:5802
-msgid ""
-"cannot assign a value to the result of a field post-increment expression"
+msgid "cannot assign a value to the result of a field post-increment 
expression"
 msgstr "æ— æ³•å°†å€¼èµ‹ç»™å­—æ®µåŽå¢žè¡¨è¾¾å¼"
 
 #: awkgram.y:5805
@@ -552,44 +548,41 @@ msgstr "èµ‹å€¼çš„ç›®æ ‡æ— æ•ˆï¼ˆæ“ä½œç  %s）"
 #: awkgram.y:6697
 #, c-format
 msgid "identifier %s: qualified names not allowed in traditional / POSIX mode"
-msgstr "æ ‡è¯†ç¬¦ %sï¼šåˆæ ¼åç§°ä¸å…è®¸åœ¨ä¼ ç»Ÿ / POSIX 模式下使用"
+msgstr "æ ‡è¯†ç¬¦ %sï¼šä¼ ç»Ÿ / POSIX 模式下不å…
è®¸ä½¿ç”¨åˆè§„名称（qualified name）"
 
 #: awkgram.y:6702
 #, c-format
 msgid "identifier %s: namespace separator is two colons, not one"
-msgstr "æ ‡è¯†ç¬¦ %s：命名空间分隔符是两个冒号而非一个"
+msgstr "æ ‡è¯†ç¬¦ %s：命名空间的分隔符应为双冒号（::）"
 
 #: awkgram.y:6708
 #, c-format
 msgid "qualified identifier `%s' is badly formed"
-msgstr "åˆæ ¼æ ‡è¯†ç¬¦â€œ%sâ€æ ¼å¼å‡ºé”™"
+msgstr "åˆè§„æ ‡è¯†ç¬¦â€œ%sâ€æ ¼å¼é”™è¯¯"
 
 #: awkgram.y:6715
 #, c-format
-msgid ""
-"identifier `%s': namespace separator can only appear once in a qualified name"
-msgstr "æ ‡è¯†ç¬¦â€œ%s”：命名空间分隔符仅可在合æ 
¼åç§°ä¸­å‡ºçŽ°ä¸€æ¬¡"
+msgid "identifier `%s': namespace separator can only appear once in a 
qualified name"
+msgstr "æ 
‡è¯†ç¬¦â€œ%s”：合规名称中的命名空间分隔符最多只能出现一次"
 
 #: awkgram.y:6764 awkgram.y:6815
 #, c-format
 msgid "using reserved identifier `%s' as a namespace is not allowed"
-msgstr "ä¸å…è®¸ä½¿ç”¨ä¿ç•™æ ‡è¯†ç¬¦â€œ%s”作为命名空间"
+msgstr "ä¸å…è®¸å°†åå‘æ ‡è¯†ç¬¦â€œ%s”作为命名空间"
 
 #: awkgram.y:6771 awkgram.y:6781
 #, c-format
-msgid ""
-"using reserved identifier `%s' as second component of a qualified name is "
-"not allowed"
-msgstr "ä¸å…è®¸ä½¿ç”¨ä¿ç•™æ ‡è¯†ç¬¦â€œ%s”作为合æ 
¼åç§°çš„第二部分"
+msgid "using reserved identifier `%s' as second component of a qualified name 
is not allowed"
+msgstr "不允许将反向æ 
‡è¯†ç¬¦â€œ%s”作为合规名称的第二个组成部分"
 
 #: awkgram.y:6799
 msgid "@namespace is a gawk extension"
-msgstr "@namespace 是 gawk 扩展"
+msgstr "@namespace 是 gawk 保留字"
 
 #: awkgram.y:6806
 #, c-format
 msgid "namespace name `%s' must meet identifier naming rules"
-msgstr "命名空间名称“%sâ€å¿…é¡»ç¬¦åˆæ ‡è¯†ç¬¦å‘½åè§„åˆ™"
+msgstr "命名空间“%sâ€å¿…é¡»ç¬¦åˆæ ‡è¯†ç¬¦çš„å‘½åè§„åˆ™"
 
 #: builtin.c:143
 #, c-format
@@ -758,7 +751,7 @@ msgstr "[s]printf：值 %s 对“%%%câ€æ ¼å¼æ¥è¯´è¶…
出范围"
 #: builtin.c:1529
 #, c-format
 msgid "%%%c format is POSIX standard but not portable to other awks"
-msgstr "%%%c æ ¼å¼ç¬¦åˆ POSIX æ ‡å‡†ä½†åœ¨å…¶å®ƒ awk 实现上å…
¼å®¹æ€§ä¸ä½³"
+msgstr "%%%c æ ¼å¼ç¬¦åˆ POSIX è§„èŒƒï¼Œä½†å¯èƒ½æ— æ³•ä¸Žå…¶ä»–çš„ awk å…
¼å®¹"
 
 #: builtin.c:1629
 #, c-format
@@ -843,8 +836,7 @@ msgstr "substrï¼šå¼€å§‹åæ ‡ %g 超出字符串尾部"
 
 #: builtin.c:1913
 #, c-format
-msgid ""
-"substr: length %g at start index %g exceeds length of first argument (%lu)"
+msgid "substr: length %g at start index %g exceeds length of first argument 
(%lu)"
 msgstr "substrï¼šåœ¨å¼€å§‹åæ ‡ %2$g 下长度 %1$g 超
出第一个参数的长度 (%3$lu)"
 
 #: builtin.c:1986
@@ -1072,8 +1064,7 @@ msgstr "typeof：第二个参数不是数组"
 
 #: builtin.c:4082
 #, c-format
-msgid ""
-"typeof detected invalid flags combination `%s'; please file a bug report."
+msgid "typeof detected invalid flags combination `%s'; please file a bug 
report."
 msgstr "typeof å‡½æ•°å‘çŽ°ä¸€ä¸ªæ— 
效的选项组合“%s”；请向开发者汇报此错误。"
 
 #: builtin.c:4101
@@ -1187,14 +1178,11 @@ msgid "non-zero integer value"
 msgstr "非零整数值"
 
 #: command.y:819
-msgid ""
-"backtrace [N] - print trace of all or N innermost (outermost if N < 0) "
-"frames."
+msgid "backtrace [N] - print trace of all or N innermost (outermost if N < 0) 
frames."
 msgstr "backtrace [N] - 显示所有或最近 N 层 (若 N < 
0，则显示最远 N 层) 调用。"
 
 #: command.y:821
-msgid ""
-"break [[filename:]N|function] - set breakpoint at the specified location."
+msgid "break [[filename:]N|function] - set breakpoint at the specified 
location."
 msgstr "break [[文件名:]N|函数] - 在指定处设置断点。"
 
 #: command.y:823
@@ -1202,9 +1190,7 @@ msgid "clear [[filename:]N|function] - delete breakpoints 
previously set."
 msgstr "clear [[文件名:]N|函数] - åˆ é™¤ä¹‹å‰è®¾ç½®çš„æ–­ç‚¹ã€‚"
 
 #: command.y:825
-msgid ""
-"commands [num] - starts a list of commands to be executed at a "
-"breakpoint(watchpoint) hit."
+msgid "commands [num] - starts a list of commands to be executed at a 
breakpoint(watchpoint) hit."
 msgstr "commands [编号] - 在断点 (监视点) 处执行一系列命令。"
 
 #: command.y:827
@@ -1268,12 +1254,8 @@ msgid "ignore N COUNT - set ignore-count of breakpoint 
number N to COUNT."
 msgstr "ignore N 次数 - 设置忽略断点 N 的次数。"
 
 #: command.y:857
-msgid ""
-"info topic - source|sources|variables|functions|break|frame|args|locals|"
-"display|watch."
-msgstr ""
-"info 主题 - 查看 info 信息，主题可以为 
source|sources|variables|functions|"
-"break|frame|args|locals|display|watch。"
+msgid "info topic - 
source|sources|variables|functions|break|frame|args|locals|display|watch."
+msgstr "info 主题 - 查看 info 信息，主题可以为 
source|sources|variables|functions|break|frame|args|locals|display|watch。"
 
 #: command.y:859
 msgid "list [-|+|[filename:]lineno|function|range] - list specified line(s)."
@@ -1284,8 +1266,7 @@ msgid "next [COUNT] - step program, proceeding through 
subroutine calls."
 msgstr "next [次数] - 单步运行程序，并且步过子调用。"
 
 #: command.y:863
-msgid ""
-"nexti [COUNT] - step one instruction, but proceed through subroutine calls."
+msgid "nexti [COUNT] - step one instruction, but proceed through subroutine 
calls."
 msgstr "nexti [次数] - 单运行一步指令，但步过其子调用。"
 
 #: command.y:865
@@ -1321,8 +1302,7 @@ msgid "set var = value - assign value to a scalar 
variable."
 msgstr "set 变量 = 值 - ç»™æ ‡é‡å˜é‡èµ‹å€¼ã€‚"
 
 #: command.y:883
-msgid ""
-"silent - suspends usual message when stopped at a breakpoint/watchpoint."
+msgid "silent - suspends usual message when stopped at a 
breakpoint/watchpoint."
 msgstr "silent - 在断点/监视点处中断时，隐藏常规消息。"
 
 #: command.y:885
@@ -1350,9 +1330,7 @@ msgid "undisplay [N] - remove variable(s) from automatic 
display list."
 msgstr "undisplay [N] - 从自动显示列表中移除指定变量。"
 
 #: command.y:897
-msgid ""
-"until [[filename:]N|function] - execute until program reaches a different "
-"line or line N within current frame."
+msgid "until [[filename:]N|function] - execute until program reaches a 
different line or line N within current frame."
 msgstr "until [[文件名:]N|函数] - 
在当前层中执行，在下一行或第 N 行处暂停。"
 
 #: command.y:899
@@ -1368,12 +1346,8 @@ msgid "watch var - set a watchpoint for a variable."
 msgstr "watch 变量 - 为变量设置监视点。"
 
 #: command.y:905
-msgid ""
-"where [N] - (same as backtrace) print trace of all or N innermost (outermost "
-"if N < 0) frames."
-msgstr ""
-"where [N] - (与backtrace相同) 显示所有或最近 N 层 (若 N < 
0，则显示最远 N "
-"层) 调用。"
+msgid "where [N] - (same as backtrace) print trace of all or N innermost 
(outermost if N < 0) frames."
+msgstr "where [N] - (与backtrace相同) 显示所有或最近 N 层 (若 N < 
0，则显示最远 N 层) 调用。"
 
 #: command.y:1016 debug.c:414 gawkapi.c:259 msg.c:139
 #, c-format
@@ -2083,7 +2057,7 @@ msgstr "make_builtinï¼šæ— æ³•ä½¿ç”¨ gawk 内置的 
“%s” 作为函数名"
 #: ext.c:109
 #, c-format
 msgid "make_builtin: can't use gawk built-in `%s' as namespace name"
-msgstr "make_builtinï¼šæ— æ³•ä½¿ç”¨ gawk 内置的 “%s” 
作为命名空间名称"
+msgstr "make_builtinï¼šæ— æ³•ä½¿ç”¨ gawk 内置的 “%s” 作为命名空间"
 
 #: ext.c:126
 #, c-format
@@ -2249,7 +2223,7 @@ msgstr "inplace::beginï¼šæ— æ³•å¯¹â€œ%s”执行 stat 
(%s)"
 #: extension/inplace.c:159
 #, c-format
 msgid "inplace::begin: `%s' is not a regular file"
-msgstr "inplace::begin：“%s”不是普通文件"
+msgstr "ininplace::begin：“%s”不是普通文件"
 
 #: extension/inplace.c:170
 #, c-format
@@ -2312,7 +2286,7 @@ msgstr "inplace::end：link(“%s”, “%s”) 失败 
(%s)"
 #: extension/inplace.c:257
 #, c-format
 msgid "inplace::end: rename(`%s', `%s') failed (%s)"
-msgstr "inplace::end：rename(“%s”, “%s”) failed (%s)"
+msgstr "inplace::end：rename(“%s”, “%s”) 失败 (%s)"
 
 #: extension/ordchr.c:72
 msgid "ord: called with inappropriate argument(s)"
@@ -2411,11 +2385,11 @@ msgstr "NF 被设置为负值"
 
 #: field.c:403
 msgid "decrementing NF is not portable to many awk versions"
-msgstr "减少 NF 的值在许多其他 awk 版本上不受支持"
+msgstr "降序 NF æ— æ³•è¢«å¤§å¤šæ•° awk 所兼容"
 
 #: field.c:847
 msgid "accessing fields from an END rule may not be portable"
-msgstr "从 END 规则中访问字段的可移植性不佳"
+msgstr "其他 awk 可能不支持使用 END "
 
 #: field.c:975 field.c:982
 msgid "split: fourth argument is a gawk extension"
@@ -2443,7 +2417,7 @@ msgstr "splitï¼šæ— 
法将第四个参数的子数组用于第二个参数"
 
 #: field.c:1035
 msgid "split: null string for third arg is a non-standard extension"
-msgstr "splitï¼šç¬¬ä¸‰ä¸ªå‚æ•°ä¸ºç©ºå­—ç¬¦ä¸²æ˜¯éžæ ‡å‡†æ‰©å±•"
+msgstr "split：第三个参数为空字符串：其他 awk 
可能不支持这一特性"
 
 #: field.c:1072
 msgid "patsplit: fourth argument is not an array"
@@ -2513,13 +2487,11 @@ msgstr "awk_value_to_node：数值类型“%dâ€æ— æ•ˆ"
 
 #: gawkapi.c:385
 msgid "add_ext_func: received NULL name_space parameter"
-msgstr "add_ext_func：收到空 name_space 参数"
+msgstr "add_ext_func：name_space 参数为空"
 
 #: gawkapi.c:523
 #, c-format
-msgid ""
-"node_to_awk_value: detected invalid numeric flags combination `%s'; please "
-"file a bug report."
+msgid "node_to_awk_value: detected invalid numeric flags combination `%s'; 
please file a bug report."
 msgstr "node_to_awk_valueï¼šå‘çŽ°ä¸€ä¸ªæ— 
效的选项组合“%s”；请向开发者汇报此错误。"
 
 #: gawkapi.c:551
@@ -2532,9 +2504,7 @@ msgstr "node_to_awk_value：值为空"
 
 #: gawkapi.c:610 gawkapi.c:644 gawkapi.c:671 gawkapi.c:704
 #, c-format
-msgid ""
-"node_to_awk_value detected invalid flags combination `%s'; please file a bug "
-"report."
+msgid "node_to_awk_value detected invalid flags combination `%s'; please file 
a bug report."
 msgstr "node_to_awk_value å‘çŽ°äº†ä¸€ä¸ªæ— 
效的选项组合“%s”；请向开发者汇报此错误。"
 
 #: gawkapi.c:1082
@@ -2599,8 +2569,7 @@ msgstr "“%s”重定向中的表达式是空字符串"
 
 #: io.c:796
 #, c-format
-msgid ""
-"filename `%.*s' for `%s' redirection may be result of logical expression"
+msgid "filename `%.*s' for `%s' redirection may be result of logical 
expression"
 msgstr 
"“%3$s”重定向中的文件名“%2$.*1$s”可能是逻辑表达式的结果"
 
 #: io.c:844
@@ -2625,8 +2594,7 @@ msgstr "æ— æ³•ä¸ºè¾“å…¥æ‰“å¼€ç®¡é“â€œ%s”(%s)"
 
 #: io.c:950
 #, c-format
-msgid ""
-"get_file socket creation not supported on this platform for `%s' with fd %d"
+msgid "get_file socket creation not supported on this platform for `%s' with 
fd %d"
 msgstr "此平台不支持使用 get_file 创建文件描述符为 %2$d 
的套接字“%1$s”"
 
 #: io.c:961
@@ -2645,8 +2613,7 @@ msgid "can't redirect to `%s' (%s)"
 msgstr "æ— æ³•é‡å®šå‘åˆ°â€œ%s”(%s)"
 
 #: io.c:1153
-msgid ""
-"reached system limit for open files: starting to multiplex file descriptors"
+msgid "reached system limit for open files: starting to multiplex file 
descriptors"
 msgstr "打开的文件数达到系统限制：开始复用文件描述符"
 
 #: io.c:1169
@@ -2865,8 +2832,7 @@ msgstr "register_output_parser：指针为空"
 
 #: io.c:3221
 #, c-format
-msgid ""
-"output wrapper `%s' conflicts with previously installed output wrapper `%s'"
+msgid "output wrapper `%s' conflicts with previously installed output wrapper 
`%s'"
 msgstr "输出解析器“%s”与之前设置的“%s”相冲突"
 
 #: io.c:3228
@@ -2880,9 +2846,7 @@ msgstr "register_output_processor：指针为空"
 
 #: io.c:3278
 #, c-format
-msgid ""
-"two-way processor `%s' conflicts with previously installed two-way processor "
-"`%s'"
+msgid "two-way processor `%s' conflicts with previously installed two-way 
processor `%s'"
 msgstr "双向处理器“%s”与之前设置的“%s”相冲突"
 
 #: io.c:3287
@@ -3094,7 +3058,6 @@ msgstr "\t-Z locale-name\t\t--locale=locale-name\n"
 #. address for translation bugs.
 #. no-wrap
 #: main.c:633
-#, fuzzy
 msgid ""
 "\n"
 "To report bugs, see node `Bugs' in `gawk.info'\n"
@@ -3102,17 +3065,17 @@ msgid ""
 "printed version.  This same information may be found at\n"
 "https://www.gnu.org/software/gawk/manual/html_node/Bugs.html.\n";
 "PLEASE do NOT try to report bugs by posting in comp.lang.awk,\n"
+"\n"
 "or by using a web forum such as Stack Overflow.\n"
 "\n"
 msgstr ""
 "\n"
-"提交错误报告请参考“gawk.info”中的“Bugs”页，它位于\n"
-"“Reporting Problems and Bugs”一节。  您也可以在\n"
+"如需提交错误报告，请参考“gawk.info”中的“Bugs”页，\n"
+"它位于“Reporting Problems and Bugs”一节。您也可以在\n"
 "https://www.gnu.org/software/gawk/manual/html_node/Bugs.html\n";
 "中找到相同的信息。\n"
 "请勿在群组 comp.lang.awk 上提交错误报告，\n"
-"\n"
-"也请不要使用网络论坛（如 Stack Overflow）提交错误报告。\n"
+"或者使用 Stack Overflow 等论坛报告错误。\n"
 "\n"
 
 #: main.c:641
@@ -3168,9 +3131,7 @@ msgstr ""
 msgid ""
 "You should have received a copy of the GNU General Public License\n"
 "along with this program. If not, see http://www.gnu.org/licenses/.\n";
-msgstr ""
-"ä½ åº”è¯¥æ”¶åˆ°ç¨‹åºé™„å¸¦çš„ä¸€ä»½ GNU 通用公å…
±è®¸å¯è¯(GPL)。如果没有收到，请参看 "
-"http://www.gnu.org/licenses/ 。\n"
+msgstr "ä½ åº”è¯¥æ”¶åˆ°ç¨‹åºé™„å¸¦çš„ä¸€ä»½ GNU 通用公å…
±è®¸å¯è¯(GPL)。如果没有收到，请参看 http://www.gnu.org/licenses/ 
。\n"
 
 #: main.c:732
 msgid "-Ft does not set FS to tab in POSIX awk"
@@ -3237,7 +3198,7 @@ msgstr "“-e/--source”的空参数被忽略"
 
 #: main.c:1631 main.c:1636
 msgid "`--profile' overrides `--pretty-print'"
-msgstr "“--posix”覆盖“--pretty-print”"
+msgstr "“--profile”覆盖“--pretty-print”"
 
 #: main.c:1648
 msgid "-M ignored: MPFR/GMP support not compiled in"
@@ -3327,9 +3288,7 @@ msgstr "“\\x”转义序列中没有十六进制数"
 
 #: node.c:633
 #, c-format
-msgid ""
-"hex escape \\x%.*s of %d characters probably not interpreted the way you "
-"expect"
+msgid "hex escape \\x%.*s of %d characters probably not interpreted the way 
you expect"
 msgstr "十六进制转义符 \\x%.*s 表示的 %d 
个字符可能不会被如期望情况解释"
 
 #: node.c:648
@@ -3338,9 +3297,7 @@ msgid "escape sequence `\\%c' treated as plain `%c'"
 msgstr "转义序列“\\%c”被当作单纯的“%c”"
 
 #: node.c:784
-msgid ""
-"Invalid multibyte data detected. There may be a mismatch between your data "
-"and your locale."
+msgid "Invalid multibyte data detected. There may be a mismatch between your 
data and your locale."
 msgstr "æ£€æµ‹åˆ°äº†æ— æ•ˆçš„å¤šå­—èŠ‚æ•°æ®ã€‚å¯èƒ½ä½ 
的数据和区域设置不匹配。"
 
 #: posix/gawkmisc.c:177
@@ -3355,7 +3312,7 @@ msgstr "%s %s “%sâ€ï¼šæ— æ³•è®¾ç½® 
close-on-exec：(fcntl F_SETFD：%s)"
 
 #: profile.c:73
 msgid "Program indentation level too deep. Consider refactoring your code"
-msgstr "ç¨‹åºç¼©è¿›ç­‰çº§è¿‡æ·±ã€‚è¯·è€ƒè™‘é‡æž„æ‚¨çš„ä»£ç "
+msgstr "ä»£ç ç¼©è¿›çš„å±‚æ¬¡å¤ªæ·±ã€‚è¯·è€ƒè™‘é‡æž„æ‚¨çš„ä»£ç "
 
 #: profile.c:110
 #, c-format
@@ -3410,7 +3367,7 @@ msgid ""
 "\n"
 msgstr ""
 "\n"
-"# 包含的文件（-i 和/或 @include）\n"
+"# å·²åŠ è½½æ‰©å±• (-l 和/或 @load)\n"
 "\n"
 
 #: profile.c:1397
@@ -3433,24 +3390,22 @@ msgid "redir2str: unknown redirection type %d"
 msgstr "redir2str：未知重定向类型 %d"
 
 #: re.c:58 re.c:161
-msgid ""
-"behavior of matching a regexp containing NUL characters is not defined by "
-"POSIX"
-msgstr "POSIX 未定义匹配包含 NUL 空字符的正则表达式的行为"
+msgid "behavior of matching a regexp containing NUL characters is not defined 
by POSIX"
+msgstr "POSIX 规范中不支持匹配包含 NUL 字符的正则表达式"
 
 #: re.c:125
 msgid "invalid NUL byte in dynamic regexp"
-msgstr "åŠ¨æ€æ­£åˆ™è¡¨è¾¾å¼ä¸­çš„æ— æ•ˆ NUL 空字节"
+msgstr "åŠ¨æ€æ­£åˆ™è¡¨è¾¾å¼ä¸­å«æœ‰æ— æ•ˆçš„ NUL 字节"
 
 #: re.c:172
 #, c-format
 msgid "regexp escape sequence `\\%c' treated as plain `%c'"
-msgstr "正则表达式转义序列“\\%c”被当作单纯的“%c”"
+msgstr 
"正则表达式中的转义序列“\\%c”将被当作纯文本“%c”"
 
 #: re.c:191
 #, c-format
 msgid "regexp escape sequence `\\%c' is not a known regexp operator"
-msgstr 
"正则表达式转义序列“\\%c”不是已知的正则表达式操作符"
+msgstr "正则表达式中的转义序列“\\%c”不是有效的操作符"
 
 #: re.c:650
 #, c-format
@@ -3663,8 +3618,7 @@ msgstr "æ— æ³•å¼¹å‡º main 的上下文"
 #~ msgid "extension: cannot open library `%s' (%s)"
 #~ msgstr "extensionï¼šæ— æ³•æ‰“å¼€åº“â€œ%s”(%s)"
 
-#~ msgid ""
-#~ "extension: library `%s': does not define `plugin_is_GPL_compatible' (%s)"
+#~ msgid "extension: library `%s': does not define `plugin_is_GPL_compatible' 
(%s)"
 #~ msgstr 
"extension：库“%s”：未定义“plugin_is_GPL_compatible”(%s)"
 
 #~ msgid "extension: library `%s': cannot call function `%s' (%s)"
@@ -3814,8 +3768,7 @@ msgstr "æ— æ³•å¼¹å‡º main 的上下文"
 #~ msgid "xor(%lf, %lf): fractional values will be truncated"
 #~ msgstr "xor(%lf, %lf): 小数部分会被截断"
 
-#~ msgid ""
-#~ "for loop: array `%s' changed size from %ld to %ld during loop execution"
+#~ msgid "for loop: array `%s' changed size from %ld to %ld during loop 
execution"
 #~ msgstr "for loop: 数组“%s”在循环执行时大小从 %ld 改变为 
%ld"
 
 #~ msgid "`break' outside a loop is not portable"
@@ -3836,9 +3789,7 @@ msgstr "æ— æ³•å¼¹å‡º main 的上下文"
 #~ msgid "statement has no effect"
 #~ msgstr "è¡¨è¾¾å¼æ— ä»»ä½•ä½œç”¨"
 
-#~ msgid ""
-#~ "concatenation: side effects in one expression have changed the length of "
-#~ "another!"
+#~ msgid "concatenation: side effects in one expression have changed the 
length of another!"
 #~ msgstr "concatenation: 
一个表达式的额外效应已改变另一个的长度！"
 
 #~ msgid "assignment used in conditional context"

-----------------------------------------------------------------------

Summary of changes:
 ChangeLog                        |   4 +
 config.guess                     | 168 +++++++++++++++++++++++++++++++++--
 extension/build-aux/ChangeLog    |   4 +
 extension/build-aux/config.guess | 168 +++++++++++++++++++++++++++++++++--
 po/ChangeLog                     |   4 +
 po/zh_CN.po                      | 185 ++++++++++++++-------------------------
 6 files changed, 400 insertions(+), 133 deletions(-)


hooks/post-receive
-- 
gawk