Various coding fixes

trans/models/translation.py

@@ -1080,6 +1080,7 @@ class Translation(models.Model, URLMixin):
         '''
         Merges contect of translate-toolkit store as a suggestions.
         '''
+        from trans.models.unitdata import Suggestion
         ret = False
         for unit in store.all_units():
 

trans/models/unitdata.py

@@ -173,8 +173,8 @@ class CommentManager(models.Manager):
             unit.translation.invalidate_cache('targetcomments')
 
         # Update unit stats
-        for unit in new_comment.get_related_units():
-            unit.update_has_comment()
+        for relunit in new_comment.get_related_units():
+            relunit.update_has_comment()
 
         # Notify subscribed users
         notify_new_comment(