resolve update conflict#2

Closed

SkyLull wants to merge 119 commits intoargparsefrom

3.13-argparse-conflict-resolving

Commits on Nov 16, 2024

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

mattwang44
and
mindihx
authored

Commits on Nov 20, 2024

feat: translate time in 3.13 (#979)

ken71301
and
mattwang44
authored

Commits on Nov 22, 2024

Translate `library/sys.monitoring` (#892)

mattwang44
and
mindihx
authored
fix: remove the translation since it caused the page to miss some text (#1001)
ken71301
authored

Commits on Nov 30, 2024

Sync with CPython 3.13 (#998)

authored

Commits on Dec 1, 2024

build(deps): bump JamesIves/github-pages-deploy-action from 4.6.8 to 4.7.1 (#1003)
dependabot[bot]
authored

Commits on Dec 15, 2024

Sync with CPython 3.13 (#1002)
pydoc-zh-tw[bot]
authored

Commits on Dec 20, 2024

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

Commits on Dec 23, 2024

Update translation for library/enum, library/exceptions and howto/sorting (#1010)
mindihx
authored

Commits on Dec 24, 2024

Commits on Dec 29, 2024

Sync with CPython 3.13 (#1008)

authored

Commits on Jan 1, 2025

build(deps): bump JamesIves/github-pages-deploy-action (#1016)
dependabot[bot]
authored

Commits on Jan 8, 2025

feat: translate library/socket.po intro section

weijay0804
authored and
ken71301
committed
feat: update with reviewer's suggestions

weijay0804
authored and
ken71301
committed
feat: update with reviewer's suggestions

weijay0804
authored and
ken71301
committed
fix: 修正 socket.po 中的函數名稱錯誤

weijay0804
authored and
ken71301
committed

Commits on Jan 15, 2025

Commits on Feb 7, 2025

Commits on Feb 8, 2025

Merge pull request #1021 from mattwang44/extending/building
josix
authored

Commits on Feb 15, 2025

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

Commits on Feb 23, 2025

Commits on Mar 7, 2025

Commits on Mar 8, 2025

translate library/random.po (#1027)

Dr-XYZ
and
mattwang44
authored

Commits on Mar 11, 2025

translate library/os (#1029)

Super1115
and
mattwang44
authored

Commits on Apr 21, 2025

替換：調用/訪問/當前/類別名/搜索/模塊/内/组/獲取/数/示例/文檔/操作系統 (#1022)
PeterDaveHello
authored

Commits on Apr 24, 2025

fix(ci): setup uv in sync workflow (#1032)
mattwang44
authored

Commits on May 4, 2025

Commits on May 6, 2025

Commits on May 10, 2025

Sync with CPython 3.13 (#1041)
pydoc-zh-tw[bot]
authored

Commits on May 11, 2025

sync with cpython 26b6ab49 (#1042)

pydoc-zh-tw[bot]
and
github-actions[bot]
authored

Commits on May 14, 2025

Translate library/cmd.po rst: 13-99 (#1045)
Dr-XYZ
authored

Commits on May 20, 2025

Commits on May 26, 2025

Translate library/venv.po (#1050)

Dr-XYZ
and
mattwang44
authored

Commits on Jun 22, 2025

Translate library/trace.po (#1052)
Dr-XYZ
authored

Commits on Jun 23, 2025

Translate library/zoneinfo.po (#1057)
Dr-XYZ
authored

Commits on Jul 1, 2025

build(deps): bump stefanzweifel/git-auto-commit-action from 5 to 6 (#1081)
dependabot[bot]
authored

Commits on Jul 5, 2025

Commits on Jul 6, 2025

Commits on Jul 11, 2025

Translate `library/xml.sax.utils.po` (#1097)

LamentXU123
and
mattwang44
authored

Commits on Jul 12, 2025

Commits on Jul 14, 2025

Commits on Jul 17, 2025

Commits on Jul 18, 2025

Commits on Jul 22, 2025

Translate library/pydoc.po (#1126)

Dr-XYZ
and
mattwang44
authored

Commits on Jul 28, 2025

Commits on Jul 31, 2025

translate library/contextvars.po

husohome
authored and
mattwang44
committed
Translate library/tkinter.po (#1119)

Dr-XYZ
and
mattwang44
committed

Commits on Aug 21, 2025

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

Dr-XYZ
and
mattwang44
authored

Commits on Aug 22, 2025

Sync with CPython 3.13 (#1133)

authored

Commits on Aug 30, 2025

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