Hi maxdroid,
there mergeconflict still persists- there is still a commit that edits
the release notes. i guess the solution would be either create a new
branch off master with only the changes that relate to the partners page
or reset the existing branch back to a state that does not contain the
release note changes (i guess that would be
9f9b2193a9a55dc6251a5899ea9ce56cb55607da) and then readd the parnters
page and do a force push.
i know git can be pretty complicated sometimes- if you need help just ask ;)
lg & cheers,
muri
On 04/05/2018 03:24 PM, Max wrote:
> I'm sorry. Haven't noticed it. Hope it works now.
>
> Cheers and thanks
> max
>
> -------- Original-Nachricht --------
> An 5. Apr. 2018, 15:03, Muri Nicanor schrieb:
>
>> Hi maxdroid,
>>
>> thanks- there is now a merge conflict, because that branch also changes
>> wiki/src/news/version_3.6.2.de.po (in
>> a28e33a3a73fc2a1a08d3414c20c8fc5478c4901). Could you fix that?
>>
>> thanks,
>> cheers,
>> muri
>>
>> On 04/05/2018 02:18 PM, Max wrote:
>>> hi muri,
>>>
>>> the repository is now https://gitlab.com/MaxDroid42/tails
>>> Branch: translation/partners
>>> Commit: 4486588b067b1c15aff231c0abbae942386bede6
>>>
>>> thanks for looking over it.
>>>
>>> cheers
>>> max
>>>
>>> ‐‐‐‐‐‐‐ Original Message ‐‐‐‐‐‐‐
>>>
>>> On 5 April 2018 1:31 PM, Muri Nicanor <muri@???> wrote:
>>>
>>>> Hi maxdroid,
>>>>
>>>> thanks for helping out with translations!
>>>>
>>>> Could you please split the individual translations in seperate branches?
>>>>
>>>> At the moment there is only one branch for both the partners and the
>>>>
>>>> upgrade translation, which makes it harder to review translations that
>>>>
>>>> belong together.
>>>>
>>>> (Also there are two files in that branch that don't belong to the
>>>>
>>>> translation (config/chroot_local-patches/Desktop-Notify and
>>>>
>>>> config/chroot_local-patches/live-boot) - i guess those are remains of a
>>>>
>>>> build...)
>>>>
>>>> thanks again,
>>>>
>>>> if there are any questions, feel free to ask!
>>>>
>>>> cheers,
>>>>
>>>> muri
>>>>
>>>> On 03/30/2018 11:10 AM, MaxDroid42@??? wrote:
>>>>
>>>>> I am sorry. I forgot the commit. It is 296d625...
>>>>>
>>>>> Tails-l10n mailing list
>>>>>
>>>>> Tails-l10n@???
>>>>>
>>>>> [https://mailman.boum.org/listinfo/tails-l10n](<a href=)">https://mailman.boum.org/listinfo/tails-l10n">[https://mailman.boum.org/listinfo/tails-l10n](<a href=)">https://mailman.boum.org/listinfo/tails-l10n">https://mailman.boum.org/listinfo/tails-l10n">https://mailman.boum.org/listinfo/tails-l10n">[https://mailman.boum.org/listinfo/tails-l10n](<a href=)">https://mailman.boum.org/listinfo/tails-l10n
>>>>>
>>>>> To unsubscribe from this list, send an empty email to Tails-l10n-unsubscribe@???.
>>>>
>>>> Tails-l10n mailing list
>>>>
>>>> Tails-l10n@???
>>>>
>>>> [https://mailman.boum.org/listinfo/tails-l10n](<a href=)">https://mailman.boum.org/listinfo/tails-l10n">[https://mailman.boum.org/listinfo/tails-l10n](<a href=)">https://mailman.boum.org/listinfo/tails-l10n">https://mailman.boum.org/listinfo/tails-l10n">https://mailman.boum.org/listinfo/tails-l10n">[https://mailman.boum.org/listinfo/tails-l10n](<a href=)">https://mailman.boum.org/listinfo/tails-l10n
>>>>
>>>> To unsubscribe from this list, send an empty email to Tails-l10n-unsubscribe@???.
>>>
>>>
>>> _______________________________________________
>>> Tails-l10n mailing list
>>> Tails-l10n@???
>>> [https://mailman.boum.org/listinfo/tails-l10n](<a href=)">https://mailman.boum.org/listinfo/tails-l10n">[https://mailman.boum.org/listinfo/tails-l10n](<a href=)">https://mailman.boum.org/listinfo/tails-l10n">https://mailman.boum.org/listinfo/tails-l10n">https://mailman.boum.org/listinfo/tails-l10n">[https://mailman.boum.org/listinfo/tails-l10n](<a href=)">https://mailman.boum.org/listinfo/tails-l10n
>>> To unsubscribe from this list, send an empty email to Tails-l10n-unsubscribe@???.
>>>
>>
>> _______________________________________________
>> Tails-l10n mailing list
>> Tails-l10n@???
>> [https://mailman.boum.org/listinfo/tails-l10n](<a href=)">https://mailman.boum.org/listinfo/tails-l10n">[https://mailman.boum.org/listinfo/tails-l10n](<a href=)">https://mailman.boum.org/listinfo/tails-l10n">https://mailman.boum.org/listinfo/tails-l10n">https://mailman.boum.org/listinfo/tails-l10n">[https://mailman.boum.org/listinfo/tails-l10n](<a href=)">https://mailman.boum.org/listinfo/tails-l10n
>> To unsubscribe from this list, send an empty email to Tails-l10n-unsubscribe@???.
>>
>>
>> _______________________________________________
>> Tails-l10n mailing list
>> Tails-l10n@???
>> https://mailman.boum.org/listinfo/tails-l10n
>> To unsubscribe from this list, send an empty email to Tails-l10n-unsubscribe@???.
