diff options
| author | alaaosh <alaaosh@54714841-351b-0410-a198-e36a94b762f5> | 2009-12-15 18:22:00 (GMT) |
|---|---|---|
| committer | Sayamindu Dasgupta <sayamindu@gmail.com> | 2010-01-08 22:38:18 (GMT) |
| commit | 9779c4b894953af37ea668bbbdb6ded5037ed42f (patch) | |
| tree | f5fc1a07979b917486d0e9d7ec872125be0be2ef | |
| parent | 91d6256671e26e83034b170f333ec7cdc193c597 (diff) | |
turn conflicting translations into suggestions when updating from version control.
git-svn-id: https://translate.svn.sourceforge.net/svnroot/translate/src/branches/Pootle-2.0/Pootle@13512 54714841-351b-0410-a198-e36a94b762f5
| -rw-r--r-- | Pootle-2.0.0/local_apps/pootle_app/models/translation_project.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Pootle-2.0.0/local_apps/pootle_app/models/translation_project.py b/Pootle-2.0.0/local_apps/pootle_app/models/translation_project.py index 340718c..ff5b983 100644 --- a/Pootle-2.0.0/local_apps/pootle_app/models/translation_project.py +++ b/Pootle-2.0.0/local_apps/pootle_app/models/translation_project.py @@ -219,7 +219,7 @@ class TranslationProject(models.Model): #FIXME: try to avoid merging if file was not updated logging.debug("merging %s with version control update", store.file.path) - store.mergefile(working_copy, "versionmerge", allownewstrings=False, suggestions=False, notranslate=False, obsoletemissing=False) + store.mergefile(working_copy, "versionmerge", allownewstrings=False, suggestions=True, notranslate=False, obsoletemissing=False) try: hooks.hook(self.project.code, "postupdate", store.file.path) |