Skip to content

Commit dadadb5

Browse files
authored
Merge branch '3.14' into library/re
2 parents f8fca95 + 5551021 commit dadadb5

File tree

530 files changed

+83285
-57247
lines changed

Some content is hidden

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

530 files changed

+83285
-57247
lines changed

.github/workflows/ci.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,11 @@ jobs:
1313
ci:
1414
runs-on: ubuntu-22.04
1515
steps:
16-
- uses: actions/checkout@v4
16+
- uses: actions/checkout@v5
1717

18-
- uses: actions/setup-python@v5
18+
- uses: actions/setup-python@v6
1919
with:
20-
python-version: "3.13"
20+
python-version: "3.14"
2121

2222
- name: Install Dependencies
2323
run: sudo apt-get install gettext

.github/workflows/deploy-gh-page.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,13 @@ name: deploy-gh-page
33
on:
44
push:
55
branches:
6-
- "3.13"
6+
- "3.14"
77

88
jobs:
99
cd:
1010
runs-on: ubuntu-latest
1111
steps:
12-
- uses: actions/checkout@v4
12+
- uses: actions/checkout@v5
1313

1414
- name: Install Dependencies
1515
run: sudo apt-get install gettext

.github/workflows/py313-sync-cpython.yml renamed to .github/workflows/py314-sync-cpython.yml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,20 @@
1-
name: python-3.13-sync-with-cpython
1+
name: python-3.14-sync-with-cpython
22

33
on:
44
push:
55
branches:
6-
- "3.13"
6+
- "3.14"
77
schedule:
88
- cron: "0 0 * * *"
99

1010
jobs:
1111
sync:
1212
runs-on: ubuntu-latest
1313
env:
14-
VERSION: "3.13"
15-
BRANCH: "cron/sync/3.13"
14+
VERSION: "3.14"
15+
BRANCH: "cron/sync/3.14"
1616
steps:
17-
- uses: actions/checkout@v4
17+
- uses: actions/checkout@v5
1818
with:
1919
ref: ${{ env.VERSION }}
2020

.github/workflows/summarize_progress.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ jobs:
1414
# added or changed files to the repository.
1515
contents: write
1616
steps:
17-
- uses: actions/checkout@v4
17+
- uses: actions/checkout@v5
1818

1919
- name: Install poetry
2020
uses: abatilo/actions-poetry@v4
@@ -27,7 +27,7 @@ jobs:
2727

2828

2929
- name: Checkout wiki code
30-
uses: actions/checkout@v4
30+
uses: actions/checkout@v5
3131
with:
3232
repository: ${{github.repository}}.wiki
3333
path: markdown

.scripts/summarize_progress/main.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ def format_line_po(filename: str, po_link: str, progress: str, num_entries: str,
137137
filedict_sorted = dict(sorted(filedict.items()))
138138
for filename, filedata in filedict_sorted.items():
139139
file_path = f"{dirname}/{filename}" if dirname else filename
140-
po_link = f"https://github.com/python/python-docs-zh-tw/tree/3.13/{file_path}"
140+
po_link = f"https://github.com/python/python-docs-zh-tw/tree/3.14/{file_path}"
141141
issue_link = filedata['issue']
142142
issue_number = f"#{issue_link.split('/')[-1]}"
143143
create_issue_link = f"https://github.com/python/python-docs-zh-tw/issues/new?title=Translate%20`{file_path}`"

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ endef
3838
export PRINT_HELP_PYSCRIPT # End of python section
3939

4040
CPYTHON_CLONE := ../cpython
41-
VERSION := $(or $(VERSION), 3.13)
41+
VERSION := $(or $(VERSION), 3.14)
4242
SPHINX_CONF := $(CPYTHON_CLONE)/Doc/conf.py
4343
LANGUAGE := zh_TW
4444
LC_MESSAGES := $(CPYTHON_CLONE)/Doc/locales/$(LANGUAGE)/LC_MESSAGES

README.rst

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ Python 官方說明文件臺灣繁體中文翻譯計畫
66
:target: https://discord.gg/44XheGXhWH
77
:alt: Join Chat on Discord
88

9-
這是 Python 3.13 官方說明文件的臺灣繁體中文(zh_TW)翻譯。
9+
這是 Python 3.14 官方說明文件的臺灣繁體中文(zh_TW)翻譯。
1010

1111
翻譯之前,請務必詳讀並同意\ `授權與 License`_。參與方式請參考\ `參與翻譯`_。
1212

@@ -133,13 +133,13 @@ the PSF for inclusion in the documentation.
133133

134134
接著在 terminal 裡按照以下步驟:
135135

136-
1. 基於最新版本的 ``upstream/3.13`` 開啟一個 branch,現在假設我們想要翻譯 library/math.po \
136+
1. 基於最新版本的 ``upstream/3.14`` 開啟一個 branch,現在假設我們想要翻譯 library/math.po \
137137
所以把這個 branch 叫做 ``library/math``:
138138

139139
.. code-block:: bash
140140
141141
git fetch upstream
142-
git checkout -b library/math upstream/3.13
142+
git checkout -b library/math upstream/3.14
143143
144144
2. 接著就可以開始翻譯(翻譯時可參考\ `翻譯守則`_),你可以手動開啟 Poedit 應用程式再選 \
145145
library/math.po 檔案打開
@@ -223,7 +223,7 @@ the PSF for inclusion in the documentation.
223223

224224
- 從 upstream(我們的主要 GitHub repo)做 fetch 的動作
225225
- 對 origin(你的 fork)做 push
226-
- 永遠不對 ``3.13`` branch 進行修改,請保持讓這個 branch 唯讀,可以避免掉很多問題。
226+
- 永遠不對 ``3.14`` branch 進行修改,請保持讓這個 branch 唯讀,可以避免掉很多問題。
227227

228228
要翻譯哪些東西
229229
--------------

about.po

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# Copyright (C) 2001-2025, Python Software Foundation
1+
# Copyright (C) 2001 Python Software Foundation
22
# This file is distributed under the same license as the Python package.
33
#
44
# Translators:
@@ -11,7 +11,7 @@
1111
# hsiao yi <[email protected]>, 2015
1212
msgid ""
1313
msgstr ""
14-
"Project-Id-Version: Python 3.13\n"
14+
"Project-Id-Version: Python 3.14\n"
1515
"Report-Msgid-Bugs-To: \n"
1616
"POT-Creation-Date: 2025-01-01 00:15+0000\n"
1717
"PO-Revision-Date: 2022-05-12 00:11+0800\n"

0 commit comments

Comments
 (0)