Merge remote-tracking branch 'origin/master'

trans/forms.py

@@ -105,7 +105,8 @@ class MergeForm(forms.Form):
     merge = forms.IntegerField()
 
 class AutoForm(forms.Form):
-    overwrite = forms.BooleanField(label = _('Overwrite entries'), required = False, initial = False)
+    overwrite = forms.BooleanField(label = _('Overwrite strings'), required = False, initial = False)
+    inconsistent = forms.BooleanField(label = _('Replace inconsistent'), required = False, initial = False)
     subproject = forms.ChoiceField(label = _('Subproject to use'), required = False, initial = '')
 
     def __init__(self, obj, *args, **kwargs):

trans/views.py

@@ -145,9 +145,12 @@ def auto_translation(request, project, subproject, lang):
     autoform = AutoForm(obj, request.POST)
     change = None
     if autoform.is_valid():
-        units = obj.unit_set.all()
-        if not autoform.cleaned_data['overwrite']:
-            units = units.filter(translated = False)
+        if autoform.cleaned_data['inconsistent']:
+            units = obj.unit_set.filter_type('inconsistent')
+        elif autoform.cleaned_data['overwrite']:
+            units = obj.unit_set.all()
+        else:
+            units = obj.unit_set.filter(translated = False)
 
         sources = Unit.objects.filter(translation__language = obj.language, translated = True)
         if autoform.cleaned_data['subproject'] == '':