Skip to content

Fixed translations for zh_TW#3393

Merged
stefanhaller merged 2 commits intojesseduffield:masterfrom
olivertzeng:master
Mar 19, 2024
Merged

Fixed translations for zh_TW#3393
stefanhaller merged 2 commits intojesseduffield:masterfrom
olivertzeng:master

Conversation

@olivertzeng
Copy link

@olivertzeng olivertzeng commented Mar 17, 2024

  • PR Description

Improve translations for Traditional Chinese.

  • Please check if the PR fulfills these requirements
  • Cheatsheets are up-to-date (run go generate ./...)
  • Code has been formatted (see here)
  • Tests have been added/updated (see here for the integration test guide)
  • Text is internationalised (see here)
  • Docs (specifically docs/Config.md) have been updated if necessary
  • You've read through your own file changes for silly mistakes etc

@olivertzeng
Copy link
Author

i really dont know how to do git rebase
someone from somewhere suggest me to do git rebase -i but i really dont know how to edit the file(i know how vim works but dont know how the file works) so what i did is i deleted my repo

i really cant find a good tutorial for using git rebase interactive mode properly3

Copy link
Collaborator

@stefanhaller stefanhaller left a comment

Choose a reason for hiding this comment

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

i really dont know how to do git rebase

It looks like you figured that out, your commits are sitting on master correctly now. (I had to rebase again though, because another PR was merged meanwhile.)

I didn't merge this yet because there are formatting issues. I could have fixed most of them for you, but I wasn't sure whether the ones in traditionalChineseIntroPopupMessage were intentional, see below.

In the future, please don't make PRs from your master branch; create a feature branch for it instead, this makes it easier for us to push changes to it. Thanks.

Comment on lines +41 to +52
感謝你使用 lazygit,你真的很厲害。有三件事要與你分享
感謝使用 lazygit!這裡有一些資源可供參考

1) 如果你想了解 lazygit 的功能,請看這個影片
https://youtu.be/CPLdltN7wgE
1) 📺lazygit 教學📺
https://youtu.be/CPLdltN7wgE

2) 請務必閱讀最新的發布說明
https://github.com/jesseduffield/lazygit/releases
2) 📣釋出說明📣
https://github.com/jesseduffield/lazygit/releases

3) 如果你正在使用 git,那麼就是一個程式設計師!在你的幫助下,
我們可以使 lazygit 變得更好,請考慮成為貢獻者並一起同樂:
https://github.com/jesseduffield/lazygit
你也可以贊助我,並告訴我有什麼要改進的,點擊右下方的捐贈按鈕即可。
就算是只在版本庫中點個星星分享愛也很棒!
3) 💖如果你想要貢獻一份心力你可以💖:
改進 lazygit 原始碼:https://github.com/jesseduffield/lazygit
按右下角的捐款斗內我們
或單存添加 lazygit 到你的 star 清單內以增加曝光度都能大力的幫助我們!
Copy link
Collaborator

Choose a reason for hiding this comment

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

The indentation of this message has changed, is there a reason for it? I suppose you have some auto-formatter that did this automatically. I see that the indentation of the glossary above has also changed.

Copy link
Author

Choose a reason for hiding this comment

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

No I don't. I thought that the indentation isn't necessary. Should I change it back

Copy link
Collaborator

Choose a reason for hiding this comment

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

Yes, I think it would be good to format it in the same way as the english one, unless there are some language rules in Chinese that speak against it.

Copy link
Author

Choose a reason for hiding this comment

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

is it good now

Copy link
Collaborator

Choose a reason for hiding this comment

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

Well, not really, the commit history is still a mess containing merge commits that are impossible to understand, and the file was not auto-formatted correctly. I fixed all this in #3394 as a draft PR, and added a commit to change the indentation back to how it was before; you could now either git reset --hard onto that one and force-push, or we just merge mine. I don't care very much either way.

I do have to say that I found this experience a bit painful, and I don't really like spending time on things like this. On the other hand, I value your contribution and I didn't want your work to be lost, so thanks for your work.

@olivertzeng
Copy link
Author

olivertzeng commented Mar 18, 2024 via email

Authored-by: Oliver Tzeng <olivertzeng@proton.me>
@stefanhaller stefanhaller added the i18n anything i18n related label Mar 19, 2024
@stefanhaller
Copy link
Collaborator

I went ahead and did the git reset for you, and force-pushed, so that we can close this.

@stefanhaller stefanhaller merged commit 1d4448d into jesseduffield:master Mar 19, 2024
@olivertzeng
Copy link
Author

I went ahead and did the git reset for you, and force-pushed, so that we can close this.

yay thanks
ill try to learn git rebase after ive found a good article about git rebase -i

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

i18n anything i18n related

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants