diff --git a/Master/aggregate.make b/Master/aggregate.make
index 2f2bf6ea..bd918ce0 100644
--- a/Master/aggregate.make
+++ b/Master/aggregate.make
@@ -56,7 +56,7 @@ SUBPROJECTS := $(strip $(SUBPROJECTS))
 
 ifneq ($(SUBPROJECTS),)
 internal-all internal-install internal-uninstall internal-clean \
-  internal-distclean internal-check::
+  internal-distclean internal-check internal-strings::
 	@ operation=$(subst internal-,,$@); \
 	for f in $(SUBPROJECTS); do \
 	  echo "Making $$operation in $$f..."; \
diff --git a/Master/application.make b/Master/application.make
index d56bac22..3960917e 100644
--- a/Master/application.make
+++ b/Master/application.make
@@ -74,10 +74,7 @@ internal-clean:: $(APPS_WITH_SUBPROJECTS:=.clean.app.subprojects)
 internal-distclean:: $(APPS_WITH_SUBPROJECTS:=.distclean.app.subprojects)
 endif
 
+internal-strings:: $(APP_NAME:=.strings.app.variables)
+
 $(APP_NAME):
 	@$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory $@.all.app.variables
-
-
-## Local variables:
-## mode: makefile
-## End:
diff --git a/Master/bundle.make b/Master/bundle.make
index 1f98764f..2e918626 100644
--- a/Master/bundle.make
+++ b/Master/bundle.make
@@ -52,11 +52,8 @@ internal-clean:: $(BUNDLES_WITH_SUBPROJECTS:=.clean.bundle.subprojects)
 internal-distclean:: $(BUNDLES_WITH_SUBPROJECTS:=.distclean.bundle.subprojects)
 endif
 
+internal-strings:: $(BUNDLE_NAME:=.strings.bundle.variables)
+
 $(BUNDLE_NAME):
 	@$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory \
 		$@.all.bundle.variables
-
-
-## Local variables:
-## mode: makefile
-## End:
diff --git a/Master/clibrary.make b/Master/clibrary.make
index bb174d74..2b5b21b6 100644
--- a/Master/clibrary.make
+++ b/Master/clibrary.make
@@ -50,10 +50,8 @@ internal-clean:: $(CLIBRARIES_WITH_SUBPROJECTS:=.clean.clibrary.subprojects)
 internal-distclean:: $(CLIBRARIES_WITH_SUBPROJECTS:=.distclean.clibrary.subprojects)
 endif
 
+internal-strings:: $(CLIBRARY_NAME:=.strings.clibrary.variables)
+
 $(CLIBRARY_NAME):
 	@$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory \
 		$@.all.clibrary.variables
-
-## Local variables:
-## mode: makefile
-## End:
diff --git a/Master/ctool.make b/Master/ctool.make
index 577167f1..d064e80b 100644
--- a/Master/ctool.make
+++ b/Master/ctool.make
@@ -46,10 +46,8 @@ internal-clean:: $(CTOOLS_WITH_SUBPROJECTS:=.clean.ctool.subprojects)
 internal-distclean:: $(CTOOLS_WITH_SUBPROJECTS:=.distclean.ctool.subprojects)
 endif
 
+internal-strings:: $(CTOOL_NAME:=.strings.ctool.variables)
+
 $(CTOOL_NAME):
 	@$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory \
 	         $@.all.ctool.variables
-
-## Local variables:
-## mode: makefile
-## End:
diff --git a/Master/framework.make b/Master/framework.make
index fd9e688e..95eea2cf 100644
--- a/Master/framework.make
+++ b/Master/framework.make
@@ -38,10 +38,8 @@ internal-clean:: $(FRAMEWORK_NAME:=.clean.framework.variables)
 
 internal-distclean:: $(FRAMEWORK_NAME:=.distclean.framework.variables)
 
+internal-strings:: $(FRAMEWORK_NAME:=.strings.framework.variables)
+
 $(FRAMEWORK_NAME):
 	@$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \
 		$@.all.framework.variables
-
-## Local variables:
-## mode: makefile
-## End:
diff --git a/Master/gswapp.make b/Master/gswapp.make
index 0f122ac7..1bf2c6bd 100644
--- a/Master/gswapp.make
+++ b/Master/gswapp.make
@@ -71,10 +71,8 @@ internal-clean:: $(GSWAPPS_WITH_SUBPROJECTS:=.clean.gswapp.subprojects)
 internal-distclean:: $(GSWAPPS_WITH_SUBPROJECTS:=.distclean.gswapp.subprojects)
 endif
 
+internal-strings:: $(GSWAPP_NAME:=.strings.gswapp.variables)
+
 $(GSWAPP_NAME):
 	@$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory \
 	            $@.all.gswapp.variables
-
-## Local variables:
-## mode: makefile
-## End:
diff --git a/Master/gswbundle.make b/Master/gswbundle.make
index 3a62ec9f..3b203445 100644
--- a/Master/gswbundle.make
+++ b/Master/gswbundle.make
@@ -52,11 +52,8 @@ internal-clean:: $(GSWBUNDLES_WITH_SUBPROJECTS:=.clean.gswbundle.subprojects)
 internal-distclean:: $(GSWBUNDLES_WITH_SUBPROJECTS:=.distclean.gswbundle.subprojects)
 endif
 
+internal-all:: $(GSWBUNDLE_NAME:=.all.gswbundle.variables)
+
 $(GSWBUNDLE_NAME):
 	@$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory \
 		$@.all.gswbundle.variables
