Merge branch '3.10' into translate-stdtypes-intro-true-value-test

Author: mattwang44

.github/workflows/ci.yml

@@ -18,4 +18,4 @@ jobs:
         run: sudo apt-get install gettext
 
       - name: Validate
-        run: VERSION=${{ github.event.pull_request.base.ref }} MODE=dummy make
+        run: VERSION=${{ github.event.pull_request.base.ref }} MODE=dummy make all

.github/workflows/deploy-gh-page.yml

@@ -15,7 +15,7 @@ jobs:
         run: sudo apt-get install gettext
 
       - name: Build
-        run: make
+        run: make all
 
       - name: Deploy to gh page
         uses: JamesIves/[email protected]

Makefile

@@ -2,7 +2,7 @@
 #
 # Here is what you can do:
 #
-# - make  # Automatically build an html local version
+# - make all # Automatically build an html local version
 # - make todo  # To list remaining tasks
 # - make merge  # To merge pot from upstream
 # - make fuzzy  # To find fuzzy strings
@@ -15,6 +15,27 @@
 #
 # Credits: Python Documentation French Translation Team (https://github.com/python/python-docs-fr)
 
+.DEFAULT_GOAL := help # Sets default action to be help
+
+define PRINT_HELP_PYSCRIPT # start of Python section
+import re, sys
+
+output = []
+# Loop through the lines in this file
+for line in sys.stdin:
+    # if the line has a command and a comment start with
+    #   two pound signs, add it to the output
+    match = re.match(r'^([a-zA-Z_-]+):.*?## (.*)$$', line)
+    if match:
+        target, help = match.groups()
+        output.append("%-10s %s" % (target, help))
+# Sort the output in alphanumeric order
+output.sort()
+# Print the help result
+print('\n'.join(output))
+endef
+export PRINT_HELP_PYSCRIPT # End of python section
+
 CPYTHON_CLONE := ../cpython/
 SPHINX_CONF := $(CPYTHON_CLONE)/Doc/conf.py
 LANGUAGE := zh_TW
@@ -25,16 +46,17 @@ MODE := autobuild-dev-html
 BRANCH := $(or $(VERSION), $(shell git describe --contains --all HEAD))
 JOBS := 4
 
-
 .PHONY: all
