Merge remote-tracking branch 'origin/master'

docs/admin/projects.rst

@@ -277,9 +277,9 @@ strings in the message:
 ``%(total)s``
     Total strings count
 ``%(fuzzy)s``
-    Fuzzy strings count
+    Count of strings needing review
 ``%(fuzzy_percent)s``
-    Fuzzy strings percent
+    Percent of strings needing review
 ``%(translated)s``
     Translated strings count
 ``%(translated_percent)s``

docs/api.rst

@@ -160,7 +160,7 @@ Weblate provides various exports to allow you further process the data.
     ``failing``, ``failing_percent``
         number and percentage of failing checks
     ``fuzzy``, ``fuzzy_percent``
-        number and percentage of fuzzy strings
+        number and percentage of strings needing review
     ``total_words``
         total number of words
     ``translated_words``

docs/changes.rst

@@ -33,6 +33,7 @@ Released on ? 2015.
 * Improved translation locking.
 * Added quality check for AngularJS interpolation.
 * Added extensive group based ACLs.
+* Clarified terminology on strings needing review (formerly fuzzy).
 
 weblate 2.4
 -----------

docs/faq.rst

@@ -166,7 +166,7 @@ Weblate provides you several ways to utilize existing translations while
 translating:
 
 - You can use import functionality to load compendium as translations,
-  suggestions or fuzzy translations. This is best approach for one time
+  suggestions or translations needing review. This is best approach for one time
   translation using compedium or similar translation database.
 - You can setup :ref:`tmserver` with all databases you have and let Weblate use
   it. This is good for case when you want to use it for several times during

docs/user/files.rst

@@ -46,12 +46,12 @@ Add as translation
 Add as a suggestion
     Imported translations are added as suggestions, do this when you want to
     review imported strings.
-Add as fuzzy translation
-    Imported translations are added as fuzzy translations. This can be useful
+Add as translation needing review
+    Imported translations are added as translations needing review. This can be useful
     for review as well.
 
 Additionally, when adding as a translation, you can choose whether to overwrite
-already translated strings or not or how to handle fuzzy strings in imported
+already translated strings or not or how to handle strings needing review in imported
 file.
 
 .. image:: ../images/export-import.png

docs/user/translating.rst

@@ -5,10 +5,10 @@ Translation links
 -----------------
 
 Once you navigate to a translation, you will be shown set of links which lead
-to translation. These are results of various checks, like untranslated or fuzzy
-strings. Should no other checks fire, there will be still link to all
-translations. Alternatively you can use search field to find translation you
-need to fix.
+to translation. These are results of various checks, like untranslated or
+strings needing review. Should no other checks fire, there will be still link
+to all translations. Alternatively you can use search field to find translation
+you need to fix.
 
 .. image:: ../images/strings-to-check.png
 

weblate/html/list-translations.html

@@ -9,7 +9,7 @@
 <th colspan="2">{% trans "Translated" %}</th>
 <th class="col-untranslated" style="display: none">{% trans "Untranslated" context "Number of untranslated strings" %}</th>
 <th class="col-words">{% trans "Words" context "Number of translated words" %}</th>
-<th class="col-fuzzy">{% trans "Fuzzy" context "Number of fuzzy strings" %}</th>
+<th class="col-fuzzy">{% trans "Review" context "Number of strings needing review" %}</th>
 <th class="col-checks">{% trans "Checks" context "Number of failing checks" %}</th>
 <th class="col-suggestions">{% trans "Suggestions" context "Number of suggestions" %}</th>
 <th class="sort-skip">
@@ -20,7 +20,7 @@
   <ul class="dropdown-menu" id="columns-menu" role="menu">
     <li><a><label><input type="checkbox" id="toggle-untranslated"> {% trans "Untranslated" context "Number of untranslated strings" %}</label></a></li>
     <li><a><label><input type="checkbox" id="toggle-words" checked="true"> {% trans "Words" context "Number of translated words" %}</label></a></li>
-    <li><a><label><input type="checkbox" id="toggle-fuzzy" checked="true"> {% trans "Fuzzy" context "Number of fuzzy strings" %}</label></a></li>
+    <li><a><label><input type="checkbox" id="toggle-fuzzy" checked="true"> {% trans "Review" context "Number of strings needing review" %}</label></a></li>
     <li><a><label><input type="checkbox" id="toggle-checks" checked="true"> {% trans "Checks" context "Number of failing checks" %}</label></a></li>
     <li><a><label><input type="checkbox" id="toggle-suggestions" checked="true"> {% trans "Suggestions" context "Number of suggestions" %}</label></a></li>
   </ul>
@@ -42,7 +42,7 @@
 <td class="percent col-words" title="{% blocktrans count words=trans.untranslated_words %}{{ words }} word to translate!{% plural %}{{ words }} words to translate!{% endblocktrans %}" >{{ trans.get_words_percent }}%</td>
 <td class="percent col-fuzzy">
 {% if fuzzy > 0 %}
