[6.0][BUGS#1164] Fix properly reloading TMX after team synchronization

[miurahr]

• [BUGS#1164] Fix properly reloading TMX after team synchronization (#730)
• [BUGS#1164] Fix reloading TMX after team synchronization (#645)
• [BUGS#1164] fix: break project translation when rebase and commit (#733)

• Extend RebaseAndCommit.IRebase interface to add reload method

• Control reload of projectTMX in RebaseAndCommit#rebaseAndCommit method.

• When saving a team project and another member have updated translations and OmegaT run rebaseAndCommit, enforce TM become removed from the result. The change here to change that when merge TMX from remote and local, we save it into file, but DON'T replace it in projectTMX. We reload the file when necessary, in RebaseAndCommit.IRebase#reload. It changes RealProject#mergeTMX to return merged TMX and the caller should handle the tmx.

• fix: RebaseAndCommit: force load when no changes

(cherry picked from commit 4e00736372fc1a88fb35920136bc754302cb4e64) (cherry picked from commit 1f4069bcf9adcf17412b48707df7eafe708fc7d5) (cherry picked from commit 49d5720732e445bdecde5de0da5bd413de420416) Signed-off-by: Hiroshi Miura [email protected] Co-authored-by: Briac Pilpré [email protected] Signed-off-by: Hiroshi Miura [email protected]

Pull request type

• Bug fix -> [bug]

Which ticket is resolved?

• Translation memories are not correctly reloaded after team synchronization
• https://sourceforge.net/p/omegat/bugs/1164/

What does this PR change?

Other information