Re: [Tails-l10n] [Tails-dev] [review'n'merge] Fix download-i…

Nachricht löschen

Nachricht beantworten
Autor: xin
Datum:  
To: Tails localization discussion
Betreff: Re: [Tails-l10n] [Tails-dev] [review'n'merge] Fix download-iso translation
sajolida:
> xin:
>> sajolida:
>>> xin:
>>>> intrigeri:
>>>>> xin:
>>>>>> Hello, I found strange things in the translation of the download-iso
>>>>>> page in the branch feature/15292-usb-image.
>>>>>
>>>>> Sorry, I messed this branch up :/
>>>>>
>>>>> I'll repair what I can once
>>>>> https://redmine.tails.boum.org/code/issues/16205 is solved.
>>>>> This *might* fix the strange things you've found.
>>>>>
>>>>
>>>> Hello, #16205 don't fix that, my branch is still relevant.
>>>
>>> Ok. I merged it into feature/15292-usb-image (42c42ae0e9). I had to
>>> resolve a bunch of weird conflicts, so I hope I didn't mess up...
>>
>> You have merged translate/usb-image (which is not ready) instead of
>> fix_download-iso_translation...
>
> Oops! I merged this one as well now.
>
> I hope that my early merge of translate/usb-image won't be a problem.
> Please tell me if you think it is and I'll talk about how to solve this
> with intrigeri.


I'm working on a new version of this branch.
I think it's ok, I just have some conflicts to resolve.