Changeset 507 in MondoRescue for trunk/mondo/mondo/common/libmondo-verify.c

Timestamp:

Apr 30, 2006, 2:04:16 AM (18 years ago)

Author:

bcornec

Message:

merge -r489:506 $SVN_M/branches/stable

File:

• trunk/mondo/mondo/common/libmondo-verify.c (modified) (13 diffs)

trunk/mondo/mondo/common/libmondo-verify.c

@@ -9 +9 @@
 #include "mondostructures.h"
 #include "libmondo-verify.h"
-#include "libmondo-gui-EXT.h"
+#include "newt-specific-EXT.h"
 #include "libmondo-files-EXT.h"
 #include "libmondo-fork-EXT.h"
@@ -16 +16 @@
 #include "libmondo-devices-EXT.h"
 #include "libmondo-tools-EXT.h"
-#include "lib-common-externs.h"
 
 /*@unused@*/
@@ -669 +668 @@
             paranoid_free(tmp);
 
-            asprintf(&tmp, "%s has changed on live filesystem",
+            asprintf(&tmp, _("%s has changed on live filesystem"),
                      biggie_fname);
             log_to_screen(tmp);
@@ -719 +718 @@
     asprintf(&curr_acl_list_fname, ACL_BIGGLST_FNAME_RAW_SZ,
              bkpinfo->tmpdir);
-    log_to_screen("Verifying regular archives on tape");
+    log_to_screen(_("Verifying regular archives on tape"));
     total_afioballs = get_last_filelist_number(bkpinfo) + 1;
-    open_progress_form("Verifying filesystem",
-                       "I am verifying archives against your live filesystem now.",
-                       "Please wait. This may take a couple of hours.", "",
+    open_progress_form(_("Verifying filesystem"),
+                       _("I am verifying archives against your live filesystem now."),
+                       _("Please wait. This may take a couple of hours."), "",
                        total_afioballs);
     res = read_header_block_from_stream(&size, NULL, &ctrl_chr);
@@ -771 +770 @@
         res = verify_an_afioball_from_stream(bkpinfo, fname, size);
         if (res) {
-            asprintf(&tmp, "Afioball %ld differs from live filesystem",
+            asprintf(&tmp, _("Afioball %ld differs from live filesystem"),
                      current_afioball_number);
             log_to_screen(tmp);
@@ -857 +856 @@
     noof_biggiefiles = (long) size;
     log_msg(1, "noof_biggiefiles = %ld", noof_biggiefiles);
-    open_progress_form("Verifying big files", comment,
-                       "Please wait. This may take some time.", "",
+    open_progress_form(_("Verifying big files"), comment,
+                       _("Please wait. This may take some time."), "",
                        noof_biggiefiles);
     paranoid_free(comment);
@@ -876 +875 @@
             p++;
         }
-        asprintf(&comment, "Verifying bigfile #%ld (%ld K)",
+        asprintf(&comment, _("Verifying bigfile #%ld (%ld K)"),
                  current_biggiefile_number, (long) size >> 10);
         update_progress_form(comment);
@@ -949 +948 @@
 
         if (bkpinfo->manual_cd_tray) {
-            popup_and_OK("Please push CD tray closed.");
+            popup_and_OK(_("Please push CD tray closed."));
         }
         if (find_and_mount_actual_cd(bkpinfo, mountpoint)) {
-            log_to_screen("failed to mount actual CD");
+            log_to_screen(_("failed to mount actual CD"));
             return (1);
         }
@@ -964 +963 @@
         mddevice = make_vn(fname);
         if (ret) {
-            asprintf(&tmp, "make_vn of %s failed; unable to verify ISO\n",
+            asprintf(&tmp, _("make_vn of %s failed; unable to verify ISO\n"),
                      fname);
             log_to_screen(tmp);
@@ -976 +975 @@
 #endif
         if (run_program_and_log_output(command, FALSE)) {
-            asprintf(&tmp, "%s failed; unable to mount ISO image\n",
+            asprintf(&tmp, _("%s failed; unable to mount ISO image\n"),
                      command);
             log_to_screen(tmp);
@@ -1065 +1064 @@
 
     log_msg(3, "verify_tape_backups --- starting");
-    log_to_screen("Verifying backups");
+    log_to_screen(_("Verifying backups"));
     openin_tape(bkpinfo);
 
@@ -1093 +1092 @@
             && length_of_file(changed_files_fname) > 2) {
             log_to_screen
-                ("Warning - unable to check logfile to derive list of changed files");
+                (_("Warning - unable to check logfile to derive list of changed files"));
         } else {
             log_to_screen
-                ("No differences found. Therefore, no 'changed.files' text file.");
+                (_("No differences found. Therefore, no 'changed.files' text file."));
         }
     }
@@ -1119 +1118 @@
 
         log_to_screen
-            ("See /tmp/changed.files for a list of nonmatching files.");
+            (_("See /tmp/changed.files for a list of nonmatching files."));
         log_to_screen
-            ("The files probably changed on filesystem, not on backup media.");
+            (_("The files probably changed on filesystem, not on backup media."));
         //      retval++;
     }