Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/stable/mondo/mondo/mondorestore/mondo-restore.c

    r497 r541  
    505505 * The message to display if we detect that the user is using a Compaq Proliant.
    506506 */
    507 #define COMPAQ_PROLIANTS_SUCK _("Partition and format your disk using Compaq's disaster recovery CD. After you've done that, please reboot with your Mondo CD/floppy in Interactive Mode.")
     507#define COMPAQ_PROLIANTS_SUCK "Partition and format your disk using Compaq's disaster recovery CD. After you've done that, please reboot with your Mondo CD/floppy in Interactive Mode."
    508508
    509509
     
    535535    if (!does_file_exist(g_mountlist_fname)) {
    536536        log_to_screen(g_mountlist_fname);
    537         log_to_screen(_("does not exist"));
     537        log_to_screen("does not exist");
    538538        return (1);
    539539    }
     
    543543    if (retval) {
    544544        log_to_screen
    545             (_("Warning - load_raidtab_into_raidlist returned an error"));
     545            ("Warning - load_raidtab_into_raidlist returned an error");
    546546    }
    547547    res = edit_mountlist(g_mountlist_fname, mountlist, raidlist);
     
    553553    save_raidlist_to_raidtab(raidlist, RAIDTAB_FNAME);
    554554
    555     log_to_screen(_("I have finished editing the mountlist for you."));
     555    log_to_screen("I have finished editing the mountlist for you.");
    556556
    557557    return (retval);
     
    602602    popup_and_OK(COMPAQ_PROLIANTS_SUCK);
    603603    if (ask_me_yes_or_no
    604         (_("Would you like to reboot and use your Compaq CD to prep your hard drive?")))
     604        ("Would you like to reboot and use your Compaq CD to prep your hard drive?"))
    605605    {
    606606        fatal_error
    607             (_("Aborting. Please reboot and prep your hard drive with your Compaq CD."));
     607            ("Aborting. Please reboot and prep your hard drive with your Compaq CD.");
    608608    }
    609609}
     
    642642        interactively_obtain_media_parameters_from_user(bkpinfo, FALSE);
    643643    } else {
    644         popup_and_OK(_("No restoring or comparing will take place today."));
     644        popup_and_OK("No restoring or comparing will take place today.");
    645645        if (is_this_device_mounted("/mnt/cdrom")) {
    646646            run_program_and_log_output("umount /mnt/cdrom", FALSE);
     
    774774    if (g_text_mode) {
    775775        if (!ask_me_yes_or_no
    776             (_("Interactive Mode + textonly = experimental! Proceed anyway?")))
     776            ("Interactive Mode + textonly = experimental! Proceed anyway?"))
    777777        {
    778778            fatal_error("Wise move.");
     
    815815        save_mountlist_to_disk(mountlist, g_mountlist_fname);
    816816        save_raidlist_to_raidtab(raidlist, RAIDTAB_FNAME);
    817         mvaddstr_and_log_it(1, 30, _("Restoring Interactively"));
     817        mvaddstr_and_log_it(1, 30, "Restoring Interactively");
    818818        if (bkpinfo->differential) {
    819             log_to_screen(_("Because this is a differential backup, disk"));
     819            log_to_screen("Because this is a differential backup, disk");
    820820            log_to_screen
    821                 (_(" partitioning and formatting will not take place."));
     821                (" partitioning and formatting will not take place.");
    822822            done = TRUE;
    823823        } else {
    824824            if (ask_me_yes_or_no
    825                 (_("Do you want to erase and partition your hard drives?"))) {
     825                ("Do you want to erase and partition your hard drives?")) {
    826826                if (partition_table_contains_Compaq_diagnostic_partition
    827827                    (mountlist)) {
     
    834834                    if (ptn_errs) {
    835835                        log_to_screen
    836                             (_("Warning. Errors occurred during disk partitioning."));
     836                            ("Warning. Errors occurred during disk partitioning.");
    837837                    }
    838838
     
    840840                    if (!fmt_errs) {
    841841                        log_to_screen
    842                             (_("Errors during disk partitioning were handled OK."));
     842                            ("Errors during disk partitioning were handled OK.");
    843843                        log_to_screen
    844                             (_("Partitions were formatted OK despite those errors."));
     844                            ("Partitions were formatted OK despite those errors.");
    845845                        ptn_errs = 0;
    846846                    }
     
    852852            } else {
    853853                mvaddstr_and_log_it(g_currentY++, 0,
    854                                     _("User opted not to partition the devices"));
     854                                    "User opted not to partition the devices");
    855855                if (ask_me_yes_or_no
    856                     (_("Do you want to format your hard drives?"))) {
     856                    ("Do you want to format your hard drives?")) {
    857857                    fmt_errs = format_everything(mountlist, TRUE);
    858858                    if (!fmt_errs) {
     
    867867                mvaddstr_and_log_it(g_currentY++,
    868868                                    0,
    869                                     _("Errors occurred. Please repartition and format drives manually."));
     869                                    "Errors occurred. Please repartition and format drives manually.");
    870870                done = FALSE;
    871871            }
     
    873873                mvaddstr_and_log_it(g_currentY++,
    874874                                    0,
    875                                     _("Errors occurred during partitioning. Formatting, however, went OK."));
     875                                    "Errors occurred during partitioning. Formatting, however, went OK.");
    876876                done = TRUE;
    877877            }
    878878            if (!done) {
    879                 if (!ask_me_yes_or_no(_("Re-edit the mountlist?"))) {
     879                if (!ask_me_yes_or_no("Re-edit the mountlist?")) {
    880880                    retval++;
    881881                    goto end_of_func;
     
    893893    /* restore */
    894894    if ((restore_all =
    895          ask_me_yes_or_no(_("Do you want me to restore all of your data?"))))
     895         ask_me_yes_or_no("Do you want me to restore all of your data?")))
    896896    {
    897897        log_msg(1, "Restoring all data");
     
    900900        if ((restore_all =
    901901             ask_me_yes_or_no
    902              (_("Do you want me to restore _some_ of your data?")))) {
     902             ("Do you want me to restore _some_ of your data?"))) {
    903903        strcpy(old_restpath, bkpinfo->restore_path);
    904904        for (done = FALSE; !done;) {
     
    913913// (NB: %s is where your filesystem is mounted now, by default)", MNT_RESTORING);
    914914                if (popup_and_get_string
    915                     (_("Restore path"), _("Restore files to where?"), tmp,
     915                    ("Restore path", "Restore files to where?", tmp,
    916916                     MAX_STR_LEN / 4)) {
    917917                    if (!strcmp(tmp, "/")) {
    918                         if (!ask_me_yes_or_no(_("Are you sure?"))) {
     918                        if (!ask_me_yes_or_no("Are you sure?")) {
    919919                            goto gotos_suck;
    920920                        }
     
    930930                }
    931931                if (!ask_me_yes_or_no
    932                     (_("Restore another subset of your backup?"))) {
     932                    ("Restore another subset of your backup?")) {
    933933                    done = TRUE;
    934934                }
     
    941941        mvaddstr_and_log_it(g_currentY++,
    942942                            0,
    943                             _("User opted not to restore any data.                                  "));
     943                            "User opted not to restore any data.                                  ");
    944944    }
    945945    if (retval) {
    946946        mvaddstr_and_log_it(g_currentY++,
    947947                            0,
    948                             _("Errors occurred during the restore phase.            "));
    949     }
    950 
    951     if (ask_me_yes_or_no(_("Initialize the boot loader?"))) {
     948                            "Errors occurred during the restore phase.            ");
     949    }
     950
     951    if (ask_me_yes_or_no("Initialize the boot loader?")) {
    952952        run_boot_loader(TRUE);
    953953    } else {
    954954        mvaddstr_and_log_it(g_currentY++,
    955955                            0,
    956                             _("User opted not to initialize the boot loader."));
     956                            "User opted not to initialize the boot loader.");
    957957    }
    958958
     
    963963    /*  if (restore_some || restore_all || */
    964964    if (ask_me_yes_or_no
    965         (_("Label your ext2 and ext3 partitions if necessary?"))) {
     965        ("Label your ext2 and ext3 partitions if necessary?")) {
    966966        mvaddstr_and_log_it(g_currentY, 0,
    967                             _("Using e2label to label your ext2,3 partitions"));
     967                            "Using e2label to label your ext2,3 partitions");
    968968        if (does_file_exist("/tmp/fstab.new")) {
    969969            strcpy(fstab_fname, "/tmp/fstab.new");
     
    978978        if (res) {
    979979            log_to_screen
    980                 (_("label-partitions-as-necessary returned an error"));
    981             mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
     980                ("label-partitions-as-necessary returned an error");
     981            mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
    982982        } else {
    983983            mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     
    990990        mvaddstr_and_log_it(g_currentY++,
    991991                            0,
    992                             _("Warning - errors occurred during the restore phase."));
     992                            "Warning - errors occurred during the restore phase.");
    993993    }
    994994  end_of_func:
     
    10421042            retval += compare_mode(bkpinfo, mountlist, raidlist);
    10431043        } else {
    1044             log_to_screen(_("OK, I shan't restore/compare any files."));
     1044            log_to_screen("OK, I shan't restore/compare any files.");
    10451045        }
    10461046    }
     
    10521052    if (system("umount /tmp/isodir 2> /dev/null")) {
    10531053        log_to_screen
    1054             (_("WARNING - unable to unmount device where the ISO files are stored."));
     1054            ("WARNING - unable to unmount device where the ISO files are stored.");
    10551055    }
    10561056//    }
     
    11131113    if (!evaluate_mountlist(mountlist, tmpA, tmpB, tmpC)) {
    11141114        sprintf(tmp,
    1115                 _("Mountlist analyzed. Result: \"%s %s %s\" Switch to Interactive Mode?"),
     1115                "Mountlist analyzed. Result: \"%s %s %s\" Switch to Interactive Mode?",
    11161116                tmpA, tmpB, tmpC);
    11171117        if (ask_me_yes_or_no(tmp)) {
     
    11231123    }
    11241124    save_mountlist_to_disk(mountlist, g_mountlist_fname);
    1125     mvaddstr_and_log_it(1, 30, _("Restoring Automatically"));
     1125    mvaddstr_and_log_it(1, 30, "Restoring Automatically");
    11261126    if (bkpinfo->differential) {
    1127         log_to_screen(_("Because this is a differential backup, disk"));
    1128         log_to_screen(_("partitioning and formatting will not take place."));
     1127        log_to_screen("Because this is a differential backup, disk");
     1128        log_to_screen("partitioning and formatting will not take place.");
    11291129        res = 0;
    11301130    } else {
     
    11521152                if (res) {
    11531153                    log_to_screen
    1154                         (_("Warning. Errors occurred during partitioning."));
     1154                        ("Warning. Errors occurred during partitioning.");
    11551155                    res = 0;
    11561156                }
     
    11581158            retval += res;
    11591159            if (!res) {
    1160                 log_to_screen(_("Preparing to format your disk(s)"));
     1160                log_to_screen("Preparing to format your disk(s)");
    11611161                sleep(1);
    11621162                system("sync");
    1163                 log_to_screen(_("Please wait. This may take a few minutes."));
     1163                log_to_screen("Please wait. This may take a few minutes.");
    11641164                res += format_everything(mountlist, FALSE);
    11651165            }
     
    11711171        mvaddstr_and_log_it(g_currentY++,
    11721172                            0,
    1173                             _("Failed to partition and/or format your hard drives."));
    1174 
    1175         if (ask_me_yes_or_no(_("Try in interactive mode instead?"))) {
     1173                            "Failed to partition and/or format your hard drives.");
     1174
     1175        if (ask_me_yes_or_no("Try in interactive mode instead?")) {
    11761176            retval = interactive_mode(bkpinfo, mountlist, raidlist);
    11771177            goto after_the_nuke;
    11781178        } else
    11791179            if (!ask_me_yes_or_no
    1180                 (_("Would you like to try to proceed anyway?"))) {
     1180                ("Would you like to try to proceed anyway?")) {
    11811181            return (retval);
    11821182        }
     
    11861186        unmount_all_devices(mountlist);
    11871187        log_to_screen
    1188             (_("Unable to mount all partitions. Sorry, I cannot proceed."));
     1188            ("Unable to mount all partitions. Sorry, I cannot proceed.");
    11891189        return (retval);
    11901190    }
     
    12021202    mvaddstr_and_log_it(g_currentY,
    12031203                        0,
    1204                         _("Using e2label to label your ext2,3 partitions"));
     1204                        "Using e2label to label your ext2,3 partitions");
    12051205
    12061206    sprintf(tmp, "label-partitions-as-necessary %s < /tmp/fstab",
     
    12081208    res = run_program_and_log_output(tmp, TRUE);
    12091209    if (res) {
    1210         log_to_screen(_("label-partitions-as-necessary returned an error"));
    1211         mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
     1210        log_to_screen("label-partitions-as-necessary returned an error");
     1211        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
    12121212    } else {
    1213         mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     1213        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
    12141214    }
    12151215    retval += res;
     
    12171217  after_the_nuke:
    12181218    if (retval) {
    1219         log_to_screen(_("Errors occurred during the nuke phase."));
     1219        log_to_screen("Errors occurred during the nuke phase.");
    12201220    } else if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "RESTORE"))    // Bruno's thing
    12211221    {
    12221222        log_to_screen
    1223             (_("PC was restored successfully. Thank you for using Mondo Rescue."));
     1223            ("PC was restored successfully. Thank you for using Mondo Rescue.");
    12241224        log_to_screen
    1225             (_("Please visit our website at http://www.mondorescue.org for more information."));
     1225            ("Please visit our website at http://www.mondorescue.org for more information.");
    12261226    } else {
    1227         strcpy(tmp,_(" Mondo has restored your system. Please remove the backup media and reboot.\n\nPlease visit our website at http://www.mondorescue.org for more information."));
     1227        strcpy(tmp," Mondo has restored your system. Please remove the backup media and reboot.\n\nPlease visit our website at http://www.mondorescue.org for more information.");
    12281228        if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "restore") == NULL) {
    12291229            popup_and_OK(tmp);
    12301230        }
    12311231        log_to_screen
    1232             (_("Mondo has restored your system. Please remove the backup media and reboot."));
     1232            ("Mondo has restored your system. Please remove the backup media and reboot.");
    12331233        log_to_screen
    1234             (_("Please visit our website at http://www.mondorescue.org for more information."));
     1234            ("Please visit our website at http://www.mondorescue.org for more information.");
    12351235    }
    12361236    g_I_have_just_nuked = TRUE;
     
    12811281    if (!g_restoring_live_from_cd) {
    12821282        popup_and_OK
    1283             (_("Please insert tape/CD/boot floppy, then hit 'OK' to continue."));
     1283            ("Please insert tape/CD/boot floppy, then hit 'OK' to continue.");
    12841284        sleep(1);
    12851285    }
     
    12931293    log_msg(2, "bkpinfo->isodir = %s", bkpinfo->isodir);
    12941294
    1295     open_evalcall_form(_("Thinking..."));
     1295    open_evalcall_form("Thinking...");
    12961296
    12971297    get_cfg_file_from_archive_or_bust(bkpinfo);
     
    13061306        save_filelist(filelist, "/tmp/selected-files.txt");
    13071307        strcpy(old_restpath, bkpinfo->restore_path);
    1308         if (popup_and_get_string(_("Restore path"),
    1309                                  _("Restore files to where? )"),
     1308        if (popup_and_get_string("Restore path",
     1309                                 "Restore files to where? )",
    13101310                                 bkpinfo->restore_path, MAX_STR_LEN / 4)) {
    13111311            iamhere("Restoring everything");
     
    14031403
    14041404    if (!(fin = fopen(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""), "r"))) {
    1405         log_to_screen(_("Cannot even open bigfile's info file"));
     1405        log_to_screen("Cannot even open bigfile's info file");
    14061406        return (1);
    14071407    }
     
    15161516    log_msg(3, "file_to_openout = %s", file_to_openout);
    15171517    if (!(fout = fopen(file_to_openout, "w"))) {
    1518         log_to_screen(_("Cannot openout outfile_fname - hard disk full?"));
     1518        log_to_screen("Cannot openout outfile_fname - hard disk full?");
    15191519        return (1);
    15201520    }
     
    15391539                    g_current_media_number, sliceno);
    15401540            log_msg(2, tmp);
    1541             sprintf(tmp, _("Restoring from %s #%d"),
     1541            sprintf(tmp, "Restoring from %s #%d",
    15421542                    media_descriptor_string(bkpinfo->backup_media_type),
    15431543                    g_current_media_number);
    15441544            log_to_screen(tmp);
    15451545            insist_on_this_cd_number(bkpinfo, g_current_media_number);
    1546             log_to_screen(_("Continuing to restore."));
     1546            log_to_screen("Continuing to restore.");
    15471547        } else {
    15481548            strcpy(tmp,
     
    15731573                    strcpy(suffix, "");
    15741574                } else {
    1575                     log_to_screen(_("OK, that's pretty fsck0red..."));
     1575                    log_to_screen("OK, that's pretty fsck0red...");
    15761576                    return (1);
    15771577                }
     
    19771977                filelist_name);
    19781978        log_msg(2,
    1979                 "This is a bit silly (ask dev-team to fix mondo-makefilelist, please)");
     1979                "This is a bit silly (ask Hugo to fix mondo-makefilelist, please)");
    19801980        log_msg(2,
    19811981                "but it's non-critical. It's cosmetic. Don't worry about it.");
     
    20312031            if (run_program_and_log_output(tmp, FALSE)) {
    20322032                log_to_screen
    2033                     (_("(compare_a_tarball) Compression program not found - oh no!"));
     2033                    ("(compare_a_tarball) Compression program not found - oh no!");
    20342034                paranoid_MR_finish(1);
    20352035            }
     
    20542054            if (filelist_subset_fname[0] != '\0') {
    20552055                sprintf(command,
    2056                         "afio -i -M 8m -b %ld -c %ld %s -w '%s' %s",
     2056                        "afio -i -M 8m -b %ld -c %ld %s -w %s %s",
    20572057                        TAPE_BLOCK_SIZE,
    20582058                        BUFSIZE, executable, filelist_subset_fname,
     
    20892089            if (res) {
    20902090                log_to_screen
    2091                     (_("Errors occurred while setting extended attributes"));
     2091                    ("Errors occurred while setting extended attributes");
    20922092            } else {
    20932093                log_msg(1, "I set xattr OK");
     
    21002100            if (res) {
    21012101                log_to_screen
    2102                     (_("Errors occurred while setting access control lists"));
     2102                    ("Errors occurred while setting access control lists");
    21032103            } else {
    21042104                log_msg(1, "I set ACL OK");
     
    21172117    if (does_file_exist("/PAUSE")) {
    21182118        popup_and_OK
    2119             (_("Press ENTER to go on. Delete /PAUSE to stop these pauses."));
     2119            ("Press ENTER to go on. Delete /PAUSE to stop these pauses.");
    21202120    }
    21212121    unlink(filelist_subset_fname);
     
    23142314
    23152315    if (does_file_exist("/PAUSE") && current_tarball_number >= 50) {
    2316         log_to_screen(_("Paused after set %ld"), current_tarball_number);
    2317         popup_and_OK(_("Pausing. Press ENTER to continue."));
     2316        log_to_screen("Paused after set %ld", current_tarball_number);
     2317        popup_and_OK("Pausing. Press ENTER to continue.");
    23182318    }
    23192319
     
    23782378    read_cfg_var(g_mondo_cfg_file, "total-slices", tmp);
    23792379    total_slices = atol(tmp);
    2380     sprintf(tmp, _("Reassembling large files      "));
     2380    sprintf(tmp, "Reassembling large files      ");
    23812381    mvaddstr_and_log_it(g_currentY, 0, tmp);
    23822382    if (length_of_file(BIGGIELIST) < 6) {
     
    23942394    log_msg(2, tmp);
    23952395
    2396     open_progress_form(_("Reassembling large files"),
    2397                        _("I am now reassembling all the large files."),
    2398                        _("Please wait. This may take some time."),
     2396    open_progress_form("Reassembling large files",
     2397                       "I am now reassembling all the large files.",
     2398                       "Please wait. This may take some time.",
    23992399                       "", total_slices);
    24002400    for (bigfileno = 0, finished = FALSE; !finished;) {
     
    24172417                insist_on_this_cd_number(bkpinfo,
    24182418                                         ++g_current_media_number);
    2419                 sprintf(tmp, _("Restoring from %s #%d"),
     2419                sprintf(tmp, "Restoring from %s #%d",
    24202420                        media_descriptor_string(bkpinfo->
    24212421                                                backup_media_type),
     
    24312431        } else {
    24322432            just_changed_cds = FALSE;
    2433             sprintf(tmp, _("Restoring big file %ld"), bigfileno + 1);
     2433            sprintf(tmp, "Restoring big file %ld", bigfileno + 1);
    24342434            update_progress_form(tmp);
    24352435            res =
     
    24602460    if (does_file_exist("/PAUSE")) {
    24612461        popup_and_OK
    2462             (_("Press ENTER to go on. Delete /PAUSE to stop these pauses."));
     2462            ("Press ENTER to go on. Delete /PAUSE to stop these pauses.");
    24632463    }
    24642464    close_progress_form();
    24652465    if (retval) {
    2466         mvaddstr_and_log_it(g_currentY++, 74, _("Errors."));
     2466        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
    24672467    } else {
    2468         mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     2468        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
    24692469    }
    24702470    paranoid_free(xattr_fname);
     
    25142514    assert(bkpinfo != NULL);
    25152515
    2516     mvaddstr_and_log_it(g_currentY, 0, _("Restoring from archives"));
     2516    mvaddstr_and_log_it(g_currentY, 0, "Restoring from archives");
    25172517    log_msg(2,
    25182518            "Insisting on 1st CD, so that I can have a look at LAST-FILELIST-NUMBER");
     
    25242524    read_cfg_var(g_mondo_cfg_file, "last-filelist-number", tmp);
    25252525    max_val = atol(tmp) + 1;
    2526     sprintf(progress_str, _("Restoring from %s #%d"),
     2526    sprintf(progress_str, "Restoring from %s #%d",
    25272527            media_descriptor_string(bkpinfo->backup_media_type),
    25282528            g_current_media_number);
    25292529    log_to_screen(progress_str);
    2530     open_progress_form(_("Restoring from archives"),
    2531                        _("Restoring data from the archives."),
    2532                        _("Please wait. This may take some time."),
     2530    open_progress_form("Restoring from archives",
     2531                       "Restoring data from the archives.",
     2532                       "Please wait. This may take some time.",
    25332533                       progress_str, max_val);
    25342534    for (;;) {
     
    25562556            if (current_tarball_number == 0) {
    25572557                log_to_screen
    2558                     (_("No tarballs. Strange. Maybe you only backed up freakin' big files?"));
     2558                    ("No tarballs. Strange. Maybe you only backed up freakin' big files?");
    25592559                return (0);
    25602560            }
     
    25662566            }
    25672567            g_current_media_number++;
    2568             sprintf(progress_str, _("Restoring from %s #%d"),
     2568            sprintf(progress_str, "Restoring from %s #%d",
    25692569                    media_descriptor_string(bkpinfo->backup_media_type),
    25702570                    g_current_media_number);
    25712571            log_to_screen(progress_str);
    25722572        } else {
    2573             sprintf(progress_str, _("Restoring from fileset #%ld on %s #%d"),
     2573            sprintf(progress_str, "Restoring from fileset #%ld on %s #%d",
    25742574                    current_tarball_number,
    25752575                    media_descriptor_string(bkpinfo->backup_media_type),
     
    25832583                                              filelist);
    25842584            }
    2585             sprintf(tmp, _("%s #%d, fileset #%ld - restore "),
     2585            sprintf(tmp, "%s #%d, fileset #%ld - restore ",
    25862586                    media_descriptor_string(bkpinfo->backup_media_type),
    25872587                    g_current_media_number, current_tarball_number);
    25882588            if (res) {
    2589                 strcat(tmp, _("reported errors"));
     2589                strcat(tmp, "reported errors");
    25902590            } else if (attempts > 1) {
    2591                 strcat(tmp, _("succeeded"));
     2591                strcat(tmp, "succeeded");
    25922592            } else {
    2593                 strcat(tmp, _("succeeded"));
     2593                strcat(tmp, "succeeded");
    25942594            }
    25952595            if (attempts > 1) {
    2596                 sprintf(tmp + strlen(tmp), _(" (%d attempts) - review logs"),
     2596                sprintf(tmp + strlen(tmp), " (%d attempts) - review logs",
    25972597                        attempts);
    25982598            }
     
    26092609    close_progress_form();
    26102610    if (retval) {
    2611         mvaddstr_and_log_it(g_currentY++, 74, _("Errors."));
     2611        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
    26122612    } else {
    2613         mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     2613        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
    26142614    }
    26152615    paranoid_free(tmp);
     
    26942694            noof_biggiefiles);
    26952695    log_msg(2, tmp);
    2696     open_progress_form(_("Reassembling large files"),
    2697                        _("I am now reassembling all the large files."),
    2698                        _("Please wait. This may take some time."),
     2696    open_progress_form("Reassembling large files",
     2697                       "I am now reassembling all the large files.",
     2698                       "Please wait. This may take some time.",
    26992699                       "", total_slices);
    27002700
     
    27162716            p++;
    27172717        }
    2718         sprintf(tmp, _("Restoring big file %ld (%lld K)"),
     2718        sprintf(tmp, "Restoring big file %ld (%lld K)",
    27192719                current_bigfile_number + 1, biggie_size / 1024);
    27202720        update_progress_form(tmp);
     
    27672767    if (does_file_exist("/PAUSE")) {
    27682768        popup_and_OK
    2769             (_("Press ENTER to go on. Delete /PAUSE to stop these pauses."));
     2769            ("Press ENTER to go on. Delete /PAUSE to stop these pauses.");
    27702770    }
    27712771
    27722772    close_progress_form();
    27732773    if (retval) {
    2774         mvaddstr_and_log_it(g_currentY++, 74, _("Errors."));
     2774        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
    27752775    } else {
    2776         mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     2776        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
    27772777    }
    27782778    paranoid_free(biggies_whose_EXATs_we_should_set);
     
    28302830    malloc_string(xattr_fname);
    28312831    malloc_string(acl_fname);
    2832     mvaddstr_and_log_it(g_currentY, 0, _("Restoring from archives"));
     2832    mvaddstr_and_log_it(g_currentY, 0, "Restoring from archives");
    28332833    read_cfg_var(g_mondo_cfg_file, "last-filelist-number", tmp);
    28342834    max_val = atol(tmp) + 1;
     
    28382838    run_program_and_log_output("pwd", 5);
    28392839
    2840     sprintf(progress_str, _("Restoring from media #%d"),
     2840    sprintf(progress_str, "Restoring from media #%d",
    28412841            g_current_media_number);
    28422842    log_to_screen(progress_str);
    2843     open_progress_form(_("Restoring from archives"),
    2844                        _("Restoring data from the archives."),
    2845                        _("Please wait. This may take some time."),
     2843    open_progress_form("Restoring from archives",
     2844                       "Restoring data from the archives.",
     2845                       "Please wait. This may take some time.",
    28462846                       progress_str, max_val);
    28472847
     
    28772877        }
    28782878        sprintf(tmp,
    2879                 _("Restoring from fileset #%ld (name=%s, size=%ld K)"),
     2879                "Restoring from fileset #%ld (name=%s, size=%ld K)",
    28802880                current_afioball_number, tmp_fname, (long) tmp_size >> 10);
    28812881        res =
     
    28862886        retval += res;
    28872887        if (res) {
    2888             sprintf(tmp, _("Fileset %ld - errors occurred"),
     2888            sprintf(tmp, "Fileset %ld - errors occurred",
    28892889                    current_afioball_number);
    28902890            log_to_screen(tmp);
     
    28982898        current_afioball_number++;
    28992899        g_current_progress++;
    2900         sprintf(progress_str, _("Restoring from fileset #%ld on %s #%d"),
     2900        sprintf(progress_str, "Restoring from fileset #%ld on %s #%d",
    29012901                current_afioball_number,
    29022902                media_descriptor_string(bkpinfo->backup_media_type),
     
    29102910    close_progress_form();
    29112911    if (retval) {
    2912         mvaddstr_and_log_it(g_currentY++, 74, _("Errors."));
     2912        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
    29132913    } else {
    2914         mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     2914        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
    29152915    }
    29162916    paranoid_free(tmp);
     
    29632963    if (!find_home_of_exe("petris") && !g_text_mode) {
    29642964        newtDrawRootText(0, g_noof_rows - 2,
    2965                          _("Press ALT-<left cursor> twice to play Petris :-) "));
     2965                         "Press ALT-<left cursor> twice to play Petris :-) ");
    29662966        newtRefresh();
    29672967    }
    2968     mvaddstr_and_log_it(g_currentY, 0, _("Preparing to read your archives"));
     2968    mvaddstr_and_log_it(g_currentY, 0, "Preparing to read your archives");
    29692969    if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
    29702970        mount_cdrom(bkpinfo);
    29712971        mvaddstr_and_log_it(g_currentY++, 0,
    2972                             _("Restoring OS and data from streaming media"));
     2972                            "Restoring OS and data from streaming media");
    29732973        if (bkpinfo->backup_media_type == cdstream) {
    29742974            openin_cdstream(bkpinfo);
     
    29872987    } else {
    29882988        mvaddstr_and_log_it(g_currentY++, 0,
    2989                             _("Restoring OS and data from CD       "));
     2989                            "Restoring OS and data from CD       ");
    29902990        mount_cdrom(bkpinfo);
    29912991        resA = restore_all_tarballs_from_CD(bkpinfo, filelist);
     
    29942994    chdir(cwd);
    29952995    if (resA + resB) {
    2996         log_to_screen(_("Errors occurred while data was being restored."));
     2996        log_to_screen("Errors occurred while data was being restored.");
    29972997    }
    29982998    if (length_of_file("/etc/raidtab") > 0) {
     
    31053105        retval++;
    31063106        log_to_screen
    3107             (_("Error(s) occurred while processing filelist and wildcard"));
     3107            ("Error(s) occurred while processing filelist and wildcard");
    31083108    }
    31093109    iamhere("FIXME");
     
    32003200   *                                                                        *
    32013201   **************************************************************************/
    3202 
    3203 #ifdef ENABLE_NLS
    3204     setlocale(LC_ALL, "");
    3205     (void) textdomain("mondo");
    3206 #endif
    3207 
    32083202    if (getuid() != 0) {
    3209         fprintf(stderr, _("Please run as root.\n"));
     3203        fprintf(stderr, "Please run as root.\r\n");
    32103204        exit(127);
    32113205    }
     
    33513345        strcpy(bkpinfo->restore_path, "/tmp/TESTING");
    33523346        bkpinfo->backup_media_type = dvd;
    3353         open_progress_form(_("Reassembling /dev/hda1"),
    3354                            _("Shark is a bit of a silly person."),
    3355                            _("Please wait. This may take some time."),
     3347        open_progress_form("Reassembling /dev/hda1",
     3348                           "Shark is a bit of a silly person.",
     3349                           "Please wait. This may take some time.",
    33563350                           "", 1999);
    33573351        system("rm -Rf /tmp/*pih*");
     
    34293423        retval = run_grub(FALSE, "/dev/hda");
    34303424        if (retval) {
    3431             log_to_screen(_("Failed to write Master Boot Record"));
     3425            log_to_screen("Failed to write Master Boot Record");
    34323426        }
    34333427        paranoid_MR_finish(0);
     
    34403434        if (argc != 1) {
    34413435            popup_and_OK
    3442                 (_("Live mode doesn't support command-line parameters yet."));
     3436                ("Live mode doesn't support command-line parameters yet.");
    34433437            paranoid_MR_finish(1);
    34443438//    return(1);
     
    34723466        log_msg(2, "FYI, MOUNTLIST_FNAME = %s ", g_mountlist_fname);
    34733467        if (argc == 3 && strcmp(argv[1], "--monitas-memorex") == 0) {
    3474             log_to_screen(_("Uh, that hasn't been implemented yet."));
     3468            log_to_screen("Uh, that hasn't been implemented yet.");
    34753469            paranoid_MR_finish(1);
    34763470        }
     
    35013495        if (retval) {
    35023496            log_to_screen
    3503                 (_("Warning - load_raidtab_into_raidlist returned an error"));
     3497                ("Warning - load_raidtab_into_raidlist returned an error");
    35043498        }
    35053499
     
    35553549            }
    35563550            if (retval) {
    3557                 log_to_screen(_("Failed to write Master Boot Record"));
     3551                log_to_screen("Failed to write Master Boot Record");
    35583552            }
    35593553        } else if (argc == 2 && strcmp(argv[1], "--isonuke") == 0) {
     
    35613555            retval = iso_mode(bkpinfo, mountlist, raidlist, TRUE);
    35623556        } else if (argc != 1) {
    3563             log_to_screen(_("Invalid paremeters"));
     3557            log_to_screen("Invalid paremeters");
    35643558            paranoid_MR_finish(1);
    35653559        } else {
     
    35733567        if (does_file_exist("/tmp/changed.files")) {
    35743568            log_to_screen
    3575                 (_("See /tmp/changed.files for list of files that have changed."));
     3569                ("See /tmp/changed.files for list of files that have changed.");
    35763570        }
    35773571        mvaddstr_and_log_it(g_currentY++,
    35783572                            0,
    3579                             _("Run complete. Errors were reported. Please review the logfile."));
     3573                            "Run complete. Errors were reported. Please review the logfile.");
    35803574    } else {
    35813575        if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
    35823576            mvaddstr_and_log_it(g_currentY++,
    35833577                                0,
    3584                                 _("Run complete. Please remove floppy/CD/media and reboot."));
     3578                                "Run complete. Please remove floppy/CD/media and reboot.");
    35853579        } else {
    35863580            run_program_and_log_output("sync", FALSE);
     
    36033597            mvaddstr_and_log_it(g_currentY++,
    36043598                                0,
    3605                                 _("Run complete. Please remove media and reboot."));
     3599                                "Run complete. Please remove media and reboot.");
    36063600        }
    36073601    }
     
    36133607            if (mount_all_devices(mountlist, TRUE)) {
    36143608                log_to_screen
    3615                     (_("Unable to re-mount partitions for post-nuke stuff"));
     3609                    ("Unable to re-mount partitions for post-nuke stuff");
    36163610            } else {
    36173611                log_msg(1, "Re-mounted partitions for post-nuke stuff");
     
    36463640    run_program_and_log_output(tmp, FALSE);
    36473641    log_to_screen
    3648         (_("Restore log copied to /tmp/mondo-restore.log on your hard disk"));
     3642        ("Restore log copied to /tmp/mondo-restore.log on your hard disk");
    36493643    sprintf(tmp,
    3650             _("Mondo-restore is exiting (retval=%d)                                      "),
     3644            "Mondo-restore is exiting (retval=%d)                                      ",
    36513645            retval);
    36523646    log_to_screen(tmp);
Note: See TracChangeset for help on using the changeset viewer.