Merge remote-tracking branch 'origin/master'

trans/models.py

@@ -426,7 +426,7 @@ class Translation(models.Model):
             if unit1 is None:
                 unit1 = store1.findunit(unit2.source)
             if unit1 is None:
-                logger.error("The template does not contain the following unit:\n%s", str(unit2))
+                continue
             else:
                 if len(unit2.target.strip()) == 0:
                     continue