[Localization] Dear Qt Team, I would like to contribute the translation of "Chinese (Taiwan)" to Qt/QtCreator.

[Haowei Hsu]

>
> >
> >   1. *How to solve these conflicts? Rebase?*
> >
> cherry-pick them into the same branch and resolve the conflicts as you
> go. then re-push them together.
>


>   4. *If one of them passes the review and is merged, what should I do to
> >   others?*
> >
> you'll need to merge them in order, at least the ones which have diff
> dependencies.


 About the 1 and 4, I wondered whether I should:

   - *merge all of them into a new Review Request?*
   - *or merge them into the 10.0 branch in order individually after
   passing the review?*

---
Haowei Hsu

Haowei Hsu <hwhsu1231 at gmail.com> 於 2023年3月20日 週一 下午12:46寫道：

> Currently, the following 3 Review Requests are added *+1* by both *Franklin
> Weng* and *Yi-Jyun Pan*, and don't have Merge Conflicts:
>
>    - l10n(zh_TW): Fix translations of 'Code Style' (I744b139c)
>    <https://codereview.qt-project.org/c/qt-creator/qt-creator/+/467489>
>    - l10n(zh_TW): Fix translations of 'Repository' (Idc23f518)
>    <https://codereview.qt-project.org/c/qt-creator/qt-creator/+/467485>
>    - l10n(zh_TW): Fix translations of 'Generator' (Iab696ac7)
>    <https://codereview.qt-project.org/c/qt-creator/qt-creator/+/466593>
>
> Should these Review Requests be merged first?
>
> ---
> Haowei Hsu
>
> Haowei Hsu <hwhsu1231 at gmail.com> 於 2023年3月20日 週一 上午11:23寫道：
>
>> >   3. *When should I solve these conflicts?*
>>> >
>>> now
>>
>>
>>> >   4. *If one of them passes the review and is merged, what should I do
>>> to
>>> >   others?*
>>> >
>>> you'll need to merge them in order, at least the ones which have diff
>>> dependencies.
>>
>>
>> About the 3 and 4, shouldn't I wait for the Review Request passing the
>> review, and then solve the its conflicts?
>>
>> ---
>> Haowei Hsu
>>
>> Oswald Buddenhagen <oswald.buddenhagen at gmx.de> 於 2023年3月20日 週一 上午1:27寫道：
>>
>>> On Sun, Mar 19, 2023 at 11:09:31PM +0800, Haowei Hsu wrote:
>>> >So far, I have opened a few Review Request waiting to be reviewed and
>>> >merged.
>>> >And I noticed that there are some conflicts between some of them.
>>> >
>>> >   1. *How to solve these conflicts? Rebase?*
>>> >
>>> cherry-pick them into the same branch and resolve the conflicts as you
>>> go. then re-push them together.
>>>
>>> you'll need to use `git rebase -i` if you need to fix the commits
>>> subsequently.
>>>
>>> >   3. *When should I solve these conflicts?*
>>> >
>>> now
>>>
>>> >   4. *If one of them passes the review and is merged, what should I do
>>> to
>>> >   others?*
>>> >
>>> you'll need to merge them in order, at least the ones which have diff
>>> dependencies.
>>> _______________________________________________
>>> Localization mailing list
>>> Localization at qt-project.org
>>> https://lists.qt-project.org/listinfo/localization
>>>
>>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.qt-project.org/pipermail/localization/attachments/20230320/25a37e89/attachment-0001.htm>