Some of my 'Debian -> &debian;' replacements were in error and I had

to revert them (oh dear :-( ); doing this also for zh_CN.

2 files changed, 7 insertions, 31 deletions

diff --git a/po/zh_CN/administrivia.po b/po/zh_CN/administrivia.po
index f674e7b53..58ba903c5 100644
--- a/po/zh_CN/administrivia.po
+++ b/po/zh_CN/administrivia.po
@@ -26,12 +26,7 @@ msgstr "关于本文档"
 
 #. Tag: para
 #: administrivia.xml:11
-#, fuzzy, no-c-format
-#| msgid ""
-#| "This manual was created for Sarge's debian-installer, based on the Woody "
-#| "installation manual for boot-floppies, which was based on earlier "
-#| "&debian; installation manuals, and on the Progeny distribution manual "
-#| "which was released under GPL in 2003."
+#, no-c-format
 msgid ""
 "This manual was created for Sarge's debian-installer, based on the Woody "
 "installation manual for boot-floppies, which was based on earlier Debian "
@@ -39,7 +34,7 @@ msgid ""
 "released under GPL in 2003."
 msgstr ""
 "本手册是为 Sarge 版 debian-installer 创建，基于 Woody 版的软盘安装手册，而那"
-"份手册又是基于更早版本的 &debian; 安装手册和 2003 年 GPL 协议下的 Progeny 分"
+"份手册又是基于更早版本的 Debian 安装手册和 2003 年 GPL 协议下的 Progeny 分"
 "发手册。"
 
 #. Tag: para
@@ -185,15 +180,7 @@ msgstr ""
 
 #. Tag: para
 #: administrivia.xml:113
-#, fuzzy, no-c-format
-#| msgid ""
-#| "Many, many &debian; users and developers contributed to this document. "
-#| "Particular note must be made of Michael Schmitz (m68k support), Frank "
-#| "Neumann (original author of the <ulink url=\"&url-m68k-old-amiga-install;"
-#| "\">Amiga install manual</ulink>), Arto Astala, Eric Delaunay/Ben Collins "
-#| "(SPARC information), Tapio Lehtonen, and Stéphane Bortzmeyer for numerous "
-#| "edits and text. We have to thank Pascal Le Bail for useful information "
-#| "about booting from USB memory sticks."
+#, no-c-format
 msgid ""
 "Many, many Debian users and developers contributed to this document. "
 "Particular note must be made of Michael Schmitz (m68k support), Frank "
@@ -203,7 +190,7 @@ msgid ""
 "edits and text. We have to thank Pascal Le Bail for useful information about "
 "booting from USB memory sticks."
 msgstr ""
-"有许许多多的 &debian; 用户和开发人员为本文档做出了贡献。特别要感谢 Michael "
+"有许许多多的 Debian 用户和开发人员为本文档做出了贡献。特别要感谢 Michael "
 "Schmitz (m68k 支持)、Frank Neumann (<ulink url=\"&url-m68k-old-amiga-install;"
 "\">Amiga 安装手册</ulink>的最初作者)、Arto Astala、Eric Delaunay/Ben Collins "
 "(SPARC 信息)、Tapio Lehtonen 和 Stéphane Bortzmeyer 做了大量的编辑和文字处"
diff --git a/po/zh_CN/bookinfo.po b/po/zh_CN/bookinfo.po
index ce3eb4f49..5f97149eb 100644
--- a/po/zh_CN/bookinfo.po
+++ b/po/zh_CN/bookinfo.po
@@ -34,18 +34,7 @@ msgstr ""
 
 #. Tag: para
 #: bookinfo.xml:17
-#, fuzzy, no-c-format
-#| msgid ""
-#| "This installation guide is based on an earlier manual written for the old "
-#| "&debian; installation system (the <quote>boot-floppies</quote>), and has "
-#| "been updated to document the new &debian; installer. However, for "
-#| "&architecture;, the manual has not been fully updated and fact checked "
-#| "for the new installer. There may remain parts of the manual that are "
-#| "incomplete or outdated or that still document the boot-floppies "
-#| "installer. A newer version of this manual, possibly better documenting "
-#| "this architecture, may be found on the Internet at the <ulink url=\"&url-"
-#| "d-i;\">&d-i; home page</ulink>. You may also be able to find additional "
-#| "translations there."
+#, no-c-format
 msgid ""
 "This installation guide is based on an earlier manual written for the old "
 "Debian installation system (the <quote>boot-floppies</quote>), and has been "
@@ -57,8 +46,8 @@ msgid ""
 "on the Internet at the <ulink url=\"&url-d-i;\">&d-i; home page</ulink>. You "
 "may also be able to find additional translations there."
 msgstr ""
-"本安装指南是基于一份为旧版 &debian; 安装系统(<quote>boot-floppies</quote>) 而"
-"撰写的手册，并针对新的 &debian; 安装系统进行了增补和修订。但是，对于 "
+"本安装指南是基于一份为旧版 Debian 安装系统(<quote>boot-floppies</quote>) 而"
+"撰写的手册，并针对新的 Debian 安装系统进行了增补和修订。但是，对于 "
 "&architecture; 体系结构，本手册尚未针对新版的安装程序进行完整的更新和实际检"
 "测。这使得本手册中可能会存在少量不完整或过时的、或者仍然在讲述 boot-floppies "
 "安装程序的内容。本手册的新版本，也许会更好的用于本体系，您可以通过 Internet "