Merge lp:~seb128/apt-ddtp-tools/apt-ddtp-tools into lp:apt-ddtp-tools

[Sebastien Bacher]

[Paride Legovini (paride)]

This is already a big improvement, but I would still find instructions confusing. In particular: if I want to open a new series, should I start with "Opening a new series" or with the earlier steps? Now I know that the earlier steps are needed (...right?), but that's not clear from the checklist alone. Maybe it should be made more explicit.

Also, when "opening a new series", should one proceed to the "Merging new translations from debian" section? By looking at the headers hierarchy, I would say "no", but if the answer is "yes", then the headers hierarchy should be improved.

Nit/cosmetic: this is the first time I see $SERIE being used, instead of $SERIES, even as a singular.

[lp:~seb128/apt-ddtp-tools/apt-ddtp-tools]

113. By Sebastien Bacher on 2025-03-25

Refactor to resolve the issues pointed in the first review

[Sebastien Bacher (seb128)]

@paride: Thanks for the review.

I've refactored the sections a bit more have one part at the beginning about the new series opening follow by another about doing updates (which should happen after the opening of the new cycle but also again during the cycle).

I've also fixed the "series" spelling

[Paride Legovini (paride)]

Thank you, I find it way more clear now. I going ahead merging this, should we want more improvement (likely to happen when we'll try to actually exercise this again) we can iterate with more MPs.

review: Approve

=== modified file 'UbuntuChecklist'
--- UbuntuChecklist	2023-04-14 03:34:17 +0000
+++ UbuntuChecklist	2025-03-25 15:04:55 +0000
@@ -1,10 +1,9 @@
-
-= Checklist for translated package descriptons =
+= Checklist for translated package descriptions =
 
 This document gives a overview how to work with translated 
 package descriptions in ubuntu. You need the tools from:
 {{{
-lp:~mvo/apt-ddtp-tools/trunk
+lp:~ubuntu-release/apt-ddtp-tools/trunk
 }}}
 
 The launchpad project with the bzr branches and imports is
@@ -13,41 +12,78 @@
 https://launchpad.net/ddtp-ubuntu
 }}}
 
-== Preparing the bzr trees ==
+== Opening a new series (for a new ubuntu release) ==
+
+=== Define the series ===
+
+To make easier to copy paste some of the commands from this document
+
+{{{
+export SERIES=<new-series-codename> 
+}}}
+
+
+=== Creating the branches ===
+
+Create the translation branches for the new series (by doing a checkout from the current stable branches and pushing them as $SERIES):
+{{{
+lp:~ubuntu-core-dev/ddtp-ubuntu/ddtp-$SERIES
+}}}
+
+{{{
+lp:~ubuntu-core-dev/ddtp-ubuntu/ddtp-pot-$SERIES
+}}}
+
+=== Preparing the bzr trees ===
 
 Most data is imported and exported via bzr now, you need the
 dirs:
 
-ubuntu/bzr-po-exports/bzr-ddtp-ubuntu-lunar that points to
-lp:~ubuntu-core-dev/ddtp-ubuntu/ddtp-lunar for the exported po files
+ubuntu/bzr-po-exports/bzr-ddtp-ubuntu-$SERIES that points to
+lp:~ubuntu-core-dev/ddtp-ubuntu/ddtp-$SERIES for the exported po files
 
-ubuntu/bzr-pot-imports/bzr-ddtp-pot-lunar that points to
-lp:~ubuntu-core-dev/ddtp-ubuntu/ddtp-pot-lunar for the pot files that LP
+ubuntu/bzr-pot-imports/bzr-ddtp-pot-$SERIES that points to
+lp:~ubuntu-core-dev/ddtp-ubuntu/ddtp-pot-$SERIES for the pot files that LP
 will import from you
 
+{{{
+export SERIES=plucky
+bzr branch lp:~ubuntu-release/apt-ddtp-tools/trunk apt-ddtp-tools
+cd apt-ddtp-tools/ubuntu
+mkdir bzr-po-exports
+cd bzr-po-exports
+bzr branch lp:~ubuntu-core-dev/ddtp-ubuntu/ddtp-$SERIES bzr-ddtp-ubuntu-$SERIES
+cd -
+mkdir bzr-pot-imports
+cd bzr-pot-imports 
+bzr branch lp:~ubuntu-core-dev/ddtp-ubuntu/ddtp-pot-$SERIES bzr-ddtp-pot-$SERIES
+cd -
+}}}
 
