Choose better variable names

weblate/trans/management/commands/checkgit.py

@@ -28,7 +28,7 @@ class Command(WeblateCommand):
         '''
         Shows status of git repository in given projects.
         '''
-        for s in self.get_subprojects(*args, **options):
-            r = s.get_repo()
-            print '%s:' % s
-            print r.git.status()
+        for subproject in self.get_subprojects(*args, **options):
+            repo = subproject.get_repo()
+            print '%s:' % subproject
+            print repo.git.status()

weblate/trans/management/commands/commitgit.py

@@ -28,5 +28,5 @@ class Command(WeblateCommand):
         '''
         Commits pending translations in given projects.
         '''
-        for s in self.get_subprojects(*args, **options):
-            s.commit_pending()
+        for subproject in self.get_subprojects(*args, **options):
+            subproject.commit_pending()

weblate/trans/models.py

@@ -2328,13 +2328,21 @@ class Translation(models.Model):
             subproject__project=self.subproject.project
         )
         # Filter out those who don't want automatic update, but keep ourselves
-        translations = translations.filter(Q(pk=self.pk) | Q(subproject__allow_translation_propagation=True))
+        translations = translations.filter(
+            Q(pk=self.pk) | Q(subproject__allow_translation_propagation=True)
+        )
 
         ret = False
 
         # Do actual merge
-        for s in translations:
-            ret |= s.merge_store(author, store, overwrite, mergefuzzy, merge_header)
+        for translation in translations:
+            ret |= translation.merge_store(
+                author,
+                store,
+                overwrite,
+                mergefuzzy,
+                merge_header
+            )
 
         return ret