diff --git a/src/trans.c b/src/trans.c
index d0366958..7da2bb5a 100644
--- a/src/trans.c
+++ b/src/trans.c
@@ -68,27 +68,31 @@ GenerateTranslationTemplate(void)
     print_escaped_string_helper(stdout, tr("LANGID"), 1);
     printf("\n\n");
 
-    printf("BANNER %s\n\n", DBufValue(&Banner));
+    printf("BANNER %s\n", DBufValue(&Banner));
 
-    /* Weekday Names */
+    printf("\n# Weekday Names\n");
     for (i=0; i<7; i++) {
-        TranslationTemplate(DayName[i]);
+        printf("SET $%s ", DayName[i]);
+        print_escaped_string_helper(stdout, tr(DayName[i]), 1);
+        printf("\n");
     }
 
-    /* Month Names */
+    printf("\n# Month Names\n");
     for (i=0; i<12; i++) {
-        TranslationTemplate(MonthName[i]);
+        printf("SET $%s ", MonthName[i]);
+        print_escaped_string_helper(stdout, tr(MonthName[i]), 1);
+        printf("\n");
     }
 
-    /* Translatable system variables */
+    printf("\n# Other Translation-related System Variables\n");
     GenerateSysvarTranslationTemplates();
 
-    /* Error messages */
+    printf("\n# Error Messages\n");
     for (i=0; i<NumErrs; i++) {
         TranslationTemplate(ErrMsg[i]);
     }
 
-    /* Other translatables */
+    printf("\n# Other Messages\n");
     for (i=0; translatables[i] != NULL; i++) {
         TranslationTemplate(translatables[i]);
     }
diff --git a/tests/test.cmp b/tests/test.cmp
index 11813433..f150d0cb 100644
--- a/tests/test.cmp
+++ b/tests/test.cmp
@@ -24338,25 +24338,30 @@ TRANSLATE "LANGID" "en"
 
 BANNER Reminders for %w, %d%s %m, %y%o:
 
-TRANSLATE "Monday" ""
-TRANSLATE "Tuesday" ""
-TRANSLATE "Wednesday" ""
-TRANSLATE "Thursday" ""
-TRANSLATE "Friday" ""
-TRANSLATE "Saturday" ""
-TRANSLATE "Sunday" ""
-TRANSLATE "January" ""
-TRANSLATE "February" ""
-TRANSLATE "March" ""
-TRANSLATE "April" ""
-TRANSLATE "May" ""
-TRANSLATE "June" ""
-TRANSLATE "July" ""
-TRANSLATE "August" ""
-TRANSLATE "September" ""
-TRANSLATE "October" ""
-TRANSLATE "November" ""
-TRANSLATE "December" ""
+# Weekday Names
+SET $Monday "Monday"
+SET $Tuesday "Tuesday"
+SET $Wednesday "Wednesday"
+SET $Thursday "Thursday"
+SET $Friday "Friday"
+SET $Saturday "Saturday"
+SET $Sunday "Sunday"
+
+# Month Names
+SET $January "January"
+SET $February "February"
+SET $March "March"
+SET $April "April"
+SET $May "May"
+SET $June "June"
+SET $July "July"
+SET $August "August"
+SET $September "September"
+SET $October "October"
+SET $November "November"
+SET $December "December"
+
+# Other Translation-related System Variables
 SET $Ago "ago"
 SET $Am "am"
 SET $And "and"
@@ -24373,6 +24378,8 @@ SET $Pm "pm"
 SET $Today "today"
 SET $Tomorrow "tomorrow"
 SET $Was "was"
+
+# Error Messages
 TRANSLATE "Ok" ""
 TRANSLATE "Missing ']'" ""
 TRANSLATE "Missing quote" ""
@@ -24473,6 +24480,8 @@ TRANSLATE "Expecting weekday name" ""
 TRANSLATE "Duplicate argument name" ""
 TRANSLATE "Expression evaluation is disabled" ""
 TRANSLATE "Time limit for expression evaluation exceeded" ""
+
+# Other Messages
 TRANSLATE "    %s(%d): ["["]#%d] %s function `%s'" ""
 TRANSLATE "%s function `%s' defined at %s:%d does not use its argument" ""
 TRANSLATE "%s function `%s' defined at %s:%d should take 1 argument but actually takes %d" ""