summaryrefslogtreecommitdiff
path: root/po/zh_CN
diff options
context:
space:
mode:
Diffstat (limited to 'po/zh_CN')
-rw-r--r--po/zh_CN/hardware.po78
-rw-r--r--po/zh_CN/install-methods.po45
-rw-r--r--po/zh_CN/preseed.po25
-rw-r--r--po/zh_CN/random-bits.po18
4 files changed, 76 insertions, 90 deletions
diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index 408892e26..bbc83e195 100644
--- a/po/zh_CN/hardware.po
+++ b/po/zh_CN/hardware.po
@@ -140,7 +140,6 @@ msgstr "alpha"
#. Tag: entry
#: hardware.xml:81
#, no-c-format
-#| msgid "<entry>VME</entry>"
msgid "<entry>ARM</entry>"
msgstr "<entry>ARM</entry>"
@@ -201,7 +200,6 @@ msgstr "orion5x"
#. Tag: entry
#: hardware.xml:95
#, no-c-format
-#| msgid "<entry>prep</entry>"
msgid "<entry>Versatile</entry>"
msgstr "<entry>Versatile</entry>"
@@ -1913,12 +1911,17 @@ msgid ""
"url=\"&url-arm-cyrius-kuroboxpro;\">Buffalo Kurobox</ulink>, <ulink url="
"\"&url-arm-cyrius-mv2120;\">HP mv2120</ulink>, <ulink url=\"&url-arm-cyrius-"
"qnap;\">QNAP Turbo Station</ulink> (TS-109, TS-209 and TS-409)."
-msgstr "Orion 是 Marvell 的 SoC (system on a chip) 产品,芯片上集成了 ARM CPU、以太网、SATA、USB,以及一些其他的功能。现在市场上有很多 NAS (Network Attached Storage) 设备基于 Orion 芯片。我们能支持以下几种基于 Orion 的设备: <ulink url=\"&url-arm-cyrius-kuroboxpro;\">Buffalo Kurobox</ulink>、<ulink url=\"&url-arm-cyrius-mv2120;\">HP mv2120</ulink>、 <ulink url=\"&url-arm-cyrius-qnap;\">QNAP Turbo Station</ulink> (TS-109, TS-209 and TS-409)。"
+msgstr ""
+"Orion 是 Marvell 的 SoC (system on a chip) 产品,芯片上集成了 ARM CPU、以太"
+"网、SATA、USB,以及一些其他的功能。现在市场上有很多 NAS (Network Attached "
+"Storage) 设备基于 Orion 芯片。我们能支持以下几种基于 Orion 的设备: <ulink "
+"url=\"&url-arm-cyrius-kuroboxpro;\">Buffalo Kurobox</ulink>、<ulink url="
+"\"&url-arm-cyrius-mv2120;\">HP mv2120</ulink>、 <ulink url=\"&url-arm-cyrius-"
+"qnap;\">QNAP Turbo Station</ulink> (TS-109, TS-209 and TS-409)。"
#. Tag: term
#: hardware.xml:821
#, no-c-format
-#| msgid "<term>prep</term>"
msgid "<term>Versatile</term>"
msgstr "<term>Versatile</term>"
@@ -1928,7 +1931,9 @@ msgstr "<term>Versatile</term>"
msgid ""
"The Versatile platform is emulated by QEMU and is therefore a nice way to "
"test and run Debian on ARM if you don't have the hardware."
-msgstr "Versatile 平台由 QEMU 模拟,如果您没有硬件设备,用它来测试运行在 ARM 上的 Debian 是一个不错的方法。"
+msgstr ""
+"Versatile 平台由 QEMU 模拟,如果您没有硬件设备,用它来测试运行在 ARM 上的 "
+"Debian 是一个不错的方法。"
#. Tag: para
#: hardware.xml:841
@@ -2078,23 +2083,6 @@ msgstr ""
#. Tag: para
#: hardware.xml:988
#, no-c-format
-#| msgid ""
-#| "Debian on &arch-title; supports the following platforms: <itemizedlist> "
-#| "<listitem><para> SGI IP22: this platform includes the SGI machines Indy, "
-#| "Indigo 2 and Challenge S. Since these machines are very similar, whenever "
-#| "this document refers to the SGI Indy, the Indigo 2 and Challenge S are "
-#| "meant as well. </para></listitem> <listitem><para> SGI IP32: this "
-#| "platform is generally known as SGI O2. </para></listitem> "
-#| "<listitem><para> Broadcom BCM91250A (SWARM): this is an ATX form factor "
-#| "evaluation board from Broadcom based on the dual-core SB1 1250 CPU. </"
-#| "para></listitem> <listitem><para> Broadcom BCM91480B (BigSur): this is an "
-#| "ATX form factor evaluation board from Broadcom based on the quad-core "
-#| "SB1A 1480 CPU. </para></listitem> </itemizedlist> Complete information "
-#| "regarding supported mips/mipsel machines can be found at the <ulink url="
-#| "\"&url-linux-mips;\">Linux-MIPS homepage</ulink>. In the following, only "
-#| "the systems supported by the Debian installer will be covered. If you are "
-#| "looking for support for other subarchitectures, please contact the <ulink "
-#| "url=\"&url-list-subscribe;\"> debian-&arch-listname; mailing list</ulink>."
msgid ""
"Debian on &arch-title; supports the following platforms: <itemizedlist> "
"<listitem><para> SGI IP22: this platform includes the SGI machines Indy, "
@@ -2114,7 +2102,21 @@ msgid ""
"by the Debian installer will be covered. If you are looking for support for "
"other subarchitectures, please contact the <ulink url=\"&url-list-subscribe;"
"\"> debian-&arch-listname; mailing list</ulink>."
-msgstr "&arch-title; 上的 Debian 支持以下平台:<itemizedlist> <listitem><para> SGI IP22: 该平台包括的 SGI 的 Indy、Indigo 2 和 Challenge S。由于这些机器非常近似,在本文档中所指的 SGI Indy 同样也代表 Indigo 2 与 Challenge S。</para></listitem> <listitem><para> SGI IP32:该平台常被称为 SGI O2。</para></listitem> <listitem><para> MIPS Malta:该平台由 QEMU 模拟,如果您没有硬件设备,用它来测试 MIPS 上的 Debian 是个不错的方法。</para></listitem> <listitem><para> Broadcom BCM91250A (SWARM):此为 ATX 规格的开发板,基于 Broadcom 的 双核 SB1 1250 处理器。</para></listitem> <listitem><para> Broadcom BCM91480B (BigSur):此为 ATX 规格的开发板,基于 Broadcom 的四核 SB1A 1480 处理器。</para></listitem> </itemizedlist> 关于支持 mips/mipsel 机器的完整信息见 <ulink url=\"&url-linux-mips;\">Linux-MIPS homepage</ulink>。以下只涉及 Debian 安装程序所支持的系统。如果您在寻找其它子系统的支持,请联系 <ulink url=\"&url-list-subscribe;\"> debian-&arch-listname; mailing list</ulink>。"
+msgstr ""
+"&arch-title; 上的 Debian 支持以下平台:<itemizedlist> <listitem><para> SGI "
+"IP22: 该平台包括的 SGI 的 Indy、Indigo 2 和 Challenge S。由于这些机器非常近"
+"似,在本文档中所指的 SGI Indy 同样也代表 Indigo 2 与 Challenge S。</para></"
+"listitem> <listitem><para> SGI IP32:该平台常被称为 SGI O2。</para></"
+"listitem> <listitem><para> MIPS Malta:该平台由 QEMU 模拟,如果您没有硬件设"
+"备,用它来测试 MIPS 上的 Debian 是个不错的方法。</para></listitem> "
+"<listitem><para> Broadcom BCM91250A (SWARM):此为 ATX 规格的开发板,基于 "
+"Broadcom 的 双核 SB1 1250 处理器。</para></listitem> <listitem><para> "
+"Broadcom BCM91480B (BigSur):此为 ATX 规格的开发板,基于 Broadcom 的四核 "
+"SB1A 1480 处理器。</para></listitem> </itemizedlist> 关于支持 mips/mipsel 机"
+"器的完整信息见 <ulink url=\"&url-linux-mips;\">Linux-MIPS homepage</ulink>。"
+"以下只涉及 Debian 安装程序所支持的系统。如果您在寻找其它子系统的支持,请联系 "
+"<ulink url=\"&url-list-subscribe;\"> debian-&arch-listname; mailing list</"
+"ulink>。"
#. Tag: para
#: hardware.xml:1035
@@ -2148,21 +2150,6 @@ msgstr ""
#. Tag: para
#: hardware.xml:1062
#, no-c-format
-#| msgid ""
-#| "Debian on &arch-title; supports the following platforms: <itemizedlist> "
-#| "<listitem><para> Cobalt Microserver: only MIPS based Cobalt machines are "
-#| "covered here. This includes the Cobalt Qube 2700 (Qube1), RaQ, Qube2 and "
-#| "RaQ2, and the Gateway Microserver. </para></listitem> <listitem><para> "
-#| "Broadcom BCM91250A (SWARM): this is an ATX form factor evaluation board "
-#| "from Broadcom based on the dual-core SB1 1250 CPU. </para></listitem> "
-#| "<listitem><para> Broadcom BCM91480B (BigSur): this is an ATX form factor "
-#| "evaluation board from Broadcom based on the quad-core SB1A 1480 CPU. </"
-#| "para></listitem> </itemizedlist> Complete information regarding supported "
-#| "mips/mipsel machines can be found at the <ulink url=\"&url-linux-mips;"
-#| "\">Linux-MIPS homepage</ulink>. In the following, only the systems "
-#| "supported by the Debian installer will be covered. If you are looking for "
-#| "support for other subarchitectures, please contact the <ulink url=\"&url-"
-#| "list-subscribe;\"> debian-&arch-listname; mailing list</ulink>."
msgid ""
"Debian on &arch-title; supports the following platforms: <itemizedlist> "
"<listitem><para> Cobalt Microserver: only MIPS based Cobalt machines are "
@@ -2180,7 +2167,20 @@ msgid ""
"by the Debian installer will be covered. If you are looking for support for "
"other subarchitectures, please contact the <ulink url=\"&url-list-subscribe;"
"\"> debian-&arch-listname; mailing list</ulink>."
-msgstr "&arch-title; 上的 Debian 支持以下平台: <itemizedlist> <listitem><para> Cobalt Microserver:只适用基于 MIPS 的 Cobalt 机器。包括 Cobalt Qube 2700 (Qube1)、RaQ、Qube2 和 RaQ2,以及 Gateway Microserver。</para></listitem> <listitem><para> MIPS Malta:改平台由 QEMU 模拟,如果您没有硬件设备,使用它来测试运行在 MIPS 上的 Debian 是个不错的方法。</para></listitem> <listitem><para> Broadcom BCM91250A (SWARM):此为 ATX 规格的开发板,基于 Broadcom 的双核 SB1 1250 处理器。</para></listitem> <listitem><para> Broadcom BCM91480B (BigSur): 此为 ATX 规格的开发板,基于 Broadcom 的四核 SB1A 1480 处理器。</para></listitem> </itemizedlist> 关于支持 mips/mipsel 机器的完整信息见 <ulink url=\"&url-linux-mips;\">Linux-MIPS homepage</ulink>。以下只涉及 Debian 安装程序所支持的系统。如果您在寻找其它子系统的支持,请联系 <ulink url=\"&url-list-subscribe;\"> debian-&arch-listname; mailing list</ulink>。"
+msgstr ""
+"&arch-title; 上的 Debian 支持以下平台: <itemizedlist> <listitem><para> "
+"Cobalt Microserver:只适用基于 MIPS 的 Cobalt 机器。包括 Cobalt Qube 2700 "
+"(Qube1)、RaQ、Qube2 和 RaQ2,以及 Gateway Microserver。</para></listitem> "
+"<listitem><para> MIPS Malta:改平台由 QEMU 模拟,如果您没有硬件设备,使用它来"
+"测试运行在 MIPS 上的 Debian 是个不错的方法。</para></listitem> "
+"<listitem><para> Broadcom BCM91250A (SWARM):此为 ATX 规格的开发板,基于 "
+"Broadcom 的双核 SB1 1250 处理器。</para></listitem> <listitem><para> "
+"Broadcom BCM91480B (BigSur): 此为 ATX 规格的开发板,基于 Broadcom 的四核 "
+"SB1A 1480 处理器。</para></listitem> </itemizedlist> 关于支持 mips/mipsel 机"
+"器的完整信息见 <ulink url=\"&url-linux-mips;\">Linux-MIPS homepage</ulink>。"
+"以下只涉及 Debian 安装程序所支持的系统。如果您在寻找其它子系统的支持,请联系 "
+"<ulink url=\"&url-list-subscribe;\"> debian-&arch-listname; mailing list</"
+"ulink>。"
#. Tag: title
#: hardware.xml:1103
diff --git a/po/zh_CN/install-methods.po b/po/zh_CN/install-methods.po
index b76879cd6..1e7ab91ce 100644
--- a/po/zh_CN/install-methods.po
+++ b/po/zh_CN/install-methods.po
@@ -245,42 +245,38 @@ msgstr "NSLU2 安装文件"
#. Tag: para
#: install-methods.xml:173
#, no-c-format
-#| msgid ""
-#| "A firmware image is provided for the Linksys NSLU2 which will "
-#| "automatically boot <classname>debian-installer</classname>. This firmware "
-#| "image can be obtained from &nslu2-firmware-img;."
msgid ""
"A firmware image is provided for the Linksys NSLU2 which will automatically "
"boot <classname>debian-installer</classname>. This image can be uploaded via "
"the Linksys web frontend or with upslug2. This firmware image can be "
"obtained from &nslu2-firmware-img;."
-msgstr "用于 Linksys NSLU2 的固件映像将自动引导 <classname>debian-installer</classname>。该映象可以用 Linksys web 前端或 upslug2 加载。固件映像可以从 &nslu2-firmware-img; 获得。"
+msgstr ""
+"用于 Linksys NSLU2 的固件映像将自动引导 <classname>debian-installer</"
+"classname>。该映象可以用 Linksys web 前端或 upslug2 加载。固件映像可以从 "
+"&nslu2-firmware-img; 获得。"
#. Tag: title
#: install-methods.xml:185
#, no-c-format
-#| msgid "NSLU2 Installation Files"
msgid "Thecus N2100 Installation Files"
msgstr "Thecus N2100 安装文件"
#. Tag: para
#: install-methods.xml:186
#, no-c-format
-#| msgid ""
-#| "A firmware image is provided for the Linksys NSLU2 which will "
-#| "automatically boot <classname>debian-installer</classname>. This firmware "
-#| "image can be obtained from &nslu2-firmware-img;."
msgid ""
"A firmware image is provided for the Thecus N2100 which will automatically "
"boot <classname>debian-installer</classname>. This image can be installed "
"using the Thecus firmware upgrade process. This firmware image can be "
"obtained from &n2100-firmware-img;."
-msgstr "用于 Linksys NSLU2 的固件映像将自动引导 <classname>debian-installer</classname>。该映象可以使用 Thecus 固件升级程序安装。固件映像可以从 &nslu2-firmware-img; 获得。"
+msgstr ""
+"用于 Linksys NSLU2 的固件映像将自动引导 <classname>debian-installer</"
+"classname>。该映象可以使用 Thecus 固件升级程序安装。固件映像可以从 &nslu2-"
+"firmware-img; 获得。"
#. Tag: title
#: install-methods.xml:197
#, no-c-format
-#| msgid "CATS Installation Files"
msgid "GLAN Tank Installation Files"
msgstr "GLAN Tank 安装文件"
@@ -291,12 +287,13 @@ msgid ""
"The GLAN Tank requires a kernel and ramdisk on an ext2 partition on the disk "
"on which you intend to install Debian. These images can be obtained from "
"&glantank-firmware-img;."
-msgstr "GLAN Tank 需要内核和 ramdisk,位于您打算安装 Debian 的 ext2 磁盘分区上。这些映象可以从 &glantank-firmware-img; 获得。"
+msgstr ""
+"GLAN Tank 需要内核和 ramdisk,位于您打算安装 Debian 的 ext2 磁盘分区上。这些"
+"映象可以从 &glantank-firmware-img; 获得。"
#. Tag: title
#: install-methods.xml:208
#, no-c-format
-#| msgid "CATS Installation Files"
msgid "Kurobox Pro Installation Files"
msgstr "Kurobox Pro 安装文件"
@@ -307,34 +304,34 @@ msgid ""
"The Kurobox Pro requires a kernel and ramdisk on an ext2 partition on the "
"disk on which you intend to install Debian. These images can be obtained "
"from &kuroboxpro-firmware-img;."
-msgstr "Kurobox Pro 需要内核和 ramdisk,位于您打算安装 Debian 的 ext2 磁盘分区上。这些映象可以从 &kuroboxpro-firmware-img; 获得。"
+msgstr ""
+"Kurobox Pro 需要内核和 ramdisk,位于您打算安装 Debian 的 ext2 磁盘分区上。这"
+"些映象可以从 &kuroboxpro-firmware-img; 获得。"
#. Tag: title
#: install-methods.xml:219
#, no-c-format
-#| msgid "NSLU2 Installation Files"
msgid "HP mv2120 Installation Files"
msgstr "HP mv2120 安装文件"
#. Tag: para
#: install-methods.xml:220
#, no-c-format
-#| msgid ""
-#| "A firmware image is provided for the Linksys NSLU2 which will "
-#| "automatically boot <classname>debian-installer</classname>. This firmware "
-#| "image can be obtained from &nslu2-firmware-img;."
msgid ""
"A firmware image is provided for the HP mv2120 which will automatically boot "
"<classname>debian-installer</classname>. This image can be installed with "
"uphpmvault on Linux and other systems and with the HP Media Vault Firmware "
"Recovery Utility on Windows. The firmware image can be obtained from &mv2120-"
"firmware-img;."
-msgstr "HP mv2120 的固件映象能自动引导 <classname>debian-installer</classname>。该映象在 Linux 和其他系统上可以用 uphpmvault 安装。Windows 上可以使用 HP Media Vault Firmware Recovery Utility 安装。可以从 &mv2120-firmware-img; 获得此固件映象。"
+msgstr ""
+"HP mv2120 的固件映象能自动引导 <classname>debian-installer</classname>。该映"
+"象在 Linux 和其他系统上可以用 uphpmvault 安装。Windows 上可以使用 HP Media "
+"Vault Firmware Recovery Utility 安装。可以从 &mv2120-firmware-img; 获得此固件"
+"映象。"
#. Tag: title
#: install-methods.xml:232
#, no-c-format
-#| msgid "CATS Installation Files"
msgid "QNAP Turbo Station Installation Files"
msgstr "QNAP Turbo Station 安装文件"
@@ -345,7 +342,9 @@ msgid ""
"The QNAP Turbo Station (TS-109, TS-209 and TS-409) requires a kernel and "
"ramdisk which can be obtained from &qnap-firmware-img;. A script is provided "
"to write these images to flash."
-msgstr "QNAP Turbo Station (TS-109, TS-209 和 TS-409) 需要内核和 ramdisk,这些可从 &qnap-firmware-img; 获得。有一个脚本用于将这些映象写到 flash 里面。"
+msgstr ""
+"QNAP Turbo Station (TS-109, TS-209 和 TS-409) 需要内核和 ramdisk,这些可从 "
+"&qnap-firmware-img; 获得。有一个脚本用于将这些映象写到 flash 里面。"
#. Tag: title
#: install-methods.xml:279
diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po
index 921cca118..ef9be194c 100644
--- a/po/zh_CN/preseed.po
+++ b/po/zh_CN/preseed.po
@@ -1373,7 +1373,13 @@ msgid ""
"appropriate address if <classname>netcfg/get_gateway</classname> is not set. "
"As a special case, you can set <classname>netcfg/get_gateway</classname> to "
"<quote>none</quote> to specify that no gateway should be used."
-msgstr "请注意,如果 <classname>netcfg/get_netmask</classname> 没有预置,<command>netcfg</command> 将自动侦测掩码。这种情况下,为了自动安装,变量需要标记为 <literal>seen</literal> 。同样,如果 <classname>netcfg/get_gateway</classname> 没有设置,<command>netcfg</command> 将自动选择一个合适的地址。特殊情况下,您可以设置 <classname>netcfg/get_gateway</classname> 为 <quote>none</quote> 确定不使用网关。"
+msgstr ""
+"请注意,如果 <classname>netcfg/get_netmask</classname> 没有预置,"
+"<command>netcfg</command> 将自动侦测掩码。这种情况下,为了自动安装,变量需要"
+"标记为 <literal>seen</literal> 。同样,如果 <classname>netcfg/get_gateway</"
+"classname> 没有设置,<command>netcfg</command> 将自动选择一个合适的地址。特殊"
+"情况下,您可以设置 <classname>netcfg/get_gateway</classname> 为 <quote>none</"
+"quote> 确定不使用网关。"
#. Tag: title
#: preseed.xml:772
@@ -2258,23 +2264,6 @@ msgstr "完成安装"
#. Tag: screen
#: preseed.xml:1014
#, no-c-format
-#| msgid ""
-#| "# During installations from serial console, the regular virtual consoles\n"
-#| "# (VT1-VT6) are normally disabled in /etc/inittab. Uncomment the next\n"
-#| "# line to prevent this.\n"
-#| "#d-i finish-install/keep-consoles boolean true\n"
-#| "\n"
-#| "# Avoid that last message about the install being complete.\n"
-#| "d-i finish-install/reboot_in_progress note\n"
-#| "\n"
-#| "# This will prevent the installer from ejecting the CD during the "
-#| "reboot,\n"
-#| "# which is useful in some situations.\n"
-#| "#d-i cdrom-detect/eject boolean false\n"
-#| "\n"
-#| "# This is how to make the installer shutdown when finished, but not\n"
-#| "# reboot into the installed system.\n"
-#| "#d-i debian-installer/exit/halt boolean true"
msgid ""
"# During installations from serial console, the regular virtual consoles\n"
"# (VT1-VT6) are normally disabled in /etc/inittab. Uncomment the next\n"
diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po
index 51cf93c81..5dbae66d9 100644
--- a/po/zh_CN/random-bits.po
+++ b/po/zh_CN/random-bits.po
@@ -967,15 +967,6 @@ msgstr ""
#. Tag: para
#: random-bits.xml:485
#, no-c-format
-#| msgid ""
-#| "Substitute one of the following for <replaceable>ARCH</replaceable> in "
-#| "the <command>debootstrap</command> command: <userinput>alpha</userinput>, "
-#| "<userinput>amd64</userinput>, <userinput>arm</userinput>, "
-#| "<userinput>hppa</userinput>, <userinput>i386</userinput>, "
-#| "<userinput>ia64</userinput>, <userinput>m68k</userinput>, "
-#| "<userinput>mips</userinput>, <userinput>mipsel</userinput>, "
-#| "<userinput>powerpc</userinput>, <userinput>s390</userinput>, or "
-#| "<userinput>sparc</userinput>."
msgid ""
"Substitute one of the following for <replaceable>ARCH</replaceable> in the "
"<command>debootstrap</command> command: <userinput>alpha</userinput>, "
@@ -984,7 +975,14 @@ msgid ""
"<userinput>ia64</userinput>, <userinput>m68k</userinput>, <userinput>mips</"
"userinput>, <userinput>mipsel</userinput>, <userinput>powerpc</userinput>, "
"<userinput>s390</userinput>, or <userinput>sparc</userinput>."
-msgstr "用下面列出的一个架构替换 <command>debootstrap</command> 命令中的 <replaceable>ARCH</replaceable>: <userinput>alpha</userinput>, <userinput>amd64</userinput>, <userinput>arm</userinput>, <userinput>armel</userinput>, <userinput>hppa</userinput>, <userinput>i386</userinput>, <userinput>ia64</userinput>, <userinput>m68k</userinput>, <userinput>mips</userinput>, <userinput>mipsel</userinput>, <userinput>powerpc</userinput>, <userinput>s390</userinput>, or <userinput>sparc</userinput>。"
+msgstr ""
+"用下面列出的一个架构替换 <command>debootstrap</command> 命令中的 "
+"<replaceable>ARCH</replaceable>: <userinput>alpha</userinput>, "
+"<userinput>amd64</userinput>, <userinput>arm</userinput>, <userinput>armel</"
+"userinput>, <userinput>hppa</userinput>, <userinput>i386</userinput>, "
+"<userinput>ia64</userinput>, <userinput>m68k</userinput>, <userinput>mips</"
+"userinput>, <userinput>mipsel</userinput>, <userinput>powerpc</userinput>, "
+"<userinput>s390</userinput>, or <userinput>sparc</userinput>。"
#. Tag: screen
#: random-bits.xml:504