Changeset 541 in MondoRescue for branches/stable/mondo/mondo/mondorestore/mondo-rstr-compare.c
- Timestamp:
- May 13, 2006, 8:47:23 PM (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/stable/mondo/mondo/mondorestore/mondo-rstr-compare.c
r522 r541 135 135 if (!(fin = fopen(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""), "r"))) { 136 136 sprintf(tmp_ptr, 137 _("Cannot open bigfile %ld (%s)'s info file"),137 "Cannot open bigfile %ld (%s)'s info file", 138 138 bigfileno + 1, bigfile_fname_ptr); 139 139 log_to_screen(tmp_ptr); … … 149 149 log_msg(2, "biggiestruct.checksum = %s", biggiestruct.checksum); 150 150 151 sprintf(tmp_ptr, _("Comparing %s"), bigfile_fname_ptr);151 sprintf(tmp_ptr, "Comparing %s", bigfile_fname_ptr); 152 152 153 153 if (!g_text_mode) { … … 252 252 } 253 253 mvaddstr_and_log_it(g_currentY, 0, 254 _("Comparing large files "));255 open_progress_form( _("Comparing large files"),256 _("I am now comparing the large files"),257 _("against the filesystem. Please wait."), "",254 "Comparing large files "); 255 open_progress_form("Comparing large files", 256 "I am now comparing the large files", 257 "against the filesystem. Please wait.", "", 258 258 noof_biggiefiles); 259 259 for (bigfileno = 0; bigfileno < noof_biggiefiles; bigfileno++) { … … 268 268 return (0); 269 269 if (retval) { 270 mvaddstr_and_log_it(g_currentY++, 74, _("Errors."));271 } else { 272 mvaddstr_and_log_it(g_currentY++, 74, _("Done."));270 mvaddstr_and_log_it(g_currentY++, 74, "Errors."); 271 } else { 272 mvaddstr_and_log_it(g_currentY++, 74, "Done."); 273 273 } 274 274 return (retval); … … 428 428 429 429 assert(bkpinfo != NULL); 430 mvaddstr_and_log_it(g_currentY, 0, _("Comparing archives"));430 mvaddstr_and_log_it(g_currentY, 0, "Comparing archives"); 431 431 read_cfg_var(g_mondo_cfg_file, "last-filelist-number", tmp); 432 432 433 433 max_val = atol(tmp); 434 sprintf(progress_str, _("Comparing with %s #%d "),434 sprintf(progress_str, "Comparing with %s #%d ", 435 435 media_descriptor_string(bkpinfo->backup_media_type), 436 436 g_current_media_number); 437 437 438 open_progress_form( _("Comparing files"),439 _("Comparing tarballs against filesystem."),440 _("Please wait. This may take some time."),438 open_progress_form("Comparing files", 439 "Comparing tarballs against filesystem.", 440 "Please wait. This may take some time.", 441 441 progress_str, max_val); 442 442 … … 475 475 log_msg(2, "OK, I think it's time for another CD..."); 476 476 g_current_media_number++; 477 sprintf(progress_str, _("Comparing with %s #%d "),477 sprintf(progress_str, "Comparing with %s #%d ", 478 478 media_descriptor_string(bkpinfo->backup_media_type), 479 479 g_current_media_number); … … 488 488 close_progress_form(); 489 489 if (retval) { 490 mvaddstr_and_log_it(g_currentY++, 74, _("Errors."));491 } else { 492 mvaddstr_and_log_it(g_currentY++, 74, _("Done."));490 mvaddstr_and_log_it(g_currentY++, 74, "Errors."); 491 } else { 492 mvaddstr_and_log_it(g_currentY++, 74, "Done."); 493 493 } 494 494 paranoid_free(tarball_fname); … … 541 541 noof_changed_files = count_lines_in_file("/tmp/changed.txt"); 542 542 if (noof_changed_files) { 543 sprintf(tmp, _("%ld files do not match the backup "),543 sprintf(tmp, "%ld files do not match the backup ", 544 544 noof_changed_files); 545 545 // mvaddstr_and_log_it( g_currentY++, 0, tmp ); … … 548 548 paranoid_system(command); 549 549 } else { 550 sprintf(tmp, _("All files match the backup "));550 sprintf(tmp, "All files match the backup "); 551 551 mvaddstr_and_log_it(g_currentY++, 0, tmp); 552 552 log_to_screen(tmp); … … 598 598 while (get_cfg_file_from_archive(bkpinfo)) { 599 599 if (!ask_me_yes_or_no 600 ( _("Failed to find config file/archives. Choose another source?")))600 ("Failed to find config file/archives. Choose another source?")) 601 601 { 602 602 fatal_error("Unable to find config file/archives. Aborting."); … … 607 607 read_cfg_file_into_bkpinfo(g_mondo_cfg_file, bkpinfo); 608 608 g_current_media_number = 1; 609 mvaddstr_and_log_it(1, 30, _("Comparing Automatically"));609 mvaddstr_and_log_it(1, 30, "Comparing Automatically"); 610 610 iamhere("Pre-MAD"); 611 611 retval = mount_all_devices(mountlist, FALSE); … … 626 626 mvaddstr_and_log_it(g_currentY++, 627 627 0, 628 _("Warning - differences found during the compare phase"));628 "Warning - differences found during the compare phase"); 629 629 } 630 630 … … 633 633 if (count_lines_in_file("/tmp/changed.txt") > 0) { 634 634 mvaddstr_and_log_it(g_currentY++, 0, 635 _("Differences found while files were being compared."));635 "Differences found while files were being compared."); 636 636 streamline_changes_file("/tmp/changed.files", "/tmp/changed.txt"); 637 637 if (count_lines_in_file("/tmp/changed.files") <= 0) { 638 638 mvaddstr_and_log_it(g_currentY++, 0, 639 _("...but they were logfiles and temporary files. Your archives are fine."));639 "...but they were logfiles and temporary files. Your archives are fine."); 640 640 log_to_screen 641 ( _("The differences were logfiles and temporary files. Your archives are fine."));641 ("The differences were logfiles and temporary files. Your archives are fine."); 642 642 } else { 643 643 q = count_lines_in_file("/tmp/changed.files"); 644 sprintf(tmp, _("%ld significant difference%s found."), q,644 sprintf(tmp, "%ld significant difference%s found.", q, 645 645 (q != 1) ? "s" : ""); 646 646 mvaddstr_and_log_it(g_currentY++, 0, tmp); … … 648 648 649 649 strcpy(tmp, 650 _("Type 'less /tmp/changed.files' for a list of non-matching files"));650 "Type 'less /tmp/changed.files' for a list of non-matching files"); 651 651 mvaddstr_and_log_it(g_currentY++, 0, tmp); 652 652 log_to_screen(tmp); … … 658 658 } else { 659 659 log_to_screen 660 ( _("No significant differences were found. Your backup is perfect."));660 ("No significant differences were found. Your backup is perfect."); 661 661 } 662 662 kill_petris(); … … 694 694 run_program_and_log_output(command, FALSE); 695 695 mvaddstr_and_log_it(g_currentY, 696 0, _("Verifying archives against filesystem"));696 0, "Verifying archives against filesystem"); 697 697 698 698 if (bkpinfo->disaster_recovery … … 714 714 } 715 715 716 mvaddstr_and_log_it(g_currentY++, 74, _("Done."));716 mvaddstr_and_log_it(g_currentY++, 74, "Done."); 717 717 paranoid_free(dir); 718 718 paranoid_free(command); … … 751 751 run_program_and_log_output(command, FALSE); 752 752 mvaddstr_and_log_it(g_currentY, 753 0, _("Verifying archives against filesystem"));753 0, "Verifying archives against filesystem"); 754 754 res = verify_tape_backups(bkpinfo); 755 755 chdir(dir); 756 756 if (res) { 757 mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));758 } else { 759 mvaddstr_and_log_it(g_currentY++, 74, _("Done."));757 mvaddstr_and_log_it(g_currentY++, 74, "Failed."); 758 } else { 759 mvaddstr_and_log_it(g_currentY++, 74, "Done."); 760 760 } 761 761 paranoid_free(dir);
Note:
See TracChangeset
for help on using the changeset viewer.