I cannot agree with you, Akihiro.
When stable-liberty version was created, we set master version as "Read Only".
Translators had to improve stable-liberty branch.
The corrections made in stable-liberty version is newer than the old translations in master version.
So when I merged, the newer translations will be copied and replaced the old translations.
So the corrections will be moved to the master version.

But the rejections will not.
So it's not a good practise to only reject translations in stable-liberty without input the correct translations.

Could you check in Nova master version?
I think your corrections to IBM translations should be moved to master version.

Best regards
Ying Chun Guo (Daisy)


Akihiro Motoki <amotoki@gmail.com> wrote on 10/08/2015 09:31:36 PM:

> From: Akihiro Motoki <amotoki@gmail.com>
> To: Ying Chun Guo/China/IBM@IBMCN
> Cc: Openstack-i18n <openstack-i18n@lists.openstack.org>
> Date: 10/08/2015 09:32 PM
> Subject: Re: [Openstack-i18n] Approved & rejected translations after
> versions merging
>
> On a second thought, I start to think this can happen in every
> OpenStack release.
>
> What can possibly happen?
>
> Most reviews are done after RC1 is released. It means reviews and
> corrections are done in stable-xxxx branch.
> It is not a rare case that strings are also translated in the master branch.
> In this case, corrections in stable-xxxx branch will not be
> feedback-ed to the master branch
> and this means that translators/reviewers need to do the same thing
> again and can lead to
> inconsistent translations.
>
> What can we do?
>
> I don't think we have a general solution to this.
> Zanata's current behavior may work well in most cases, but does not
> work for us.
>
> One possible solution is to allow language coordinators (or
> reviewers) to upload PO files.
> Language coordinators (or reviewers) can use diff tools locally and
> merge translations
> more efficiently. The demand may be different among languages.
> If they can upload PO files, we can cope with this lang by lang.
>
> Thought?
>
> Akihiro
>
> 2015-10-08 19:37 GMT+09:00 Akihiro Motoki <amotoki@gmail.com>:
> Daisy,
>
> Is there any way to apply modifications made in stable-liberty branch
> to the master branch?
>
> We made a lot of modifications/fixes to strings from IBM translation
> contribution
> in stable-liberty branch. The master branch already has translations because
> it is contributed by IBM, so merging from liberty to master does not help us.
>
> It seems translators or language coordinator cannot upload PO files,
> so I cannot have a way to replace the master translation with the
> liberty version
> in a batch way.
>
> We don't want to check >100 rejected strings and copy >100 modified strings 
> from liberty manually.
>
> Is there any suggestion?
>
> Akihiro
>
> 2015-10-03 2:12 GMT+09:00 Ying Chun Guo <guoyingc@cn.ibm.com>:
> Hi,
>
> A translation could be approved or rejected. This action is called
> translation review.
> A version merging is to copy all matching translated/approved
> translations from the source version to the target version.
> If there is an existing translated/approved translation, the newer
> translation will be used.
> After liberty translations are closed, we will merge translations
> from stable-liberty version to master version,
> and then open both stable-liberty version and master version to
> accept translations.
> I investigated whether translation review would be copied after
> version merging.
>
> Here are the results:
> The review result - "approve" will be copied to the target version,
> while the review result - "reject" will not.
> Only "rejecting" existing translations will not have the same
> translations rejected in master version.
> But "approving" existing translations will have the same
> translations approved in the master version.
> That means, if there are "rejected" translations in stable-liberty,
> it's better to input the correct translations.
>
> The investigation result is OK with me.
> If you have different opinions, please propose here.
> If you want to understand more about version merging, please let me know.
>
> Best regards
> Ying Chun Guo (Daisy)

> _______________________________________________
> Openstack-i18n mailing list
> Openstack-i18n@lists.openstack.org
> http://lists.openstack.org/cgi-bin/mailman/listinfo/openstack-i18n