Merge remote-tracking branch 'origin/master'

weblate/html/mail/footer.html

@@ -13,7 +13,7 @@
 <td>{% trans "Untranslated strings:" %}</th><td>{{ translation.untranslated }} ({{ translation.get_untranslated_percent }}%)</td>
 </tr>
 <tr>
-<td>{% trans "Strings needing review:" %}</th><td>{{ translation.fuzzy }} ({{ translation.get_fuzzy_percent }}%)</td>
+<td>{% trans "Strings marked for review:" %}</th><td>{{ translation.fuzzy }} ({{ translation.get_fuzzy_percent }}%)</td>
 </tr>
 </table>
 

weblate/html/mail/footer.txt

@@ -3,7 +3,7 @@
 {% trans "Total strings:" %} {{ translation.total }}
 {% trans "Translated strings:" %} {{ translation.translated }} ({{ translation.get_translated_percent }}%)
 {% trans "Untranslated strings:" %} {{ translation.untranslated }} ({{ translation.get_untranslated_percent }}%)
-{% trans "Strings needing review:" %} {{ translation.fuzzy }} ({{ translation.get_fuzzy_percent }}%)
+{% trans "Strings marked for review:" %} {{ translation.fuzzy }} ({{ translation.get_fuzzy_percent }}%)
 
 {% blocktrans %}You can translate at {{ translation_url }}{% endblocktrans %}
 {% endfilter%}{% endautoescape %}{% include "mail/signature.txt" %}

weblate/trans/forms.py

@@ -431,7 +431,7 @@ class FilterField(forms.ChoiceField):
             ('nottranslated', _('Not translated strings')),
             ('todo', _('Strings needing attention')),
             ('translated', _('Translated strings')),
-            ('fuzzy', _('Strings needing review')),
+            ('fuzzy', _('Strings marked for review')),
             ('suggestions', _('Strings with suggestions')),
             ('comments', _('Strings with comments')),
             ('allchecks', _('Strings with any failing checks')),

weblate/trans/models/translation.py

@@ -984,15 +984,6 @@ class Translation(models.Model, URLMixin, PercentMixin, LoggerMixin):
             self.translated_words,
         )
 
-        # Not translated strings
-        result.add_if(
-            'nottranslated',
-            _('Not translated strings'),
-            self.total - self.translated - self.fuzzy,
-            'danger',
-            self.total_words - self.translated_words - self.fuzzy_words,
-        )
-
         # Untranslated strings
         result.add_if(
             'todo',
@@ -1002,10 +993,19 @@ class Translation(models.Model, URLMixin, PercentMixin, LoggerMixin):
             self.total_words - self.translated_words,
         )
 
+        # Not translated strings
+        result.add_if(
+            'nottranslated',
+            _('Not translated strings'),
+            self.total - self.translated - self.fuzzy,
+            'danger',
+            self.total_words - self.translated_words - self.fuzzy_words,
+        )
+
         # Fuzzy strings
         result.add_if(
             'fuzzy',
-            _('Strings needing review'),
+            _('Strings marked for review'),
             self.fuzzy,
             'danger',
             self.fuzzy_words,