Changeset 541 in MondoRescue for branches/stable/mondo/mondo/mondorestore/mondo-prep.c

Timestamp:

May 13, 2006, 8:47:23 PM (18 years ago)

Author:

bcornec

Message:

Stable is reverted to r436 (2.0.7) to put it in line with 2.0.8 and start from there over

File:

• branches/stable/mondo/mondo/mondorestore/mondo-prep.c (modified) (31 diffs)

branches/stable/mondo/mondo/mondorestore/mondo-prep.c

@@ -239 +239 @@
 // zero & reboot
             log_to_screen
-                (_("I am sorry for the inconvenience but I must ask you to reboot."));
+                ("I am sorry for the inconvenience but I must ask you to reboot.");
             log_to_screen
-                (_("I need to reset the Master Boot Record; in order to be"));
+                ("I need to reset the Master Boot Record; in order to be");
             log_to_screen
-                (_("sure the kernel notices, I must reboot after doing it."));
+                ("sure the kernel notices, I must reboot after doing it.");
             log_to_screen("Please hit 'Enter' to reboot.");
             for (lino = 0; lino < drivelist->entries; lino++) {
@@ -269 +269 @@
             system("sync");
             popup_and_OK
-                (_("I must now reboot. Please leave the boot media in the drive and repeat your actions - e.g. type 'nuke' - and it should work fine."));
+                ("I must now reboot. Please leave the boot media in the drive and repeat your actions - e.g. type 'nuke' - and it should work fine.");
             system("reboot");
         }
@@ -615 +615 @@
 #ifdef __FreeBSD__
     log_to_screen
-        (_("I don't know how to extrapolate the mountlist on FreeBSD. Sorry."));
+        ("I don't know how to extrapolate the mountlist on FreeBSD. Sorry.");
     return (1);
 #endif
@@ -624 +624 @@
             if (!does_file_exist("/etc/raidtab")) {
                 log_to_screen
-                    (_("Cannot find /etc/raidtab - cannot extrapolate the fdisk entries"));
+                    ("Cannot find /etc/raidtab - cannot extrapolate the fdisk entries");
                 finish(1);
             }
@@ -749 +749 @@
     }
     if (is_this_device_mounted(device)) {
-        sprintf(tmp, _("%s is mounted - cannot format it       "), device);
+        sprintf(tmp, "%s is mounted - cannot format it       ", device);
         log_to_screen(tmp);
         paranoid_free(program);
@@ -761 +761 @@
             if (!does_file_exist("/tmp/raidconf.txt")) {
                 log_to_screen
-                    (_("/tmp/raidconf.txt does not exist. I therefore cannot start Vinum."));
+                    ("/tmp/raidconf.txt does not exist. I therefore cannot start Vinum.");
             } else {
                 int res;
@@ -769 +769 @@
                 if (res) {
                     log_to_screen
-                        (_("`vinum create /tmp/raidconf.txt' returned errors. Please fix them and re-run mondorestore."));
+                        ("`vinum create /tmp/raidconf.txt' returned errors. Please fix them and re-run mondorestore.");
                     finish(1);
                 }
@@ -780 +780 @@
             char line[MAX_STR_LEN];
             sprintf(tmp,
-                    _("Initializing Vinum device %s (this may take a *long* time)"),
+                    "Initializing Vinum device %s (this may take a *long* time)",
                     device);
             log_to_screen(tmp);
@@ -823 +823 @@
         }
 #else
-        sprintf(tmp, _("Initializing RAID device %s"), device);
+        sprintf(tmp, "Initializing RAID device %s", device);
         log_to_screen(tmp);
 
 // Shouldn't be necessary.
-        log_to_screen(_("Stopping %s"), device);
+        log_to_screen("Stopping %s", device);
         stop_raid_device(device);
         system("sync");
@@ -900 +900 @@
     retval += res;
     if (retval) {
-        strcat(tmp, _("...failed"));
+        strcat(tmp, "...failed");
     } else {
-        strcat(tmp, _("...OK"));
+        strcat(tmp, "...OK");
     }
 
@@ -951 +951 @@
             (interactively) ? "true" : "false");
     log_it(tmp);
