* Version: 2.7.1.

1 files changed, 87 insertions, 82 deletions

diff --git a/po/zh_CN.po b/po/zh_CN.po
index eca8f742..893167b4 100644
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
@@ -17,7 +17,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: man-db 2.5.1-pre2\n"
 "Report-Msgid-Bugs-To: Colin Watson <cjwatson@debian.org>\n"
-"POT-Creation-Date: 2014-09-28 00:10+0100\n"
+"POT-Creation-Date: 2014-11-07 16:16+0000\n"
 "PO-Revision-Date: 2008-01-16 17:49-0600\n"
 "Last-Translator: Ming Hua <minghua-guest@users.alioth.debian.org>\n"
 "Language-Team: Chinese (simplified) <translation-team-zh-cn@lists."
@@ -107,7 +107,7 @@ msgid "The man database defaults to %s%s."
 msgstr "默认的 man 数据库是 %s%s。"
 
 #: src/accessdb.c:64 src/catman.c:98 src/globbing_test.c:58
-#: src/lexgrog_test.c:68 src/man.c:279 src/manconv_main.c:94 src/mandb.c:108
+#: src/lexgrog_test.c:68 src/man.c:281 src/manconv_main.c:94 src/mandb.c:108
 #: src/manpath.c:65 src/whatis.c:123 src/zsoelim_main.c:66
 msgid "emit debugging messages"
 msgstr "输出调试信息"
@@ -122,20 +122,20 @@ msgstr "无法打开 %s 读取数据"
 msgid "[SECTION...]"
 msgstr "[章节...]"
 
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:302 src/whatis.c:133
 msgid "PATH"
 msgstr "路径"
 
-#: src/catman.c:99 src/man.c:300 src/whatis.c:133
+#: src/catman.c:99 src/man.c:302 src/whatis.c:133
 msgid "set search path for manual pages to PATH"
 msgstr "设置搜索手册页的路径为“路径”"
 
-#: src/catman.c:100 src/man.c:278 src/mandb.c:116 src/manpath.c:67
+#: src/catman.c:100 src/man.c:280 src/mandb.c:116 src/manpath.c:67
 #: src/whatis.c:135
 msgid "FILE"
 msgstr "文件"
 
-#: src/catman.c:100 src/man.c:278 src/mandb.c:116 src/manpath.c:67
+#: src/catman.c:100 src/man.c:280 src/mandb.c:116 src/manpath.c:67
 #: src/whatis.c:135
 msgid "use this user configuration file"
 msgstr "使用该用户设置文件"
@@ -213,7 +213,7 @@ msgstr "无法搜索目录 %s"
 msgid "warning: cannot create catdir %s"
 msgstr "警告：无法创建 catdir %s"
 
-#: src/check_mandirs.c:452 src/man.c:1783 src/man.c:1825 src/man.c:1860
+#: src/check_mandirs.c:452 src/man.c:1786
 #, c-format
 msgid "can't change to directory %s"
 msgstr "无法切换到目录 %s 中"
@@ -254,19 +254,19 @@ msgstr "警告：%s：忽略错误的文件名"
 msgid "PATH SECTION NAME"
 msgstr "路径 章节 名称"
 
-#: src/globbing_test.c:59 src/man.c:303
+#: src/globbing_test.c:59 src/man.c:305
 msgid "EXTENSION"
 msgstr "扩展"
 
-#: src/globbing_test.c:59 src/man.c:304
+#: src/globbing_test.c:59 src/man.c:306
 msgid "limit search to extension type EXTENSION"
 msgstr "将搜索限制在扩展类型为“扩展”的手册页之内"
 
-#: src/globbing_test.c:60 src/man.c:305
+#: src/globbing_test.c:60 src/man.c:307
 msgid "look for pages case-insensitively (default)"
 msgstr "查找手册页时不区分大小写字母 (默认)"
 
-#: src/globbing_test.c:61 src/man.c:306
+#: src/globbing_test.c:61 src/man.c:308
 msgid "look for pages case-sensitively"
 msgstr "查找手册页时区分大小写字母。"
 
@@ -287,7 +287,7 @@ msgid_plural "warning: whatis for %s exceeds %d bytes, truncating."
 msgstr[0] "警告：对 %s 的 whatis 操作结果超过 %d 字节，正在截断。"
 msgstr[1] "警告：对 %s 的 whatis 操作结果超过 %d 字节，正在截断。"
 
