Remove m68k specific phrases from PO files

7 files changed, 39 insertions, 59 deletions

diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index 840061fdc..75dd5f4cc 100644
--- a/po/zh_CN/boot-installer.po
+++ b/po/zh_CN/boot-installer.po
@@ -3405,16 +3405,16 @@ msgid ""
 "Some users may need specific support because of e.g. some visual impairment. "
 "<phrase arch=\"alpha;ia64;powerpc;x86\">USB braille displays are detected "
 "automatically, but most other</phrase> <phrase arch=\"arm;hppa;mips;mipsel;"
-"m68k;sparc\">Most</phrase> accessibility features have to be enabled "
-"manually. <phrase arch=\"x86\">On machines that support it, the boot menu "
-"emits a beep when it is ready to receive keystrokes.</phrase> Some boot "
-"parameters can <phrase arch=\"x86\">then</phrase> be appended to enable "
-"accessibility features. Note that on most architectures the boot loader "
-"interprets your keyboard as a QWERTY keyboard."
+"sparc\">Most</phrase> accessibility features have to be enabled manually. "
+"<phrase arch=\"x86\">On machines that support it, the boot menu emits a beep "
+"when it is ready to receive keystrokes.</phrase> Some boot parameters can "
+"<phrase arch=\"x86\">then</phrase> be appended to enable accessibility "
+"features. Note that on most architectures the boot loader interprets your "
+"keyboard as a QWERTY keyboard."
 msgstr ""
 "一些用户，比如有视觉障碍的，可能需要特别的支持。<phrase arch=\"alpha;ia64;"
 "powerpc;x86\">USB 盲文点显器(braille display) 可以自动被检测到，但多数情况下"
-"其他的</phrase> <phrase arch=\"arm;hppa;mips;mipsel;m68k;sparc\">多数情况下</"
+"其他的</phrase> <phrase arch=\"arm;hppa;mips;mipsel;sparc\">多数情况下</"
 "phrase> 辅助功能不得不使用手动进行设置。<phrase arch=\"x86\">在能支持的机器"
 "上，接受输入时，引导菜单会发出一声 beep。</phrase> 一些引导参数可以 <phrase "
 "arch=\"x86\">接着</phrase> 被添加到后面打开辅助功能。需要注意在大多数架构下 "
diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index 451079491..54b90638a 100644
--- a/po/zh_CN/hardware.po
+++ b/po/zh_CN/hardware.po
@@ -3134,14 +3134,11 @@ msgid ""
 "also be supported by the installation system; modular drivers should "
 "normally be loaded automatically. <phrase arch=\"x86\">This includes most "
 "PCI and PCMCIA cards.</phrase> <phrase arch=\"i386\">Many older ISA cards "
-"are supported as well.</phrase> <phrase arch=\"m68k\">Again, see <ulink url="
-"\"&url-m68k-faq;\"></ulink> for complete details.</phrase>"
+"are supported as well.</phrase>"
 msgstr ""
 "几乎所有被 Linux 内核支持的网络接口卡(NIC)也全都被安装系统所支持；驱动模块通"
 "常会自动加载。<phrase arch=\"x86\">这包含大多数 PCI 和 PCMCIA 卡。</phrase> "
-"<phrase arch=\"i386\">许多旧的 ISA 卡也能支持。</phrase> <phrase arch=\"m68k"
-"\">再次，参阅 <ulink url=\"&url-m68k-faq;\"></ulink> 获得完整的信息。</"
-"phrase>"
+"<phrase arch=\"i386\">许多旧的 ISA 卡也能支持。</phrase>"
 
 #. Tag: para
 #: hardware.xml:1786
diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index d3157a62f..d0e690e06 100644
--- a/po/zh_CN/install-methods.po
+++ b/po/zh_CN/install-methods.po
@@ -1612,19 +1612,16 @@ msgid ""
 "(RARP) is one way to tell your client what IP address to use for itself. "
 "Another way is to use the BOOTP protocol.</phrase> <phrase condition="
 "\"supports-bootp\">BOOTP is an IP protocol that informs a computer of its IP "
