Location via proxy:   [ UP ]  
[Report a bug]   [Manage cookies]                
Skip to content

Commit d24c138

Browse files
pydoc-zh-tw[bot]github-actions[bot]mattwang44
authored
Sync with CPython 3.12 (#664)
* sync with cpython c06ac1b4 * fix: resolve fuzzy entries * sync with cpython dbbe0eeb * sync with cpython 27d5ea29 * sync with cpython 0102faf0 * fix: resolve fuzzy entries --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Matt Wang <mattwang44@gmail.com>
1 parent c5d2c8f commit d24c138

Some content is hidden

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

89 files changed

+7549
-8973
lines changed

Makefile

+1-4
Original file line numberDiff line numberDiff line change
@@ -105,10 +105,7 @@ endif
105105
mkdir -p "$$(dirname "$$PO")";\
106106
if [ -f "$$PO" ];\
107107
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";\
112109
else\
113110
msgcat --lang=$(LANGUAGE) -o "$$PO" "$$POT";\
114111
fi\

c-api/exceptions.po

+3-3
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ msgid ""
88
msgstr ""
99
"Project-Id-Version: Python 3.12\n"
1010
"Report-Msgid-Bugs-To: \n"
11-
"POT-Creation-Date: 2023-08-23 00:03+0000\n"
11+
"POT-Creation-Date: 2023-10-11 17:13+0000\n"
1212
"PO-Revision-Date: 2018-05-23 14:05+0000\n"
1313
"Last-Translator: Adrian Liaw <adrianliaw2000@gmail.com>\n"
1414
"Language-Team: Chinese - TAIWAN (https://github.com/python/python-docs-zh-"
@@ -809,8 +809,8 @@ msgstr ""
809809
msgid ""
810810
"Implement part of the interpreter's implementation of :keyword:`!except*`. "
811811
"*orig* is the original exception that was caught, and *excs* is the list of "
812-
"the exceptions that need to be raised. This list contains the the unhandled "
813-
"part of *orig*, if any, as well as the exceptions that were raised from the :"
812+
"the exceptions that need to be raised. This list contains the unhandled part "
813+
"of *orig*, if any, as well as the exceptions that were raised from the :"
814814
"keyword:`!except*` clauses (so they have a different traceback from *orig*) "
815815
"and those that were reraised (and have the same traceback as *orig*). Return "
816816
"the :exc:`ExceptionGroup` that needs to be reraised in the end, or ``None`` "

c-api/init_config.po

+1-1
Original file line numberDiff line numberDiff line change
@@ -662,7 +662,7 @@ msgstr ""
662662

663663
#: ../../c-api/init_config.rst:548
664664
msgid "Command line arguments: :data:`sys.argv`."
665-
msgstr ""
665+
msgstr "命令列引數::data:`sys.argv`。"
666666

667667
#: ../../c-api/init_config.rst:550
668668
msgid ""

0 commit comments

Comments
 (0)