Globally use S/390 instead of s390 for consistency.

Unfuzzy po-based translations as well.

4 files changed, 23 insertions, 24 deletions

diff --git a/po/zh_CN/boot-installer.po b/po/zh_CN/boot-installer.po
index c8a507387..174155948 100644
--- a/po/zh_CN/boot-installer.po
+++ b/po/zh_CN/boot-installer.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2017-06-03 20:05+0000\n"
+"POT-Creation-Date: 2017-07-02 19:58+0000\n"
 "PO-Revision-Date: 2017-06-11 22:36+0800\n"
 "Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
 "Language-Team:  <debian-l10n-chinese@lists.debian.org>\n"
@@ -2205,8 +2205,8 @@ msgstr ""
 #. Tag: title
 #: boot-installer.xml:1622
 #, no-c-format
-msgid "s390 Limitations"
-msgstr "s390 的限制"
+msgid "S/390 Limitations"
+msgstr "S/390 的限制"
 
 #. Tag: para
 #: boot-installer.xml:1623
@@ -2231,8 +2231,8 @@ msgstr ""
 #. Tag: title
 #: boot-installer.xml:1639
 #, no-c-format
-msgid "s390 Boot Parameters"
-msgstr "s390 引导参数"
+msgid "S/390 Boot Parameters"
+msgstr "S/390 引导参数"
 
 #. Tag: para
 #: boot-installer.xml:1640
diff --git a/po/zh_CN/hardware.po b/po/zh_CN/hardware.po
index 173823e7c..bc379eded 100644
--- a/po/zh_CN/hardware.po
+++ b/po/zh_CN/hardware.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2017-04-21 20:00+0000\n"
+"POT-Creation-Date: 2017-07-02 21:04+0000\n"
 "PO-Revision-Date: 2017-06-12 15:07+0800\n"
 "Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
 "Language-Team:  <debian-l10n-chinese@lists.debian.org>\n"
@@ -2077,7 +2077,7 @@ msgstr "zSeries 和 System z 机器类型"
 msgid ""
 "Since &debian; Squeeze, support for booting in ESA/390 mode was dropped. "
 "Your machine needs to support the z/Architecture, 64-bit support is "
-"mandatory. The userland of the s390 port is still compiled for ESA/390, "
+"mandatory. The userland of the S/390 port is still compiled for ESA/390, "
 "though. All zSeries and System z hardware is fully supported. &arch-title; "
 "support software is included from the kernel 4.3 development stream. The "
 "most current information about IBM's Linux support can be found at the "
@@ -2086,7 +2086,7 @@ msgid ""
 "\">System z</trademark> page on developerWorks</ulink>."
 msgstr ""
 "从 &debian; Squeeze 起已不再支持 ESA/390 模式的引导。您的机器至少要支持 z/"
-"Architecture，必须支持 64 位。不过 s390 移植的 userland 仍然为 ESA/390 编译。"
+"Architecture，必须支持 64 位。不过 S/390 移植的 userland 仍然为 ESA/390 编译。"
 "所有的 zSeries 和 System z 硬件完全获得支持。&arch-title; 支持的软件源自 3.1 "
 "内核开发流。关于 IBM Linux 最新的支持信息位于 <ulink url=\"http://www.ibm."
 "com/developerworks/linux/linux390/development_technical.html\"> Linux on "
diff --git a/po/zh_CN/preparing.po b/po/zh_CN/preparing.po
index c866f2fb0..a44dbb36f 100644
--- a/po/zh_CN/preparing.po
+++ b/po/zh_CN/preparing.po
@@ -5,7 +5,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2017-04-17 21:48+0000\n"
+"POT-Creation-Date: 2017-07-02 19:58+0000\n"
 "PO-Revision-Date: 2017-06-11 23:30+0800\n"
 "Last-Translator: Yangfl <mmyangfl@gmail.com>\n"
 "Language-Team:  <debian-l10n-chinese@lists.debian.org>\n"
@@ -2411,11 +2411,11 @@ msgstr ""
 #, no-c-format
 msgid ""
 "The installation server needs to copy the exact directory structure from any "
-"&debian-gnu; mirror, but only the s390 and architecture-independent files "
+"&debian-gnu; mirror, but only the S/390 and architecture-independent files "
 "are required. You can also copy the contents of all installation CDs into "
 "such a directory tree."
 msgstr ""
