Imported Upstream version 4.2.2

1 files changed, 144 insertions, 121 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index 6ed8359..36206da 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -7,199 +7,220 @@ msgid ""
 msgstr ""
 "Project-Id-Version: sed 4.2.0\n"
 "Report-Msgid-Bugs-To: bug-gnu-utils@gnu.org\n"
-"POT-Creation-Date: 2009-06-27 15:08+0200\n"
+"POT-Creation-Date: 2012-12-22 14:36+0100\n"
 "PO-Revision-Date: 2008-01-28 23:17+0800\n"
 "Last-Translator: LI Daobing <lidaobing@gmail.com>\n"
-"Language-Team: Chinese (simplified) <translation-team-zh-cn@lists."
-"sourceforge.net>\n"
+"Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
+"Language: zh_CN\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
 
-#: sed/compile.c:161
+#: sed/compile.c:144
 msgid "multiple `!'s"
 msgstr "多个“!”"
 
-#: sed/compile.c:162
+#: sed/compile.c:145
 msgid "unexpected `,'"
 msgstr "意外的“,”"
 
-#: sed/compile.c:163
+#: sed/compile.c:146
 msgid "invalid usage of +N or ~N as first address"
 msgstr "无法将 +N 或 ~N 作为第一个地址"
 
-#: sed/compile.c:164
+#: sed/compile.c:147
 msgid "unmatched `{'"
 msgstr "未匹配的“{”"
 
-#: sed/compile.c:165
+#: sed/compile.c:148
 msgid "unexpected `}'"
 msgstr "意外的“}”"
 
-#: sed/compile.c:166
+#: sed/compile.c:149
 msgid "extra characters after command"
 msgstr "命令后含有多余的字符"
 
-#: sed/compile.c:167
+#: sed/compile.c:150
 msgid "expected \\ after `a', `c' or `i'"
 msgstr "期望在“a”, “c”, “i”之后有“\\”"
 
-#: sed/compile.c:168
+#: sed/compile.c:151
 msgid "`}' doesn't want any addresses"
 msgstr "“}”不需要任何地址"
 
-#: sed/compile.c:169
+#: sed/compile.c:152
 msgid ": doesn't want any addresses"
 msgstr ": 不需要任何地址"
 
-#: sed/compile.c:170
+#: sed/compile.c:153
 msgid "comments don't accept any addresses"
 msgstr "注释不接受任何地址"
 
-#: sed/compile.c:171
+#: sed/compile.c:154
 msgid "missing command"
 msgstr "遗漏命令"
 
-#: sed/compile.c:172
+#: sed/compile.c:155
 msgid "command only uses one address"
 msgstr "命令只使用一个地址"
 
-#: sed/compile.c:173
+#: sed/compile.c:156
 msgid "unterminated address regex"
 msgstr "未终止的地址正则表达式"
 
-#: sed/compile.c:174
+#: sed/compile.c:157
 msgid "unterminated `s' command"
 msgstr "未终止的“s”命令"
 
-#: sed/compile.c:175
+#: sed/compile.c:158
 msgid "unterminated `y' command"
 msgstr "未终止的“y”命令"
 
-#: sed/compile.c:176
+#: sed/compile.c:159
 msgid "unknown option to `s'"
 msgstr "“s”的未知选项"
 
-#: sed/compile.c:177
+#: sed/compile.c:160
 msgid "multiple `p' options to `s' command"
 msgstr "多个“s”命令的选项“p”"
 
-#: sed/compile.c:178
+#: sed/compile.c:161
 msgid "multiple `g' options to `s' command"
 msgstr "多个“s”命令的选项“g”"
 
-#: sed/compile.c:179
+#: sed/compile.c:162
 msgid "multiple number options to `s' command"
 msgstr "多个“s”命令的数值选项"
 
-#: sed/compile.c:180
+#: sed/compile.c:163
 msgid "number option to `s' command may not be zero"
 msgstr "“s”命令的数值选项不能为零"
 
-#: sed/compile.c:181
+#: sed/compile.c:164
 msgid "strings for `y' command are different lengths"
 msgstr "“y”命令的字符串长度不同"
 
