fix conflict translation

ken71301 · ken71301 · commit 1b2c863ed6d5 · 2024-11-04T22:31:23.000+08:00
diff --git a/reference/import.po b/reference/import.po
@@ -7,7 +7,7 @@ msgstr ""
 "Project-Id-Version: Python 3.13\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-09-03 11:11+0800\n"
-"PO-Revision-Date: 2024-11-04 22:16+0800\n"
+"PO-Revision-Date: 2024-11-04 22:31+0800\n"
 "Last-Translator: Ken Cheng <ken71301@gmail.com>\n"
 "Language-Team: Chinese - TAIWAN (https://github.com/python/python-docs-zh-"
 "tw)\n"
@@ -983,7 +983,7 @@ msgid ""
 "a module spec the loader had that responsibility."
 msgstr ""
 "在引入過程中使用規格允許在引入系統的各個組件之間傳遞狀態，例如在建立模組規格"
-"的尋檢器和執行該規格的載入器之間傳遞。最重要的是，這允許引入機制執行載入的樣"
+"的尋檢器和執行該規格的載入器之間傳遞。最重要的是，這允許引入機制執行載入的模"
 "板操作，而在沒有模組規格的情況下，這些操作則是載入器的責任。"
 
 #: ../../reference/import.rst:532
@@ -993,14 +993,17 @@ msgid ""
 "interpreter startup <programs>`. The one exception is ``__main__``, where :"
 "attr:`!__spec__` is :ref:`set to None in some cases <main_spec>`."
 msgstr ""
-"模組的規格以 ``__spec__`` 屬性的形式公開在模組物件上。有關模組規格內容的詳細"
-"資訊，請參閱 :class:`~importlib.machinery.ModuleSpec`。"
+"模組的規格以 :attr:`module.__spec__` 的形式公開。適當地設定 :attr:`!"
+"__spec__` 同樣適用於\\ :ref:`在直譯器啟動期間初始化的模組<programs>`。唯一的"
+"例外是 ``__main__``，其中 :attr:`!__spec__` 會\\ :ref:`在某些情況下被設定成 "
+"None <main_spec>`。"
 
 #: ../../reference/import.rst:538
 msgid ""
 "See :class:`~importlib.machinery.ModuleSpec` for details on the contents of "
 "the module spec."
 msgstr ""
+"有關模組規格內容的詳細資訊，請參閱 :class:`~importlib.machinery.ModuleSpec`。"
 
 #: ../../reference/import.rst:546
 msgid "__path__ attributes on modules"