-<a href="{{ trans.get_translate_url }}?type=fuzzy" title="{% blocktrans count trans.fuzzy as count %}There is {{ count }} fuzzy string.{% plural %}There are {{ count }} fuzzy strings.{% endblocktrans %}">
+<a href="{{ trans.get_translate_url }}?type=fuzzy" title="{% blocktrans count trans.fuzzy as count %}There is {{ count }} string needing review.{% plural %}There are {{ count }} strings needing review.{% endblocktrans %}">
 {{ fuzzy }}%
 </a>
 {% else %}

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 "Fuzzy strings:" %}</th><td>{{ translation.fuzzy }} ({{ translation.get_fuzzy_percent }}%)</td>
+<td>{% trans "Strings needing 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 "Fuzzy strings:" %} {{ translation.fuzzy }} ({{ translation.get_fuzzy_percent }}%)
+{% trans "Strings needing review :" %} {{ translation.fuzzy }} ({{ translation.get_fuzzy_percent }}%)
 
 {% blocktrans %}You can translate at {{ translation_url }}{% endblocktrans %}
 {% endfilter%}{% endautoescape %}{% include "mail/signature.txt" %}

weblate/html/translate.html

@@ -63,7 +63,7 @@
   <i class="fa fa-keyboard-o html-tooltip" data-toggle="tooltip" data-placement="bottom"
     data-title="{% trans "Keyboard shortcuts available:"%}<br />
     {% trans "Ctrl+Enter - Save" %}<br />
-    {% trans "Ctrl+Shift+Enter - Unmark fuzzy and save" %}<br />
+    {% trans "Ctrl+Shift+Enter - Unmark review needed flag and save" %}<br />
     {% trans "Alt+PageUp/PageDown/Home/End - Translation units navigation"%}<br />
     {% trans "Alt+E - Focus translation editor"%}<br />
     {% trans "Alt+C - Focus comment editor"%}<br />
@@ -71,7 +71,7 @@
     {% trans "Alt+N - Shows nearby strings tab"%}<br />
     {% trans "Alt+S - Shows search tab"%}<br />
     {% trans "Alt+V - Copies source string"%}<br />
-    {% trans "Alt+F - Toggle fuzzy flag"%}<br />
+    {% trans "Alt+F - Toggle review needed flag"%}<br />
     "></i>
   </span><h4 class="panel-title">{% if unit.translation.is_template %}{% trans "Editing source string" %}{% else %}{% trans "Translate" %}{% endif %}</h4></div>
   <div class="panel-body">

weblate/html/translation.html

@@ -314,7 +314,7 @@
 <td class="number">{{ object.translated_words }}</td>
 </tr>
 <tr>
-<th>{% trans "Fuzzy" %}</th>
+<th>{% trans "Review" %}</th>
 <td class="percent">{{ object.get_fuzzy_percent }}%</td>
 <td class="number">{{ object.fuzzy }}</td>
 <td class="number"></td>

weblate/html/zen-units.html

@@ -41,7 +41,7 @@
 {% csrf_token %}
 {{ item.form.checksum }}
 {{ item.form.target }}
-{{ item.form.fuzzy }} <label for="id_{{ item.unit.checksum }}_fuzzy">{% trans "Fuzzy" context "Message is fuzzy" %}</label>
+{{ item.form.fuzzy }} <label for="id_{{ item.unit.checksum }}_fuzzy">{% trans "Review" context "Message needs review" %}</label>
 </form>
 </td>
 </tr>

weblate/trans/forms.py

@@ -303,7 +303,7 @@ class TranslationForm(ChecksumForm):
         required=False,
     )
     fuzzy = forms.BooleanField(
-        label=pgettext_lazy('Checkbox for marking translation fuzzy', 'Fuzzy'),
+        label=pgettext_lazy('Checkbox for marking translation needing review', 'Needs review'),
         required=False
     )
 
@@ -349,15 +349,15 @@ class SimpleUploadForm(forms.Form):
         choices=(
             ('', _('Add as translation')),
             ('suggest', _('Add as a suggestion')),
-            ('fuzzy', _('Add as fuzzy translation')),
+            ('fuzzy', _('Add as translation needing review')),
         ),
         required=False
     )
     fuzzy = forms.ChoiceField(
-        label=_('Fuzzy strings processing'),
+        label=_('Processing of strings needing review'),
         choices=(
             ('', _('Do not import')),
-            ('process', _('Import as fuzzy')),
+            ('process', _('Import as string needing review')),
             ('approve', _('Import as translated')),
         ),
         required=False
@@ -471,7 +471,7 @@ class SearchForm(forms.Form):
             ('all', _('All strings')),
             ('untranslated', _('Untranslated strings')),
             ('translated', _('Translated strings')),
-            ('fuzzy', _('Fuzzy strings')),
+            ('fuzzy', _('Strings needing review')),
             ('suggestions', _('Strings with suggestions')),
             ('comments', _('Strings with comments')),
             ('allchecks', _('Strings with any failing checks')),

weblate/trans/models/translation.py

@@ -1016,7 +1016,7 @@ class Translation(models.Model, URLMixin, PercentMixin, LoggerMixin):
         if self.fuzzy > 0:
             result.append((
                 'fuzzy',
-                _('Fuzzy strings'),
+                _('Strings needing review'),
                 self.fuzzy,
                 'danger',
             ))

weblate/trans/templatetags/translations.py

@@ -523,7 +523,7 @@ def get_state_flags(unit):
 
     if unit.fuzzy:
         flags.append((
-            _('Message is fuzzy'),
+            _('Message needs review'),
             'question-circle text-danger'
         ))
     elif not unit.translated: