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

[Haowei Hsu]

Hello Qt Team,

Can you review the following RRs again?

   - l10n(zh_TW): Fix translations of 'Debug' (I59b82e44)
   <https://codereview.qt-project.org/c/qt-creator/qt-creator/+/466977>
   - l10n(zh_TW): Fix translations of 'Filter' (I6687a224)
   <https://codereview.qt-project.org/c/qt-creator/qt-creator/+/467482>

I've rebased them to solve the Merge Conflicts.
---
Haowei Hsu

Haowei Hsu <hwhsu1231 at gmail.com> 於 2023年3月21日 週二 下午1:01寫道：

> Excuse me, Qt Team.
>
> I've submitted: l10n(zh_TW): Fix translations of 'Generator' (Iab696ac7)
> <https://codereview.qt-project.org/c/qt-creator/qt-creator/+/466593> to
> be merged
> since thie Review Request has no Merge Comflict with any of others.
> However, the rest of two have a Merge Conflicts with each other:
>
>    - l10n(zh_TW): Fix translations of 'Debug' (I59b82e44)
>    <https://codereview.qt-project.org/c/qt-creator/qt-creator/+/466977>
>    - l10n(zh_TW): Fix translations of 'Configure' (I82733532)
>    <https://codereview.qt-project.org/c/qt-creator/qt-creator/+/466592>
>
> What should I do to them?
> Should I submit them directly as well?
> Or should do something to resolve the conflict?
> And should I rebase other local branches on the 10.0 branch?
>
> [image: image.png]
> ---
> Haowei Hsu
>
> Haowei Hsu <hwhsu1231 at gmail.com> 於 2023年3月21日 週二 上午1:21寫道：
>
>> Currently, I noticed that the following Review Requests are labeled *"Ready
>> to submit"*.
>> [image: image.png]
>> [image: image.png]
>> And some of them have Merge Conflicts with other Review Requests.
>> I wondered:
>>
>>    - Should I do something to solve the Merge Conflicts myself?
>>    - Or should I leave the rest of works to Qt Team?
>>
>> ---
>> Haowei Hsu
>>
>> Haowei Hsu <hwhsu1231 at gmail.com> 於 2023年3月20日 週一 下午3:47寫道：
>>
>>> Excuse me.
>>>
>>> I want to know where the following message comes from in Qt Creator:
>>>
>>> *Please enter the directory in which you want to build your project. Qt
>>> Creator recommends to not use the source directory for building. This
>>> ensures that the source directory remains clean and enables multiple builds
>>> with different settings.*
>>>
>>> If possible, can someone provide the screenshot of it?
>>> Related Link:
>>> https://codereview.qt-project.org/c/qt-creator/qt-creator/+/467575/comments/1d5c7b0a_63437a5b
>>>
>>> ---
>>> Haowei Hsu
>>>
>>> Haowei Hsu <hwhsu1231 at gmail.com> 於 2023年3月20日 週一 下午3:43寫道：
>>>
>>>> Excuse me, Oswald.
>>>>
>>>> About these 3 Review Requests, do they satisfy the conditions to be
>>>> merged?
>>>>
>>>> ---
>>>> 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/20230322/d8507347/attachment-0001.htm>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: image.png
Type: image/png
Size: 34427 bytes
Desc: not available
URL: <http://lists.qt-project.org/pipermail/localization/attachments/20230322/d8507347/attachment-0003.png>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: image.png
Type: image/png
Size: 21553 bytes
Desc: not available
URL: <http://lists.qt-project.org/pipermail/localization/attachments/20230322/d8507347/attachment-0004.png>
-------------- next part --------------
A non-text attachment was scrubbed...
Name: image.png
Type: image/png
Size: 89488 bytes
Desc: not available
URL: <http://lists.qt-project.org/pipermail/localization/attachments/20230322/d8507347/attachment-0005.png>