-== Opening a new series (for a new ubuntu release) ==
+=== Add the new series on launchpad ===
 
 Go to https://launchpad.net/ddtp-ubuntu/+addseries and add something
-like: "lunar", "The translations for Ubuntu 23.04 'lunar'".
+like: "$SERIES", "The translations for Ubuntu XX.YY '$SERIES'".
 
 Go to
-https://translations.launchpad.net/ddtp-ubuntu/lunar/+translations-settings
-and select target branch like "lp:~ubuntu-core-dev/ddtp-ubuntu/ddtp-lunar" and
+https://translations.launchpad.net/ddtp-ubuntu/$SERIES/+translations-settings
+and select target branch like "lp:~ubuntu-core-dev/ddtp-ubuntu/ddtp-$SERIES" and
 make sure to set the syncronisation settings to import "pot and
 translations".
 
-Push your branch containing the pot files and then request a one-time 
-translation import at
-https://translations.launchpad.net/ddtp-ubuntu/lunar/+request-bzr-import
-
-== Support for alternative series ==
-
-If an update is needed for an alternative series (like "kinetic"),
-you need to alter the file "series.sh". Then everything should
-work magically.
-
-== Update the pot file in rosetta ==
+- https://launchpad.net/ddtp-ubuntu/plucky/+setbranch , set 
+'link to an existing branch' to ~ubuntu-core-dev/ddtp-ubuntu/ddtp-pot-$SERIES
+
+- https://translations.launchpad.net/ddtp-ubuntu/plucky/+link-translations-branch 
+set 'Translations export branch' to ~ubuntu-core-dev/ddtp-ubuntu/ddtp-$SERIES
+
+== Update the translations ==
+
+The following steps should be followed as part of the new serie opening
+but at not limited to it as translations will be refreshed again at 
+other cycle milestones.
+
+=== Update the pot file in rosetta ===
 
 Go into to the ubuntu dir and run:
 {{{
@@ -59,7 +95,21 @@
 in $COMP/ubuntu-ddtp-$comp.pot. They will be uploaded automatically
 via a bzr commit at the end.
 
-== Merging new translations from debian ==
+Push your branch containing the pot files
+{{{
+cd bzr-pot-imports/bzr-ddtp-pot-$SERIES
+bzr push lp:~ubuntu-core-dev/ddtp-ubuntu/ddtp-pot-$SERIES
+}}}
+
+and then request a one-time translation import at
+https://translations.launchpad.net/ddtp-ubuntu/$SERIES/+request-bzr-import
+
+Templates files for the different pockets should be displayed as approved 
+on https://translations.launchpad.net/ddtp-ubuntu/plucky/+imports
+After a bit https://translations.launchpad.net/ddtp-ubuntu/plucky 
+should show translations
+
+=== Merging new translations from debian ===
 
 Go to {{{ubuntu/debian-ddtp-import}}} and run 
 {{{
@@ -72,7 +122,7 @@
 }}}
 and wait until the updates are imported by rosetta
 
-== Uploading new Translations-$lang files to the archive ==
+=== Uploading new Translations-$lang files to the archive ===
 
 Get (or update) the bzr checkout of the export:
 {{{
@@ -92,8 +142,8 @@
 
 It will also generate a package to upload in ubuntu/packages.
 
-== Generate a sync export for debian ==
-Go to jaunty/debian-ddtp-import and run:
+=== Generate a sync export for debian ===
+Go to ubuntu/debian-ddtp-import and run:
 {{{ ./gen-sync.sh }}}
 that will output a lot of files in the missing-in-debian/
 directory.
@@ -104,3 +154,12 @@
 rm *no.same.md5*
 for f in *; do ../ddtp-upload.py $f; done
 }}}
+
+== Other notes ==
+
+=== Support for alternative series ===
+
+If an update is needed for an alternative series (like "kinetic"),
+you need to alter the file "series.sh". Then everything should
+work magically.
+