-"address and where on the network to obtain a boot image.</phrase> <phrase "
-"arch=\"m68k\">Yet another alternative exists on VMEbus systems: the IP "
-"address can be manually configured in boot ROM.</phrase> The DHCP (Dynamic "
-"Host Configuration Protocol) is a more flexible, backwards-compatible "
-"extension of BOOTP. Some systems can only be configured via DHCP."
+"address and where on the network to obtain a boot image.</phrase> The DHCP "
+"(Dynamic Host Configuration Protocol) is a more flexible, backwards-"
+"compatible extension of BOOTP. Some systems can only be configured via DHCP."
 msgstr ""
 "<phrase condition=\"supports-rarp\">The Reverse Address Resolution Protocol "
 "(RARP) 是一种告诉您的客户机它自己 IP 地址的方法。另外一种方法是采用 BOOTP 协"
 "议。</phrase> <phrase condition=\"supports-bootp\">BOOTP 是一种 IP 协议，用来"
-"告诉一台计算机它自己 IP 地址以及从网络何处获得启动映像。</phrase> <phrase "
-"arch=\"m68k\">在 VMEbus 系统上面的另外一种选择是：IP 地址可以能够在引导 ROM "
-"中手工配置。</phrase> DHCP (Dynamic Host Configuration Protocol) 是一个更灵"
-"活，向后兼容的 BOOTP 扩展。有些系统只能通过 DHCP 来配置。"
+"告诉一台计算机它自己 IP 地址以及从网络何处获得启动映像。</phrase> DHCP "
+"(Dynamic Host Configuration Protocol) 是一个更灵活，向后兼容的 BOOTP 扩展。有"
+"些系统只能通过 DHCP 来配置。"
 
 #. Tag: para
 #: install-methods.xml:1177
diff --git a/po/zh_CN/partitioning.po b/po/zh_CN/partitioning.po
index 2cc753531..d1f1b069b 100644
--- a/po/zh_CN/partitioning.po
+++ b/po/zh_CN/partitioning.po
@@ -657,16 +657,11 @@ msgid ""
 "The master and slave disks of the secondary controller can be called "
 "<filename>/dev/hdc</filename> and <filename>/dev/hdd</filename>, "
 "respectively. Newer IDE controllers can actually have two channels, "
-"effectively acting like two controllers. <phrase arch=\"m68k\"> The letters "
-"may differ from what shows in the mac program pdisk (i.e. what shows up as "
-"<filename>/dev/hdc</filename> on pdisk may show up as <filename>/dev/hda</"
-"filename> in Debian). </phrase>"
+"effectively acting like two controllers."
 msgstr ""
 "第二个控制器的主磁盘和从磁盘会分别被叫做 <filename>/dev/hdc</filename> 和 "
 "<filename>/dev/hdd</filename>，较新的 IDE 控制器实际上有两个通道，扮演着两个"
-"控制器的角色。<phrase arch=\"m68k\"> 字符可能和 mac 程序 pdisk 显示有所不同。"
-"(在 pdisk 上的 <filename>/dev/hdc</filename> 可能在 Debian 中显示为 "
-"<filename>/dev/hda</filename>)。</phrase>"
+"控制器的角色。"
 
 #. Tag: para
 #: partitioning.xml:372
diff --git a/po/zh_CN/post-install.po b/po/zh_CN/post-install.po
index 677931711..f0d125c35 100644
--- a/po/zh_CN/post-install.po
+++ b/po/zh_CN/post-install.po
@@ -45,20 +45,20 @@ msgstr ""
 msgid ""
 "Alternatively you can press the key combination <keycombo> <keycap>Ctrl</"
 "keycap> <keycap>Alt</keycap> <keycap>Del</keycap> </keycombo> <phrase arch="