-
-
-## Local variables:
-## mode: makefile
-## End:
diff --git a/Master/library.make b/Master/library.make
index 6dd29e6d..47d1a0e2 100644
--- a/Master/library.make
+++ b/Master/library.make
@@ -50,10 +50,8 @@ internal-clean:: $(LIBRARIES_WITH_SUBPROJECTS:=.clean.library.subprojects)
 internal-distclean:: $(LIBRARIES_WITH_SUBPROJECTS:=.distclean.library.subprojects)
 endif
 
+internal-strings:: $(LIBRARY_NAME:=.strings.library.variables)
+
 $(LIBRARY_NAME):
 	@$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory \
 		$@.all.library.variables
-
-## Local variables:
-## mode: makefile
-## End:
diff --git a/Master/palette.make b/Master/palette.make
index c96d57b5..35db1a56 100644
--- a/Master/palette.make
+++ b/Master/palette.make
@@ -47,10 +47,8 @@ ifneq ($(PALETTES_WITH_SUBPROJECTS),)
 internal-clean:: $(PALETTES_WITH_SUBPROJECTS:=.clean.palette.subprojects)
 endif
 
+internal-strings:: $(PALETTE_NAME:=.strings.palette.variables)
+
 $(PALETTE_NAME):
 	@$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory \
 		$@.all.palette.variables
-
-## Local variables:
-## mode: makefile
-## End:
diff --git a/Master/service.make b/Master/service.make
index c2801707..27cc5bfc 100644
--- a/Master/service.make
+++ b/Master/service.make
@@ -59,10 +59,8 @@ internal-clean:: $(SERVICES_WITH_SUBPROJECTS:=.clean.service.subprojects)
 internal-distclean:: $(SERVICES_WITH_SUBPROJECTS:=.distclean.service.subprojects)
 endif
 
+internal-strings:: $(SERVICE_NAME:=.strings.service.variables)
+
 $(SERVICE_NAME):
 	@$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory \
 	            $@.all.service.variables
-
-## Local variables:
-## mode: makefile
-## End:
diff --git a/Master/subproject.make b/Master/subproject.make
index 3ed96df4..f7609aee 100644
--- a/Master/subproject.make
+++ b/Master/subproject.make
@@ -84,10 +84,8 @@ internal-distclean::
 	rm -rf Resources
 endif
 
+internal-strings:: $(SUBPROJECT_NAME:=.strings.subproject.variables)
+
 $(SUBPROJECT_NAME):
 	@$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory \
 		$@.all.subproject.variables
-
-## Local variables:
-## mode: makefile
-## End:
diff --git a/Master/test-application.make b/Master/test-application.make
index 5b5c2e12..3af0e686 100644
--- a/Master/test-application.make
+++ b/Master/test-application.make
@@ -58,6 +58,8 @@ internal-clean:: $(TEST_APPS_WITH_SUBPROJECTS:=.clean.test-app.subprojects)
 internal-distclean:: $(TEST_APPS_WITH_SUBPROJECTS:=.distclean.test-app.subprojects)
 endif
 
+internal-strings:: $(TEST_APP_NAME:=.strings.test-app.variables)
+
 $(TEST_APP_NAME)::
 	@$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory \
 	         $@.all.test-app.variables
@@ -67,7 +69,3 @@ internal-install::
 
 internal-uninstall::
 	@ echo Skipping uninstallation of test apps...
-
-## Local variables:
-## mode: makefile
-## End:
diff --git a/Master/test-library.make b/Master/test-library.make
index 14992cd3..ca160e60 100644
--- a/Master/test-library.make
+++ b/Master/test-library.make
@@ -52,10 +52,8 @@ endif
 
 internal-check:: $(TEST_LIBRARY_NAME:=.check.test-lib.variables)
 
+internal-strings:: $(TEST_LIBRARY_NAME:=.strings.test-lib.variables)
+
 $(TEST_LIBRARY_NAME)::
 	@$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory \
 		$@.all.test-lib.variables
-
-## Local variables:
-## mode: makefile
-## End:
diff --git a/Master/test-tool.make b/Master/test-tool.make
index 86539495..ba23f22f 100644
--- a/Master/test-tool.make
+++ b/Master/test-tool.make
@@ -42,6 +42,8 @@ internal-clean:: $(TEST_TOOLS_WITH_SUBPROJECTS:=.clean.test-tool.subprojects)
 internal-distclean:: $(TEST_TOOLS_WITH_SUBPROJECTS:=.distclean.test-tool.subprojects)
 endif
 
+internal-strings:: $(TEST_TOOL_NAME:=.strings.test-tool.variables)
+
 $(TEST_TOOL_NAME)::
 	@$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory \
 	         $@.all.test-tool.variables
@@ -51,7 +53,3 @@ internal-install::
 
 internal-uninstall::
 	@ echo Skipping uninstallation of test tools...
-
-## Local variables:
-## mode: makefile
-## End:
diff --git a/Master/tool.make b/Master/tool.make
index f8fac40c..3f754f8b 100644
--- a/Master/tool.make
+++ b/Master/tool.make
@@ -56,10 +56,8 @@ internal-distclean::
 	rm -rf Resources
 endif
 
+internal-strings:: $(TOOL_NAME:=.strings.tool.variables)
+
 $(TOOL_NAME):
 	@$(MAKE) -f $(MAKEFILE_NAME) --no-print-directory --no-keep-going \
 	         $@.all.tool.variables
-
-## Local variables:
-## mode: makefile
-## End: