resolve update conflict #2

SkyLull · 2025-08-30T16:10:44Z

No description provided.

Co-authored-by: mindihx <ymhuang.ymh@gmail.com>

Co-authored-by: Wei-Hsiang (Matt) Wang <mattwang44@gmail.com>

* translate `library/sys.monitoring.po` * Apply suggestions from code review Co-authored-by: mindihx <ymhuang.ymh@gmail.com> --------- Co-authored-by: mindihx <ymhuang.ymh@gmail.com>

python#1001)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Wei-Hsiang (Matt) Wang <mattwang44@gmail.com>

…4.7.1 (python#1003) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

…ting (python#1010)

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: W. H. Wang <mattwang44@gmail.com>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

pythongh-611

fix(glossary): typo

Translate `extending/building.po`

* Update translation for library/pathlib.po * Refine translation for library/pathlib.po * Update translation of `pattern` in library/pathlib.po

) Co-authored-by: Becca <61359625+beccalzh@users.noreply.github.com>

Bumps [JamesIves/github-pages-deploy-action](https://github.com/jamesives/github-pages-deploy-action) from 4.7.2 to 4.7.3. - [Release notes](https://github.com/jamesives/github-pages-deploy-action/releases) - [Commits](JamesIves/github-pages-deploy-action@v4.7.2...v4.7.3) --- updated-dependencies: - dependency-name: JamesIves/github-pages-deploy-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] <support@github.com> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Co-authored-by: mattwang44 <24987826+mattwang44@users.noreply.github.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>

Co-authored-by: Claude <noreply@anthropic.com>

Co-authored-by: mattwang44 <24987826+mattwang44@users.noreply.github.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: W. H. Wang <mattwang44@gmail.com>

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: W. H. Wang <mattwang44@gmail.com>

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: W. H. Wang <mattwang44@gmail.com>

…hon#1117) Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: Matt Wang <mattwang44@gmail.com>

…ython#1110) Co-authored-by: josix <18432820+josix@users.noreply.github.com> Co-authored-by: mattwang44 <24987826+mattwang44@users.noreply.github.com> Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: Josix <josixwang@gmail.com>

Co-authored-by: mattwang44 <24987826+mattwang44@users.noreply.github.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Matt Wang <mattwang44@gmail.com>

feat: deploy PR preview to gh pages

Co-authored-by: W. H. Wang <mattwang44@gmail.com>

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Matt Wang <mattwang44@gmail.com>

…on#1130) Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: mattwang44 <24987826+mattwang44@users.noreply.github.com>

Co-authored-by: W. H. Wang <mattwang44@gmail.com>

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Matt Wang <mattwang44@gmail.com>

mattwang44 and others added 30 commits November 16, 2024 15:39

Translate the second half of library/pdb.po (python#991)

10794fd

Co-authored-by: mindihx <ymhuang.ymh@gmail.com>

feat: translate time in 3.13 (python#979)

4f8f280

Co-authored-by: Wei-Hsiang (Matt) Wang <mattwang44@gmail.com>

Translate library/sys.monitoring (python#892)

9e4dde8

* translate `library/sys.monitoring.po` * Apply suggestions from code review Co-authored-by: mindihx <ymhuang.ymh@gmail.com> --------- Co-authored-by: mindihx <ymhuang.ymh@gmail.com>

fix: remove the translation since it caused the page to miss some text (

2f9db7b

python#1001)

Sync with CPython 3.13 (python#998)

fc9f0d6

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Wei-Hsiang (Matt) Wang <mattwang44@gmail.com>

build(deps): bump JamesIves/github-pages-deploy-action from 4.6.8 to …

85fadd9

…4.7.1 (python#1003) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

Sync with CPython 3.13 (python#1002)

c4c0d58

fix(library/tempfile): add a missing backtick (python#1009)

cc66b14

Update translation for library/enum, library/exceptions and howto/sor…

e7b5675

…ting (python#1010)

Translate library/http.cookies

059c1dd

Update translation for library/http.cookies

e5cecf1

Update translation in code comment for library/http.cookies

43ad743

Sync with CPython 3.13 (python#1008)

f3042a1

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: W. H. Wang <mattwang44@gmail.com>

build(deps): bump JamesIves/github-pages-deploy-action (python#1016)

cb35f7e

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

feat: translate library/socket.po intro section

55c563a

pythongh-611

feat: update with reviewer's suggestions

c9b1c2f

feat: update with reviewer's suggestions

88d1d54

fix: 修正 socket.po 中的函數名稱錯誤

27ee90f

fix(glossary): typo

241ff06

Merge pull request python#1017 from python/glossary-typo

c347ae2

fix(glossary): typo

Sync with CPython 3.13 (python#1015)

e2bf6ce

translate the second half of library/signal.po (python#995)

5864e8f

translate extending/building.po

e6a2349

Merge pull request python#1021 from mattwang44/extending/building

0ee2e18

Translate `extending/building.po`

Update translation for library/pathlib.po (python#1013)

06b05d9

* Update translation for library/pathlib.po * Refine translation for library/pathlib.po * Update translation of `pattern` in library/pathlib.po

Translate "Function" and "Exception" part of library/re.po (python#996

cc8bdcc

) Co-authored-by: Becca <61359625+beccalzh@users.noreply.github.com>

translate extending/extending.po - part 1 (python#1023)

ef944ec

translate library/stringprep.po (python#1024)

1cc7e8d

deps: assign python version in ci (python#1028)

6f11b03

Copilot AI and others added 29 commits July 14, 2025 11:17

Translate c-api/objimpl.po to Traditional Chinese (python#1112)

a9a4bed

Co-authored-by: mattwang44 <24987826+mattwang44@users.noreply.github.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>

Translate library/code.po (python#997)

75e9a91

Co-authored-by: Claude <noreply@anthropic.com>

Complete translation of all tutorial .po files (python#1114)

0a5b23f

Co-authored-by: mattwang44 <24987826+mattwang44@users.noreply.github.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: W. H. Wang <mattwang44@gmail.com>

Sync with CPython 3.13 (python#1109)

bd39cbc

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: W. H. Wang <mattwang44@gmail.com>

Translate library/warnings.po (python#1115)

a5b2754

Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> Co-authored-by: W. H. Wang <mattwang44@gmail.com>

Complete translation of library/struct.po to Traditional Chinese (pyt…

7a66339

…hon#1117) Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: Matt Wang <mattwang44@gmail.com>

feat: add create issue link to summary table

813de09

fix: wrong args seq

e37da89

fix: issue display in summary table

c71602e

fix: fix displayed file path

a7e006c

feat(summary): show string count

15c239b

fix(script): fix wrong polib usage

2eb2be8

fix(script): wrong subscription index

c9f4af1

Translate c-api/hash.po to Traditional Chinese (python#1122)

98b5eea

Co-authored-by: mattwang44 <24987826+mattwang44@users.noreply.github.com> Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>

Sync with CPython 3.13 (python#1118)

0b2c140

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Matt Wang <mattwang44@gmail.com>

feat: deploy PR preview to gh pages

6e856b4

fix: replace archived action for gen app token

a1aaf1f

fix: use app token to push to gh-pages branch

3f47875

Merge pull request python#1127 from python/pr-preview

707a327

feat: deploy PR preview to gh pages

fix(ci): cannot run doc preview for PR from forked repo (python#1131)

7ecda97

Translate library/pydoc.po (python#1126)

6c367bc

Co-authored-by: W. H. Wang <mattwang44@gmail.com>

Sync with CPython 3.13 (python#1123)

a8c0d8e

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Matt Wang <mattwang44@gmail.com>

Complete translation of howto/timerfd.po to Traditional Chinese (pyth…

39d0d2f

…on#1130) Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: mattwang44 <24987826+mattwang44@users.noreply.github.com>

translate library/contextvars.po

965b5a5

Translate library/tkinter.po (python#1119)

a03c8a9

Co-authored-by: W. H. Wang <mattwang44@gmail.com>

Translate library/tkinter.dnd.po (python#1138)

ba7e03a

Co-authored-by: W. H. Wang <mattwang44@gmail.com>

Sync with CPython 3.13 (python#1133)

a9d1fe5

Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Matt Wang <mattwang44@gmail.com>

Merge branch 'argparse' into 3.13-argparse-conflict-resolving

d0fbe11

SkyLull closed this Aug 30, 2025

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

resolve update conflict #2

resolve update conflict #2

Uh oh!

SkyLull commented Aug 30, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

13 participants

resolve update conflict #2

resolve update conflict #2

Uh oh!

Conversation

SkyLull commented Aug 30, 2025

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

13 participants