Merge branch 'master' into temp-ghash-experimentstemp-ghash-experiments

Note that 'store hash' feature was removed for now - to complex to maintain (conflicts)
and relatively easy to re-add if we ever really want this one day.

Conflicts:
	source/blender/blenlib/BLI_ghash.h
	source/blender/blenlib/intern/BLI_ghash.c
	source/blender/blenlib/intern/hash_mm2a.c
	source/blender/bmesh/tools/bmesh_region_match.c
	tests/gtests/blenlib/BLI_ghash_performance_test.cc
	tests/gtests/blenlib/BLI_ghash_test.cc
	tests/gtests/blenlib/CMakeLists.txt

1 files changed, 7 insertions, 1 deletions

diff --git a/intern/locale/msgfmt.cc b/intern/locale/msgfmt.cc
index 17720adfa48..4779450bd1b 100644
--- a/intern/locale/msgfmt.cc
+++ b/intern/locale/msgfmt.cc
@@ -228,7 +228,7 @@ void make(const char *input_file_name,
     }
     // Record a fuzzy mark.
     if (starts_with(l, "#,") && l.find("fuzzy") != std::string::npos) {
-      fuzzy = 1;
+      fuzzy = true;
     }
     // Skip comments
     if (l[0] == '#') {
@@ -316,6 +316,12 @@ void make(const char *input_file_name,
     // Skip empty lines.
     l = trim(l);
     if (l.empty()) {
+      if (section == SECTION_STR) {
+        add(msgctxt, msgid, msgstr, fuzzy);
+        msgctxt = msgid = msgstr = "";
+        section = SECTION_NONE;
+        fuzzy = false;
+      }
       continue;
     }
     l = unescape(l);