-"安装服务器需要从任意 &debian-gnu; 镜像复制精确的目录结构，当然只需 s390 和一"
+"安装服务器需要从任意 &debian-gnu; 镜像复制精确的目录结构，当然只需 S/390 和一"
 "些独立于体系的文件。您也可以复制所有的安装 CD 到这样的目录树中。"
 
 #. Tag: emphasis
diff --git a/po/zh_CN/using-d-i.po b/po/zh_CN/using-d-i.po
index 34d2a5573..52944e3dd 100644
--- a/po/zh_CN/using-d-i.po
+++ b/po/zh_CN/using-d-i.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: d-i-manual\n"
 "Report-Msgid-Bugs-To: debian-boot@lists.debian.org\n"
-"POT-Creation-Date: 2017-02-17 15:58+0000\n"
+"POT-Creation-Date: 2017-07-02 19:58+0000\n"
 "PO-Revision-Date: 2012-11-26 15:04+0800\n"
 "Last-Translator: Ji YongGang <jungleji@gmail.com>\n"
 "Language-Team: debian-chinese-gb <debian-chinese-gb@lists.debian.org>\n"
@@ -1044,8 +1044,8 @@ msgstr ""
 "如果您使用 low 优先级安装，您可以选择额外的 locale，包括那些称为<quote>传统</"
 "quote>的 locale <footnote> <para> 传统 locale 是那些没有使用 UTF-8 的 "
 "locale，它们使用旧的字符编码标准，比如 ISO&nbsp;8859-1 (西欧语言) 或 EUC-JP "
-"(日语)。</para> </footnote>，用于安装完成的系统；如果这样选择，您将被询问使"
-"用哪种 locale 作为安装完成系统中的默认 locale。"
+"(日语)。</para> </footnote>，用于安装完成的系统；如果这样选择，您将被询问使用"
+"哪种 locale 作为安装完成系统中的默认 locale。"
 
 #. Tag: title
 #: using-d-i.xml:669
@@ -1315,8 +1315,8 @@ msgstr ""
 #. Tag: para
 #: using-d-i.xml:893
 #, no-c-format
-msgid "The installer does not modify the system clock on the s390 platform."
-msgstr "在 s390 平台，安装程序不会修改系统时钟。"
+msgid "The installer does not modify the system clock on the S/390 platform."
+msgstr "在 S/390 平台，安装程序不会修改系统时钟。"
 
 #. Tag: para
 #: using-d-i.xml:906
@@ -3416,8 +3416,8 @@ msgid ""
 "the base system if you have a slow computer or network connection."
 msgstr ""
 "现在，您拥有了一个可用但有限的系统。大多数用户会安装额外的软件，并根据他们的"
-"需求进行调整，安装程序允许您这么做。如果您的计算机或网络比较慢，这一步或许比安"
-"装基本系统还要花时间。"
+"需求进行调整，安装程序允许您这么做。如果您的计算机或网络比较慢，这一步或许比"
+"安装基本系统还要花时间。"
 
 #. Tag: title
 #: using-d-i.xml:2260
@@ -3854,8 +3854,8 @@ msgid ""
 "you are installing. If you disagree with these selections you can deselect "
 "them. You can even opt to install no tasks at all at this point."
 msgstr ""
-"注意，根据所安装计算机的特征，有些任务被预先选择。如果您不需要它们，可以取消这"
-"些任务。此时甚至可以不选中任何任务。"
+"注意，根据所安装计算机的特征，有些任务被预先选择。如果您不需要它们，可以取消"
+"这些任务。此时甚至可以不选中任何任务。"
 
 #. Tag: para
 #: using-d-i.xml:2540
@@ -5158,10 +5158,9 @@ msgid ""
 "download the tarball or zip file for the correct release and unpack it to "
 "the file system on the medium."
 msgstr ""
-"大多数固件的压缩包和 zip 文件可以从这里获得：<itemizedlist> "
-"<listitem><para> <ulink url=\"&url-firmware-tarballs;\"></ulink> </para></"
-"listitem> </itemizedlist> 下载对应版本的压缩包或 zip 文件，然后解压到介质的文"
-"件系统里面。"
+"大多数固件的压缩包和 zip 文件可以从这里获得：<itemizedlist> <listitem><para> "
+"<ulink url=\"&url-firmware-tarballs;\"></ulink> </para></listitem> </"
+"itemizedlist> 下载对应版本的压缩包或 zip 文件，然后解压到介质的文件系统里面。"
 
 #. Tag: para
 #: using-d-i.xml:3491