-"\"powerpc;m68k\"> or <keycombo> <keycap>Control</keycap> <keycap>Shift</"
-"keycap> <keycap>Power</keycap> </keycombo> on Macintosh systems</phrase>. A "
-"last option is to log in as root and type one of the commands "
-"<command>poweroff</command>, <command>halt</command> or <command>shutdown -h "
-"now</command> if either of the key combinations do not work or you prefer to "
-"type commands; use <command>reboot</command> to reboot the system."
+"\"powerpc\"> or <keycombo> <keycap>Control</keycap> <keycap>Shift</keycap> "
+"<keycap>Power</keycap> </keycombo> on Macintosh systems</phrase>. A last "
+"option is to log in as root and type one of the commands <command>poweroff</"
+"command>, <command>halt</command> or <command>shutdown -h now</command> if "
+"either of the key combinations do not work or you prefer to type commands; "
+"use <command>reboot</command> to reboot the system."
 msgstr ""
 "另外，您可以按下组合键 <keycombo> <keycap>Ctrl</keycap> <keycap>Alt</keycap> "
-"<keycap>Del</keycap> </keycombo> <phrase arch=\"powerpc;m68k\"> 或 "
-"<keycombo> <keycap>Control</keycap> <keycap>Shift</keycap> <keycap>Power</"
-"keycap> </keycombo> 于 Macintosh 系统上</phrase>。最后一个选项是用 root 登"
-"录，执行 <command>poweroff</command>、<command>halt</command> 或 "
-"<command>shutdown -h now</command> 中的一个命令，这在组合键不起作用或者您喜欢"
-"敲命令时使用；<command>reboot</command> 可以重启系统。"
+"<keycap>Del</keycap> </keycombo> <phrase arch=\"powerpc\"> 或 <keycombo> "
+"<keycap>Control</keycap> <keycap>Shift</keycap> <keycap>Power</keycap> </"
+"keycombo> 于 Macintosh 系统上</phrase>。最后一个选项是用 root 登录，执行 "
+"<command>poweroff</command>、<command>halt</command> 或 <command>shutdown -h "
+"now</command> 中的一个命令，这在组合键不起作用或者您喜欢敲命令时使用；"
+"<command>reboot</command> 可以重启系统。"
 
 #. Tag: title
 #: post-install.xml:46
diff --git a/po/zh_CN/preparing.po b/po/zh_CN/preparing.po
index 3421136dd..5f1f4d6d4 100644
--- a/po/zh_CN/preparing.po
+++ b/po/zh_CN/preparing.po
@@ -1184,7 +1184,6 @@ msgid ""
 "(Windows 9x, Windows NT/2000/XP, OS/2, MacOS, Solaris, FreeBSD, &hellip;) </"
 "phrase> <phrase arch=\"alpha\"> (Tru64 (Digital UNIX), OpenVMS, Windows NT, "
 "FreeBSD, &hellip;) </phrase> <phrase arch=\"s390\"> (VM, z/OS, OS/390, "
-"&hellip;) </phrase> <phrase arch=\"m68k\"> (Amiga OS, Atari TOS, Mac OS, "
 "&hellip;) </phrase> and want to stick Linux on the same disk, you will need "
 "to repartition the disk. Debian requires its own hard disk partitions. It "
 "cannot be installed on Windows or MacOS partitions. It may be able to share "
@@ -1195,7 +1194,6 @@ msgstr ""
 "Windows NT/2000/XP、OS/2、MacOS、Solaris、FreeBSD，&hellip;) </phrase> "
 "<phrase arch=\"alpha\"> (Tru64 (Digital UNIX)、OpenVMS、Windows NT、FreeBSD，"
 "&hellip;) </phrase> <phrase arch=\"s390\"> (VM、z/OS、OS/390，&hellip;) </"
-"phrase> <phrase arch=\"m68k\"> (Amiga OS、Atari TOS、Mac OS，&hellip;) </"
 "phrase>，同时也希望把 Linux 装在同一块硬盘上，那么您就必须重新对硬盘分区。"
 "Debian 需要它自己专用的硬盘分区。它不能被安装在 Windows 或者 MacOS 的分区上。"
 "它可以与其它 Linux 系统共享一些分区，但是我们在这里不会对此进行说明。最起码，"
@@ -1208,15 +1206,13 @@ msgid ""
 "You can find information about your current partition setup by using a "
 "partitioning tool for your current operating system<phrase arch=\"x86\">, "
 "such as fdisk or PartitionMagic</phrase><phrase arch=\"powerpc\">, such as "
