Commitd0860a3

authored

Merge branch 'python:3.12' into 3.12

2 parents77cf40d +430edde commitd0860a3Copy full SHA for d0860a3

File tree

+18065

-17098

lines changed

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

+18065

-17098

lines changed

Lines changed: 1 addition & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -105,10 +105,7 @@ endif`
`105`	`105`	`mkdir -p "$$(dirname "$$PO")";\`
`106`	`106`	`if [ -f "$$PO" ];\`
`107`	`107`	`then\`
`108`		`- case "$$POT" in\`
`109`		`- whatsnew) msgmerge --lang=$(LANGUAGE) --backup=off --force-po --no-fuzzy-matching -U "$$PO" "$$POT" ;;\`
`110`		`- *) msgmerge --lang=$(LANGUAGE) --backup=off --force-po -U "$$PO" "$$POT" ;;\`
`111`		`- esac\`
	`108`	`+ msgmerge --lang=$(LANGUAGE) --backup=off --force-po -U "$$PO" "$$POT";\`
`112`	`109`	`else\`
`113`	`110`	`msgcat --lang=$(LANGUAGE) -o "$$PO" "$$POT";\`
`114`	`111`	`fi\`

Lines changed: 5 additions & 4 deletions

Original file line number	Diff line number	Diff line change
`@@ -13,7 +13,7 @@ msgid ""`
`13`	`13`	`msgstr ""`
`14`	`14`	`"Project-Id-Version:Python 3.12\n"`
`15`	`15`	`"Report-Msgid-Bugs-To:\n"`
`16`		`-"POT-Creation-Date:2023-02-27 00:17+0000\n"`
	`16`	`+"POT-Creation-Date:2023-11-05 09:50+0000\n"`
`17`	`17`	`"PO-Revision-Date:2022-08-31 12:34+0800\n"`
`18`	`18`	`"Last-Translator:Steven Hsu <hsuhaochun@gmail.com>\n"`
`19`	`19`	`"Language-Team:Chinese - TAIWAN (https://github.com/python/python-docs-zh-"`
`@@ -117,9 +117,10 @@ msgstr "給有意成為 Python 說明文件貢獻者的綜合指南。"`
`117`	`117`
`118`	`118`	`#:../../bugs.rst:41`
`119`	`119`	`msgid""`
`120`		-"`Documentation Translations <https://devguide.python.org/documenting/"
`121`		-"#translating>`_"
`122`		-msgstr"`說明文件翻譯 <https://devguide.python.org/documenting/#translating>`_"
	`120`	+"`Documentation Translations <https://devguide.python.org/documentation/"
	`121`	+"translating/>`_"
	`122`	`+msgstr""`
	`123`	+"`說明文件翻譯 <https://devguide.python.org/documentation/translating/>`_"
`123`	`124`
`124`	`125`	`#:../../bugs.rst:42`
`125`	`126`	`msgid""`

Comments

(0)