[ANNOUNCE] Branch libreoffice-4-0-1 created

Hi all,

there have been created the libreoffice-4-0-1 branch. It will be used
for fine tuning of the 4.0.1 release.

The following rules apply:

        + preferably just translation or blocker fixes
  + only cherry-picking from libreoffice-4-0 branch
  + 2 additional reviews needed; 2nd reviewer pushes
  + no regular merges back to anything

The 'libreoffice-4-0' branch is still active and will be used for the
4.0.2 bugfix release. Please read more at

       http://wiki.documentfoundation.org/ReleasePlan
       http://wiki.documentfoundation.org/Development/Branches

Now, if you want to switch your clone to the branch, please do:

./g pull -r
./g checkout -b libreoffice-4-0-1 origin/libreoffice-4-0-1

Hopefully it will work for you :slight_smile: Most probably, you will also want to
do (if you haven't done it yet):

git config --global push.default tracking

When you do git push with this, git will push only the branch you are
on; e.g. libreoffice-4-0-1 when you have switched to it. This will
save you some git shouting at you.

Happy hacking,
Petr

Hi :slight_smile:
Sorry.  I am fairly new to all this and have no idea what is meant.  Does it mean the translations for the 'previous' 4.0.1 branch gets copied en-masse to the newer 4.0.2? 
Regards from
Tom :slight_smile:

Hi Tom,

good question. The announce might be a bit misleading for translators
because it primary describes code change handling. The workflow for
translations is much easier.

Translators primary works with pootle and do not need to mind about the
source code branches. The last translations from pootle are always
committed in the right source branch by Andras Timar before each
release/tag.

Note that 4.0.X are bug fix releases. There should not be new
strings[*]. So, one branch for 4.0 release is enough in pootle.

[*] A string might be modified even after the string freeze if it is
needed to fix a serious bug. In this case, the original English string
is updated in pootle by Andras, the related translations become fuzzy
and should get translated in Pootle before next release/tag.

I hope that it is more clear now. Maybe, I should not send these
announcements to the l10n list. It was meant as a head up to make people
aware about the tag. It means that all further changes will in the next
build :slight_smile:

Best Regards,
Petr

Tom Davies píše v St 20. 02. 2013 v 11:49 +0000:

Hi :slight_smile:
I liked the announcement so please don't stop doing them!  Even though i didn't understand it this time i will have a better understanding of it next time.

Now i have another question though!  If you know something specific has had no new strings between 1 branch and the next could it be brought forwards to the new branch en-masse in the same way?  Even if it was incomplete last time?

Within a branch makes a LOT of sense and it's a huge relief to hear that is being done already!  :slight_smile:
Thanks and regards from
Tom :slight_smile:

Tom Davies píše v St 20. 02. 2013 v 19:08 +0000:

Hi :slight_smile: I liked the announcement so please don't stop doing them! Even
though i didn't understand it this time i will have a better
understanding of it next time.

ok, will continue in sending them :slight_smile:

Now i have another question though! If you know something specific has
had no new strings between 1 branch and the next could it be brought
forwards to the new branch en-masse in the same way? Even if it was
incomplete last time?

Within a branch makes a LOT of sense and it's a huge relief to hear
that is being done already! :slight_smile:

I am not sure if I understand it correctly. Do you suggest that if you
translated a string in the 4.0 branch, it should add the same
translation to the 3.6 branch and vice versa?

Such thing would make sense. I am not sure if pootle do this
automatically or if Andras does some hackery when synchronizing pootle
and git sources.

Best Regards,
Petr