translations - last of the main messages

PerditionC · PerditionC · commit f602d418f6c7 · 2024-09-08T13:05:03.000-04:00
all non debug messages now in string catalog (unless some overlooked); further refinement may be needed as messages translated.
diff --git a/bcread.c b/bcread.c
@@ -24,7 +24,7 @@ int check_too_bad(unsigned int bad_count); /* new 0.91p */
 int check_too_bad(unsigned int bad_count) /* return 1 if too many bad clusters */
 {
 	if (bad_count == MAX_BAD_SECTORS) {
-          printf("\n *** Too many bad clusters! Do a surface scan after FORMAT! ***\n");
+          printf(catgets(catalog, 26, 0, "\n *** Too many bad clusters! Do a surface scan after FORMAT! ***\n"));
           return 1;
         }
         return 0;
@@ -41,7 +41,7 @@ int check_too_bad(unsigned int bad_count) /* return 1 if too many bad clusters *
 unsigned long BadClustPreserve(void)
 {
   if (parameter_block.bpb.bytes_per_sector != 512) {
-    printf("BadClustPreserve aborted: not 512 bytes/sector!\n");
+    printf(catgets(catalog, 26, 1, "BadClustPreserve aborted: not 512 bytes/sector!\n"));
     return 0xffffffffUL;
   }
   if (param.fat_type == FAT32) {
@@ -77,10 +77,10 @@ unsigned long BadClustPreserve32(void) /* should use multisector read here */
   cluststart += (fatsize * parameter_block.bpb.number_of_fats);
 
   if (debug_prog == TRUE)
-    printf(" Scanning FAT Sectors %lu to %lu...\n",
+    printf(catgets(catalog, 26, 2, " Scanning FAT Sectors %lu to %lu...\n"),
       fatstart, fatstart+fatsize);
   else
-    printf(" Scanning existing FAT...\n");
+    printf(catgets(catalog, 26, 3, " Scanning existing FAT...\n"));
 
   j = 0;
   for (sect = fatstart; sect < (fatstart+fatsize); sect += chunksize) {
@@ -142,7 +142,7 @@ unsigned long BadClustPreserve32(void) /* should use multisector read here */
       if (percentage != 100) Display_Percentage_Formatted(100);
     }
 
-  printf("\n Cluster stats: %lu used, %lu bad, %lu items, %lu last.\n",
+  printf(catgets(catalog, 26, 4, "\n Cluster stats: %lu used, %lu bad, %lu items, %lu last.\n"),
     countused, countbad, countitems, last_used);
   return ( cluststart +
     ( (1+last_used-2) * BPB_SECTORS_PER_CLUSTER(parameter_block.bpb) ) - 1 );
@@ -213,7 +213,7 @@ unsigned long BadClustPreserve16(void)
   } /* for all FAT sectors */
   if (debug_prog == TRUE) printf("\n");
 
-  printf("\n Cluster stats: %lu used, %lu bad, %lu items, %lu last.\n",
+  printf(catgets(catalog, 26, 5, "\n Cluster stats: %lu used, %lu bad, %lu items, %lu last.\n"),
     countused, countbad, countitems, last_used);
   return ( cluststart +
     ( (1+last_used-2) * BPB_SECTORS_PER_CLUSTER(parameter_block.bpb) ) - 1 );
@@ -239,7 +239,7 @@ unsigned long BadClustPreserve12(void) /* FAT12 is max 12 sectors / FAT, simple
 
   if (fatsize > 1) buf = (unsigned char *)(&huge_sector_buffer[0]);
   if (fatsize > (sizeof(huge_sector_buffer_0) >> 9)) {
-    printf(" Cannot process existing FAT12, too big!\n");
+    printf(catgets(catalog, 26, 6, " Cannot process existing FAT12, too big!\n"));
     return 0xffffffffUL;
   }
   /* no scan announcement: just show the results. FAT12 is tiny. */
@@ -294,7 +294,7 @@ unsigned long BadClustPreserve12(void) /* FAT12 is max 12 sectors / FAT, simple
     index += 3;
   }
 
-  printf("\n Cluster stats: %lu used, %lu bad, %lu items, %lu last.\n",
+  printf(catgets(catalog, 26, 7, "\n Cluster stats: %lu used, %lu bad, %lu items, %lu last.\n"),
     countused, countbad, countitems, last_used);
   return ( cluststart +
     ( (1+last_used-2) * BPB_SECTORS_PER_CLUSTER(parameter_block.bpb) ) - 1 );
diff --git a/nls/format.en b/nls/format.en
@@ -22,6 +22,8 @@
 1,4:NO
 # other possibly common bits
 1,5:Failed!\n
+1,6:Failed.\n
+1,7:Aborting.\n
 
 # short help screen (shown if compiled without LEGACY_HELP)
 # Use as many messages as needed, 1 message per max 79 column line
@@ -402,6 +404,29 @@
 23,14: Drive looks unformatted, UNFORMAT information NOT saved.\n
 23,15:Number of reserved sectors differs: FOUND %lu / PLANNED %u.\n
 23,16:Number of FATs differs: FOUND %lu / PLANNED %hu\n
+23,17:Cluster size differs: FOUND %lu / PLANNED %hu (sectors)\n
+#  FOUND # FAT?? / PLANNED # FAT??
+23,18:FAT size differs: FOUND %lu %s / PLANNED %lu %s\n
+23,19:MIRROR data would overwrite used clusters. Aborting.
+23,20:SafeFormat: have to trash %lu used data sectors!\n
+23,21:Mirror map pointer write error - UNFORMAT will fail for you!\n
+23,22:Skipping UNFORMAT / mirror data backup step.\n
+23,23:Read error at sector %lu - UNFORMAT data damaged\n
+23,24:Write error at sector %lu - UNFORMAT data damaged\n
+23,25: Mirror map is %lu bytes long, 
+23,26: %lu sectors mirrored.\n
+23,27:No MIRROR / UNDELETE data: Wrong magic.\n
+23,28:\n End of mirror map. UNFORMAT done.\n
+23,29: Cloning boot sector into backup.\n
+23,30: Invalidating filesystem info sector data.\n
+23,31:*** Could not copy backup sector %lu to sector %lu ***\n
+23,32:Boot sector would be overwritten by nonsense, 0 or > 7 FATs.\n
+23,33:*** Could not restore sector %lu ***\n
+23,34:*** Could not clone FAT sector %lu into sector %lu ***\n
+23,35:WARNING: %hu FAT copies requested, using %hu instead.\n
+23,36:WARNING: UNFORMAT turns FAT1x drive into FAT32.\n
+23,37:WARNING: UNFORMAT turns FAT32 drive into FAT1x!?\n
+23,38:\n Boot sector data: %hu FAT copies (offset %lu), %lu sectors per FAT\n
 
 # savefs.c unable to save filesystem properties error message
 # Use as many messages as needed, 1 message per max 79 column line
@@ -411,3 +436,27 @@
 24,0:Filesystem properties will change, cannot preserve the\n
 24,1:(possibly empty) old bad cluster list. Use a surface scan\n
 24,2:tool or FORMAT /U if you want to update the bad cluster list.\n
+
+# recordbc.c
+25,0:Unusable disk: Bad sector in system data. Format terminated.\n
+25,1:\nBoot sector broken.\n
+25,2:\nFAT sector broken.\n
+25,3:\nRoot directory sector broken.\n
+25,4:\nBoot sector broken.\n
+25,5:\nFAT sector broken.\n
+25,6:\nRoot directory sector broken.\n
+25,7:\nReserved sector (boot, info, backup of either...) broken.\n
+25,8:\nFAT sector broken.\n
+25,9:*** Bad sector %lu, cluster %lu marked bad in FAT! ***\n
+25,10:WARNING: Have to mark USED cluster %lu as bad!\n
+25,11:*** Found %u bad sectors. Marked %lu clusters as bad. ***\n
+
+# bcread.c (bad clusters)
+26,0:\n *** Too many bad clusters! Do a surface scan after FORMAT! ***\n
+26,1:BadClustPreserve aborted: not 512 bytes/sector!\n
+26,2: Scanning FAT Sectors %lu to %lu...\n
+26,3: Scanning existing FAT...\n
+26,4:\n Cluster stats: %lu used, %lu bad, %lu items, %lu last.\n
+26,5:\n Cluster stats: %lu used, %lu bad, %lu items, %lu last.\n
+26,6: Cannot process existing FAT12, too big!\n
+26,7:\n Cluster stats: %lu used, %lu bad, %lu items, %lu last.\n
diff --git a/recordbc.c b/recordbc.c
@@ -26,7 +26,7 @@ void Record_Bad_Clusters_FAT32(void);
 void unusable_wimp(void);
 void unusable_wimp(void) /* give up format attempt, broken metadata sector */
 {
-    printf("Unusable disk: Bad sector in system data. Format terminated.\n");
+    printf(catgets(catalog, 25, 0, "Unusable disk: Bad sector in system data. Format terminated.\n"));
     Exit(4,30);
 } /* unusable_wimp */
 
@@ -75,14 +75,14 @@ void Record_Bad_Clusters_FAT12(void)
 
     if (bad_sector_map[0] < parameter_block.bpb.reserved_sectors)
       {
-      printf("\nBoot sector broken.\n");
+      printf(catgets(catalog, 25, 1, "\nBoot sector broken.\n"));
       }
     else
       {
       if (bad_sector_map[0] < first_root_sector)
-        printf("\nFAT sector broken.\n");
+        printf(catgets(catalog, 25, 2, "\nFAT sector broken.\n"));
       else
-        printf("\nRoot directory sector broken.\n");
+        printf(catgets(catalog, 25, 3, "\nRoot directory sector broken.\n"));
       }
 
     unusable_wimp();	/* can happen for all FAT types - common code (0.91p) */
@@ -199,14 +199,14 @@ void Record_Bad_Clusters_FAT16(void)
 
     if (bad_sector_map[0] < parameter_block.bpb.reserved_sectors)
       {
-      printf("\nBoot sector broken.\n");
+      printf(catgets(catalog, 25, 4, "\nBoot sector broken.\n"));
       }
     else
       {
       if (bad_sector_map[0] < first_root_sector)
-        printf("\nFAT sector broken.\n");
+        printf(catgets(catalog, 25, 5, "\nFAT sector broken.\n"));
       else
-        printf("\nRoot directory sector broken.\n");
+        printf(catgets(catalog, 25, 6, "\nRoot directory sector broken.\n"));
       }
 
     unusable_wimp();	/* can happen for all FAT types - common code (0.91p) */
@@ -313,9 +313,9 @@ void Record_Bad_Clusters_FAT32(void) /* added actual FAT writing in 0.91j */
     /* Terminate the program... the disk is not usable. */
 
     if (bad_sector_map[0] < parameter_block.bpb.reserved_sectors)
-      printf("\nReserved sector (boot, info, backup of either...) broken.\n");
+      printf(catgets(catalog, 25, 7, "\nReserved sector (boot, info, backup of either...) broken.\n"));
     else
-      printf("\nFAT sector broken.\n");
+      printf(catgets(catalog, 25, 8, "\nFAT sector broken.\n"));
 
     unusable_wimp();	/* can happen for all FAT types - common code (0.91p) */
 
@@ -351,13 +351,13 @@ void Record_Bad_Clusters_FAT32(void) /* added actual FAT writing in 0.91j */
     fat_value |= sector_buffer[fat_index+0];
 
     if (fat_value == 0)
-      printf("*** Bad sector %lu, cluster %lu marked bad in FAT! ***\n",
+      printf(catgets(catalog, 25, 9, "*** Bad sector %lu, cluster %lu marked bad in FAT! ***\n"),
         bad_sector_map[bad_sector_map_index], bad_cluster);
 
     if ( (fat_value < 0x0ffffff0UL) || (fat_value > 0x0ffffff7UL) ) /* not yet marked? */
       {
       if (fat_value != 0)
-        printf("WARNING: Have to mark USED cluster %lu as bad!\n", bad_cluster);
+        printf(catgets(catalog, 25, 10, "WARNING: Have to mark USED cluster %lu as bad!\n"), bad_cluster);
 
       drive_statistics.allocation_units_with_bad_sectors++;
 
@@ -375,7 +375,7 @@ void Record_Bad_Clusters_FAT32(void) /* added actual FAT writing in 0.91j */
     bad_sector_map_index++;
     } /* loop over bad sector list */
 
-  printf("*** Found %u bad sectors. Marked %lu clusters as bad. ***\n",
+  printf(catgets(catalog, 25, 11, "*** Found %u bad sectors. Marked %lu clusters as bad. ***\n"),
     bad_sector_map_index, drive_statistics.allocation_units_with_bad_sectors);
   
 }
diff --git a/savefs.c b/savefs.c