-all: $(VENV)/bin/sphinx-build $(VENV)/bin/blurb clone
+all: $(VENV)/bin/sphinx-build $(VENV)/bin/blurb clone ## Automatically build an html local version
 	mkdir -p $(LC_MESSAGES)
 	for dirname in $$(find . -name '*.po' | xargs -n1 dirname | sort -u | grep -v '^\.$$'); do mkdir -p $(LC_MESSAGES)/$$dirname; done
 	for file in *.po */*.po; do ln -f $$file $(LC_MESSAGES)/$$file; done
 	. $(VENV)/bin/activate; $(MAKE) -C $(CPYTHON_CLONE)/Doc/ SPHINXOPTS='-j$(JOBS) -D locale_dirs=locales -D language=$(LANGUAGE) -D gettext_compact=0' $(MODE)
 
+help:
+	@python3 -c "$$PRINT_HELP_PYSCRIPT" < $(MAKEFILE_LIST)
 
-clone:
+clone: ## Clone latest cpython repository to `../cpython/` if it doesn't exist
 	git clone --depth 1 --no-single-branch https://github.com/python/cpython.git $(CPYTHON_CLONE)  || echo "cpython exists"
 	cd $(CPYTHON_CLONE) && git checkout $(BRANCH)
 
@@ -53,24 +75,24 @@ $(VENV)/bin/blurb: $(VENV)/bin/activate
 
 
 .PHONY: upgrade_venv
-upgrade_venv: $(VENV)/bin/activate
+upgrade_venv: $(VENV)/bin/activate ## Upgrade the venv that compiles the doc
 	. $(VENV)/bin/activate; python3 -m pip install --upgrade sphinx python-docs-theme blurb
 
 
 .PHONY: progress
-progress:
+progress: ## Compute current progression
 	@python3 -c 'import sys; print("{:.1%}".format(int(sys.argv[1]) / int(sys.argv[2])))'  \
 	$(shell msgcat *.po */*.po | msgattrib --translated | grep -c '^msgid') \
 	$(shell msgcat *.po */*.po | grep -c '^msgid')
 
 
 .PHONY: todo
-todo:
+todo: ## List remaining tasks
 	for file in *.po */*.po; do echo $$(msgattrib --untranslated $$file | grep ^msgid | sed 1d | wc -l ) $$file; done | grep -v ^0 | sort -gr
 
 
 .PHONY: merge
-merge: upgrade_venv
+merge: upgrade_venv ## To merge pot from upstream
 ifneq "$(shell cd $(CPYTHON_CLONE) 2>/dev/null && git describe --contains --all HEAD)" "$(BRANCH)"
 	$(error "You're merging from a different branch")
 endif
@@ -102,9 +124,9 @@ update_txconfig:
 
 
 .PHONY: fuzzy
-fuzzy:
+fuzzy: ## Find fuzzy strings
 	for file in *.po */*.po; do echo $$(msgattrib --only-fuzzy --no-obsolete "$$file" | grep -c '#, fuzzy') $$file; done | grep -v ^0 | sort -gr
 
 .PHONY: rm_cpython
-rm_cpython:
+rm_cpython: ## Remove cloned cpython repo
 	rm -rf $(CPYTHON_CLONE)

README.rst

@@ -2,19 +2,19 @@
 Python 官方說明文件臺灣繁體中文翻譯計畫
 =======================================
 
-.. image:: https://badgen.now.sh/badge/chat/on%20Telegram/blue
-   :target: https://t.me/PyDocTW
-   :alt: Join Chat on Telegram
+.. image:: https://badgen.net/badge/chat/on%20Discord/blue
+   :target: https://discord.gg/44XheGXhWH
+   :alt: Join Chat on Discord
 
 這是 Python 3.10 官方說明文件的臺灣繁體中文（zh_TW）翻譯。
 
 翻譯之前，請務必詳讀並同意\ `授權與 License`_。參與方式請參考\ `參與翻譯`_。
 
 你可以在 https://python.github.io/python-docs-zh-tw/ 瀏覽目前翻譯的成果。
 
-想問問題、認識翻譯同好，歡迎加入 Telegram 聊天室 `t.me/PyDocTW`_
+想問問題、認識翻譯同好，歡迎加入 Discord 頻道 `discord.gg/44XheGXhWH`_
 
-.. _t.me/PyDocTW: https://t.me/PyDocTW
+.. _discord.gg/44XheGXhWH: https://discord.gg/44XheGXhWH
 
 .. contents:: **目錄 Table of Contents**
 
@@ -132,7 +132,7 @@ the PSF for inclusion in the documentation.
 
 3. 存檔以後，執行以下列指令編譯輸出文件，以確保你的修改沒有 rST 的語法錯誤或警告 ::
 
-    make
+    make all
 
    如果你還沒有執行 `維護、預覽`_ 的 clone CPython 的動作，此指令會自動幫你 clone CPython，\
    並且會使用 Sphinx 幫你檢查 rST 語法錯誤，我們盡量保持沒有 warning \
@@ -326,10 +326,10 @@ Sprint中共同討論是否合併進術語列表。
 ==============
 
 如果有需要共同討論的問題，請開設一個新的 Issue_。如果是翻譯上遇到困難需要\
-幫助，則可以使用 Telegram_。
+幫助，則可以使用 Discord_。
 
 .. _Issue: https://github.com/python/python-docs-zh-tw/issues
-.. _Telegram: https://t.me/PyDocTW
+.. _Discord: https://discord.gg/44XheGXhWH
 
 另外，此翻譯的 coordinator 為 `mattwang44 <https://github.com/mattwang44>`_ 和 \
 `josix <https://github.com/josix>`_，你也可以分別透過以下 email 聯繫：\
@@ -339,7 +339,7 @@ Sprint中共同討論是否合併進術語列表。
 額外翻譯資源
 ============
 
-- Telegram group `t.me/PyDocTW`_
+- Discord channel `discord.gg/44XheGXhWH`_
 - `Doc-SIG mailing list <https://mail.python.org/mailman/listinfo/doc-sig>`_
 - `PEP 545 <https://www.python.org/dev/peps/pep-0545/>`_
 - `zh_CN Translation of the Python Documentation

c-api/apiabiversion.po

@@ -1,86 +1,92 @@
-# SOME DESCRIPTIVE TITLE.
 # Copyright (C) 2001-2022, Python Software Foundation
 # This file is distributed under the same license as the Python package.
 #
 # Translators:
+# Liang-Bo Wang <[email protected]>, 2015
+# Matt Wang <[email protected]>, 2022
 msgid ""
 msgstr ""
 "Project-Id-Version: Python 3.10\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2021-10-26 16:47+0000\n"
-"PO-Revision-Date: 2015-12-09 17:51+0000\n"
-"Last-Translator: Liang-Bo Wang <[email protected]>\n"
+"PO-Revision-Date: 2022-01-24 22:34+0800\n"
+"Last-Translator: Matt Wang <[email protected]>\n"
 "Language-Team: Chinese - TAIWAN (https://github.com/python/python-docs-zh-"
 "tw)\n"
 "Language: zh_TW\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 3.0.1\n"
 
 #: ../../c-api/apiabiversion.rst:7
 msgid "API and ABI Versioning"
-msgstr ""
+msgstr "API 和 ABI 版本管理"
 
 #: ../../c-api/apiabiversion.rst:9
 msgid ""
 "CPython exposes its version number in the following macros. Note that these "
 "correspond to the version code is **built** with, not necessarily the "
 "version used at **run time**."
 msgstr ""
+"CPython 透過以下巨集 (macro) 公開其版本號。請注意，對應到的是\\ **建置 "
+"(built)** 所用到的版本，並不一定是\\ **運行時期 (run time)** 所使用的版本。"
 
 #: ../../c-api/apiabiversion.rst:13
 msgid ""
 "See :ref:`stable` for a discussion of API and ABI stability across versions."
-msgstr ""
+msgstr "關於跨版本 API 和 ABI 穩定性的討論，請見 :ref:`stable`\\ 。"
 
 #: ../../c-api/apiabiversion.rst:17
 msgid "The ``3`` in ``3.4.1a2``."
-msgstr ""
+msgstr "在 ``3.4.1a2`` 中的 ``3``\\ 。"
 
 #: ../../c-api/apiabiversion.rst:21
 msgid "The ``4`` in ``3.4.1a2``."
-msgstr ""
+msgstr "在 ``3.4.1a2`` 中的 ``4``\\ 。"
 
 #: ../../c-api/apiabiversion.rst:25
 msgid "The ``1`` in ``3.4.1a2``."
-msgstr ""
+msgstr "在 ``3.4.1a2`` 中的 ``1``\\ 。"
 
 #: ../../c-api/apiabiversion.rst:29
 msgid ""
 "The ``a`` in ``3.4.1a2``. This can be ``0xA`` for alpha, ``0xB`` for beta, "
 "``0xC`` for release candidate or ``0xF`` for final."
 msgstr ""
+"在 ``3.4.1a2`` 中的 ``a``\\ 。\\ ``0xA`` 代表 alpha 版本、\\ ``0xB`` 代表 "
+"beta 版本、\\ ``0xC`` 為發布候選版本、\\ ``0xF`` 則為最終版。"
 
 #: ../../c-api/apiabiversion.rst:35
 msgid "The ``2`` in ``3.4.1a2``. Zero for final releases."
-msgstr ""
+msgstr "在 ``3.4.1a2`` 中的 ``2``\\ 。零則為最終發布版本。"
 
 #: ../../c-api/apiabiversion.rst:39
 msgid "The Python version number encoded in a single integer."
-msgstr ""
+msgstr "被編碼為單一整數的 Python 版本號。"
 
 #: ../../c-api/apiabiversion.rst:41
 msgid ""
 "The underlying version information can be found by treating it as a 32 bit "
 "number in the following manner:"
-msgstr ""
+msgstr "所代表的版本資訊可以用以下規則將其看做是一個 32 位元數字來獲得："
 
 #: ../../c-api/apiabiversion.rst:45
 msgid "Bytes"
-msgstr ""
+msgstr "位元組串"
 
 #: ../../c-api/apiabiversion.rst:45
 msgid "Bits (big endian order)"
-msgstr ""
+msgstr "位元（大端位元組序 (big endian order)）"
 
 #: ../../c-api/apiabiversion.rst:45
 msgid "Meaning"
-msgstr ""
+msgstr "意義"
 
 #: ../../c-api/apiabiversion.rst:45
 msgid "Value for ``3.4.1a2``"
-msgstr ""
+msgstr "``3.4.1a2`` 中的值"
 
 #: ../../c-api/apiabiversion.rst:47
 msgid "1"
@@ -163,7 +169,9 @@ msgid ""
 "Thus ``3.4.1a2`` is hexversion ``0x030401a2`` and ``3.10.0`` is hexversion "
 "``0x030a00f0``."
 msgstr ""
+"因此 ``3.4.1a2`` 代表 hexversion ``0x030401a2``\\ 、\\ ``3.10.0`` 代表 "
+"hexversion ``0x030a00f0``\\ 。"
 
 #: ../../c-api/apiabiversion.rst:62
 msgid "All the given macros are defined in :source:`Include/patchlevel.h`."
-msgstr ""
+msgstr "所有提到的巨集都定義在 :source:`Include/patchlevel.h`\\ 。"