-    mvaddstr_and_log_it(g_currentY, 0, _("Formatting partitions     "));
-    open_progress_form(_("Formatting partitions"),
-                       _("I am now formatting your hard disk partitions."),
-                       _("This may take up to five minutes."), "",
+    mvaddstr_and_log_it(g_currentY, 0, "Formatting partitions     ");
+    open_progress_form("Formatting partitions",
+                       "I am now formatting your hard disk partitions.",
+                       "This may take up to five minutes.", "",
                        mountlist->entries + 1);
 
@@ -1001 +1001 @@
     if (does_file_exist("/tmp/i-want-my-lvm")) {
         wait_until_software_raids_are_prepped("/proc/mdstat", 10);
-        log_to_screen(_("Configuring LVM"));
+        log_to_screen("Configuring LVM");
         if (!g_text_mode) {
             newtSuspend();
@@ -1092 +1092 @@
 
     if (retval) {
-        mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
+        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
         log_to_screen
-            (_("Errors occurred during the formatting of your hard drives."));
+            ("Errors occurred during the formatting of your hard drives.");
     } else {
-        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
+        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
 
@@ -1107 +1107 @@
 //123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 
             log_to_screen
-                (_("Partition table locked up %d times. At least one 'mkfs' (format) command"),
+                ("Partition table locked up %d times. At least one 'mkfs' (format) command",
                  g_partition_table_locked_up);
             log_to_screen
-                (_("failed. I think these two events are related. Sometimes, fdisk's ioctl() call"));
+                ("failed. I think these two events are related. Sometimes, fdisk's ioctl() call");
             log_to_screen
-                (_("to refresh its copy of the partition table causes the kernel to lock the "));
+                ("to refresh its copy of the partition table causes the kernel to lock the ");
             log_to_screen
-                (_("partition table. I believe this has just happened."));
+                ("partition table. I believe this has just happened.");
             if (ask_me_yes_or_no
-                (_("Please choose 'yes' to reboot and try again; or 'no' to ignore this warning and continue.")))
+                ("Please choose 'yes' to reboot and try again; or 'no' to ignore this warning and continue."))
             {
                 system("sync");
@@ -1125 +1125 @@
         } else {
             log_to_screen
-                (_("Partition table locked up %d time%c. However, disk formatting succeeded."),
+                ("Partition table locked up %d time%c. However, disk formatting succeeded.",
                  g_partition_table_locked_up,
                  (g_partition_table_locked_up == 1) ? '.' : 's');
@@ -1528 +1528 @@
     pout_to_fdisk = popen(tmp, "w");
     if (!pout_to_fdisk) {
-        log_to_screen(_("Cannot call parted2fdisk to configure %s"), drivename);
+        log_to_screen("Cannot call parted2fdisk to configure %s", drivename);
         paranoid_free(device_str);
         paranoid_free(format);
@@ -1564 +1564 @@
                     if (system(command)) {
                         log_to_screen
-                            (_("Warning! Unable to make the drive bootable."));
+                            ("Warning! Unable to make the drive bootable.");
                     }
                     paranoid_free(device_str);
@@ -1614 +1614 @@
             if (!file) {
                 sprintf(tmp,
-                        _("Warning - unable to open %s for wiping it's partition table"),
+                        "Warning - unable to open %s for wiping it's partition table",
                         drivename);
                 log_to_screen(tmp);
@@ -1621 +1621 @@
             for (i = 0; i < 512; i++) {
                 if (!write(file, "\0", 1)) {
-                    sprintf(tmp, _("Warning - unable to write to %s"),
+                    sprintf(tmp, "Warning - unable to write to %s",
                             drivename);
                     log_to_screen(tmp);
@@ -1656 +1656 @@
         if (current_devno == 5 && previous_devno == 4) {
             log_to_screen
-                (_("You must leave at least one partition spare as the Extended partition."));
+                ("You must leave at least one partition spare as the Extended partition.");
             paranoid_free(device_str);
             paranoid_free(format);
@@ -1674 +1674 @@
             if (system(tmp)) {
                 log_to_screen
-                    (_("Warning! Unable to make the slice bootable."));
+                    ("Warning! Unable to make the slice bootable.");
             }
         }
@@ -1702 +1702 @@
             g_partition_table_locked_up++;
             log_to_screen
-                (_("A flaw in the Linux kernel has locked the partition table."));
+                ("A flaw in the Linux kernel has locked the partition table.");
         }
     }
@@ -1775 +1775 @@
 
     if (is_this_device_mounted(partition_name)) {
-        sprintf(tmp, _("%s is mounted, and should not be partitioned"),
+        sprintf(tmp, "%s is mounted, and should not be partitioned",
                 partition_name);
         log_to_screen(tmp);
@@ -1812 +1812 @@
                 if (prev_partno >= 4) {
                     log_to_screen
-                        (_("You need to leave at least one partition free, for 'extended/logical'"));
+                        ("You need to leave at least one partition free, for 'extended/logical'");
                     paranoid_free(program);
                     paranoid_free(partition_name);
@@ -2002 +2002 @@
 */
 
-    open_progress_form(_("Partitioning devices"),
-                       _("I am now going to partition all your drives."),
-                       _("This should not take more than five minutes."), "",
+    open_progress_form("Partitioning devices",
+                       "I am now going to partition all your drives.",
+                       "This should not take more than five minutes.", "",
                        mountlist->entries);
 
@@ -2016 +2016 @@
     close_progress_form();
     if (retval) {
-        mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
+        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
         log_to_screen
-            (_("Errors occurred during the partitioning of your hard drives."));
+            ("Errors occurred during the partitioning of your hard drives.");
     } else {
-        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
+        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
         paranoid_system("rm -f /tmp/fdisk*.log 2> /dev/null");
     }
@@ -2532 +2532 @@
         return;
     }
-    sprintf(tmp, _("Expanding entries to suit drive %s (%ld MB)"), drive_name,
+    sprintf(tmp, "Expanding entries to suit drive %s (%ld MB)", drive_name,
             current_size_of_drive);
     log_to_screen(tmp);
@@ -2551 +2551 @@
 
     if (original_size_of_drive <= 0) {
-        sprintf(tmp, _("Cannot resize %s's entries. Drive not found."),
+        sprintf(tmp, "Cannot resize %s's entries. Drive not found.",
                 drive_name);
         log_to_screen(tmp);
@@ -2581 +2581 @@
             newsizL = (long) new_size;
         }
-        sprintf(tmp, _("Changing %s from %lld KB to %ld KB"),
+        sprintf(tmp, "Changing %s from %lld KB to %ld KB",
                 drivemntlist->el[partno]->device,
                 drivemntlist->el[partno]->size, newsizL);
@@ -2588 +2588 @@
     }
     final_size = get_phys_size_of_drive(drive_name);
-    sprintf(tmp, _("final_size = %ld MB"), final_size);
+    sprintf(tmp, "final_size = %ld MB", final_size);
     paranoid_free(tmp);
     log_to_screen(tmp);
@@ -2629 +2629 @@
                                                         device);
     }
-    log_to_screen(_("Mountlist adjusted to suit current hard drive(s)"));
+    log_to_screen("Mountlist adjusted to suit current hard drive(s)");
     paranoid_free(drivelist);
 }