Changeset 541 in MondoRescue for branches/stable/mondo/mondo/mondorestore/mondo-rstr-newt.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-rstr-newt.c (modified) (55 diffs)

branches/stable/mondo/mondo/mondorestore/mondo-rstr-newt.c

@@ -156 +156 @@
 
     newtPushHelpLine
-        (_("   Add one of the following unallocated RAID partitions to this RAID device."));
-    sprintf(tmp, "%-26s %s", _("Device"), _("Size"));
+        ("   Add one of the following unallocated RAID partitions to this RAID device.");
+    sprintf(tmp, "%-26s %s", "Device", "Size");
     headerMsg = newtLabel(1, 1, tmp);
     partitionsListbox =
@@ -164 +164 @@
                              partitionsListbox);
     i = 7;
-    bOK = newtCompactButton(i, 9, _("  OK  "));
-    bCancel = newtCompactButton(i += 9, 9, _("Cancel"));
-    newtOpenWindow(22, 6, 36, 10, _("Unallocated RAID partitions"));
+    bOK = newtCompactButton(i, 9, "  OK  ");
+    bCancel = newtCompactButton(i += 9, 9, "Cancel");
+    newtOpenWindow(22, 6, 36, 10, "Unallocated RAID partitions");
     myForm = newtForm(NULL, NULL, 0);
     newtFormAddComponents(myForm, headerMsg, partitionsListbox, bOK,
@@ -258 +258 @@
     size_str[0] = '\0';
     /* sprintf(size_str,""); */
-    newtOpenWindow(20, 5, 48, 10, _("Add entry"));
-    label0 = newtLabel(2, 1, _("Device:    "));
-    label1 = newtLabel(2, 2, _("Mountpoint:"));
-    label2 = newtLabel(2, 3, _("Size (MB): "));
-    label3 = newtLabel(2, 4, _("Format:    "));
+    newtOpenWindow(20, 5, 48, 10, "Add entry");
+    label0 = newtLabel(2, 1, "Device:    ");
+    label1 = newtLabel(2, 2, "Mountpoint:");
+    label2 = newtLabel(2, 3, "Size (MB): ");
+    label3 = newtLabel(2, 4, "Format:    ");
     deviceComp =
         newtEntry(14, 1, device_str, 30, (void *) &device_here, 0);
@@ -270 +270 @@
         newtEntry(14, 4, format_str, 15, (void *) &format_here, 0);
     sizeComp = newtEntry(14, 3, size_str, 10, (void *) &size_here, 0);
-    bOK = newtButton(5, 6, _("  OK  "));
-    bCancel = newtButton(17, 6, _("Cancel"));
+    bOK = newtButton(5, 6, "  OK  ");
+    bCancel = newtButton(17, 6, "Cancel");
     newtPushHelpLine
-        (_("To add an entry to the mountlist, please fill in these fields and then hit 'OK'"));
+        ("To add an entry to the mountlist, please fill in these fields and then hit 'OK'");
     myForm = newtForm(NULL, NULL, 0);
     newtFormAddComponents(myForm, deviceComp, mountpointComp, sizeComp,
@@ -292 +292 @@
         if (b_res == bOK) {
             if (device_str[strlen(device_str) - 1] == '/') {
-                popup_and_OK(_("You left the device nearly blank!"));
+                popup_and_OK("You left the device nearly blank!");
                 b_res = NULL;
             }
             if (size_of_specific_device_in_mountlist(mountlist, device_str)
                 >= 0) {
-                popup_and_OK(_("Can't add this - you've got one already!"));
+                popup_and_OK("Can't add this - you've got one already!");
                 b_res = NULL;
             }
@@ -346 +346 @@
     sz_out[0] = '\0';
     if (popup_and_get_string
-        ("Add variable", _("Enter the name of the variable to add"), sz_out,
+        ("Add variable", "Enter the name of the variable to add", sz_out,
          MAX_STR_LEN)) {
         strip_spaces(sz_out);
@@ -355 +355 @@
         if (i < items) {
             popup_and_OK
-                (_("No need to add that variable. It is already listed here."));
+                ("No need to add that variable. It is already listed here.");
         } else {
             strcpy(raidrec->additional_vars.el[items].label, sz_out);
@@ -555 +555 @@
 
     sprintf(prompt,
-            _("Please enter the RAID level you want. (concat, striped, raid5)"));
+            "Please enter the RAID level you want. (concat, striped, raid5)");
     if (raidrec->raidlevel == -1) {
         strcpy(tmp, "concat");
@@ -608 +608 @@
     strcpy(personalities,
            last_line_of_file("/tmp/raid-personalities.txt"));
-    sprintf(prompt, _("Please enter the RAID level you want. %s"),
+    sprintf(prompt, "Please enter the RAID level you want. %s",
             personalities);
     if (raidrec->raid_level == -1) {
@@ -618 +618 @@
          out != -1 && out != 0 && out != 1 && out != 4 && out != 5
          && out != 10;) {
-        res = popup_and_get_string(_("Specify RAID level"), prompt, tmp, 10);
+        res = popup_and_get_string("Specify RAID level", prompt, tmp, 10);
         if (!res) {
             return;
@@ -641 +641 @@
         } else {
             if (ask_me_yes_or_no
-                (_("You have chosen a RAID personality which is not registered with the kernel. Make another selection?")))
+                ("You have chosen a RAID personality which is not registered with the kernel. Make another selection?"))
             {
                 out = 999;
@@ -720 +720 @@
     assert_string_is_neither_NULL_nor_zerolength(raid_device);
 
-    sprintf(tmp, _("Delete %s from RAID device %s - are you sure?"),
+    sprintf(tmp, "Delete %s from RAID device %s - are you sure?",
             disklist->el[currline].device, raid_device);
     if (!ask_me_yes_or_no(tmp)) {
@@ -768 +768 @@
                                                   device);
     if (pos >= 0) {
-        sprintf(tmp, _("Cannot delete %s: it is in use by RAID device %s"),
+        sprintf(tmp, "Cannot delete %s: it is in use by RAID device %s",
                 mountlist->el[currline].device,
                 raidlist->el[pos].OSSWAP(raid_device, volname));
@@ -774 +774 @@
         return;
     }
-    sprintf(tmp, _("Delete %s - are you sure?"),
+    sprintf(tmp, "Delete %s - are you sure?",
             mountlist->el[currline].device);
     if (!ask_me_yes_or_no(tmp)) {
@@ -829 +829 @@
         return;
     }
-    sprintf(tmp, _("Do you want me to delete %s's partitions, too?"), device);
+    sprintf(tmp, "Do you want me to delete %s's partitions, too?", device);
     delete_partitions_too = ask_me_yes_or_no(tmp);
     if (delete_partitions_too) {
@@ -896 +896 @@
 
     av = &raidrec->additional_vars;
-    sprintf(tmp, _("Delete %s - are you sure?"), av->el[lino].label);
+    sprintf(tmp, "Delete %s - are you sure?", av->el[lino].label);
     if (ask_me_yes_or_no(tmp)) {
         if (!strcmp(av->el[lino].label, "persistent-superblock")
             || !strcmp(av->el[lino].label, "chunk-size")) {
-            sprintf(tmp, _("%s must not be deleted. It would be bad."),
+            sprintf(tmp, "%s must not be deleted. It would be bad.",
                     av->el[lino].label);
             popup_and_OK(tmp);
@@ -967 +967 @@
                     warned_already = TRUE;
                     sprintf(tmp,
-                            _("Too many lines. Displaying first %d entries only. Close a directory to see more."),
+                            "Too many lines. Displaying first %d entries only. Close a directory to see more.",
                             ARBITRARY_MAXIMUM);
                     popup_and_OK(tmp);
@@ -1105 +1105 @@
     assert(filelist != NULL);
 
-    log_to_screen(_("Editing filelist"));
+    log_to_screen("Editing filelist");
     newtPushHelpLine
-        (_("   Please edit the filelist to your satisfaction, then click OK or Cancel."));
+        ("   Please edit the filelist to your satisfaction, then click OK or Cancel.");
     j = 4;
-    bLess = newtCompactButton(j, 17, _(" Less "));
-    bMore = newtCompactButton(j += 12, 17, _(" More "));
-    bToggle = newtCompactButton(j += 12, 17, _("Toggle"));
-    bRegex = newtCompactButton(j += 12, 17, _("RegEx"));
-    bCancel = newtCompactButton(j += 12, 17, _("Cancel"));
-    bOK = newtCompactButton(j += 12, 17, _("  OK  "));
+    bLess = newtCompactButton(j, 17, " Less ");
+    bMore = newtCompactButton(j += 12, 17, " More ");
+    bToggle = newtCompactButton(j += 12, 17, "Toggle");
+    bRegex = newtCompactButton(j += 12, 17, "RegEx");
+    bCancel = newtCompactButton(j += 12, 17, "Cancel");
+    bOK = newtCompactButton(j += 12, 17, "  OK  ");
     filelistListbox =
         newtListbox(2, 1, 15, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
@@ -1120 +1120 @@
     lines_in_flist_window =
         redraw_filelist(filelist, keylist, filelistListbox);
-    newtOpenWindow(1, 3, 77, 18, _("Editing filelist"));
+    newtOpenWindow(1, 3, 77, 18, "Editing filelist");
     myForm = newtForm(NULL, NULL, 0);
     newtFormAddComponents(myForm, filelistListbox, bLess, bMore, bToggle,
@@ -1129 +1129 @@
             finished =
                 ask_me_yes_or_no
-                (_("Are you happy with your file selection?"));
+                ("Are you happy with your file selection?");
         } else if (b_res == bCancel) {
             finished = TRUE;
         } else if (b_res == bRegex) {
-            popup_and_OK(_("I haven't implemented this yet..."));
+            popup_and_OK("I haven't implemented this yet...");
         } else {
             curr_choice = newtListboxGetCurrent(filelistListbox);
@@ -1269 +1269 @@
     sprintf(size_str, "%lld", mountlist->el[currline].size / 1024);
     newtOpenWindow(20, 5, 48, 10, "Edit entry");
-    label0 = newtLabel(2, 1, _("Device:"));
-    label1 = newtLabel(2, 2, _("Mountpoint:"));
-    label2 = newtLabel(2, 3, _("Size (MB): "));
-    label3 = newtLabel(2, 4, _("Format:    "));
+    label0 = newtLabel(2, 1, "Device:");
+    label1 = newtLabel(2, 2, "Mountpoint:");
+    label2 = newtLabel(2, 3, "Size (MB): ");
+    label3 = newtLabel(2, 4, "Format:    ");
     deviceComp =
         newtEntry(14, 1, device_str, 30, (void *) &device_here, 0);
@@ -1285 +1285 @@
         sizeComp = newtEntry(14, 3, size_str, 10, (void *) &size_here, 0);
     }
-    bOK = newtButton(2, 6, _("  OK  "));
-    bCancel = newtButton(14, 6, _("Cancel"));
+    bOK = newtButton(2, 6, "  OK  ");
+    bCancel = newtButton(14, 6, "Cancel");
     if (strstr(mountlist->el[currline].device, RAID_DEVICE_STUB)) {
         b_raid = newtButton(26, 6, "RAID..");
     }
     newtPushHelpLine
-        (_("       Edit this partition's mountpoint, size and format; then click 'OK'."));
+        ("       Edit this partition's mountpoint, size and format; then click 'OK'.");
     myForm = newtForm(NULL, NULL, 0);
     newtFormAddComponents(myForm, deviceComp, mountpointComp, sizeComp,
@@ -1307 +1307 @@
             && strstr(device_used_to_be, RAID_DEVICE_STUB)
             && strcmp(device_str, device_used_to_be)) {
-            popup_and_OK(_("You can't change /dev/mdX to /dev/mdY."));
+            popup_and_OK("You can't change /dev/mdX to /dev/mdY.");
             b_res = NULL;
             continue;
         } else if (b_res == bOK && !strcmp(mountpoint_str, "image")
                    && strcmp(mountpt_used_to_be, "image")) {
-            popup_and_OK(_("You can't change a regular device to an image."));
+            popup_and_OK("You can't change a regular device to an image.");
             b_res = NULL;
             continue;
@@ -1335 +1335 @@
                  */
                 popup_and_OK
-                    (_("You cannot edit the RAID settings until you have OK'd your change to the device node."));
+                    ("You cannot edit the RAID settings until you have OK'd your change to the device node.");
             } else {
                 j = find_raid_device_in_raidlist(raidlist,
@@ -1342 +1342 @@
                 if (j < 0) {
                     sprintf(tmp,
-                            _("/etc/raidtab does not have an entry for %s; please delete it and add it again"),
+                            "/etc/raidtab does not have an entry for %s; please delete it and add it again",
                             mountlist->el[currline].device);
                     popup_and_OK(tmp);
                 } else {
-                    log_it(_("edit_raidlist_entry - calling"));
+                    log_it("edit_raidlist_entry - calling");
                     edit_raidlist_entry(mountlist, raidlist,
                                         &raidlist->el[j], currline);
@@ -1396 +1396 @@
     else if (strcmp(device_used_to_be, device_str)) {
         popup_and_OK
-            (_("You are renaming a RAID device as another RAID device. I don't like it but I'll allow it."));
+            ("You are renaming a RAID device as another RAID device. I don't like it but I'll allow it.");
     }
 #endif
@@ -1506 +1506 @@
     int currline2 = 0;
 
-    log_it(_("Started edit_raidlist_entry"));
+    log_it("Started edit_raidlist_entry");
     memcpy((void *) &bkp_raidrec, (void *) raidrec,
            sizeof(struct vinum_volume));
-    sprintf(title_of_editraidForm_window, _("Plexes on %s"),
+    sprintf(title_of_editraidForm_window, "Plexes on %s",
             raidrec->volname);
-    newtPushHelpLine(_("   Please select a plex to edit"));
+    newtPushHelpLine("   Please select a plex to edit");
     newtOpenWindow(13, 5, 54, 15, title_of_editraidForm_window);
     for (;;) {
@@ -1517 +1517 @@
         char headerstr[MAX_STR_LEN];
         snprintf(headerstr, MAX_STR_LEN, "%-14s %-8s  %11s  %8s",
-                 _("Plex"), _("Level",) _("Stripe Size"), _("Subdisks"));
-
-        bOK = newtCompactButton(2, 13, _("  OK  "));
-        bCancel = newtCompactButton(12, 13, _("Cancel"));
-        bAdd = newtCompactButton(22, 13, _(" Add "));
-        bEdit = newtCompactButton(32, 13, _(" Edit "));
-        bDelete = newtCompactButton(42, 13, _("Delete"));
+                 "Plex", "Level", "Stripe Size", "Subdisks");
+
+        bOK = newtCompactButton(2, 13, "  OK  ");
+        bCancel = newtCompactButton(12, 13, "Cancel");
+        bAdd = newtCompactButton(22, 13, " Add ");
+        bEdit = newtCompactButton(32, 13, " Edit ");
+        bDelete = newtCompactButton(42, 13, "Delete");
 
         plexesListbox =
@@ -1583 +1583 @@
         if (b_res == bDelete) {
             char msg[MAX_STR_LEN];
-            sprintf(msg, _("Are you sure you want to delete %s.p%i?"),
+            sprintf(msg, "Are you sure you want to delete %s.p%i?",
                     raidrec->volname, currline2);
             if (ask_me_yes_or_no(msg)) {
-                log_it(_("Deleting RAID plex"));
+                log_it("Deleting RAID plex");
                 memcpy((void *) &raidrec->plex[currline2],
                        (void *) &raidrec->plex[raidrec->plexes - 1],
@@ -1660 +1660 @@
     for (;;) {
         log_msg(2, "Main loop");
-        sprintf(title_of_editraidForm_window, _("Edit %s"),
+        sprintf(title_of_editraidForm_window, "Edit %s",
                 raidrec->raid_device);
         strcpy(sz_raid_level,
@@ -1666 +1666 @@
         strcpy(sz_data_disks,
                number_of_disks_as_string(raidrec->data_disks.entries,
-                                         _("data")));
+                                         "data"));
         strcpy(sz_spare_disks,
                number_of_disks_as_string(raidrec->spare_disks.entries,
-                                         _("spare")));
+                                         "spare"));
         strcpy(sz_parity_disks,
                number_of_disks_as_string(raidrec->parity_disks.entries,
-                                         _("parity")));
+                                         "parity"));
         strcpy(sz_failed_disks,
                number_of_disks_as_string(raidrec->failed_disks.entries,
-                                         _("failed")));
+                                         "failed"));
         bSelectData = newtButton(1, 1, sz_data_disks);
         bSelectSpare = newtButton(20, 1, sz_spare_disks);
@@ -1681 +1681 @@
         bSelectFailed = newtButton(20, 5, sz_failed_disks);
         bChangeRaid = newtButton(1, 9, sz_raid_level);
-        bOK = newtButton(16 + (raidrec->raid_level == -1), 9, _("  OK  "));
-        bCancel = newtButton(28, 9, _("Cancel"));
+        bOK = newtButton(16 + (raidrec->raid_level == -1), 9, "  OK  ");
+        bCancel = newtButton(28, 9, "Cancel");
         bAdditional =
             newtCompactButton(1, 13,
-                              _("Additional settings and information"));
+                              "Additional settings and information");
         newtPushHelpLine
-            (_("  Edit the RAID device's settings to your heart's content, then hit OK/Cancel."));
+            ("  Edit the RAID device's settings to your heart's content, then hit OK/Cancel.");
         editraidForm = newtForm(NULL, NULL, 0);
         newtFormAddComponents(editraidForm, bSelectData, bSelectParity,
@@ -1696 +1696 @@
             choose_raid_level(raidrec);
         } else if (b_res == bSelectData) {
-            select_raid_disks(mountlist, raidlist, raidrec, _("data"),
+            select_raid_disks(mountlist, raidlist, raidrec, "data",
                               &raidrec->data_disks);
         } else if (b_res == bSelectSpare) {
-            select_raid_disks(mountlist, raidlist, raidrec, _("spare"),
+            select_raid_disks(mountlist, raidlist, raidrec, "spare",
                               &raidrec->spare_disks);
         } else if (b_res == bSelectParity) {
-            select_raid_disks(mountlist, raidlist, raidrec, _("parity"),
+            select_raid_disks(mountlist, raidlist, raidrec, "parity",
                               &raidrec->parity_disks);
         } else if (b_res == bSelectFailed) {
-            select_raid_disks(mountlist, raidlist, raidrec, _("failed"),
+            select_raid_disks(mountlist, raidlist, raidrec, "failed",
                               &raidrec->failed_disks);
         } else if (b_res == bAdditional) {
@@ -1786 +1786 @@
             raidlist->el[currline].volname, currline2);
     newtPushHelpLine
-        (_("   Please select a subdisk to edit, or edit this plex's parameters"));
+        ("   Please select a subdisk to edit, or edit this plex's parameters");
     newtOpenWindow(13, 3, 54, 18, title_of_editraidForm_window);
     for (;;) {
@@ -1792 +1792 @@
         char headerstr[MAX_STR_LEN];
         char tmp[64];
-        snprintf(headerstr, MAX_STR_LEN, "%-24s %s", _("Subdisk"), _("Device"));
+        snprintf(headerstr, MAX_STR_LEN, "%-24s %s", "Subdisk", "Device");
 
 
@@ -1806 +1806 @@
             break;
         default:
-            sprintf(tmp, _("unknown (%i)"), raidrec->raidlevel);
+            sprintf(tmp, "unknown (%i)", raidrec->raidlevel);
             break;
         }
-        bLevel = newtCompactButton(2, 2, _(" RAID level "));
+        bLevel = newtCompactButton(2, 2, " RAID level ");
         sLevel = newtLabel(19, 2, tmp);
 
         if (raidrec->raidlevel >= 0) {
             sprintf(tmp, "%ik", raidrec->stripesize);
-            bStripeSize = newtCompactButton(2, 4, _(" Stripe size "));
+            bStripeSize = newtCompactButton(2, 4, " Stripe size ");
         } else {
             strcpy(tmp, "N/A");
-            bStripeSize = newtLabel(2, 4, _("Stripe size:"));
+            bStripeSize = newtLabel(2, 4, "Stripe size:");
         }
         sStripeSize = newtLabel(19, 4, tmp);
 
-        bOK = newtCompactButton(2, 16, _("  OK  "));
-        bCancel = newtCompactButton(12, 16, _("Cancel"));
-        bAdd = newtCompactButton(22, 16, _(" Add "));
-        bEdit = newtCompactButton(32, 16, _(" Edit "));
-        bDelete = newtCompactButton(42, 16, _("Delete"));
+        bOK = newtCompactButton(2, 16, "  OK  ");
+        bCancel = newtCompactButton(12, 16, "Cancel");
+        bAdd = newtCompactButton(22, 16, " Add ");
+        bEdit = newtCompactButton(32, 16, " Edit ");
+        bDelete = newtCompactButton(42, 16, "Delete");
 
 
@@ -1911 +1911 @@
             sprintf(tmp, "%i", raidrec->stripesize);
             if (popup_and_get_string
-                (_("Stripe size"),
-                 _("Please enter the stripe size in kilobytes."), tmp, 20)) {
+                ("Stripe size",
+                 "Please enter the stripe size in kilobytes.", tmp, 20)) {
                 raidrec->stripesize = atoi(tmp);
             }
@@ -1963 +1963 @@
 
     strcpy(sz_out, raidrec->additional_vars.el[lino].value);
-    sprintf(header, _("Edit %s"), raidrec->additional_vars.el[lino].label);
-    sprintf(comment, _("Please set %s's value (currently '%s')"),
+    sprintf(header, "Edit %s", raidrec->additional_vars.el[lino].label);
+    sprintf(comment, "Please set %s's value (currently '%s')",
             raidrec->additional_vars.el[lino].label, sz_out);
     if (popup_and_get_string(header, comment, sz_out, MAX_STR_LEN)) {
@@ -2026 +2026 @@
     strcpy(flaws_str_C, "xxxxxxxxx");
     if (mountlist->entries > ARBITRARY_MAXIMUM) {
-        log_to_screen(_("Arbitrary limits suck, man!"));
+        log_to_screen("Arbitrary limits suck, man!");
         finish(1);
     }
     newtPushHelpLine
-        (_("   Please edit the mountlist to your satisfaction, then click OK or Cancel."));
+        ("   Please edit the mountlist to your satisfaction, then click OK or Cancel.");
     i = 4;
-    bAdd = newtCompactButton(i, 17, _(" Add "));
-    bEdit = newtCompactButton(i += 11, 17, _(" Edit "));
-    bDelete = newtCompactButton(i += 12, 17, _("Delete"));
-    bReload = newtCompactButton(i += 12, 17, _("Reload"));
-    bCancel = newtCompactButton(i += 12, 17, _("Cancel"));
-    bOK = newtCompactButton(i += 12, 17, _("  OK  "));
-    sprintf(tmp, "%-24s %-24s %-8s  %s", _("Device"), _("Mountpoint"), _("Format"),
-            _("Size (MB)"));
+    bAdd = newtCompactButton(i, 17, " Add ");
+    bEdit = newtCompactButton(i += 11, 17, " Edit ");
+    bDelete = newtCompactButton(i += 12, 17, "Delete");
+    bReload = newtCompactButton(i += 12, 17, "Reload");
+    bCancel = newtCompactButton(i += 12, 17, "Cancel");
+    bOK = newtCompactButton(i += 12, 17, "  OK  ");
+    sprintf(tmp, "%-24s %-24s %-8s  %s", "Device", "Mountpoint", "Format",
+            "Size (MB)");
     headerMsg = newtLabel(2, 1, tmp);
     flawsLabelA = newtLabel(2, 13, flaws_str_A);
@@ -2047 +2047 @@
         newtListbox(2, 2, 10, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
     redraw_mountlist(mountlist, keylist, partitionsListbox);
-    newtOpenWindow(1, 3, 77, 18, _("Editing mountlist"));
+    newtOpenWindow(1, 3, 77, 18, "Editing mountlist");
     myForm = newtForm(NULL, NULL, 0);
     newtFormAddComponents(myForm, headerMsg, partitionsListbox,
@@ -2064 +2064 @@
                 finished =
                     ask_me_yes_or_no
-                    (_("Your mountlist might not work. Continue anyway?"));
+                    ("Your mountlist might not work. Continue anyway?");
             } else {
                 finished =
                     ask_me_yes_or_no
-                    (_("Are you sure you want to save your mountlist and continue? (No changes will be made to your partition table at this time.)"));
+                    ("Are you sure you want to save your mountlist and continue? (No changes will be made to your partition table at this time.)");
             }
         } else if (b_res == bCancel) {
             finished = TRUE;
         } else if (b_res == bReload) {
-            if (ask_me_yes_or_no(_("Reload original mountlist?"))) {
+            if (ask_me_yes_or_no("Reload original mountlist?")) {
 /*
 This would be really dumb. RAIDTAB_FNAME is #define'd.   --- Hugo, 2003/04/24
@@ -2091 +2091 @@
                  i < mountlist->entries && keylist[i] != curr_choice; i++);
             if (i == mountlist->entries && mountlist->entries > 0) {
-                log_to_screen(_("I don't know what that button does!"));
+                log_to_screen("I don't know what that button does!");
             } else {
                 currline = i;
@@ -2109 +2109 @@
                     } else {
                         popup_and_OK
-                            (_("Please add an entry. Then press ENTER to edit it."));
+                            ("Please add an entry. Then press ENTER to edit it.");
                     }
                 }
@@ -2119 +2119 @@
     newtPopHelpLine();
     if (b_res == bOK) {
-        log_it(_("You pushed 'OK'. I shall now continue."));
+        log_it("You pushed 'OK'. I shall now continue.");
         return (0);
     } else {
@@ -2198 +2198 @@
     sprintf(title_of_window, "Additional variables");
     newtPushHelpLine
-        (_("  Edit the additional fields to your heart's content, then click OK or Cancel."));
-    headerMsg = newtLabel(1, 1, _("Label                            Value"));
+        ("  Edit the additional fields to your heart's content, then click OK or Cancel.");
+    headerMsg = newtLabel(1, 1, "Label                            Value");
     varsListbox =
         newtListbox(1, 2, 6, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
     i = 1;
-    bAdd = newtCompactButton(i, 9, _(" Add "));
-    bEdit = newtCompactButton(i += 8, 9, _(" Edit "));
-    bDelete = newtCompactButton(i += 9, 9, _("Delete"));
-    bOK = newtCompactButton(i += 9, 9, _("  OK  "));
-    bCancel = newtCompactButton(i += 9, 9, _("Cancel"));
+    bAdd = newtCompactButton(i, 9, " Add ");
+    bEdit = newtCompactButton(i += 8, 9, " Edit ");
+    bDelete = newtCompactButton(i += 9, 9, "Delete");
+    bOK = newtCompactButton(i += 9, 9, "  OK  ");
+    bCancel = newtCompactButton(i += 9, 9, "Cancel");
     newtOpenWindow(17, 7, 46, 10, title_of_window);
     myForm = newtForm(NULL, NULL, 0);
@@ -2328 +2328 @@
  * @param isodir_device Where to put the device (e.g. /dev/hda4) the user enters.
  * @param isodir_format Where to put the format (e.g. ext2) the user enters.
- * @param isodir_path Where to put the path (e.g. /var/cache/mondo) the user enters.
+ * @param isodir_path Where to put the path (e.g. /root/images/mondo) the user enters.
  * @param nuke_me_please Whether we're planning on nuking or not.
  * @return TRUE if OK was pressed, FALSE otherwise.
@@ -2361 +2361 @@
 
     if (popup_and_get_string
-        (_("ISO Mode - device"), _("On what device do the ISO files live?"),
+        ("ISO Mode - device", "On what device do the ISO files live?",
          isodir_device, MAX_STR_LEN / 4)) {
         if (popup_and_get_string
-            (_("ISO Mode - format"),
-             _("What is the disk format of the device? (Hit ENTER if you don't know.)"),
+            ("ISO Mode - format",
+             "What is the disk format of the device? (Hit ENTER if you don't know.)",
              isodir_format, 16)) {
             if (popup_and_get_string
-                (_("ISO Mode - path"),
-                 _("At what path on this device can the ISO files be found?"),
+                ("ISO Mode - path",
+                 "At what path on this device can the ISO files be found?",
                  isodir_path, MAX_STR_LEN / 4)) {
                 strip_spaces(isodir_device);
@@ -2467 +2467 @@
 
     newtPushHelpLine
-        (_("This is where I nuke your hard drives. Mhahahahaha. No-one can stop Mojo Jojo!"));
-    newtOpenWindow(24, 3, 32, 13, _("Nuking"));
-    b1 = newtButton(7, 1, _("Slowly"));
-    b2 = newtButton(7, 5, _("Medium"));
-    b3 = newtButton(7, 9, _("Quickly"));
+        ("This is where I nuke your hard drives. Mhahahahaha. No-one can stop Mojo Jojo!");
+    newtOpenWindow(24, 3, 32, 13, "Nuking");
+    b1 = newtButton(7, 1, "Slowly");
+    b2 = newtButton(7, 5, "Medium");
+    b3 = newtButton(7, 9, "Quickly");
     myForm = newtForm(NULL, NULL, 0);
     newtFormAddComponents(myForm, b1, b2, b3, NULL);
@@ -2837 +2837 @@
     iamhere("Post-malloc");
     strcpy(help_text,
-           _("   Edit this RAID device's list of partitions. Choose OK or Cancel when done."));
-    sprintf(header_text, "%-24s    %s", _("Device"), _("Index"));
-    sprintf(title_of_window, _("%s contains..."), raidrec->raid_device);
+           "   Edit this RAID device's list of partitions. Choose OK or Cancel when done.");
+    sprintf(header_text, "%-24s    %s", "Device", "Index");
+    sprintf(title_of_window, "%s contains...", raidrec->raid_device);
     newtPushHelpLine(help_text);
     for (b_res = (newtComponent) 12345; b_res != bOK && b_res != bCancel;) {
@@ -2847 +2847 @@
         redraw_disklist(disklist, keylist, partitionsListbox);
         i = 1;
-        bAdd = newtCompactButton(i, 9, _(" Add "));
-        bDelete = newtCompactButton(i += 8, 9, _("Delete"));
-        bOK = newtCompactButton(i += 9, 9, _("  OK  "));
-        bCancel = newtCompactButton(i += 9, 9, _("Cancel"));
+        bAdd = newtCompactButton(i, 9, " Add ");
+        bDelete = newtCompactButton(i += 8, 9, "Delete");
+        bOK = newtCompactButton(i += 9, 9, "  OK  ");
+        bCancel = newtCompactButton(i += 9, 9, "Cancel");
         newtOpenWindow(21, 7, 38, 10, title_of_window);
         myForm = newtForm(NULL, NULL, 0);
@@ -2869 +2869 @@
                  i++);
             if (i == disklist->entries && disklist->entries > 0) {
-                log_to_screen(_("I don't know what that button does!"));
+                log_to_screen("I don't know what that button does!");
             } else {
                 currline = i;
                 if (b_res == bAdd) {
-                    log_it(_("Making list of unallocated RAID slices"));
+                    log_it("Making list of unallocated RAID slices");
                     make_list_of_unallocated_raid_partitions
                         (unallocated_raid_partitions, mountlist_dontedit,
@@ -2879 +2879 @@
                     if (unallocated_raid_partitions->entries <= 0) {
                         popup_and_OK
-                            (_("There are no unallocated partitions marked for RAID."));
+                            ("There are no unallocated partitions marked for RAID.");
                     } else {
                         log_it
-                            (_("Done. The user may add one or more of the above to RAID device"));
+                            ("Done. The user may add one or more of the above to RAID device");
                         add_disklist_entry(disklist, raidrec->raid_device,
                                            unallocated_raid_partitions);
-                        log_it(_("I have finished adding a disklist entry."));
+                        log_it("I have finished adding a disklist entry.");
                         redraw_disklist(disklist, keylist,
                                         partitionsListbox);
@@ -2894 +2894 @@
                     redraw_disklist(disklist, keylist, partitionsListbox);
                 } else {
-                    sprintf(tmp, _("%s's index is %d. What should it be?"),
+                    sprintf(tmp, "%s's index is %d. What should it be?",
                             raidrec->raid_device,
                             disklist->el[currline].index);
                     sprintf(sz_res, "%d", disklist->el[currline].index);
-                    if (popup_and_get_string(_("Set index"), tmp, sz_res, 10)) {
+                    if (popup_and_get_string("Set index", tmp, sz_res, 10)) {
                         disklist->el[currline].index = atoi(sz_res);
                     }
@@ -2955 +2955 @@
         for (output = 'z'; !strchr("AICE", output); output = tmp[0]) {
             printf
-                (_("Which mode - (A)utomatic, (I)nteractive, \n(C)ompare only, or (E)xit to shell?\n--> "));
+                ("Which mode - (A)utomatic, (I)nteractive, \n(C)ompare only, or (E)xit to shell?\n--> ");
             fgets(tmp, MAX_STR_LEN - 1, stdin);
         }
@@ -2962 +2962 @@
 
     newtPushHelpLine
-        (_("   Do you want to 'nuke' your system, restore interactively, or just compare?"));
-    newtOpenWindow(24, 3, 32, 17, _("How should I restore?"));
-    b1 = newtButton(7, 1, _("Automatically"));
-    b2 = newtButton(7, 5, _("Interactively"));
-    b3 = newtButton(7, 9, _("Compare only!"));
-    b4 = newtButton(7, 13, _("Exit to shell"));
+        ("   Do you want to 'nuke' your system, restore interactively, or just compare?");
+    newtOpenWindow(24, 3, 32, 17, "How should I restore?");
+    b1 = newtButton(7, 1, "Automatically");
+    b2 = newtButton(7, 5, "Interactively");
+    b3 = newtButton(7, 9, "Compare only!");
+    b4 = newtButton(7, 13, "Exit to shell");
     myForm = newtForm(NULL, NULL, 0);
     newtFormAddComponents(myForm, b1, b2, b3, b4, NULL);