-#: src/lexgrog.l:816 src/man.c:2131 src/man.c:2213 src/man.c:2310
+#: src/lexgrog.l:816 src/man.c:2138 src/man.c:2220 src/man.c:2317
 #: src/manconv_main.c:165 src/straycats.c:220 src/ult_src.c:347
 #: src/ult_src.c:361 src/zsoelim.l:498
 #, c-format
@@ -318,165 +318,165 @@ msgstr "显示 whatis 信息"
 msgid "show guessed series of preprocessing filters"
 msgstr "显示所猜测的预处理过滤器序列"
 
-#: src/lexgrog_test.c:73 src/man.c:295 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:297 src/man.c:322
 msgid "ENCODING"
 msgstr "编码"
 
-#: src/lexgrog_test.c:73 src/man.c:320
+#: src/lexgrog_test.c:73 src/man.c:322
 #, fuzzy
 msgid "use selected output encoding"
 msgstr "必须指定输出所用的编码"
 
-#: src/lexgrog_test.c:117 src/man.c:547 src/man.c:556
+#: src/lexgrog_test.c:117 src/man.c:549 src/man.c:558
 #, c-format
 msgid "%s: incompatible options"
 msgstr "%s：互不相容的选项"
 
-#: src/man.c:163
+#: src/man.c:165
 #, c-format
 msgid "command exited with status %d: %s"
 msgstr "命令以代码 %d 状态退出：%s"
 
-#: src/man.c:262
+#: src/man.c:264
 msgid "[SECTION] PAGE..."
 msgstr "[章节] 手册页..."
 
-#: src/man.c:280
+#: src/man.c:282
 msgid "reset all options to their default values"
 msgstr "将所有选项都重置为默认值"
 
-#: src/man.c:281
+#: src/man.c:283
 msgid "WARNINGS"
 msgstr "警告"
 
-#: src/man.c:282
+#: src/man.c:284
 msgid "enable warnings from groff"
 msgstr "开启 groff 的警告"
 
-#: src/man.c:284
+#: src/man.c:286
 msgid "Main modes of operation:"
 msgstr "主要运行模式："
 
-#: src/man.c:285
+#: src/man.c:287
 msgid "equivalent to whatis"
 msgstr "等同于 whatis"
 
-#: src/man.c:286
+#: src/man.c:288
 msgid "equivalent to apropos"
 msgstr "等同于 apropos"
 
-#: src/man.c:287
+#: src/man.c:289
 msgid "search for text in all pages"
 msgstr ""
 
-#: src/man.c:288
+#: src/man.c:290
 msgid "print physical location of man page(s)"
 msgstr "输出手册页的物理位置"
 
-#: src/man.c:291
+#: src/man.c:293
 msgid "print physical location of cat file(s)"
 msgstr "输出 cat 文件的物理位置"
 
-#: src/man.c:293
+#: src/man.c:295
 msgid "interpret PAGE argument(s) as local filename(s)"
 msgstr "把“手册页”参数当成本地文件名来解读"
 
-#: src/man.c:294
+#: src/man.c:296
 msgid "used by catman to reformat out of date cat pages"
 msgstr "由 catman 使用，用来对过时的 cat 页重新排版"
 
-#: src/man.c:295
+#: src/man.c:297
 #, fuzzy
 msgid "output source page encoded in ENCODING"
 msgstr "以指定编码输出手册页源码"
 
-#: src/man.c:297
+#: src/man.c:299
 msgid "Finding manual pages:"
 msgstr "寻找手册页："
 
-#: src/man.c:298 src/whatis.c:134
+#: src/man.c:300 src/whatis.c:134
 msgid "LOCALE"
 msgstr "区域"
 
-#: src/man.c:298
+#: src/man.c:300
 msgid "define the locale for this particular man search"
 msgstr "定义本次手册页搜索所采用的区域设置"
 
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:301 src/manpath.c:68 src/whatis.c:132
 msgid "SYSTEM"
 msgstr "系统"
 
-#: src/man.c:299 src/manpath.c:68 src/whatis.c:132
+#: src/man.c:301 src/manpath.c:68 src/whatis.c:132
 #, fuzzy
 msgid "use manual pages from other systems"
 msgstr "搜索其它 unix 系统的手册页"
 
-#: src/man.c:301 src/whatis.c:130
+#: src/man.c:303 src/whatis.c:130
 msgid "LIST"
 msgstr "列表"
 
-#: src/man.c:301
+#: src/man.c:303
 msgid "use colon separated section list"
 msgstr "使用以半角冒号分隔的章节列表"
 
-#: src/man.c:307
+#: src/man.c:309
 msgid "show all pages matching regex"
 msgstr ""
 
