feat(translate): wsgiref.po #641
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
我要先在 github 直接解衝突嗎，衝突應該是 format 的關係導致的 |
|
看起來你是直接沿用之前的那支 branch，要請先在 loval 上 rebase 到最新的 3.12 branch 再推上來（從 github 上看只能剩下新加的 commits），rebase 過程中應該也會有 conflict 就也要請你在 local 先解掉。如果不知道怎麼下 git command 再敲我討論囉 |
neo-maker-sudo
force-pushed
the
feat/wsgiref
branch
from
6fc82c7 to
3cec2fb
Compare
|
CI 沒有過歐，要請你修掉 🙏🏽 應該是跟全形括號相關 (ref) |
|
好的，沒問題 |
mattwang44
reviewed
Sep 15, 2023
neo-maker-sudo
force-pushed
the
feat/wsgiref
branch
from
2bfc19d to
ab27f17
Compare
|
matt 大，抱歉我前陣子因為工作比較忙忘記後續修改的部分，近期會把 PR 完成 |
|
痾... 我好像弄錯了，我想問這個分支好像太久沒使用，local rebase 有發生其他檔案衝突，我直接都改成不是 HEAD 的內容，之後再 Force Push 嗎 |
沒關係我也是XD 有空再來幫忙就好，需要有人接力也沒關係
要先 rebase 到最新的版本之上後再來解 conflicts 不確定你有沒有設定過指到這個 repo 的 remote repo，如果沒有的話可以用以下指令新增一個叫 git remote add python [email protected]:python/python-docs-zh-tw.git然後每次 rebase 前都記得要先 fetch 最新的版本 git fetch python
git rebase python/3.12 # may need to resolve the conflicts |
neo-maker-sudo
force-pushed
the
feat/wsgiref
branch
from
ab27f17 to
9593754
Compare
|
好的，瞭解，不確定這樣是否正確，再麻煩檢查了，感謝 |
|
@neo-maker-sudo commit history 還是有別隻 branch 的 commit，你可以嘗試把多餘的那個 commit ( |
neo-maker-sudo
force-pushed
the
feat/wsgiref
branch
from
9593754 to
f0b45b4
Compare
|
|
好的，我漏掉了，我改一下 |
…tional chinese from rst:87 to rst:845
…e word and correcting rst syntax issue
…e word and correcting rst syntax issue part 2
neo-maker-sudo
force-pushed
the
feat/wsgiref
branch
from
9612a8c to
45e4402
Compare
isabellechiu
pushed a commit
to isabellechiu/python-docs-zh-tw
that referenced
this pull request
Dec 5, 2023
* docs(wsgiref): add partial document translation from english to traditional chinese from rst:87 to rst:845 * docs(wsgiref): modified wsgiref.po for formatting via powrap library * docs(wsgiref): modified format issue at rst:250, rst:260, rst:816, rst:845 * docs(wsgiref): modified sphinx rst syntax issue * docs(wsgiref): modified simplified chinese word to traditional chinese word and correcting rst syntax issue * docs(wsgiref): modified simplified chinese word to traditional chinese word and correcting rst syntax issue part 2 --------- Co-authored-by: neochang <[email protected]>
beccalzh
pushed a commit
to beccalzh/python-docs-zh-tw
that referenced
this pull request
Sep 4, 2024
* docs(wsgiref): add partial document translation from english to traditional chinese from rst:87 to rst:845 * docs(wsgiref): modified wsgiref.po for formatting via powrap library * docs(wsgiref): modified format issue at rst:250, rst:260, rst:816, rst:845 * docs(wsgiref): modified sphinx rst syntax issue * docs(wsgiref): modified simplified chinese word to traditional chinese word and correcting rst syntax issue * docs(wsgiref): modified simplified chinese word to traditional chinese word and correcting rst syntax issue part 2 --------- Co-authored-by: neochang <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Changed Description