Date: prev next · Thread: first prev next last
2014 Archives by date, by thread · List index

2014-12-12 11:56 GMT+00:00 Mihovil Stanic <>:

12.12.2014 u 12:45, Stanislav Horáček je napisao/la:

This workflow means that everyone is forced to work on master - otherwise
it is needed to translate the same strings again and again in branches
which makes no sense.

And that's why I am confused - because we were assured that it will be
possible to choose between working on master and working on branches.

In my head is like this:
- Master is updated every day in pootle, but only source strings. If you
translate something, it will stick, but only if dev doesn't change source
string again (which is possible since it's work in progress).
- When 6 months passes, everything is moved to "stable" branch, including

This is where is gets tricky. How do you transfer translations between
master and stable?

What if I updated some translations only in stable? Do they get backported
to master?

That is exactly my problem. How do they get merged?

Let´s see. I don´t want to work on master so I don´t. But between releases,
let´s assume 4.5 and 4.4, I´m working on 4.4 only. But there is a master
project in pootle. So if 4.5 is built upon master, changes I´ve made in 4.4
branch will not be in 4.5. And I will have to do it all and over again? But
I don´t keep a journal with changed strings and I supposed not many people
do. And even if I manage to keep a journal, which i don´t want,isn´t this
worse than what we have right now?

On the other hand, if changes made on 4.4 branch make it their way to
master and back to 4.5 branch that´s ok.

But, to make it even more complicated, what happens if we work on master
and 4.4 branch? I change on master some strings that are from 4.4 branch
and don´t update 4.4? When strings from 4.4 make their way to master
(assuming 4.4->master->4.5), strings changed in master will be replaced by
ones in 4.4 or won´t they. I don´t know, it´s very unclear to me.

Anyway, as long as they don't delete my translations in stable, I don't
have anything against master branch, but I will probably not use it.


To unsubscribe e-mail to:
Posting guidelines + more:
List archive:
All messages sent to this list will be publicly archived and cannot be

Sérgio Marques

To unsubscribe e-mail to:
Posting guidelines + more:
List archive:
All messages sent to this list will be publicly archived and cannot be deleted


Privacy Policy | Impressum (Legal Info) | Copyright information: Unless otherwise specified, all text and images on this website are licensed under the Creative Commons Attribution-Share Alike 3.0 License. This does not include the source code of LibreOffice, which is licensed under the Mozilla Public License (MPLv2). "LibreOffice" and "The Document Foundation" are registered trademarks of their corresponding registered owners or are in actual use as trademarks in one or more countries. Their respective logos and icons are also subject to international copyright laws. Use thereof is explained in our trademark policy.