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)

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-compare.c (modified) (18 diffs)

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

@@ -135 +135 @@
     if (!(fin = fopen(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""), "r"))) {
         sprintf(tmp_ptr,
-                _("Cannot open bigfile %ld (%s)'s info file"),
+                "Cannot open bigfile %ld (%s)'s info file",
                 bigfileno + 1, bigfile_fname_ptr);
         log_to_screen(tmp_ptr);
@@ -149 +149 @@
     log_msg(2, "biggiestruct.checksum = %s", biggiestruct.checksum);
 
-    sprintf(tmp_ptr, _("Comparing %s"), bigfile_fname_ptr);
+    sprintf(tmp_ptr, "Comparing %s", bigfile_fname_ptr);
 
     if (!g_text_mode) {
@@ -252 +252 @@
     }
     mvaddstr_and_log_it(g_currentY, 0,
-                        _("Comparing large files                                                  "));
-    open_progress_form(_("Comparing large files"),
-                       _("I am now comparing the large files"),
-                       _("against the filesystem. Please wait."), "",
+                        "Comparing large files                                                  ");
+    open_progress_form("Comparing large files",
+                       "I am now comparing the large files",
+                       "against the filesystem. Please wait.", "",
                        noof_biggiefiles);
     for (bigfileno = 0; bigfileno < noof_biggiefiles; bigfileno++) {
@@ -268 +268 @@
     return (0);
     if (retval) {
-        mvaddstr_and_log_it(g_currentY++, 74, _("Errors."));
-    } else {
-        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
+        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
     return (retval);
@@ -428 +428 @@
 
     assert(bkpinfo != NULL);
-    mvaddstr_and_log_it(g_currentY, 0, _("Comparing archives"));
+    mvaddstr_and_log_it(g_currentY, 0, "Comparing archives");
     read_cfg_var(g_mondo_cfg_file, "last-filelist-number", tmp);
 
     max_val = atol(tmp);
-    sprintf(progress_str, _("Comparing with %s #%d "),
+    sprintf(progress_str, "Comparing with %s #%d ",
             media_descriptor_string(bkpinfo->backup_media_type),
             g_current_media_number);
 
-    open_progress_form(_("Comparing files"),
-                       _("Comparing tarballs against filesystem."),
-                       _("Please wait. This may take some time."),
+    open_progress_form("Comparing files",
+                       "Comparing tarballs against filesystem.",
+                       "Please wait. This may take some time.",
                        progress_str, max_val);
 
@@ -475 +475 @@
             log_msg(2, "OK, I think it's time for another CD...");
             g_current_media_number++;
-            sprintf(progress_str, _("Comparing with %s #%d "),
+            sprintf(progress_str, "Comparing with %s #%d ",
                     media_descriptor_string(bkpinfo->backup_media_type),
                     g_current_media_number);
@@ -488 +488 @@
     close_progress_form();
     if (retval) {
-        mvaddstr_and_log_it(g_currentY++, 74, _("Errors."));
-    } else {
-        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
+        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
     paranoid_free(tarball_fname);
@@ -541 +541 @@
     noof_changed_files = count_lines_in_file("/tmp/changed.txt");
     if (noof_changed_files) {
-        sprintf(tmp, _("%ld files do not match the backup            "),
+        sprintf(tmp, "%ld files do not match the backup            ",
                 noof_changed_files);
         //      mvaddstr_and_log_it( g_currentY++, 0, tmp );
@@ -548 +548 @@
         paranoid_system(command);
     } else {
-        sprintf(tmp, _("All files match the backup                     "));
+        sprintf(tmp, "All files match the backup                     ");
         mvaddstr_and_log_it(g_currentY++, 0, tmp);
         log_to_screen(tmp);
@@ -598 +598 @@
     while (get_cfg_file_from_archive(bkpinfo)) {
         if (!ask_me_yes_or_no
-            (_("Failed to find config file/archives. Choose another source?")))
+            ("Failed to find config file/archives. Choose another source?"))
         {
             fatal_error("Unable to find config file/archives. Aborting.");
@@ -607 +607 @@
     read_cfg_file_into_bkpinfo(g_mondo_cfg_file, bkpinfo);
     g_current_media_number = 1;
-    mvaddstr_and_log_it(1, 30, _("Comparing Automatically"));
+    mvaddstr_and_log_it(1, 30, "Comparing Automatically");
     iamhere("Pre-MAD");
     retval = mount_all_devices(mountlist, FALSE);
@@ -626 +626 @@
         mvaddstr_and_log_it(g_currentY++,
                             0,
-                            _("Warning - differences found during the compare phase"));
+                            "Warning - differences found during the compare phase");
     }
 
@@ -633 +633 @@
     if (count_lines_in_file("/tmp/changed.txt") > 0) {
         mvaddstr_and_log_it(g_currentY++, 0,
-                            _("Differences found while files were being compared."));
+                            "Differences found while files were being compared.");
         streamline_changes_file("/tmp/changed.files", "/tmp/changed.txt");
         if (count_lines_in_file("/tmp/changed.files") <= 0) {
             mvaddstr_and_log_it(g_currentY++, 0,
-                                _("...but they were logfiles and temporary files. Your archives are fine."));
+                                "...but they were logfiles and temporary files. Your archives are fine.");
             log_to_screen
-                (_("The differences were logfiles and temporary files. Your archives are fine."));
+                ("The differences were logfiles and temporary files. Your archives are fine.");
         } else {
             q = count_lines_in_file("/tmp/changed.files");
-            sprintf(tmp, _("%ld significant difference%s found."), q,
+            sprintf(tmp, "%ld significant difference%s found.", q,
                     (q != 1) ? "s" : "");
             mvaddstr_and_log_it(g_currentY++, 0, tmp);
@@ -648 +648 @@
 
             strcpy(tmp,
-                   _("Type 'less /tmp/changed.files' for a list of non-matching files"));
+                   "Type 'less /tmp/changed.files' for a list of non-matching files");
             mvaddstr_and_log_it(g_currentY++, 0, tmp);
             log_to_screen(tmp);
@@ -658 +658 @@
     } else {
         log_to_screen
-            (_("No significant differences were found. Your backup is perfect."));
+            ("No significant differences were found. Your backup is perfect.");
     }
     kill_petris();
@@ -694 +694 @@
     run_program_and_log_output(command, FALSE);
     mvaddstr_and_log_it(g_currentY,
-                        0, _("Verifying archives against filesystem"));
+                        0, "Verifying archives against filesystem");
 
     if (bkpinfo->disaster_recovery
@@ -714 +714 @@
     }
 
-    mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
+    mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     paranoid_free(dir);
     paranoid_free(command);
@@ -751 +751 @@
     run_program_and_log_output(command, FALSE);
     mvaddstr_and_log_it(g_currentY,
-                        0, _("Verifying archives against filesystem"));
+                        0, "Verifying archives against filesystem");
     res = verify_tape_backups(bkpinfo);
     chdir(dir);
     if (res) {
-        mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
-    } else {
-        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
+        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     }
     paranoid_free(dir);