-#: src/man.c:308
+#: src/man.c:310
 msgid "show all pages matching wildcard"
 msgstr ""
 
-#: src/man.c:309
+#: src/man.c:311
 msgid "make --regex and --wildcard match page names only, not descriptions"
 msgstr ""
 
-#: src/man.c:311
+#: src/man.c:313
 msgid "find all matching manual pages"
 msgstr "寻找所有匹配的手册页"
 
-#: src/man.c:312
+#: src/man.c:314
 msgid "force a cache consistency check"
 msgstr "强制进行缓存一致性的检查"
 
-#: src/man.c:314
+#: src/man.c:316
 msgid "don't try subpages, e.g. 'man foo bar' => 'man foo-bar'"
 msgstr ""
 
-#: src/man.c:316
+#: src/man.c:318
 msgid "Controlling formatted output:"
 msgstr "控制格式化的输出："
 
-#: src/man.c:317
+#: src/man.c:319
 msgid "PAGER"
 msgstr "PAGER"
 
-#: src/man.c:317
+#: src/man.c:319
 msgid "use program PAGER to display output"
 msgstr "使用 PAGER 程序显示输出文本"
 
-#: src/man.c:318 src/man.c:327
+#: src/man.c:320 src/man.c:329
 msgid "STRING"
 msgstr "字符串"
 
 #  need-proofread
-#: src/man.c:318
+#: src/man.c:320
 msgid "provide the `less' pager with a prompt"
 msgstr "给 less pager 提供一个提示行"
 
-#: src/man.c:319
+#: src/man.c:321
 msgid "display ASCII translation of certain latin1 chars"
 msgstr "显示某些 latin1 字符的 ASCII 翻译形式"
 
-#: src/man.c:322
+#: src/man.c:324
 msgid "turn off hyphenation"
 msgstr ""
 
-#: src/man.c:325
+#: src/man.c:327
 msgid "turn off justification"
 msgstr ""
 
-#: src/man.c:327
+#: src/man.c:329
 msgid ""
 "STRING indicates which preprocessors to run:\n"
 "e - [n]eqn, p - pic, t - tbl,\n"
@@ -486,34 +486,34 @@ msgstr ""
 "e - [n]eqn, p - pic, t - tbl,\n"
 "g - grap, r - refer, v - vgrind"
 
-#: src/man.c:331
+#: src/man.c:333
 #, c-format
 msgid "use %s to format pages"
 msgstr "使用 %s 对手册页排版"
 
-#: src/man.c:332
+#: src/man.c:334
 msgid "DEVICE"
 msgstr "设备"
 
-#: src/man.c:333
+#: src/man.c:335
 #, c-format
 msgid "use %s with selected device"
 msgstr "使用 %s 的指定设备"
 
-#: src/man.c:334
+#: src/man.c:336
 msgid "BROWSER"
 msgstr "浏览器"
 
-#: src/man.c:335
+#: src/man.c:337
 #, c-format
 msgid "use %s or BROWSER to display HTML output"
 msgstr "使用 %s 或指定浏览器显示 HTML 输出"
 
-#: src/man.c:336
+#: src/man.c:338
 msgid "RESOLUTION"
 msgstr "分辨率"
 
-#: src/man.c:338
+#: src/man.c:340
 msgid ""
 "use groff and display through gxditview (X11):\n"
 "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12"
@@ -521,97 +521,102 @@ msgstr ""
 "使用 groff 并通过 gxditview (X11) 来显示：\n"
 "-X = -TX75, -X100 = -TX100, -X100-12 = -TX100-12"
 
-#: src/man.c:340
+#: src/man.c:342
 msgid "use groff and force it to produce ditroff"
 msgstr "使用 groff 并强制它生成 ditroff"
 
-#: src/man.c:603 src/man.c:727
+#: src/man.c:605 src/man.c:729
 #, c-format
 msgid "No manual entry for %s\n"
 msgstr "没有 %s 的手册页条目\n"
 
-#: src/man.c:605
+#: src/man.c:607
 #, c-format
 msgid "(Alternatively, what manual page do you want from section %s?)\n"
 msgstr "(换句话问，您需要第 %s 节中的什么手册页？)\n"
 
-#: src/man.c:609
+#: src/man.c:611
 msgid "What manual page do you want?\n"
 msgstr "您需要什么手册页？\n"
 
-#: src/man.c:724
+#: src/man.c:726
 #, c-format
 msgid "No manual entry for %s in section %s\n"
 msgstr "在第 %2$s 节中没有关于 %1$s 的手册页条目。\n"
 