-#: sed/compile.c:182
+#: sed/compile.c:165
 msgid "delimiter character is not a single-byte character"
 msgstr "分割符长度不为1"
 
-#: sed/compile.c:183
+#: sed/compile.c:166
 msgid "expected newer version of sed"
 msgstr "需要更高版本的sed"
 
-#: sed/compile.c:184
+#: sed/compile.c:167
 msgid "invalid usage of line address 0"
 msgstr "非法使用地址0"
 
-#: sed/compile.c:185
+#: sed/compile.c:168
 #, c-format
 msgid "unknown command: `%c'"
 msgstr "未知的命令：“%c”"
 
-#: sed/compile.c:208
+#: sed/compile.c:169
+#, fuzzy
+msgid "incomplete command"
+msgstr "遗漏命令"
+
+#: sed/compile.c:192
 #, c-format
 msgid "%s: file %s line %lu: %s\n"
 msgstr "%s：文件 %s 行号：%lu：%s\n"
 
-#: sed/compile.c:211
+#: sed/compile.c:195
 #, c-format
 msgid "%s: -e expression #%lu, char %lu: %s\n"
 msgstr "%s：-e 表达式 #%lu，字符 %lu：%s\n"
 
-#: sed/compile.c:1665
+#: sed/compile.c:1657
 #, c-format
 msgid "can't find label for jump to `%s'"
 msgstr "无法为目的为“%s”的跳转找到标签"
 
-#: sed/execute.c:709
+#: sed/execute.c:595
 #, c-format
 msgid "%s: can't read %s: %s\n"
 msgstr "%s：无法读取 %s：%s\n"
 
-#: sed/execute.c:740
+#: sed/execute.c:624
 #, c-format
 msgid "couldn't edit %s: is a terminal"
 msgstr "无法编辑文件 %s: 这是一个终端"
 
-#: sed/execute.c:745
+#: sed/execute.c:629
 #, c-format
 msgid "couldn't edit %s: not a regular file"
 msgstr "无法编辑文件 %s: 不是一个普通文件"
 
-#: sed/execute.c:757
+#: sed/execute.c:640
 #, c-format
 msgid "%s: warning: failed to set default file creation context to %s: %s"
 msgstr ""
 
-#: sed/execute.c:764
+#: sed/execute.c:647
 #, c-format
 msgid "%s: warning: failed to get security context of %s: %s"
 msgstr ""
 
-#: sed/execute.c:783 sed/utils.c:227
+#: sed/execute.c:664 sed/utils.c:211
 #, c-format
 msgid "couldn't open temporary file %s: %s"
 msgstr "无法打开临时文件 %s: %s"
 
-#: sed/execute.c:1317 sed/execute.c:1497
+#: sed/execute.c:1193 sed/execute.c:1373
 msgid "error in subprocess"
 msgstr "子进程出错"
 
-#: sed/execute.c:1319
+#: sed/execute.c:1195
 msgid "option `e' not supported"
 msgstr "不支持选项“e”"
 
-#: sed/execute.c:1499
+#: sed/execute.c:1375
 msgid "`e' command not supported"
 msgstr "不支持命令“e”"
 
-#: sed/execute.c:1843
+#: sed/execute.c:1725
 msgid "no input files"
 msgstr "没有输入文件"
 
-#: sed/regexp.c:41
+#: sed/regexp.c:39
 msgid "no previous regular expression"
 msgstr "前面没有正则表达式"
 
-#: sed/regexp.c:42
+#: sed/regexp.c:40
 msgid "cannot specify modifiers on empty regexp"
 msgstr "无法对空正则表达式指定修饰符"
 
-#: sed/regexp.c:131
+#: sed/regexp.c:129
 #, c-format
 msgid "invalid reference \\%d on `s' command's RHS"
 msgstr "“s”命令的RHS非法引用\\%d"
 
