Skip to content

Commit

Permalink
Sync with CPython 3.12 (python#664)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>
  • Loading branch information
3 people authored Oct 14, 2023
1 parent c5d2c8f commit d24c138
Show file tree
Hide file tree
Showing 89 changed files with 7,549 additions and 8,973 deletions.
5 changes: 1 addition & 4 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,7 @@ endif
mkdir -p "$$(dirname "$$PO")";\
if [ -f "$$PO" ];\
then\
case "$$POT" in\
*whatsnew*) msgmerge --lang=$(LANGUAGE) --backup=off --force-po --no-fuzzy-matching -U "$$PO" "$$POT" ;;\
*) msgmerge --lang=$(LANGUAGE) --backup=off --force-po -U "$$PO" "$$POT" ;;\
esac\
msgmerge --lang=$(LANGUAGE) --backup=off --force-po -U "$$PO" "$$POT";\
else\
msgcat --lang=$(LANGUAGE) -o "$$PO" "$$POT";\
fi\
Expand Down
6 changes: 3 additions & 3 deletions c-api/exceptions.po
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: Python 3.12\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2023-08-23 00:03+0000\n"
"POT-Creation-Date: 2023-10-11 17:13+0000\n"
"PO-Revision-Date: 2018-05-23 14:05+0000\n"
"Last-Translator: Adrian Liaw <[email protected]>\n"
"Language-Team: Chinese - TAIWAN (https://github.com/python/python-docs-zh-"
Expand Down Expand Up @@ -809,8 +809,8 @@ msgstr ""
msgid ""
"Implement part of the interpreter's implementation of :keyword:`!except*`. "
"*orig* is the original exception that was caught, and *excs* is the list of "
"the exceptions that need to be raised. This list contains the the unhandled "
"part of *orig*, if any, as well as the exceptions that were raised from the :"
"the exceptions that need to be raised. This list contains the unhandled part "
"of *orig*, if any, as well as the exceptions that were raised from the :"
"keyword:`!except*` clauses (so they have a different traceback from *orig*) "
"and those that were reraised (and have the same traceback as *orig*). Return "
"the :exc:`ExceptionGroup` that needs to be reraised in the end, or ``None`` "
Expand Down
2 changes: 1 addition & 1 deletion c-api/init_config.po
Original file line number Diff line number Diff line change
Expand Up @@ -662,7 +662,7 @@ msgstr ""

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

#: ../../c-api/init_config.rst:550
msgid ""
Expand Down
Loading

0 comments on commit d24c138

Please sign in to comment.