From 08bca6db1016a897a3d5056c44844798851cf168 Mon Sep 17 00:00:00 2001 From: ttsangx Date: Wed, 31 Jul 2019 12:25:17 -0700 Subject: [PATCH 1/4] Linguistic fixes for Get Started documentation --- .../get-started/bootable-usb/bootable-usb.po | 8 +-- .../get-started/compatibility-check.po | 2 +- .../LC_MESSAGES/get-started/get-started.po | 2 +- .../get-started/install-configfile.po | 4 +- .../virtual-machine-install/gce.po | 28 ++++---- .../virtual-machine-install/hyper-v.po | 2 +- .../virtual-machine-install/kvm.po | 4 +- .../virtualbox-cl-installer.po | 64 +++++++++---------- .../vmw-player-preconf.po | 2 +- .../virtual-machine-install/vmw-player.po | 2 +- .../vmware-esxi-install-cl.po | 6 +- .../vmware-esxi-preconfigured-cl-image.po | 4 +- .../maintenance/increase-virtual-disk-size.po | 8 +-- .../reference/system-requirements.po | 2 +- 14 files changed, 69 insertions(+), 69 deletions(-) diff --git a/locale/zh_CN/LC_MESSAGES/get-started/bootable-usb/bootable-usb.po b/locale/zh_CN/LC_MESSAGES/get-started/bootable-usb/bootable-usb.po index df1b9d3c..c2c377fe 100644 --- a/locale/zh_CN/LC_MESSAGES/get-started/bootable-usb/bootable-usb.po +++ b/locale/zh_CN/LC_MESSAGES/get-started/bootable-usb/bootable-usb.po @@ -8,7 +8,7 @@ msgid "" msgstr "Project-Id-Version: Clear Linux* Project Docs latest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-07-17 11:17-0700\n" -"PO-Revision-Date: 2019-07-25 11:20-0008\n" +"PO-Revision-Date: 2019-07-31 12:04-0008\n" "Last-Translator: FULL NAME \n" "Language-Team: zh-Hans\n" "MIME-Version: 1.0\n" @@ -198,7 +198,7 @@ msgstr "插入 U 盘，打开 Rufus。" #: ../../get-started/bootable-usb/bootable-usb.rst:184 msgid "Under `Boot selection`, click the :guilabel:`SELECT` button." -msgstr "在 `Boot selection` 中，点击 :guilabel:`选择` 按钮。" +msgstr "在 `Boot selection` 中，点击 :guilabel:`SELECT` 按钮。" #: ../../get-started/bootable-usb/bootable-usb.rst:186 msgid "Find and select the previously extracted |CL| image file." @@ -206,7 +206,7 @@ msgstr "找到并选择此前解压缩的 |CL| 映像文件。" #: ../../get-started/bootable-usb/bootable-usb.rst:188 msgid "Click the :guilabel:`START` button. See Figure 2." -msgstr "点击 :guilabel:`启动` 按钮。见图 2。" +msgstr "点击 :guilabel:`START` 按钮。见图 2。" #: ../../get-started/bootable-usb/bootable-usb.rst:194 msgid "Figure 2: Rufus utility" @@ -216,7 +216,7 @@ msgstr "图 2: Rufus 实用程序" msgid "" "When the dialogue appears, select :guilabel:`Write in ISO image mode " "(Recommended)`. See Figure 3." -msgstr "对话出现时，选择 :guilabel:`以 ISO 映像模式写入（推荐）`。见图 3。" +msgstr "对话出现时，选择 :guilabel:`Write in ISO image mode (Recommended)`。见图 3。" #: ../../get-started/bootable-usb/bootable-usb.rst:203 msgid "Figure 3: ISOHybrid image detected" diff --git a/locale/zh_CN/LC_MESSAGES/get-started/compatibility-check.po b/locale/zh_CN/LC_MESSAGES/get-started/compatibility-check.po index 40b22553..a2c61932 100644 --- a/locale/zh_CN/LC_MESSAGES/get-started/compatibility-check.po +++ b/locale/zh_CN/LC_MESSAGES/get-started/compatibility-check.po @@ -8,7 +8,7 @@ msgid "" msgstr "Project-Id-Version: Clear Linux* Project Docs latest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-07-17 11:17-0700\n" -"PO-Revision-Date: 2019-07-25 11:20-0008\n" +"PO-Revision-Date: 2019-07-31 12:04-0008\n" "Last-Translator: FULL NAME \n" "Language-Team: zh-Hans\n" "MIME-Version: 1.0\n" diff --git a/locale/zh_CN/LC_MESSAGES/get-started/get-started.po b/locale/zh_CN/LC_MESSAGES/get-started/get-started.po index 5bec822b..eedc5736 100644 --- a/locale/zh_CN/LC_MESSAGES/get-started/get-started.po +++ b/locale/zh_CN/LC_MESSAGES/get-started/get-started.po @@ -8,7 +8,7 @@ msgid "" msgstr "Project-Id-Version: Clear Linux* Project Docs latest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-07-17 11:17-0700\n" -"PO-Revision-Date: 2019-07-25 11:20-0008\n" +"PO-Revision-Date: 2019-07-31 12:04-0008\n" "Last-Translator: FULL NAME \n" "Language-Team: zh-Hans\n" "MIME-Version: 1.0\n" diff --git a/locale/zh_CN/LC_MESSAGES/get-started/install-configfile.po b/locale/zh_CN/LC_MESSAGES/get-started/install-configfile.po index 0cd9c4a8..6b1684e0 100644 --- a/locale/zh_CN/LC_MESSAGES/get-started/install-configfile.po +++ b/locale/zh_CN/LC_MESSAGES/get-started/install-configfile.po @@ -8,7 +8,7 @@ msgid "" msgstr "Project-Id-Version: Clear Linux* Project Docs latest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-07-17 11:17-0700\n" -"PO-Revision-Date: 2019-07-25 11:20-0008\n" +"PO-Revision-Date: 2019-07-31 12:04-0008\n" "Last-Translator: FULL NAME \n" "Language-Team: zh-Hans\n" "MIME-Version: 1.0\n" @@ -105,7 +105,7 @@ msgstr "启动 U 盘。" #: ../../get-started/install-configfile.rst:49 #: ../../get-started/install-configfile.rst:171 msgid "Select :guilabel:`Clear Linux OS` from the menu." -msgstr "从菜单中选择 :guilabel:`Clear Linux 操作系统`。" +msgstr "从菜单中选择 :guilabel:`Clear Linux OS`。" #: ../../get-started/install-configfile.rst:50 #: ../../get-started/install-configfile.rst:172 diff --git a/locale/zh_CN/LC_MESSAGES/get-started/virtual-machine-install/gce.po b/locale/zh_CN/LC_MESSAGES/get-started/virtual-machine-install/gce.po index 59c2bd45..fd28cb0f 100644 --- a/locale/zh_CN/LC_MESSAGES/get-started/virtual-machine-install/gce.po +++ b/locale/zh_CN/LC_MESSAGES/get-started/virtual-machine-install/gce.po @@ -8,7 +8,7 @@ msgid "" msgstr "Project-Id-Version: Clear Linux* Project Docs latest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-07-17 11:17-0700\n" -"PO-Revision-Date: 2019-07-26 11:17-0008\n" +"PO-Revision-Date: 2019-07-31 12:04-0008\n" "Last-Translator: FULL NAME \n" "Language-Team: zh-Hans\n" "MIME-Version: 1.0\n" @@ -92,7 +92,7 @@ msgstr "创建 *存储 Bucket* 以托管上一步下载的 |CL| 映像源档案 #: ../../get-started/virtual-machine-install/gce.rst:112 #: ../../get-started/virtual-machine-install/gce.rst:158 msgid "Click the :guilabel:`Navigation menu` icon on the upper left screen menu." -msgstr "点击左上部屏幕菜单中的 :guilabel:`导航菜单` 图标。" +msgstr "点击左上部屏幕菜单中的 :guilabel:`Navigation menu` 图标。" #: ../../get-started/virtual-machine-install/gce.rst:56 msgid "" @@ -120,13 +120,13 @@ msgid "" "Click the :guilabel:`CREATE BUCKET` button to enter the bucket creation " "tool. The bucket name must be unique because buckets in the Cloud Storage" " share a single global namespace." -msgstr "点击 :guilabel:`创建 BUCKET` 按钮，进入 bucket 创建工具界面。bucket 的名称必须是唯一的，因为 Cloud Storage 中的所有 bucket 共享一个全局命名空间。" +msgstr "点击 :guilabel:`CREATE BUCKET` 按钮，进入 bucket 创建工具界面。bucket 的名称必须是唯一的，因为 Cloud Storage 中的所有 bucket 共享一个全局命名空间。" #: ../../get-started/virtual-machine-install/gce.rst:79 msgid "" "Leave the remaining options set to the defaults, and click the " ":guilabel:`Create` button at the bottom to create a *Bucket*." -msgstr "其余设置选项保留默认值，然后点击底部的 :guilabel:`创建` 按钮创建 *Bucket*。" +msgstr "其余设置选项保留默认值，然后点击底部的 :guilabel:`Create` 按钮创建 *Bucket*。" #: ../../get-started/virtual-machine-install/gce.rst:86 msgid "Figure 4: Set bucket name" @@ -137,7 +137,7 @@ msgid "" "Once the bucket is created, click the :guilabel:`Upload files` button on " "the Bucket details page to upload the |CL| GCE image archive to the named" " bucket:" -msgstr "创建 bucket 后，点击 Bucket 详细资料页上的 :guilabel:`上传文件` 按钮将 |CL| GCE 映像档案文件上传至指定的 bucket：" +msgstr "创建 bucket 后，点击 Bucket 详细资料页上的 :guilabel:`Upload files` 按钮将 |CL| GCE 映像档案文件上传至指定的 bucket：" #: ../../get-started/virtual-machine-install/gce.rst:96 msgid "Figure 5: Cloud Storage bucket" @@ -183,13 +183,13 @@ msgstr "在虚拟机映像创建页上，将映像源类型更改为 *Cloud Stor #: ../../get-started/virtual-machine-install/gce.rst:135 msgid "Under :guilabel:`Source`, select :guilabel:`Browse`." -msgstr "在 :guilabel:`来源` 中，选择 :guilabel:`浏览`。" +msgstr "在 :guilabel:`Source` 中，选择 :guilabel:`Browse`。" #: ../../get-started/virtual-machine-install/gce.rst:137 msgid "" "Locate the :file:`clear--gce.tar.gz` file, and click " ":guilabel:`Select`." -msgstr "找到 :file:`clear--gce.tar.gz` 文件，然后点击 :guilabel:`选择`。" +msgstr "找到 :file:`clear--gce.tar.gz` 文件，然后点击 :guilabel:`Select`。" #: ../../get-started/virtual-machine-install/gce.rst:144 msgid "Figure 10: Create image using imported object" @@ -199,7 +199,7 @@ msgstr "图 10：利用导入的对象创建映像" msgid "" "Accept all default options, and click the :guilabel:`Create` button at " "the bottom to import the Clear Linux GCE image to the image library." -msgstr "接受所有默认选项，然后点击底部的 :guilabel:`创建` 按钮，将 Clear Linux GCE 映像导入映像库。" +msgstr "接受所有默认选项，然后点击底部的 :guilabel:`Create` 按钮，将 Clear Linux GCE 映像导入映像库。" #: ../../get-started/virtual-machine-install/gce.rst:153 msgid "Figure 11: Image is created" @@ -215,7 +215,7 @@ msgstr "|CL| 映像导入后，可以启动一个运行 |CL| 的虚拟机实例 msgid "" "Select :menuselection:`Compute Engine --> VM Instances` from the side bar" " on the left." -msgstr "从左侧边栏选择 :menuselection:`Compute Engine --> 映像`。" +msgstr "从左侧边栏选择 :menuselection:`Compute Engine --> VM instances`。" #: ../../get-started/virtual-machine-install/gce.rst:167 msgid "Figure 12: VM instances catalog" @@ -231,7 +231,7 @@ msgstr "如果此项目中没有创建虚拟机实例，系统会提示您创建 msgid "" "Alternatively, click the :guilabel:`CREATE INSTANCE` button on the VM " "instances page to create a VM instance." -msgstr "另外，也可以点击虚拟机实例页上的 :guilabel:`创建实例` 按钮创建虚拟机实例。" +msgstr "另外，也可以点击虚拟机实例页上的 :guilabel:`CREATE INSTANCE` 按钮创建虚拟机实例。" #: ../../get-started/virtual-machine-install/gce.rst:179 msgid "Figure 13: VM creation" @@ -245,11 +245,11 @@ msgstr "图 14：虚拟机实例列表" msgid "" "Under :guilabel:`Region`, choose a region based on the `Best practices " "for Compute Engine regions selection`_." -msgstr "在 :guilabel:`区域` 中，根据 `Best practices for Compute Engine regions selection`_ 选择一个区域。" +msgstr "在 :guilabel:`Region` 中，根据 `Best practices for Compute Engine regions selection`_ 选择一个区域。" #: ../../get-started/virtual-machine-install/gce.rst:190 msgid "Under :guilabel:`Boot disk`, click the :guilabel:`Change` button." -msgstr "在 :guilabel:`引导磁盘` 中，点击 :guilabel:`更改` 按钮。" +msgstr "在 :guilabel:`Boot disk` 中，点击 :guilabel:`Change` 按钮。" #: ../../get-started/virtual-machine-install/gce.rst:196 msgid "Figure 15: Use custom image" @@ -269,7 +269,7 @@ msgstr "图 16：选择 Clear Linux 引导磁盘创建虚拟机实例" msgid "" "Scroll down to the bottom of the VM instance creation page, expand the " ":guilabel:`Management, security, disks, networking, sole tenancy` group." -msgstr "向下滚动至虚拟机实例创建页的底部，展开 :guilabel:`管理、安全、磁盘、联网、独占租区` 群组。" +msgstr "向下滚动至虚拟机实例创建页的底部，展开 :guilabel:`Management, security, disks, networking, sole tenancy` 群组。" #: ../../get-started/virtual-machine-install/gce.rst:214 msgid "Figure 17: Set up SSH keys" @@ -305,7 +305,7 @@ msgstr "分配的用户名来自电子邮件地址 ``@`` 前面的字符，包 #: ../../get-started/virtual-machine-install/gce.rst:238 msgid "Click the :guilabel:`Create` button to create the |CL| VM." -msgstr "点击 :guilabel:`创建` 按钮创建 |CL| 虚拟机。" +msgstr "点击 :guilabel:`Create` 按钮创建 |CL| 虚拟机。" #: ../../get-started/virtual-machine-install/gce.rst:240 msgid "The Clear Linux VM instance is created and assigned a public IP address:" diff --git a/locale/zh_CN/LC_MESSAGES/get-started/virtual-machine-install/hyper-v.po b/locale/zh_CN/LC_MESSAGES/get-started/virtual-machine-install/hyper-v.po index fc2c4cae..94f9fe02 100644 --- a/locale/zh_CN/LC_MESSAGES/get-started/virtual-machine-install/hyper-v.po +++ b/locale/zh_CN/LC_MESSAGES/get-started/virtual-machine-install/hyper-v.po @@ -8,7 +8,7 @@ msgid "" msgstr "Project-Id-Version: Clear Linux* Project Docs latest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-07-17 11:17-0700\n" -"PO-Revision-Date: 2019-07-25 11:20-0008\n" +"PO-Revision-Date: 2019-07-31 12:04-0008\n" "Last-Translator: FULL NAME \n" "Language-Team: zh-Hans\n" "MIME-Version: 1.0\n" diff --git a/locale/zh_CN/LC_MESSAGES/get-started/virtual-machine-install/kvm.po b/locale/zh_CN/LC_MESSAGES/get-started/virtual-machine-install/kvm.po index c6e4ce42..af033b74 100644 --- a/locale/zh_CN/LC_MESSAGES/get-started/virtual-machine-install/kvm.po +++ b/locale/zh_CN/LC_MESSAGES/get-started/virtual-machine-install/kvm.po @@ -8,7 +8,7 @@ msgid "" msgstr "Project-Id-Version: Clear Linux* Project Docs latest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-07-17 11:17-0700\n" -"PO-Revision-Date: 2019-07-25 11:20-0008\n" +"PO-Revision-Date: 2019-07-31 12:04-0008\n" "Last-Translator: FULL NAME \n" "Language-Team: zh-Hans\n" "MIME-Version: 1.0\n" @@ -102,7 +102,7 @@ msgid "" "`_ directory. This script " "will launch the |CL| VM and provide console interaction within the same " "terminal emulator window." -msgstr "下载 `start_qemu.sh`_ script from the `image `_ 目录。此脚本将启动 |CL| 虚拟机，并在同一个终端模拟器窗口中提供控制台交互操作。" +msgstr "从 `image `_ 目录下载 `start_qemu.sh`_ 脚本。此脚本将启动 |CL| 虚拟机，并在同一个终端模拟器窗口中提供控制台交互操作。" #: ../../get-started/virtual-machine-install/kvm.rst:91 msgid "Make the script executable:" diff --git a/locale/zh_CN/LC_MESSAGES/get-started/virtual-machine-install/virtualbox-cl-installer.po b/locale/zh_CN/LC_MESSAGES/get-started/virtual-machine-install/virtualbox-cl-installer.po index be347445..cdc45267 100644 --- a/locale/zh_CN/LC_MESSAGES/get-started/virtual-machine-install/virtualbox-cl-installer.po +++ b/locale/zh_CN/LC_MESSAGES/get-started/virtual-machine-install/virtualbox-cl-installer.po @@ -8,7 +8,7 @@ msgid "" msgstr "Project-Id-Version: Clear Linux* Project Docs latest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-07-17 11:17-0700\n" -"PO-Revision-Date: 2019-07-26 11:17-0008\n" +"PO-Revision-Date: 2019-07-31 12:04-0008\n" "Last-Translator: FULL NAME \n" "Language-Team: zh-Hans\n" "MIME-Version: 1.0\n" @@ -101,17 +101,17 @@ msgstr "在主机系统上启动 |VBM|。" #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:61 msgid "Click the :guilabel:`New` button to create a new VM." -msgstr "点击 :guilabel:`新建` 按钮创建一个新虚拟机。" +msgstr "点击 :guilabel:`New` 按钮创建一个新虚拟机。" #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:63 msgid "Choose :guilabel:`Expert mode`." -msgstr "选择 :guilabel:`专家模式`。" +msgstr "选择 :guilabel:`Expert mode`。" #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:65 msgid "" "On the :guilabel:`Create Virtual Machine` screen, enter the following " "settings:" -msgstr "在 :guilabel:`创建虚拟机` 屏幕上，输入以下设置：" +msgstr "在 :guilabel:`Create Virtual Machine` 屏幕上，输入以下设置：" #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:67 msgid "**Name**: Choose name (e.g. ClearLinuxOS-VM)." @@ -138,7 +138,7 @@ msgid "" "Later, if you want to change the amount of RAM allocated, power down your" " VM. Return to :file:`Settings > System` and change :guilabel:`Base " "Memory` to the desired size." -msgstr "以后如果希望更改分配的 RAM 大小，请关闭虚拟机。返回 :file:`Settings > System` 并将 :guilabel:`基本内存` 更改为想要的大小。" +msgstr "以后如果希望更改分配的 RAM 大小，请关闭虚拟机。返回 :file:`Settings > System` 并将 :guilabel:`Base Memory` 更改为想要的大小。" #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:81 msgid "Figure 2: Create Virtual Machine" @@ -147,11 +147,11 @@ msgstr "图 2：创建虚拟机" #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:83 #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:98 msgid "Click :guilabel:`Create`." -msgstr "点击 :guilabel:`创建`。" +msgstr "点击 :guilabel:`Create`。" #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:85 msgid "On the :guilabel:`Create Virtual Hard Disk` screen, select:" -msgstr "在 :guilabel:`创建虚拟硬盘` 屏幕上，选择：" +msgstr "在 :guilabel:`Create Virtual Hard Disk` 屏幕上，选择：" #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:87 msgid "**File location**" @@ -180,7 +180,7 @@ msgstr "新的虚拟机将创建完成并出现在 |VBM| 中。" #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:102 #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:218 msgid "Click :guilabel:`Settings` to configure the |CL| VM." -msgstr "点击 :guilabel:`设置` 配置 |CL| 虚拟机。" +msgstr "点击 :guilabel:`Settings` 配置 |CL| 虚拟机。" #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:104 msgid "In the left-hand menu, navigate to the :menuselection:`System` menu." @@ -190,7 +190,7 @@ msgstr "在左侧菜单中，导航至 :menuselection:`系统` 菜单。" msgid "" "On the :guilabel:`Motherboard` tab, select the :guilabel:`Chipset` menu, " "and then select :menuselection:`ICH9`. See Figure 4." -msgstr "在 :guilabel:`主板` 标签上，选择 :guilabel:`芯片组` 菜单，然后选择 :menuselection:`ICH9`。参见图 4。" +msgstr "在 :guilabel:`Motherboard` 标签上，选择 :guilabel:`Chipset` 菜单，然后选择 :menuselection:`ICH9`。参见图 4。" #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:111 msgid "" @@ -200,7 +200,7 @@ msgstr "您可以为虚拟机选择芯片组。查阅 `VM VirtualBox User Manual #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:114 msgid "In :guilabel:`Enabled Features`, check these boxes:" -msgstr "在 :guilabel:`已启用功能` 中，选中以下方框：" +msgstr "在 :guilabel:`Enabled Features` 中，选中以下方框：" #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:116 msgid "**Enable I/O APIC**" @@ -223,7 +223,7 @@ msgstr "默认情况下，只为新的虚拟机分配 1 个虚拟 CPU。可在 #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:132 msgid "Click :guilabel:`OK`." -msgstr "点击 :guilabel:`确定`。" +msgstr "点击 :guilabel:`OK`。" #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:135 msgid "Install |CL| on the |VB| VM" @@ -247,20 +247,20 @@ msgstr "|CL| 安装程序 ISO 必须在虚拟机上作为虚拟 CD-ROM 挂载， msgid "" "From the *ClearLinux-OS* :guilabel:`Settings` menu at left, select " ":guilabel:`Storage`." -msgstr "从左边的 *ClearLinux-OS* :guilabel:`设置` 菜单选择 :guilabel:`存储`。" +msgstr "从左边的 *ClearLinux-OS* :guilabel:`Settings` 菜单选择 :guilabel:`Storage`。" #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:148 msgid "" "From :guilabel:`Storage Devices`, middle column, click the blue disk " "labeled :guilabel:`Empty`." -msgstr "从 :guilabel:`存储设备` 中间栏上，点击标记为 :guilabel:`空` 的蓝色盘。" +msgstr "从 :guilabel:`Storage Devices` 中间栏上，点击标记为 :guilabel:`Empty` 的蓝色盘。" #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:151 msgid "" "From the :guilabel:`Attributes` menu, click the blue CD disk next to the " ":guilabel:`Optical Drive` drop down menu and click :guilabel:`Choose " "Virtual Optical Disk File...`" -msgstr "从 :guilabel:`属性` 菜单点击 :guilabel:`光盘驱动器` 下拉菜单旁边的蓝色 CD 盘，然后点击 :guilabel:`选择虚拟光盘文件...`" +msgstr "从 :guilabel:`Attributes` 菜单点击 :guilabel:`Optical Drive` 下拉菜单旁边的蓝色 CD 盘，然后点击 :guilabel:`Choose Virtual Optical Disk File...`" #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:159 msgid "Figure 5: Choose Virtual Optical Disk Drive" @@ -270,7 +270,7 @@ msgstr "图 5：选择虚拟光盘驱动器" msgid "" "Where there appears :guilabel:`Please choose a virtual optical disk " "file`, select the ISO file and click *Open*." -msgstr "显示 :guilabel:`请选择虚拟光盘文件` 后，选择 ISO 文件并点击 *打开*。" +msgstr "显示 :guilabel:`Please choose a virtual optical disk file` 后，选择 ISO 文件并点击 *打开*。" #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:168 msgid "Figure 6: Mounting an ISO" @@ -278,7 +278,7 @@ msgstr "图 6：挂载 ISO" #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:170 msgid "Click :guilabel:`OK` to exit and return to the main |VBM|." -msgstr "点击 :guilabel:`确定` 退出，返回主 |VBM|。" +msgstr "点击 :guilabel:`OK` 退出，返回主 |VBM|。" #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:173 msgid "Install |CL| with live-server installer" @@ -288,7 +288,7 @@ msgstr "利用 live-server 安装程序安装 |CL|" msgid "" "In the |VBM|, select virtual machine you created and click " ":guilabel:`Start`." -msgstr "在 |VBM| 中，选择您创建的虚拟机，点击 :guilabel:`启动`。" +msgstr "在 |VBM| 中，选择您创建的虚拟机，点击 :guilabel:`Start`。" #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:181 msgid "Figure 7: Start the installer" @@ -304,7 +304,7 @@ msgstr "要从虚拟机控制台窗口释放鼠标光标，按下键盘右边的 msgid "" "When :guilabel:`Clear Linux Installer` in boot manager appears, select " ":kbd:`Enter`. Do not install the bundle `desktop-autostart`." -msgstr "引导管理器中出现 :guilabel:`Clear Linux 安装程序` 时，选择 :kbd:`回车`。不要安装 bundle 文件 `desktop-autostart`。" +msgstr "引导管理器中出现 :guilabel:`Clear Linux Installer` 时，选择 :kbd:`回车`。不要安装 bundle 文件 `desktop-autostart`。" #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:191 msgid "" @@ -316,13 +316,13 @@ msgstr "按照 :ref:`bare-metal-install-server` 中的步骤，将 |CL| 安装 msgid "" "In :guilabel:`Configure Installation Media`, navigate top VBOX HARDDISK, " "and then select :guilabel:`Confirm`." -msgstr "在 :guilabel:`配置安装介质` 中，导航至顶级 VBOX HARDDISK，然后选择 :guilabel:`确认`。" +msgstr "在 :guilabel:`Configure Installation Media` 中，导航至顶级 VBOX HARDDISK，然后选择 :guilabel:`Confirm`。" #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:197 msgid "" "In :menuselection:`Advanced options --> Manage User`, create an " "administrative user." -msgstr "在 :menuselection:`高级选项 --> 管理用户` 中，创建一个管理员用户。" +msgstr "在 :menuselection:`高级选项 --> 管理用户`中，创建一个管理员用户。" #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:200 msgid "Do not install the bundle `desktop-autostart`." @@ -330,7 +330,7 @@ msgstr "不要安装 bundle 文件 `desktop-autostart`。" #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:202 msgid "When |CL| installation is complete, click :guilabel:`Exit`." -msgstr "完成 |CL| 安装后，点击 :guilabel:`退出`。" +msgstr "完成 |CL| 安装后，点击 :guilabel:`Exit`。" #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:204 msgid "At the prompt, enter:" @@ -354,21 +354,21 @@ msgstr "返回 |VBM|。" msgid "" "From the VM :guilabel:`Settings` window, navigate to the " ":guilabel:`Storage` pane in the left menu." -msgstr "从虚拟机 :guilabel:`设置` 窗口，导航至左侧菜单的 :guilabel:`存储` 窗格。" +msgstr "从虚拟机 :guilabel:`Settings` 窗口，导航至左侧菜单的 :guilabel:`Storage` 窗格。" #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:223 msgid "" "From the middle :guilabel:`Storage Devices` column, click the blue CD " "disk labeled :guilabel:`clear--live-server.iso` under the " ":guilabel:`Controller: IDE`." -msgstr "从 :guilabel:`存储设备` 中间栏上，点击 :guilabel:`控制器: IDE` 下面标注为 :guilabel:`clear--live-server.iso` 的蓝色 CD 盘。" +msgstr "从 :guilabel:`Storage Devices` 中间栏上，点击 :guilabel:`Controller: IDE` 下面标注为 :guilabel:`clear--live-server.iso` 的蓝色 CD 盘。" #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:227 msgid "" "From the :guilabel:`Attributes` column on the right, in :guilabel:`Optical " "Drive`, select the blue CD icon beside and click :guilabel:`Remove Disk " "from Virtual Drive`." -msgstr "在 :guilabel:`光盘驱动器` 右边的 :guilabel:`属性` 栏中，选择旁边的蓝色 CD 图标，点击 :guilabel:`从虚拟驱动器中取出磁盘`。" +msgstr "在 :guilabel:`Attributes` 右边的 :guilabel:`Optical Drive` 栏中，选择旁边的蓝色 CD 图标，点击 :guilabel:`Remove Disk from Virtual Drive`。" #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:235 msgid "Figure 8: Remove Disk from Virtual Drive" @@ -378,7 +378,7 @@ msgstr "图 8：从虚拟驱动器中取出磁盘" msgid "" "Click :guilabel:`OK` to exit the :guilabel:`VM Settings` menu and return " "to the main |VBM|." -msgstr "点击 :guilabel:`确定` 退出 :guilabel:`虚拟机设置` 菜单，返回主 |VBM|。" +msgstr "点击 :guilabel:`OK` 退出 :guilabel:`VM Settings` 菜单，返回主 |VBM|。" #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:241 msgid "Install |VB| Linux Guest Additions" @@ -389,11 +389,11 @@ msgid "" "|CL| provides Linux Guest Additions drivers for full compatibility using " "an install script in the **kernel-lts** (Long Term Support) bundle by " "|CL|." -msgstr "|CL| 利用其 **kernel-lts** （长期支持） bundle 中的安装脚本为 Linux Guest Additions 驱动程序提供完全的兼容性。" +msgstr "|CL| 利用其 **kernel-lts**（长期支持）bundle 中的安装脚本为 Linux Guest Additions 驱动程序提供完全的兼容性。" #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:246 msgid "From the |VBM| select the |CL| VM, and select :guilabel:`Start`." -msgstr "从 |VBM| 中选择 |CL| 虚拟机，然后选择 :guilabel:`启动`。" +msgstr "从 |VBM| 中选择 |CL| 虚拟机，然后选择 :guilabel:`Start`。" #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:248 msgid "In the VM Console, log in as the administrative user previously created." @@ -437,7 +437,7 @@ msgid "" "In the VM Console top menu, click :guilabel:`Devices`, and select " ":guilabel:`Insert Guest Additions CD image...` to mount the |VB| driver " "installation to the |CL| VM." -msgstr "在虚拟机控制台顶级菜单中，点击 :guilabel:`设备`，然后选择 :guilabel:`插入 Guest Additions CD 映像...`，在 |CL| 虚拟机上挂载 |VB| 驱动程序安装。" +msgstr "在虚拟机控制台顶级菜单中，点击 :guilabel:`Devices`，然后选择 :guilabel:`Insert Guest Additions CD image...`，在 |CL| 虚拟机上挂载 |VB| 驱动程序安装。" #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:296 msgid "Figure 9: Insert Guest Additions CD image" @@ -447,7 +447,7 @@ msgstr "图 9：插入 Guest Additions CD 映像" msgid "" "If a dialogue appears, \"VBx_GAs_6.0.8... Would you like to run it?\", " "select :guilabel:`Cancel`." -msgstr "如果出现对话 \"VBx_GAs_6.0.8...Would you like to run it?\"，选择 :guilabel:`取消`。" +msgstr "如果出现对话 \"VBx_GAs_6.0.8...Would you like to run it?\"，选择 :guilabel:`Cancel`。" #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:301 msgid "Instead, we provide a script to patch and install |VB| drivers on |CL|." @@ -473,13 +473,13 @@ msgstr "图 10：关闭 VirtualBox 虚拟机" #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:322 msgid "Select :guilabel:`Settings`, :guilabel:`Display`." -msgstr "选择 :guilabel:`设置`，:guilabel:`显示`。" +msgstr "选择 :guilabel:`Settings`，:guilabel:`Display`。" #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:324 msgid "" "In :guilabel:`Graphics Controller`, select :guilabel:`VBoxSVGA` to adjust" " screen size dynamically." -msgstr "在 :guilabel:`显卡` 中，选择 :guilabel:`VBoxSVGA`，以便动态调整屏幕大小。" +msgstr "在 :guilabel:`Graphics Controller` 中，选择 :guilabel:`VBoxSVGA`，以便动态调整屏幕大小。" #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:331 msgid "Figure 11: VirtualBox hardware acceleration error" @@ -487,7 +487,7 @@ msgstr "图 11：VirtualBox 硬件加速错误" #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:333 msgid "In the |VBM|, select :guilabel:`Start`." -msgstr "在 |VBM| 中，选择 :guilabel:`启动`。" +msgstr "在 |VBM| 中，选择 :guilabel:`Start`。" #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:335 msgid "In the VM console, login and verify the |VB| drivers are loaded:" diff --git a/locale/zh_CN/LC_MESSAGES/get-started/virtual-machine-install/vmw-player-preconf.po b/locale/zh_CN/LC_MESSAGES/get-started/virtual-machine-install/vmw-player-preconf.po index 6088c548..e5d232cd 100644 --- a/locale/zh_CN/LC_MESSAGES/get-started/virtual-machine-install/vmw-player-preconf.po +++ b/locale/zh_CN/LC_MESSAGES/get-started/virtual-machine-install/vmw-player-preconf.po @@ -8,7 +8,7 @@ msgid "" msgstr "Project-Id-Version: Clear Linux* Project Docs latest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-07-22 12:54-0700\n" -"PO-Revision-Date: 2019-07-25 11:20-0008\n" +"PO-Revision-Date: 2019-07-31 12:04-0008\n" "Last-Translator: FULL NAME \n" "Language-Team: zh-Hans\n" "MIME-Version: 1.0\n" diff --git a/locale/zh_CN/LC_MESSAGES/get-started/virtual-machine-install/vmw-player.po b/locale/zh_CN/LC_MESSAGES/get-started/virtual-machine-install/vmw-player.po index 49d84c4b..1fc95b7c 100644 --- a/locale/zh_CN/LC_MESSAGES/get-started/virtual-machine-install/vmw-player.po +++ b/locale/zh_CN/LC_MESSAGES/get-started/virtual-machine-install/vmw-player.po @@ -8,7 +8,7 @@ msgid "" msgstr "Project-Id-Version: Clear Linux* Project Docs latest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-07-22 12:54-0700\n" -"PO-Revision-Date: 2019-07-25 11:20-0008\n" +"PO-Revision-Date: 2019-07-31 12:04-0008\n" "Last-Translator: FULL NAME \n" "Language-Team: zh-Hans\n" "MIME-Version: 1.0\n" diff --git a/locale/zh_CN/LC_MESSAGES/get-started/virtual-machine-install/vmware-esxi-install-cl.po b/locale/zh_CN/LC_MESSAGES/get-started/virtual-machine-install/vmware-esxi-install-cl.po index 9cda7cbd..cedec85b 100644 --- a/locale/zh_CN/LC_MESSAGES/get-started/virtual-machine-install/vmware-esxi-install-cl.po +++ b/locale/zh_CN/LC_MESSAGES/get-started/virtual-machine-install/vmware-esxi-install-cl.po @@ -8,7 +8,7 @@ msgid "" msgstr "Project-Id-Version: Clear Linux* Project Docs latest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-07-22 12:54-0700\n" -"PO-Revision-Date: 2019-07-25 11:20-0008\n" +"PO-Revision-Date: 2019-07-31 12:04-0008\n" "Last-Translator: FULL NAME \n" "Language-Team: zh-Hans\n" "MIME-Version: 1.0\n" @@ -25,7 +25,7 @@ msgstr "安装 |CL-ATTR|，用作 VMware\\* ESXi 来宾操作系统" msgid "" "This page explains how to create a new :abbr:`VM (Virtual Machine)` and " "manually install |CL-ATTR| on the new VM with VMware ESXi 6.5." -msgstr "本页说明如何创建新的 :abbr:`VM (Virtual Machine)` 以及如何在运行 VMware ESXi 6.5 的新虚拟机上手动安装 |CL-ATTR|。" +msgstr "本页说明如何创建新的:abbr:`虚拟机 (虚拟机)`以及如何在运行 VMware ESXi 6.5 的新虚拟机上手动安装 |CL-ATTR|。" #: ../../get-started/virtual-machine-install/vmware-esxi-install-cl.rst:14 msgid "Overview" @@ -180,7 +180,7 @@ msgstr "在 :guilabel:`选择名称和来宾操作系统` 步骤：" #: ../../get-started/virtual-machine-install/vmware-esxi-install-cl.rst:111 msgid "Give the new VM a name in the :guilabel:`Name` field. See Figure 6." -msgstr "在 :guilabel:`名称` 字段中为新虚拟机命名 见图 6。" +msgstr "在 :guilabel:`名称` 字段中为新虚拟机命名。见图 6。" #: ../../get-started/virtual-machine-install/vmware-esxi-install-cl.rst:112 msgid "" diff --git a/locale/zh_CN/LC_MESSAGES/get-started/virtual-machine-install/vmware-esxi-preconfigured-cl-image.po b/locale/zh_CN/LC_MESSAGES/get-started/virtual-machine-install/vmware-esxi-preconfigured-cl-image.po index d68c8bea..c2f5879d 100644 --- a/locale/zh_CN/LC_MESSAGES/get-started/virtual-machine-install/vmware-esxi-preconfigured-cl-image.po +++ b/locale/zh_CN/LC_MESSAGES/get-started/virtual-machine-install/vmware-esxi-preconfigured-cl-image.po @@ -8,7 +8,7 @@ msgid "" msgstr "Project-Id-Version: Clear Linux* Project Docs latest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-07-22 12:54-0700\n" -"PO-Revision-Date: 2019-07-25 11:20-0008\n" +"PO-Revision-Date: 2019-07-31 12:04-0008\n" "Last-Translator: FULL NAME \n" "Language-Team: zh-Hans\n" "MIME-Version: 1.0\n" @@ -263,7 +263,7 @@ msgstr "在 :guilabel:`选择名称和来宾操作系统` 步骤：" #: ../../get-started/virtual-machine-install/vmware-esxi-preconfigured-cl-image.rst:166 msgid "Give the new VM a name in the :guilabel:`Name` field. See Figure 6." -msgstr "在 :guilabel:`名称` 字段中为新虚拟机命名 见图 6。" +msgstr "在 :guilabel:`名称` 字段中为新虚拟机命名。见图 6。" #: ../../get-started/virtual-machine-install/vmware-esxi-preconfigured-cl-image.rst:168 msgid "" diff --git a/locale/zh_CN/LC_MESSAGES/guides/maintenance/increase-virtual-disk-size.po b/locale/zh_CN/LC_MESSAGES/guides/maintenance/increase-virtual-disk-size.po index 7e8163ad..b6096c6a 100644 --- a/locale/zh_CN/LC_MESSAGES/guides/maintenance/increase-virtual-disk-size.po +++ b/locale/zh_CN/LC_MESSAGES/guides/maintenance/increase-virtual-disk-size.po @@ -8,7 +8,7 @@ msgid "" msgstr "Project-Id-Version: Clear Linux* Project Docs latest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-07-22 12:54-0700\n" -"PO-Revision-Date: 2019-07-26 11:17-0008\n" +"PO-Revision-Date: 2019-07-31 12:04-0008\n" "Last-Translator: FULL NAME \n" "Language-Team: zh-Hans\n" "MIME-Version: 1.0\n" @@ -19,7 +19,7 @@ msgstr "Project-Id-Version: Clear Linux* Project Docs latest\n" #: ../../guides/maintenance/increase-virtual-disk-size.rst:4 msgid "Increase virtual disk size of an image" -msgstr "增加图像的虚拟磁盘大小" +msgstr "增加映像的虚拟磁盘大小" #: ../../guides/maintenance/increase-virtual-disk-size.rst:6 msgid "" @@ -89,7 +89,7 @@ msgstr "浏览至 `20450 > clear > config > image` 目录。" #: ../../guides/maintenance/increase-virtual-disk-size.rst:57 msgid "Open the :file:`hyperv-config.json` file." -msgstr "打开 :file:`hyperv-config.json` 文件。" +msgstr "打开 :file:`hyperv-config.json`文件。" #: ../../guides/maintenance/increase-virtual-disk-size.rst:58 msgid "Locate the `PartitionLayout` key." @@ -152,7 +152,7 @@ msgstr "打开终端模拟器。" msgid "" "Add the :command:`storage-utils` bundle to install the :command:`parted` " "and :command:`resize2fs` tools." -msgstr "添加 :command:storage-utils` bundle，安装 :command:`parted` 和 :command:`resize2fs` 工具。" +msgstr "添加 :command:`storage-utils` bundle，安装 :command:`parted` 和 :command:`resize2fs` 工具。" #: ../../guides/maintenance/increase-virtual-disk-size.rst:108 msgid "Launch the `parted` tool." diff --git a/locale/zh_CN/LC_MESSAGES/reference/system-requirements.po b/locale/zh_CN/LC_MESSAGES/reference/system-requirements.po index be0e51d1..e1be046c 100644 --- a/locale/zh_CN/LC_MESSAGES/reference/system-requirements.po +++ b/locale/zh_CN/LC_MESSAGES/reference/system-requirements.po @@ -8,7 +8,7 @@ msgid "" msgstr "Project-Id-Version: Clear Linux* Project Docs latest\n" "Report-Msgid-Bugs-To: \n" "POT-Creation-Date: 2019-07-17 11:17-0700\n" -"PO-Revision-Date: 2019-07-25 11:20-0008\n" +"PO-Revision-Date: 2019-07-31 12:04-0008\n" "Last-Translator: FULL NAME \n" "Language-Team: zh-Hans\n" "MIME-Version: 1.0\n" From fa7e7f5ef3762588f2cbfa9502a7107f026cc4a1 Mon Sep 17 00:00:00 2001 From: ttsangx Date: Wed, 31 Jul 2019 12:34:08 -0700 Subject: [PATCH 2/4] Updates to spacing --- .../virtual-machine-install/virtualbox-cl-installer.po | 4 ++-- .../virtual-machine-install/vmware-esxi-install-cl.po | 2 +- .../guides/maintenance/increase-virtual-disk-size.po | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/locale/zh_CN/LC_MESSAGES/get-started/virtual-machine-install/virtualbox-cl-installer.po b/locale/zh_CN/LC_MESSAGES/get-started/virtual-machine-install/virtualbox-cl-installer.po index cdc45267..f56d3ab4 100644 --- a/locale/zh_CN/LC_MESSAGES/get-started/virtual-machine-install/virtualbox-cl-installer.po +++ b/locale/zh_CN/LC_MESSAGES/get-started/virtual-machine-install/virtualbox-cl-installer.po @@ -322,7 +322,7 @@ msgstr "在 :guilabel:`Configure Installation Media` 中，导航至顶级 VBOX msgid "" "In :menuselection:`Advanced options --> Manage User`, create an " "administrative user." -msgstr "在 :menuselection:`高级选项 --> 管理用户`中，创建一个管理员用户。" +msgstr "在 :menuselection:`高级选项 --> 管理用户` 中，创建一个管理员用户。" #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:200 msgid "Do not install the bundle `desktop-autostart`." @@ -389,7 +389,7 @@ msgid "" "|CL| provides Linux Guest Additions drivers for full compatibility using " "an install script in the **kernel-lts** (Long Term Support) bundle by " "|CL|." -msgstr "|CL| 利用其 **kernel-lts**（长期支持）bundle 中的安装脚本为 Linux Guest Additions 驱动程序提供完全的兼容性。" +msgstr "|CL| 利用其 **kernel-lts** （长期支持）bundle 中的安装脚本为 Linux Guest Additions 驱动程序提供完全的兼容性。" #: ../../get-started/virtual-machine-install/virtualbox-cl-installer.rst:246 msgid "From the |VBM| select the |CL| VM, and select :guilabel:`Start`." diff --git a/locale/zh_CN/LC_MESSAGES/get-started/virtual-machine-install/vmware-esxi-install-cl.po b/locale/zh_CN/LC_MESSAGES/get-started/virtual-machine-install/vmware-esxi-install-cl.po index cedec85b..e645b926 100644 --- a/locale/zh_CN/LC_MESSAGES/get-started/virtual-machine-install/vmware-esxi-install-cl.po +++ b/locale/zh_CN/LC_MESSAGES/get-started/virtual-machine-install/vmware-esxi-install-cl.po @@ -25,7 +25,7 @@ msgstr "安装 |CL-ATTR|，用作 VMware\\* ESXi 来宾操作系统" msgid "" "This page explains how to create a new :abbr:`VM (Virtual Machine)` and " "manually install |CL-ATTR| on the new VM with VMware ESXi 6.5." -msgstr "本页说明如何创建新的:abbr:`虚拟机 (虚拟机)`以及如何在运行 VMware ESXi 6.5 的新虚拟机上手动安装 |CL-ATTR|。" +msgstr "本页说明如何创建新的:abbr:`虚拟机 (虚拟机)` 以及如何在运行 VMware ESXi 6.5 的新虚拟机上手动安装 |CL-ATTR|。" #: ../../get-started/virtual-machine-install/vmware-esxi-install-cl.rst:14 msgid "Overview" diff --git a/locale/zh_CN/LC_MESSAGES/guides/maintenance/increase-virtual-disk-size.po b/locale/zh_CN/LC_MESSAGES/guides/maintenance/increase-virtual-disk-size.po index b6096c6a..40ecead2 100644 --- a/locale/zh_CN/LC_MESSAGES/guides/maintenance/increase-virtual-disk-size.po +++ b/locale/zh_CN/LC_MESSAGES/guides/maintenance/increase-virtual-disk-size.po @@ -89,7 +89,7 @@ msgstr "浏览至 `20450 > clear > config > image` 目录。" #: ../../guides/maintenance/increase-virtual-disk-size.rst:57 msgid "Open the :file:`hyperv-config.json` file." -msgstr "打开 :file:`hyperv-config.json`文件。" +msgstr "打开 :file:`hyperv-config.json` 文件。" #: ../../guides/maintenance/increase-virtual-disk-size.rst:58 msgid "Locate the `PartitionLayout` key." From 21bf11a7dc5f87451ae9ff53c2034eea97787c04 Mon Sep 17 00:00:00 2001 From: DougTW Date: Wed, 31 Jul 2019 14:27:55 -0700 Subject: [PATCH 3/4] Minor editorial and trademark changes: (#681) * Capitalization of Figure references * Word choices * Trademark notation for Amazon Web Services Signed-off-by: DougTW --- .../clear-linux/tutorials/aws-web/aws-web.rst | 58 ++++++++++--------- 1 file changed, 31 insertions(+), 27 deletions(-) diff --git a/source/clear-linux/tutorials/aws-web/aws-web.rst b/source/clear-linux/tutorials/aws-web/aws-web.rst index 4dea6423..b4de082e 100644 --- a/source/clear-linux/tutorials/aws-web/aws-web.rst +++ b/source/clear-linux/tutorials/aws-web/aws-web.rst @@ -1,11 +1,11 @@ .. _aws-web: -Create and launch |CL-ATTR| from Amazon Web Services +Create and launch |CL-ATTR| from Amazon Web Services\* ###################################################### -This tutorial walks you through creating and launching a |CL| +This tutorial explains how to create and launch a |CL| :abbr:`AMI (Amazon Machine Image)` instance from the -:abbr:`AWS (Amazon Web Services)` console and complete the following tasks: +:abbr:`AWS\* (Amazon Web Services)` console and complete the following tasks: #. Locate and select the |CL| OS Basic AMI in the AWS Marketplace. #. Create a new public and private key pair to allow you to connect to your @@ -14,6 +14,10 @@ This tutorial walks you through creating and launching a |CL| #. Update your instance of |CL| using the :command:`swupd` command. #. Stop the |CL| instance. +.. contents:: + :local: + :depth: 1 + Prerequisites ************* @@ -35,7 +39,7 @@ Locate, select, and launch the |CL| Basic AMI ********************************************* #. Start from your main AWS services console menu in your browser and select the - :guilabel:`EC2` text as shown in figure 1: + :guilabel:`EC2` text as shown in Figure 1: .. figure:: figures/aws-web-1.png :scale: 50 % @@ -46,7 +50,7 @@ Locate, select, and launch the |CL| Basic AMI This selection brings up your :guilabel:`EC2 Dashboard` menu. #. To create a new |CL| instance from the :guilabel:`EC2 Dashboard` menu, - select the :guilabel:`Launch Instance` button as shown in figure 2: + select the :guilabel:`Launch Instance` button as shown in Figure 2: .. figure:: figures/aws-web-2.png :scale: 50 % @@ -65,11 +69,11 @@ Locate, select, and launch the |CL| Basic AMI :guilabel:`AWS Marketplace` menu item to bring up the search bar to :guilabel:`Search AWS Marketplace Products`. - #. In the search bar, type "clear linux os" and hit the :kbd:`Enter` key to + #. In the search bar, type "clear linux os" and press the :kbd:`Enter` key to search for and locate the :guilabel:`Clear Linux OS Basic` AMI. - #. Select the :guilabel:`Clear Linux OS Basic` AMI by clicking on the - :guilabel:`Select` button as shown in figure 3: + #. Select the :guilabel:`Clear Linux OS Basic` AMI by clicking the + :guilabel:`Select` button as shown in Figure 3: .. figure:: figures/aws-web-3.png :scale: 50 % @@ -78,9 +82,9 @@ Locate, select, and launch the |CL| Basic AMI Figure 3: :guilabel:`Step 1: Choose AMI` #. A pop-up dialog box appears showing you more information about the - :guilabel:`Clear Linux OS Basic` AMI along with the pricing details for running - |CL| on different platform configurations as shown in figure 4. Select - the :guilabel:`Continue` button. + :guilabel:`Clear Linux OS Basic` AMI along with the pricing details for + running |CL| on different platform configurations as shown in Figure 4. + Select the :guilabel:`Continue` button. .. figure:: figures/aws-web-4.png :scale: 50 % @@ -88,7 +92,7 @@ Locate, select, and launch the |CL| Basic AMI Figure 4: :guilabel:`Clear Linux OS Basic` -#. The :guilabel:`Choose Instance Type` menu appears as shown in figure 5. +#. The :guilabel:`Choose Instance Type` menu appears as shown in Figure 5. .. figure:: figures/aws-web-5.png :scale: 50 % @@ -107,10 +111,10 @@ Locate, select, and launch the |CL| Basic AMI :guilabel:`Review and Launch` button if you want to further customize this |CL| instance. -#. The :guilabel:`Step 7: Review the Instance Launch` menu, shown in figure 6, - allows you to - :guilabel:`Cancel` the process, return to the :guilabel:`Previous` screen - to change the configuration or :guilabel:`Launch` the instance defined. +#. The :guilabel:`Step 7: Review the Instance Launch` menu, shown in Figure 6, + allows you to :guilabel:`Cancel` the process, return to + the :guilabel:`Previous` screen to change the configuration + or :guilabel:`Launch` the instance defined. .. figure:: figures/aws-web-6.png :scale: 50 % @@ -119,7 +123,7 @@ Locate, select, and launch the |CL| Basic AMI Figure 6: :guilabel:`Step 7: Review the Instance Launch` #. Select the :guilabel:`Launch` button. A dialog box appears, as shown in - figure 7, asking you to + Figure 7, asking you to :guilabel:`Select an existing key pair or create a new pair`. .. figure:: figures/aws-web-7.png @@ -138,7 +142,7 @@ Locate, select, and launch the |CL| Basic AMI #. When the file finishes downloading, select the :guilabel:`Launch Instances` button to proceed to the - :guilabel:`Launch Status` menu shown in figure 8. + :guilabel:`Launch Status` menu shown in Figure 8. .. figure:: figures/aws-web-8.png :scale: 50 % @@ -147,7 +151,7 @@ Locate, select, and launch the |CL| Basic AMI Figure 8: :guilabel:`Launch Status` #. Once the :guilabel:`Launch Status` page changes to what is shown in - figure 9, select the :guilabel:`View Instances` button to view your + Figure 9, select the :guilabel:`View Instances` button to view your :guilabel:`Instances` dashboard. .. figure:: figures/aws-web-9.png @@ -156,10 +160,10 @@ Locate, select, and launch the |CL| Basic AMI Figure 9: :guilabel:`View Instance` -Connect to your Clear Linux OS Basic instance +Connect to your Clear Linux OS basic instance ********************************************* -Your :guilabel:`Instances` Dashboard is shown in figure 10 with the new |CL| +Your :guilabel:`Instances` Dashboard is shown in Figure 10 with the new |CL| OS basic instance already selected and in the running state. If there are other instances available, they are also listed but not selected. @@ -171,7 +175,7 @@ other instances available, they are also listed but not selected. #. To connect to your running instance, click the :guilabel:`Connect` button located at the top of your dashboard. AWS brings up the pop-up dialog - box shown in figure 11 describing how to connect to your running instance. + box shown in Figure 11 describing how to connect to your running instance. .. _fig-aws-web-11: @@ -192,7 +196,7 @@ other instances available, they are also listed but not selected. cp Downloads/AWSClearTestKey.pem . #. Change the attributes of the :file:`AWSClearTestKey.pem` using the - :command:`chmod` command as instructed in the dialog box shown in figure + :command:`chmod` command as instructed in the dialog box shown in Figure 11. .. code-block:: console @@ -217,7 +221,7 @@ other instances available, they are also listed but not selected. ECDSA key fingerprint is SHA256:LrziT5Ar66iBTfia8qmiIsrfBUm/UGam76U8bDR6yJc. Are you sure you want to continue connecting (yes/no)? -#. Type `yes` and hit the :kbd:`Enter` key. Another warning is printed to the +#. Type `yes` and press the :kbd:`Enter` key. Another warning is printed to the terminal and you are now at the command prompt of your new |CL| instance. .. code-block:: console @@ -229,7 +233,7 @@ Update the |CL| instance ************************ Run the :command:`sudo swupd update` command to update the operating -system as shown in figure 12: +system as shown in Figure 12: .. figure:: figures/aws-web-12.png :scale: 50 % @@ -237,12 +241,12 @@ system as shown in figure 12: Figure 12: :guilabel:`sudo swupd update` -In this example we updated from version 18940 to 19100. +In this example, we updated from version 18940 to 19100. Stop the |CL| instance ********************** -When you are finished using your AWS |CL| instance you need to stop it using +When you are finished using your AWS |CL| instance, you must stop it using the :guilabel:`Instances` dashboard to stop accruing charges. Complete the following steps from the :guilabel:`Instances` dashboard to stop your AWS |CL| instance from running. From c9fbbdc4de269f47b9550c63da0ad3b9a798a2a5 Mon Sep 17 00:00:00 2001 From: Mary Camp Date: Thu, 1 Aug 2019 14:12:45 -0400 Subject: [PATCH 4/4] Changes per Issue 664: moved topic, edited text (#677) Signed-off-by: MCamp859 --- .../network}/openssh-server.rst | 63 +++++++++++-------- source/clear-linux/reference/reference.rst | 1 - 2 files changed, 36 insertions(+), 28 deletions(-) rename source/clear-linux/{reference/bundles => guides/network}/openssh-server.rst (65%) diff --git a/source/clear-linux/reference/bundles/openssh-server.rst b/source/clear-linux/guides/network/openssh-server.rst similarity index 65% rename from source/clear-linux/reference/bundles/openssh-server.rst rename to source/clear-linux/guides/network/openssh-server.rst index 02e65cb4..a21032ba 100644 --- a/source/clear-linux/reference/bundles/openssh-server.rst +++ b/source/clear-linux/guides/network/openssh-server.rst @@ -1,28 +1,37 @@ .. _openssh-server: -openssh-server -############## +Enable and configure SSH service +################################ -The **openssh-server** bundle provides the OpenSSH\* package needed to enable -an SSH service in |CL-ATTR|. Remote users require an SSH service to be able -to use an encrypted login shell. +This guide describes how to set up SSH service. -|CL| enables the `sshd.socket` unit, which will listen on port 22 by default -and start the OpenSSH service as required. The first time OpenSSH starts, it +.. contents:: + :local: + :depth: 1 + +Overview +******** + +The :command:`openssh-server` bundle provides the OpenSSH package that +enables an SSH service in |CL-ATTR|. Remote users require an SSH service to be +able to use an encrypted login shell. + +|CL| enables the `sshd.socket` unit, which listens on port 22 by default +and starts the OpenSSH service as required. The first time OpenSSH starts, it generates the server SSH keys needed for the service. Prerequisites ************* -Assure the bundle :file:`openssh-server` is installed. +Ensure the :command:`openssh-server` bundle is installed. -To check it it's on your host, enter: +To list all bundles on your host, enter: .. code-block:: bash sudo swupd bundle-list -To add it, enter: +To add the :command:`openssh-server` bundle, enter: .. code-block:: bash @@ -32,9 +41,9 @@ Change default port ******************* Perform the following steps to change the default listening port for the -OpenSSH service: +OpenSSH service. -#. Open the sshd.socket file: +#. Open the :file:`sshd.socket` file: .. code-block:: bash @@ -53,7 +62,7 @@ OpenSSH service: ListenStream=4200 - Make sure to include a new line after the last line of text in the sshd.socket file. + Make sure to include a new line after the last line of text in the :file:`sshd.socket` file. #. Verify your changes: @@ -61,7 +70,7 @@ OpenSSH service: cat /etc/systemd/system/sshd.socket.d/override.conf - You should see the following output: + The following output is displayed: .. code-block:: console @@ -81,7 +90,7 @@ OpenSSH service: sudo systemctl restart sshd.socket -#. Confirm the the sshd.socket unit is listening on your new port: +#. Confirm the sshd.socket unit is listening on your new port: .. code-block:: bash @@ -95,8 +104,8 @@ Enable SFTP *********** |CL| *disables* the :abbr:`SFTP (SSH File Transfer Protocol)` subsystem by -default due to security considerations. To enable the SFTP subsystem, perform -the following configuration of the :abbr:`SSHD (SSH Daemon)` service file: +default due to security considerations. To enable the SFTP subsystem, you must +configure the :abbr:`SSHD (SSH Daemon)` service file. #. Create a systemd drop-in directory for the SSHD service: @@ -107,7 +116,7 @@ the following configuration of the :abbr:`SSHD (SSH Daemon)` service file: #. Create the following file: :file:`/etc/systemd/system/sshd@.service.d/sftp.conf` -#. Add the OPTIONS environment variable to the sftp.conf file. +#. Add the OPTIONS environment variable to the :file:`sftp.conf` file. .. code-block:: console @@ -127,7 +136,7 @@ Enable root login To enable root login via SSH, perform the following steps: -#. Create a *ssh* directory in :file:`/etc`, if it does not already exist. +#. Create an *ssh* directory in :file:`/etc`, if it does not already exist. .. code-block:: bash @@ -136,7 +145,7 @@ To enable root login via SSH, perform the following steps: #. Create the following file, if it does not already exist: :file:`/etc/ssh/sshd_config` -#. Set the configuration variable in /etc/ssh/sshd_config +#. Set the configuration variable in :file:`/etc/ssh/sshd_config`: .. code-block:: console @@ -145,12 +154,12 @@ To enable root login via SSH, perform the following steps: Enable X11-forwarding ********************* -X11 forwarding allows you to securely run graphical applications -(i.e., X clients) over the ssh conection. This will alow for remote gui apps -without the need for full VNC/remotedesktop. To enable X11-forwarding via -SSH, perform the following steps: +X11 forwarding allows you to securely run graphical applications (that is, X +clients) over the SSH conection. This enables remote GUI apps without the need +for full VNC or remote desktop setup. To enable X11-forwarding via SSH, +perform the following steps: -#. Create a *ssh* directory in :file:`/etc`, if it does not already exist. +#. Create an *ssh* directory in :file:`/etc`, if it does not already exist. .. code-block:: bash @@ -159,11 +168,11 @@ SSH, perform the following steps: #. Create the following file, if it does not already exist: :file:`/etc/ssh/sshd_config` -#. Set the configuration variables. +#. Set the following configuration variables. .. code-block:: bash AllowTcpForwarding yes X11UseLocalhost yes X11DisplayOffset 10 - X11Forwarding yes \ No newline at end of file + X11Forwarding yes diff --git a/source/clear-linux/reference/reference.rst b/source/clear-linux/reference/reference.rst index b9f7a8ea..a08ffda6 100644 --- a/source/clear-linux/reference/reference.rst +++ b/source/clear-linux/reference/reference.rst @@ -12,7 +12,6 @@ features. compatible-hardware bundle-commands bundles/bundles - bundles/openssh-server how-to-clear-overview collaboration/collaboration compatible-kernels