-#: sed/sed.c:97
+#: sed/sed.c:32
+msgid "Jay Fenlason"
+msgstr ""
+
+#: sed/sed.c:33
+msgid "Tom Lord"
+msgstr ""
+
+#: sed/sed.c:34
+msgid "Ken Pizzini"
+msgstr ""
+
+#: sed/sed.c:35
+msgid "Paolo Bonzini"
+msgstr ""
+
+#: sed/sed.c:79
 #, c-format
 msgid ""
 "GNU sed home page: <http://www.gnu.org/software/sed/>.\n"
 "General help using GNU software: <http://www.gnu.org/gethelp/>.\n"
 msgstr ""
 
-#: sed/sed.c:104
+#: sed/sed.c:86
 #, fuzzy, c-format
 msgid ""
 "E-mail bug reports to: <%s>.\n"
@@ -208,7 +229,7 @@ msgstr ""
 "将错误报告通过电子邮件发送到：%s .\n"
 "请务必将单词“%s”放在标题的某处。\n"
 
-#: sed/sed.c:117
+#: sed/sed.c:99
 msgid ""
 "  -R, --regexp-perl\n"
 "                 use Perl 5's regular expressions syntax in the script.\n"
@@ -216,7 +237,7 @@ msgstr ""
 "  -R, --regexp-perl\n"
 "                 使用 Perl 5 的正则表达式语法\n"
 
-#: sed/sed.c:122
+#: sed/sed.c:104
 #, c-format
 msgid ""
 "Usage: %s [OPTION]... {script-only-if-no-other-script} [input-file]...\n"
@@ -225,7 +246,7 @@ msgstr ""
 "用法: %s [选项]... {脚本(如果没有其他脚本)} [输入文件]...\n"
 "\n"
 
-#: sed/sed.c:126
+#: sed/sed.c:108
 #, c-format
 msgid ""
 "  -n, --quiet, --silent\n"
@@ -234,7 +255,7 @@ msgstr ""
 "  -n, --quiet, --silent\n"
 "                 取消自动打印模式空间\n"
 
-#: sed/sed.c:128
+#: sed/sed.c:110
 #, c-format
 msgid ""
 "  -e script, --expression=script\n"
@@ -243,7 +264,7 @@ msgstr ""
 "  -e 脚本, --expression=脚本\n"
 "                 添加“脚本”到程序的运行列表\n"
 
-#: sed/sed.c:130
+#: sed/sed.c:112
 #, c-format
 msgid ""
 "  -f script-file, --file=script-file\n"
@@ -253,7 +274,7 @@ msgstr ""
 "  -f 脚本文件, --file=脚本文件\n"
 "                 添加“脚本文件”到程序的运行列表\n"
 
-#: sed/sed.c:133
+#: sed/sed.c:115
 #, c-format
 msgid ""
 "  --follow-symlinks\n"
@@ -262,16 +283,16 @@ msgstr ""
 "  --follow-symlinks\n"
 "                 直接修改文件时跟随软链接\n"
 
-#: sed/sed.c:136
-#, c-format
+#: sed/sed.c:118
+#, fuzzy, c-format
 msgid ""
 "  -i[SUFFIX], --in-place[=SUFFIX]\n"
-"                 edit files in place (makes backup if extension supplied)\n"
+"                 edit files in place (makes backup if SUFFIX supplied)\n"
 msgstr ""
 "  -i[扩展名], --in-place[=扩展名]\n"
 "                 直接修改文件(如果指定扩展名就备份文件)\n"
 
-#: sed/sed.c:139
+#: sed/sed.c:121
 #, c-format
 msgid ""
 "  -b, --binary\n"
@@ -281,7 +302,7 @@ msgstr ""
 "  -b, --binary\n"
 "                 以二进制方式打开文件 (回车加换行不做特殊处理)\n"
 
-#: sed/sed.c:142
+#: sed/sed.c:124
 #, c-format
 msgid ""
 "  -l N, --line-length=N\n"
@@ -290,7 +311,7 @@ msgstr ""
 "  -l N, --line-length=N\n"
 "                 指定“l”命令的换行期望长度\n"
 
-#: sed/sed.c:144
+#: sed/sed.c:126
 #, c-format
 msgid ""
 "  --posix\n"
@@ -299,7 +320,7 @@ msgstr ""
 "  --posix\n"
 "                 关闭所有 GNU 扩展\n"
 
-#: sed/sed.c:146
+#: sed/sed.c:128
 #, c-format
 msgid ""
 "  -r, --regexp-extended\n"
@@ -308,7 +329,7 @@ msgstr ""
 "  -r, --regexp-extended\n"
 "                 在脚本中使用扩展正则表达式\n"
 
-#: sed/sed.c:151
+#: sed/sed.c:133
 #, c-format
 msgid ""
 "  -s, --separate\n"
@@ -319,7 +340,7 @@ msgstr ""
 "  -s, --separate\n"
 "                 将输入文件视为各个独立的文件而不是一个长的连续输入\n"
 
-#: sed/sed.c:154
+#: sed/sed.c:136
 #, c-format
 msgid ""
 "  -u, --unbuffered\n"
@@ -330,17 +351,24 @@ msgstr ""
 "  -u, --unbuffered\n"
 "                 从输入文件读取最少的数据，更频繁的刷新输出\n"
 
-#: sed/sed.c:157
+#: sed/sed.c:139
+#, c-format
+msgid ""
+"  -z, --null-data\n"
+"                 separate lines by NUL characters\n"
+msgstr ""
+
+#: sed/sed.c:141
 #, c-format
 msgid "      --help     display this help and exit\n"
 msgstr "      --help     打印帮助并退出\n"
 
-#: sed/sed.c:158
+#: sed/sed.c:142
 #, c-format
 msgid "      --version  output version information and exit\n"
 msgstr "      --version  输出版本信息并退出\n"
 
-#: sed/sed.c:159
+#: sed/sed.c:143
 #, c-format
 msgid ""
 "\n"
@@ -355,146 +383,141 @@ msgstr ""
 "sed脚本。其他非选项参数被视为输入文件，如果没有输入文件，那么程序将从标准\n"
 "输入读取数据。\n"
 
-#: sed/sed.c:315
-#, c-format
-msgid "super-sed version %s\n"
-msgstr "超级-sed 版本 %s\n"
-
-#: sed/sed.c:316
-#, c-format
-msgid ""
-"based on GNU sed version %s\n"
-"\n"
-msgstr ""
-"基于 GNU sed 版本 %s\n"
-"\n"
-
-#: sed/sed.c:318
-#, c-format
-msgid "GNU sed version %s\n"
-msgstr "GNU sed 版本 %s\n"
-
-#: sed/sed.c:320
-#, fuzzy, c-format
-msgid ""
-"Copyright (C) %d 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"
-"to the extent permitted by law.\n"
-msgstr ""
-"%s\n"
-"该程序为自由软件，详情可参阅版权条款。在法律允许的范围内我们不作任何担保，\n"
-"这包含但不限于任何商业适售性以及针对特定目的的适用性的担保。\n"
-
-#: sed/utils.c:93 sed/utils.c:438
+#: sed/utils.c:74 sed/utils.c:432
 #, c-format
 msgid "cannot remove %s: %s"
 msgstr "无法移除 %s：%s"
 
-#: sed/utils.c:163
+#: sed/utils.c:144
 #, c-format
 msgid "couldn't open file %s: %s"
 msgstr "无法打开文件 %s: %s"
 
-#: sed/utils.c:186
+#: sed/utils.c:167
 #, c-format
 msgid "couldn't attach to %s: %s"
 msgstr "无法绑定 %s: %s"
 
-#: sed/utils.c:245
+#: sed/utils.c:229
 #, c-format
 msgid "couldn't write %d item to %s: %s"
 msgid_plural "couldn't write %d items to %s: %s"
 msgstr[0] "无法将 %d 个项目写入 %s：%s"
 
-#: sed/utils.c:260 sed/utils.c:276
+#: sed/utils.c:244 sed/utils.c:267
 #, c-format
 msgid "read error on %s: %s"
 msgstr "读取 %s 出错：%s"
 
-#: sed/utils.c:378
+#: sed/utils.c:372
 #, c-format
 msgid "couldn't follow symlink %s: %s"
 msgstr "无法跟随软链接 %s: %s"
 
