Re: [Geary] Call for testing and translations: 0.11.1

2016-06-23 10:42 GMT-03:00 Michael Gratton <mike vee net>:

Hey Federico,

On Thu, Jun 23, 2016 at 6:52 PM, Federico Bruni <fede inventati org> wrote:
Il giorno gio 23 giu 2016 alle 10:28, Michael Gratton <mike vee net> ha scritto:
For translations, please also use the "geary-0.11" branch. Details are
here: <>.

If I update the po file in the geary-0.11 branch, the updates will be synced to master?
Probably not, since the .pot templates in each branch are different. Does it mean that I'm forced to do the work twice? Even if it wouldn't be a big deal, as I've only few strings to update, I'm curious to understand the best workflow.

Good question. It might depend on the workflow/toolset ou are using. Using Git for example it should be possible to translate the stable branch first, then use git to cherry pick the changes into master - just so long as the two branches have not diverged too far then it should apply automatically. If using Damned Lies there may be a similar option, but I haven't used it, so couldn't say.

Ideally, string changes in the stable branch should be pretty minimal if not none-existent anyway, so hopefully even as the branches diverge by quite a lot there shouldn't be much extra translation work to be done. There have been a number of string changes this time around however, mostly since a number bugs fixed were related to how Geary's handling of translations.
Damned-Lies provides an option that performs cherry-pick. After performing 'Ready for submission' from action drop-down menu, the 'Send to repository' action will be available. In such action, the checkbox 'Sync with master' will be visible if the branch is other than master (e.g. geary-0.11). Such action tries to perform cherry-pick when committing to GNOME Git repositories. Please notice that both actions I mentioned are available only for Committer and Coordinator roles, and the checkbox won't be visible if contributing to master branch.

Please see image, part of screenshot I took. URL:

Rafael Fontenelle

[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]