From 1166de3cbf6b6f8e5e5cf02d9166155253ede902 Mon Sep 17 00:00:00 2001 From: Holger Wansing Date: Fri, 3 Nov 2017 11:23:32 +0000 Subject: Fix "ID xxx-yyy already defined" validation errors: sync po-based translations. --- po/zh_CN/boot-installer.po | 24 ++++++------------------ po/zh_CN/installation-howto.po | 16 ++++------------ 2 files changed, 10 insertions(+), 30 deletions(-) (limited to 'po/zh_CN') diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po index 16a5e673f..5f7291c7f 100644 --- a/po/zh_CN/boot-installer.po +++ b/po/zh_CN/boot-installer.po @@ -561,16 +561,7 @@ msgstr "在 UEFI 下从 U 盘启动" #. Tag: para #: boot-installer.xml:293 boot-installer.xml:555 -#, fuzzy, no-c-format -#| msgid "" -#| "If your computer will boot from USB, this will probably be the easiest " -#| "route for installation. Assuming you have prepared everything from and , " -#| "just plug your USB stick into some free USB connector and reboot the " -#| "computer. The system should boot up, and unless you have used the " -#| "flexible way to build the stick and not enabled it, you should be " -#| "presented with a graphical boot menu (on hardware that supports it). Here " -#| "you can select various installer options, or just hit &enterkey;." +#, no-c-format msgid "" "If your computer will boot from USB, this will probably be the easiest route " "for installation. Assuming you have prepared everything from 到 " +"从 到 " "的所有步骤，只需插入 U 盘到一个空的 USB 口并重启。除非您使用了灵活方式创建 U " "盘并不激活，系统应该引导，并看到一个 boot: 提示符。此时您可" "以输入一些引导选项，也可以直接按 &enterkey;。" @@ -785,12 +778,7 @@ msgstr "从 CD-ROM 启动" #. Tag: para #: boot-installer.xml:579 boot-installer.xml:1093 boot-installer.xml:1694 #: boot-installer.xml:2112 -#, fuzzy, no-c-format -#| msgid "" -#| "If you have a CD set, and if your machine supports booting directly off " -#| "the CD, great! Simply configure your system for " -#| "booting off a CD as described in , insert your CD, reboot, and proceed to the next chapter." +#, no-c-format msgid "" "If you have a CD set, and if your machine supports booting directly off the " "CD, great! Simply configure your system for booting " @@ -798,7 +786,7 @@ msgid "" "insert your CD, reboot, and proceed to the next chapter." msgstr "" "如果您有此套件，并且如果您的机器支持直接 CD 引导，太棒了！只需要配置您的系统可以用 CD 启动，参见，" +"\"x86\">配置您的系统可以用 CD 启动，参见，" "插入您的 CD，重启，然后继续下一章。" # index.docbook:542, index.docbook:595, index.docbook:968, index.docbook:1787, index.docbook:2035, index.docbook:2389 diff --git a/po/zh_CN/installation-howto.po b/po/zh_CN/installation-howto.po index 23f68f7a8..9d8378ab6 100644 --- a/po/zh_CN/installation-howto.po +++ b/po/zh_CN/installation-howto.po @@ -281,12 +281,7 @@ msgstr "" #. Tag: para #: installation-howto.xml:162 -#, fuzzy, no-c-format -#| msgid "" -#| "Some BIOSes can boot USB storage directly, and some cannot. You may need " -#| "to configure your BIOS to boot from a removable drive or " -#| "even a USB-ZIP to get it to boot from the USB device. For " -#| "helpful hints and details, see ." +#, no-c-format msgid "" "Some BIOSes can boot USB storage directly, and some cannot. You may need to " "configure your BIOS to boot from a removable drive or even a " @@ -295,21 +290,18 @@ msgid "" msgstr "" "有些 BIOS 支持直接从 USB 的存储设备启动，有些不行。您或许需要设置一下 BIOS 让" "您的机器从 removable drive 或是 USB-ZIP 启动，" -"以使计算机能从 USB 设备引导。参阅，查看一些有用的" +"以使计算机能从 USB 设备引导。参阅，查看一些有用的" "提示和具体的细节说明。" #. Tag: para #: installation-howto.xml:169 -#, fuzzy, no-c-format -#| msgid "" -#| "Booting Macintosh systems from USB storage devices involves manual use of " -#| "Open Firmware. For directions, see ." +#, no-c-format msgid "" "Booting Macintosh systems from USB storage devices involves manual use of " "Open Firmware. For directions, see ." msgstr "" "从 Macintosh 系统上使用 USB 存储设备与使用 Open Fireware 相关。相关指导见" -"。" +"。" #. Tag: title #: installation-howto.xml:178 -- cgit v1.2.3