From soroush.rabiei at gmail.com Sun May 27 20:48:18 2018 From: soroush.rabiei at gmail.com (Soroush Rabiei) Date: Sun, 27 May 2018 23:18:18 +0430 Subject: [Localization] Branching scheme Message-ID: Hi I've been localizing Qt back in Qt 4 days (there was gitorious and stuff) and now I seem not be able to find out the new way to do the translations. Reading the wiki didn't help much... So as far as I know, the work must start with 5.6 LTS branch and be merged on 5.9 and then 5.11 right? I am not sure how to do this in git. Cheers, Soroush -------------- next part -------------- An HTML attachment was scrubbed... URL: From oswald.buddenhagen at qt.io Mon May 28 12:14:57 2018 From: oswald.buddenhagen at qt.io (Oswald Buddenhagen) Date: Mon, 28 May 2018 12:14:57 +0200 Subject: [Localization] Branching scheme In-Reply-To: References: Message-ID: <20180528101457.GB14137@troll08> On Sun, May 27, 2018 at 11:18:18PM +0430, Soroush Rabiei wrote: > So as far as I know, the work must start with 5.6 LTS branch and be merged > on 5.9 and then 5.11 right? > there is no obligation to translate the LTS branches, though it is certainly welcomed. and because the merge scheme is as you described, you can't really revise the decision to skip an older version. (translations are an exception here - other modules cherry-pick to the LTS branches). > I am not sure how to do this in git. > there isn't really much to do in the first place ... you do the translation for 5.6, have it integrated. then a forward merge happens (it's trivial, because there isn't actually anything to merge), and the translations show up in the 5.9 template, which you can start working on now. and so on ...