-"Drive Setup, HD Toolkit, or MacTools</phrase><phrase arch=\"m68k\">, such as "
-"HD SC Setup, HDToolBox, or SCSITool</phrase><phrase arch=\"s390\">, such as "
+"Drive Setup, HD Toolkit, or MacTools</phrase><phrase arch=\"s390\">, such as "
 "the VM diskmap</phrase>. Partitioning tools always provide a way to show "
 "existing partitions without making changes."
 msgstr ""
 "通过当前的操作系统中的分区工具，您可以获知现在的分区状况<phrase arch=\"x86"
 "\">，如 fdisk 和 PartitionMagic</phrase><phrase arch=\"powerpc\">，如 Drive "
-"Setup、HD Toolkit 和 MacTools</phrase><phrase arch=\"m68k\">，如 HD SC "
-"Setup、HDToolBox 和 SCSITool</phrase><phrase arch=\"s390\">，如 VM diskmap</"
+"Setup、HD Toolkit 和 MacTools</phrase><phrase arch=\"s390\">，如 VM diskmap</"
 "phrase>。分区工具总会提供一种办法让您查看现有的分区情况，而不作任何改动。"
 
 #. Tag: para
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index 51bf6e998..166f1fa37 100644
--- a/po/zh_CN/using-d-i.po
+++ b/po/zh_CN/using-d-i.po
@@ -4153,15 +4153,10 @@ msgstr "不使用 boot loader 继续进行"
 msgid ""
 "This option can be used to complete the installation even when no boot "
 "loader is to be installed, either because the arch/subarch doesn't provide "
-"one, or because none is desired (e.g. you will use existing boot loader). "
-"<phrase arch=\"m68k\">This option is especially useful for Macintosh, Atari, "
-"and Amiga systems, where the original operating system must be maintained on "
-"the box and used to boot GNU/Linux.</phrase>"
+"one, or because none is desired (e.g. you will use existing boot loader)."
 msgstr ""
 "该选项用于完成安装而不安装 boot loader，这种情况要么是体系/子体系不支持，要么"
-"是因为不想要(比如，您想使用已经存在的 boot loader)<phrase arch=\"m68k\">这个"
-"选项对 Macintosh、Atari 和 Amiga 系统特别有用，因为它们本来的操作系统必须保持"
-"在机器上，以用于启动 GNU/Linux。</phrase>"
+"是因为不想要(比如，您想使用已经存在的 boot loader)"
 
 #. Tag: para
 #: using-d-i.xml:2891
@@ -4222,13 +4217,13 @@ msgstr ""
 #, no-c-format
 msgid ""
 "In expert mode you will always be able to choose whether or not the clock is "
-"set to UTC. <phrase arch=\"m68k;powerpc\">Macintosh hardware clocks are "
-"normally set to local time. If you want to dual-boot, select local time "
-"instead of UTC.</phrase> <phrase arch=\"x86\">Systems that (also) run Dos or "
-"Windows are normally set to local time. If you want to dual-boot, select "
-"local time instead of UTC.</phrase>"
+"set to UTC. <phrase arch=\"powerpc\">Macintosh hardware clocks are normally "
+"set to local time. If you want to dual-boot, select local time instead of "
+"UTC.</phrase> <phrase arch=\"x86\">Systems that (also) run Dos or Windows "
+"are normally set to local time. If you want to dual-boot, select local time "
+"instead of UTC.</phrase>"
 msgstr ""
-"在 expert 模式下，您总是可以选择时钟是否设为 UTC。<phrase arch=\"m68k;powerpc"
+"在 expert 模式下，您总是可以选择时钟是否设为 UTC。<phrase arch=\"powerpc"
 "\">Macintosh 硬件时钟一般设为本地时间。如果您需要多重引导，请选择本地时间而不"
 "是 GMT。</phrase> <phrase arch=\"x86\">(还要)运行 Dos 或 Windows 的系统通常设"
 "为本地时间。如果您需要多重引导，请选择本地时间而不是 GMT。</phrase>"