Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings

feat(translate): wsgiref.po#641

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to ourterms of service andprivacy statement. We’ll occasionally send you account related emails.

Already on GitHub?Sign in to your account

Merged
mattwang44 merged 6 commits intopython:3.12fromneo-maker-sudo:feat/wsgiref
Nov 6, 2023

Conversation

neo-maker-sudo
Copy link
Contributor

Changed Description

  • Add partial document translation from english to traditional chinese

@neo-maker-sudo
Copy link
ContributorAuthor

我要先在 github 直接解衝突嗎，衝突應該是 format 的關係導致的

@mattwang44
Copy link
Collaborator

看起來你是直接沿用之前的那支 branch，要請先在 loval 上 rebase 到最新的 3.12 branch 再推上來（從 github 上看只能剩下新加的 commits），rebase 過程中應該也會有 conflict 就也要請你在 local 先解掉。如果不知道怎麼下 git command 再敲我討論囉

neo-maker-sudo reacted with eyes emoji

Copy link
Collaborator

@mattwang44mattwang44 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

review part 1 -- 格式問題

@mattwang44
Copy link
Collaborator

CI 沒有過歐，要請你修掉 🙏🏽

應該是跟全形括號相關 (ref)

@neo-maker-sudo
Copy link
ContributorAuthor

好的，沒問題

Copy link
Collaborator

@mattwang44mattwang44 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

修正簡中用詞

  • mapping: 映射 -> 對映
  • default: 默認 -> 預設
  • stream: 流 -> 串流
  • subclass: 子類 -> 子類別
  • command line: 命令行 -> 命令列
  • implement: 實現 -> 實作
  • client: 客戶端 -> 用戶端
  • message: 信息 -> 訊息
  • call: 調用 -> 呼叫
  • compatible: 兼容 -> 相容

neo-maker-sudo reacted with thumbs up emoji
@neo-maker-sudo
Copy link
ContributorAuthor

matt 大，抱歉我前陣子因為工作比較忙忘記後續修改的部分，近期會把 PR 完成

@neo-maker-sudo
Copy link
ContributorAuthor

neo-maker-sudo commentedNov 1, 2023•
edited
Loading

痾... 我好像弄錯了，我想問這個分支好像太久沒使用，local rebase 有發生其他檔案衝突，我直接都改成不是 HEAD 的內容，之後再 Force Push 嗎

@mattwang44
Copy link
Collaborator

mattwang44 commentedNov 5, 2023•
edited
Loading

@neo-maker-sudo

matt 大，抱歉我前陣子因為工作比較忙忘記後續修改的部分，近期會把 PR 完成

沒關係我也是XD 有空再來幫忙就好，需要有人接力也沒關係

我直接都改成不是 HEAD 的內容，之後再 Force Push 嗎

要先 rebase 到最新的版本之上後再來解 conflicts

不確定你有沒有設定過指到這個 repo 的 remote repo，如果沒有的話可以用以下指令新增一個叫python 的 remote repo

git remote add python git@github.com:python/python-docs-zh-tw.git

然後每次 rebase 前都記得要先 fetch 最新的版本

git fetch pythongit rebase python/3.12# may need to resolve the conflicts
neo-maker-sudo reacted with laugh emoji

@neo-maker-sudo
Copy link
ContributorAuthor

好的，瞭解，不確定這樣是否正確，再麻煩檢查了，感謝

@mattwang44
Copy link
Collaborator

@neo-maker-sudo commit history 還是有別隻 branch 的 commit，你可以嘗試把多餘的那個 commit (a78f1d6a4a911fa668a7a24de05d542c02e925c9 ) drop 掉再 force push 上來嗎？

neo-maker-sudo reacted with thumbs up emoji

Copy link
Collaborator

@mattwang44mattwang44 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

應該是最後一 part 了，這邊修完就 merge!

@mattwang44mattwang44 linked an issueNov 5, 2023 that may beclosed by this pull request
@mattwang44
Copy link
Collaborator

  • 3.12 branch 有更新，請再 rebase 一次
  • 還有一些 comment 沒修到歐，不知道是不是漏掉了？
neo-maker-sudo reacted with thumbs up emoji

@neo-maker-sudo
Copy link
ContributorAuthor

好的，我漏掉了，我改一下

Copy link
Collaborator

@mattwang44mattwang44 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others.Learn more.

LGTM 辛苦了！

@mattwang44mattwang44 merged commit02d46f1 intopython:3.12Nov 6, 2023
isabellechiu pushed a commit to isabellechiu/python-docs-zh-tw that referenced this pull requestDec 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 <neochang@neochangOsenseTech.local>
beccalzh pushed a commit to beccalzh/python-docs-zh-tw that referenced this pull requestSep 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 <neochang@neochangOsenseTech.local>
Sign up for freeto join this conversation on GitHub. Already have an account?Sign in to comment
Reviewers

@mattwang44mattwang44mattwang44 approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Translate library/wsgiref.po
2 participants
@neo-maker-sudo@mattwang44
[8]ページ先頭
©2009-2025 Movatter.jp