Git merge fixes

Author: ttsangx

locale/zh_CN/LC_MESSAGES/guides/maintenance/restart.po

@@ -129,7 +129,7 @@ msgid ""
 "below, :command:`clr-service-restart` displays a complete list of system "
 "services that require a restart. Use both options to verify that all "
 "desired daemons are restarted."
-msgstr "如果同时传递两个选项（:option:`-a` 和 :command:`-n`），:command:`clr-service-restart` 会显示需要重启的系统服务的完整清单。使用这两个选项可确认所有所需的守护程序都已重启。"
+msgstr "如果同时传递两个选项（:command:`-a` 和 :command:`-n`），:command:`clr-service-restart` 会显示需要重启的系统服务的完整清单。使用这两个选项可确认所有所需的守护程序都已重启。"
 
 
 #: ../../guides/maintenance/restart.rst:94

locale/zh_CN/LC_MESSAGES/guides/stacks/dars.po

@@ -127,8 +127,8 @@ msgid ""
 msgstr "要使用 |CL| 构建映像，请从安装了 :command:`containers-basic-dev` 捆绑包的 |CL| 开发平台开始。使用 :ref:`swupd-guide` 了解有关捆绑包和安装捆绑包的更多信息。"
 
 #: ../../guides/stacks/dars.rst:89
+msgstr "Clone the `Data Analytics Reference Stack`_ GitHub\\* repository."
 msgid "Clone the `Data Analytics Reference Stack`_ GitHub\\* repository."
-msgstr "数据分析参考堆栈版本"
 
 #: ../../guides/stacks/dars.rst:95
 msgid ""

locale/zh_CN/LC_MESSAGES/guides/stacks/dlrs/dlrs.po

@@ -134,7 +134,7 @@ msgstr "必备条件"
 
 #: ../../guides/stacks/dlrs/dlrs.rst:64
 msgid ":ref:`Install <bare-metal-install-desktop>` |CL| on your host system"
-msgstr "在主机系统上:ref:`Install <bare-metal-install-desktop>`"
+msgstr "在主机系统上 :ref:`Install <bare-metal-install-desktop>` |CL|"
 
 #: ../../guides/stacks/dlrs/dlrs.rst:65
 msgid ":command:`containers-basic` bundle"

locale/zh_CN/LC_MESSAGES/guides/stacks/greengrass.po

@@ -370,7 +370,7 @@ msgstr "例如："
 msgid ""
 "Return to the AWS documentation section called `Create and Package a "
 "Lambda Function`_ and complete the procedure."
-msgstr "返回名为`Create and Package a Lambda Function`_ 的 AWS 文档部分，并完成步骤。"
+msgstr "返回名为 `Create and Package a Lambda Function`_ 的 AWS 文档部分，并完成步骤。"
 
 #: ../../guides/stacks/greengrass.rst:248
 msgid ""
@@ -401,7 +401,7 @@ msgstr "创建 Greengrass 组和 Lambda 函数后，开始为 AWS Greengrass 配
 msgid ""
 "Follow steps 1-8 in `Configure the Lambda Function for AWS IoT "
 "Greengrass`_ in the AWS documentation."
-msgstr "按照 AWS 文档中`Configure the Lambda Function for AWS IoT Greengrass`_ 中的步骤 1-8 执行操作。"
+msgstr "按照 AWS 文档中 `Configure the Lambda Function for AWS IoT Greengrass`_ 中的步骤 1-8 执行操作。"
 
 
 #: ../../guides/stacks/greengrass.rst:265