-#: src/man.c:733
+#: src/man.c:735
 #, c-format
 msgid "See '%s' for help when manual pages are not available.\n"
 msgstr "当没有手册页时，可以用 %s 命令来寻求帮助。\n"
 
-#: src/man.c:1296
+#: src/man.c:1298
 #, c-format
 msgid "ignoring unknown preprocessor `%c'"
 msgstr "忽略未知的预处理器 `%c'"
 
-#: src/man.c:1567 src/mandb.c:327
+#: src/man.c:1572 src/mandb.c:327
 #, c-format
 msgid "can't chown %s"
 msgstr "无法 chown %s"
 
-#: src/man.c:1579 src/mandb.c:224
+#: src/man.c:1584 src/mandb.c:224
 #, c-format
 msgid "can't chmod %s"
 msgstr "无法 chmod %s"
 
-#: src/man.c:1590 src/mandb.c:215
+#: src/man.c:1595 src/mandb.c:215
 #, c-format
 msgid "can't rename %s to %s"
 msgstr "无法将 %s 改名为 %s"
 
 #  need-proofread
-#: src/man.c:1607
+#: src/man.c:1612
 #, c-format
 msgid "can't set times on %s"
 msgstr "无法设定 %s 文件的时间"
 
-#: src/man.c:1616
+#: src/man.c:1621
 #, c-format
 msgid "can't unlink %s"
 msgstr "无法删除 (unlink) %s"
 
-#: src/man.c:1667
+#: src/man.c:1672
 #, c-format
 msgid "can't create temporary cat for %s"
 msgstr "无法为 %s 创建临时 cat 文件"
 
-#: src/man.c:1781
+#: src/man.c:1784
 #, fuzzy, c-format
 msgid "can't create temporary directory"
 msgstr "无法为 %s 创建临时 cat 文件"
 
-#: src/man.c:1793
+#: src/man.c:1796
 #, c-format
 msgid "can't open temporary file %s"
 msgstr "无法打开临时文件 %s"
 
-#: src/man.c:1831 src/man.c:1865
+#: src/man.c:1826 src/man.c:1863 src/man.c:3598
+#, fuzzy, c-format
+msgid "can't restore previous working directory"
+msgstr "无法为 %s 创建临时 cat 文件"
+
+#: src/man.c:1833 src/man.c:1868
 #, c-format
 msgid "can't remove directory %s"
 msgstr "无法移除目录 %s"
 
-#: src/man.c:1976
+#: src/man.c:1980
 #, c-format
 msgid "--Man-- next: %s [ view (return) | skip (Ctrl-D) | quit (Ctrl-C) ]\n"
 msgstr "--Man-- 下一页: %s [ 查看 (return) | 跳过 (Ctrl-D) | 退出 (Ctrl-C) ]\n"
 
 #  need-proofread
-#: src/man.c:2021 src/man.c:3590
+#: src/man.c:2028
 #, c-format
 msgid "can't chdir to %s"
 msgstr "无法进入到 %s 目录中"
 
-#: src/man.c:2255
+#: src/man.c:2262
 #, c-format
 msgid ""
 "\n"
@@ -620,23 +625,23 @@ msgstr ""
 "\n"
 "无法在 catman 模式下对 %s 写入"
 
-#: src/man.c:2336
+#: src/man.c:2343
 #, c-format
 msgid "Can't convert %s to cat name"
 msgstr "无法把 %s 转换为 cat 名称"
 
 #  need-proofread
-#: src/man.c:3060
+#: src/man.c:3067
 #, c-format
 msgid "%s: relying on whatis refs is deprecated\n"
 msgstr "%s：依赖于 whatis 引用是已被废弃的做法\n"
 
-#: src/man.c:3210 src/man.c:3988
+#: src/man.c:3217 src/man.c:3995
 #, c-format
 msgid "mandb command failed with exit status %d"
 msgstr "mandb 命令失败，退出状态代码为 %d"
 
-#: src/man.c:3413
+#: src/man.c:3420
 #, c-format
 msgid "internal error: candidate type %d out of range"
 msgstr "内部错误：候选类型 %d 超出正常范围"
@@ -644,7 +649,7 @@ msgstr "内部错误：候选类型 %d 超出正常范围"
 #  I'm not sure this should be translated.  It comes from a less prompt string
 #  but seems to be only part of it.  (Ming)
 #  need-proofread
-#: src/man.c:3918
+#: src/man.c:3925
 msgid " Manual page "
 msgstr " Manual page "