Changeset 507 in MondoRescue for trunk/mondo/mondo/common/libmondo-stream.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-stream.c (modified) (15 diffs)

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

@@ -13 +13 @@
 #include "mondostructures.h"
 #include "libmondo-devices.h"
-#include "lib-common-externs.h"
 #include "libmondo-stream.h"
 #include "libmondo-string-EXT.h"
 #include "libmondo-files-EXT.h"
-#include "libmondo-gui-EXT.h"
+#include "newt-specific-EXT.h"
 #include "libmondo-fork-EXT.h"
 #include "libmondo-tools-EXT.h"
@@ -416 +415 @@
         //      log_it("g_current_media_number = %d", g_current_media_number);
         asprintf(&tmp,
-                 "When the tape drive goes quiet, please insert volume %d in this series.",
+                 _("When the tape drive goes quiet, please insert volume %d in this series."),
                  tapeno);
         popup_and_OK(tmp);
         paranoid_free(tmp);
-        open_evalcall_form("Waiting while the tape drive settles");
-    } else {
-        open_evalcall_form("Waiting while the tape drive rewinds");
+        open_evalcall_form(_("Waiting while the tape drive settles"));
+    } else {
+        open_evalcall_form(_("Waiting while the tape drive rewinds"));
     }
 
@@ -613 +612 @@
                                 bkpinfo->internal_tape_block_size))) {
         log_OS_error(g_tape_fifo);
-        log_to_screen("Cannot openin stream device");
+        log_to_screen(_("Cannot openin stream device"));
         return (1);
     }
-    log_to_screen("Reading stream");
+    log_to_screen(_("Reading stream"));
     log_it("stream device = '%s'", bkpinfo->media_device);
 /* skip data disks */
     open_evalcall_form("Skipping data disks on stream");
-    log_to_screen("Skipping data disks on stream");
+    log_to_screen(_("Skipping data disks on stream"));
     if (!(fout = fopen(outfname, "w"))) {
         log_OS_error(outfname);
-        log_to_screen("Cannot openout datadisk all.tar.gz file");
+        log_to_screen(_("Cannot openout datadisk all.tar.gz file"));
         return (-1);
     }
     if (!(datablock = (char *) malloc(256 * 1024))) {
-        log_to_screen("Unable to malloc 256*1024");
+        log_to_screen(_("Unable to malloc 256*1024"));
         exit(1);
     }
@@ -707 +706 @@
         return (0);
     } else {
-        log_to_screen("Failed to openout to cdstream (fifo)");
+        log_to_screen(_("Failed to openout to cdstream (fifo)"));
         return (1);
     }
@@ -739 +738 @@
          open_device_via_buffer(tapedev, 'w', internal_tape_block_size))) {
         log_OS_error(g_tape_fifo);
-        log_to_screen("Cannot openin stream device");
+        log_to_screen(_("Cannot openin stream device"));
         return (1);
     }
@@ -872 +871 @@
     if (!fout) {
         log_OS_error(outfname);
-        log_to_screen("Cannot openout file");
+        log_to_screen(_("Cannot openout file"));
         return (1);
     }
@@ -930 +929 @@
     }
     if (strcmp(temp_cksum, actual_cksum)) {
-        asprintf(&tmp, "actual cksum=%s; recorded cksum=%s", actual_cksum,
+        asprintf(&tmp, _("actual cksum=%s; recorded cksum=%s"), actual_cksum,
                  temp_cksum);
         log_to_screen(tmp);
         paranoid_free(tmp);
 
-        asprintf(&tmp, "%s (%ld K) is corrupt on tape", temp_fname,
+        asprintf(&tmp, _("%s (%ld K) is corrupt on tape"), temp_fname,
                  (long) orig_size >> 10);
         log_to_screen(tmp);
@@ -1078 +1077 @@
         log_it("mediasize = %ld", mediasize);
         we_need_a_new_tape = TRUE;
-        log_to_screen("Should have started a new tape/CD already");
+        log_to_screen(_("Should have started a new tape/CD already"));
     }
     if ((g_tape_posK + length_of_incoming_file / 1024) >> 10 >=
@@ -1238 +1237 @@
                                 bkpinfo->internal_tape_block_size))) {
         log_OS_error(g_tape_fifo);
-        log_to_screen("Cannot openin stream device");
+        log_to_screen(_("Cannot openin stream device"));
         return (1);
     }
@@ -1275 +1274 @@
     if (g_current_media_number > MAX_NOOF_MEDIA) {
         res++;
-        log_to_screen("Too many tapes. Man, you need to use nfs!");
+        log_to_screen(_("Too many tapes. Man, you need to use nfs!"));
     }
     if (bkpinfo->backup_media_type == cdstream) {
@@ -1288 +1287 @@
         paranoid_free(command);
         if (!g_tape_stream) {
-            log_to_screen("Failed to openout to cdstream (fifo)");
+            log_to_screen(_("Failed to openout to cdstream (fifo)"));
             return (1);
         }
@@ -1298 +1297 @@
                                     bkpinfo->internal_tape_block_size))) {
             log_OS_error(g_tape_fifo);
-            log_to_screen("Cannot openin stream device");
+            log_to_screen(_("Cannot openin stream device"));
             return (1);
         }
@@ -1379 +1378 @@
     /*@ end vars *************************************************** */
 
-    open_evalcall_form("Writing data disks to tape");
-    log_to_screen("Writing data disks to tape");
+    open_evalcall_form(_("Writing data disks to tape"));
+    log_to_screen(_("Writing data disks to tape"));
     log_it("Data disks = %s", fname);
     if (!does_file_exist(fname)) {
-        asprintf(&tmp, "Cannot find %s", fname);
+        asprintf(&tmp, _("Cannot find %s"), fname);
         log_to_screen(tmp);
         paranoid_free(tmp);
@@ -1568 +1567 @@
     if (!g_tape_stream) {
         log_to_screen
-            ("You're not backing up to tape. Why write a tape header?");
+            (_("You're not backing up to tape. Why write a tape header?"));
         return (1);
     }
@@ -1602 +1601 @@
 
     /*@ end vars *************************************************** */
-    asprintf(&tmp, "Wrong marker! (Should be %s, is actually %s)",
+    asprintf(&tmp, _("Wrong marker! (Should be %s, is actually %s)"),
              marker_to_string(should_be), marker_to_string(it_is));
     log_to_screen(tmp);