-#: sed/utils.c:412
+#: sed/utils.c:406
 #, c-format
 msgid "cannot stat %s: %s"
 msgstr "无法获取 %s 的状态: %s"
 
-#: sed/utils.c:443
+#: sed/utils.c:437
 #, c-format
 msgid "cannot rename %s: %s"
 msgstr "无法重命名 %s：%s"
 
-#: lib/regcomp.c:134
+#: lib/regcomp.c:132
 msgid "Success"
 msgstr "成功"
 
-#: lib/regcomp.c:137
+#: lib/regcomp.c:135
 msgid "No match"
 msgstr "没有匹配项"
 
-#: lib/regcomp.c:140
+#: lib/regcomp.c:138
 msgid "Invalid regular expression"
 msgstr "非法的正则表达式"
 
-#: lib/regcomp.c:143
+#: lib/regcomp.c:141
 msgid "Invalid collation character"
 msgstr "非法的收集字符"
 
-#: lib/regcomp.c:146
+#: lib/regcomp.c:144
 msgid "Invalid character class name"
 msgstr "非法的字符类型名"
 
-#: lib/regcomp.c:149
+#: lib/regcomp.c:147
 msgid "Trailing backslash"
 msgstr "尾端的“\\”"
 
-#: lib/regcomp.c:152
+#: lib/regcomp.c:150
 msgid "Invalid back reference"
 msgstr "非法回引用"
 
-#: lib/regcomp.c:155
+#: lib/regcomp.c:153
 msgid "Unmatched [ or [^"
 msgstr "未匹配的“[”或者“[^”"
 
-#: lib/regcomp.c:158
+#: lib/regcomp.c:156
 msgid "Unmatched ( or \\("
 msgstr "未匹配的“(”或者“\\(”"
 
-#: lib/regcomp.c:161
+#: lib/regcomp.c:159
 msgid "Unmatched \\{"
 msgstr "未匹配的“\\{”"
 
-#: lib/regcomp.c:164
+#: lib/regcomp.c:162
 msgid "Invalid content of \\{\\}"
 msgstr "“\\{\\}”中内容非法"
 
-#: lib/regcomp.c:167
+#: lib/regcomp.c:165
 msgid "Invalid range end"
 msgstr "非法的范围结束"
 
-#: lib/regcomp.c:170
+#: lib/regcomp.c:168
 msgid "Memory exhausted"
 msgstr "内存耗尽"
 
-#: lib/regcomp.c:173
+#: lib/regcomp.c:171
 msgid "Invalid preceding regular expression"
 msgstr "非法的正则表达式头"
 
-#: lib/regcomp.c:176
+#: lib/regcomp.c:174
 msgid "Premature end of regular expression"
 msgstr "正则表达式不完整"
 
-#: lib/regcomp.c:179
+#: lib/regcomp.c:177
 msgid "Regular expression too big"
 msgstr "正则表达式过大"
 
-#: lib/regcomp.c:182
+#: lib/regcomp.c:180
 msgid "Unmatched ) or \\)"
 msgstr "未匹配的“)”或者“\\)”"
 
-#: lib/regcomp.c:703
+#: lib/regcomp.c:705
 msgid "No previous regular expression"
 msgstr "前面没有正则表达式"
+
+#~ msgid "super-sed version %s\n"
+#~ msgstr "超级-sed 版本 %s\n"
+
+#~ msgid ""
+#~ "based on GNU sed version %s\n"
+#~ "\n"
+#~ msgstr ""
+#~ "基于 GNU sed 版本 %s\n"
+#~ "\n"
+
+#~ msgid "GNU sed version %s\n"
+#~ msgstr "GNU sed 版本 %s\n"
+
+#~ msgid ""
+#~ "%s\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"
+#~ "to the extent permitted by law.\n"
+#~ msgstr ""
+#~ "%s\n"
+#~ "该程序为自由软件，详情可参阅版权条款。在法律允许的范围内我们不作任何担"
+#~ "保，\n"
+#~ "这包含但不限于任何商业适售性以及针对特定目的的适用性的担保。\n"