Ignore:
Timestamp:
Apr 30, 2006, 2:04:16 AM (14 years ago)
Author:
bcornec
Message:

merge -r489:506 $SVN_M/branches/stable

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/mondo/mondo/common/libmondo-stream.c

    r171 r507  
    1313#include "mondostructures.h"
    1414#include "libmondo-devices.h"
    15 #include "lib-common-externs.h"
    1615#include "libmondo-stream.h"
    1716#include "libmondo-string-EXT.h"
    1817#include "libmondo-files-EXT.h"
    19 #include "libmondo-gui-EXT.h"
     18#include "newt-specific-EXT.h"
    2019#include "libmondo-fork-EXT.h"
    2120#include "libmondo-tools-EXT.h"
     
    416415        //      log_it("g_current_media_number = %d", g_current_media_number);
    417416        asprintf(&tmp,
    418                  "When the tape drive goes quiet, please insert volume %d in this series.",
     417                 _("When the tape drive goes quiet, please insert volume %d in this series."),
    419418                 tapeno);
    420419        popup_and_OK(tmp);
    421420        paranoid_free(tmp);
    422         open_evalcall_form("Waiting while the tape drive settles");
    423     } else {
    424         open_evalcall_form("Waiting while the tape drive rewinds");
     421        open_evalcall_form(_("Waiting while the tape drive settles"));
     422    } else {
     423        open_evalcall_form(_("Waiting while the tape drive rewinds"));
    425424    }
    426425
     
    613612                                bkpinfo->internal_tape_block_size))) {
    614613        log_OS_error(g_tape_fifo);
    615         log_to_screen("Cannot openin stream device");
     614        log_to_screen(_("Cannot openin stream device"));
    616615        return (1);
    617616    }
    618     log_to_screen("Reading stream");
     617    log_to_screen(_("Reading stream"));
    619618    log_it("stream device = '%s'", bkpinfo->media_device);
    620619/* skip data disks */
    621620    open_evalcall_form("Skipping data disks on stream");
    622     log_to_screen("Skipping data disks on stream");
     621    log_to_screen(_("Skipping data disks on stream"));
    623622    if (!(fout = fopen(outfname, "w"))) {
    624623        log_OS_error(outfname);
    625         log_to_screen("Cannot openout datadisk all.tar.gz file");
     624        log_to_screen(_("Cannot openout datadisk all.tar.gz file"));
    626625        return (-1);
    627626    }
    628627    if (!(datablock = (char *) malloc(256 * 1024))) {
    629         log_to_screen("Unable to malloc 256*1024");
     628        log_to_screen(_("Unable to malloc 256*1024"));
    630629        exit(1);
    631630    }
     
    707706        return (0);
    708707    } else {
    709         log_to_screen("Failed to openout to cdstream (fifo)");
     708        log_to_screen(_("Failed to openout to cdstream (fifo)"));
    710709        return (1);
    711710    }
     
    739738         open_device_via_buffer(tapedev, 'w', internal_tape_block_size))) {
    740739        log_OS_error(g_tape_fifo);
    741         log_to_screen("Cannot openin stream device");
     740        log_to_screen(_("Cannot openin stream device"));
    742741        return (1);
    743742    }
     
    872871    if (!fout) {
    873872        log_OS_error(outfname);
    874         log_to_screen("Cannot openout file");
     873        log_to_screen(_("Cannot openout file"));
    875874        return (1);
    876875    }
     
    930929    }
    931930    if (strcmp(temp_cksum, actual_cksum)) {
    932         asprintf(&tmp, "actual cksum=%s; recorded cksum=%s", actual_cksum,
     931        asprintf(&tmp, _("actual cksum=%s; recorded cksum=%s"), actual_cksum,
    933932                 temp_cksum);
    934933        log_to_screen(tmp);
    935934        paranoid_free(tmp);
    936935
    937         asprintf(&tmp, "%s (%ld K) is corrupt on tape", temp_fname,
     936        asprintf(&tmp, _("%s (%ld K) is corrupt on tape"), temp_fname,
    938937                 (long) orig_size >> 10);
    939938        log_to_screen(tmp);
     
    10781077        log_it("mediasize = %ld", mediasize);
    10791078        we_need_a_new_tape = TRUE;
    1080         log_to_screen("Should have started a new tape/CD already");
     1079        log_to_screen(_("Should have started a new tape/CD already"));
    10811080    }
    10821081    if ((g_tape_posK + length_of_incoming_file / 1024) >> 10 >=
     
    12381237                                bkpinfo->internal_tape_block_size))) {
    12391238        log_OS_error(g_tape_fifo);
    1240         log_to_screen("Cannot openin stream device");
     1239        log_to_screen(_("Cannot openin stream device"));
    12411240        return (1);
    12421241    }
     
    12751274    if (g_current_media_number > MAX_NOOF_MEDIA) {
    12761275        res++;
    1277         log_to_screen("Too many tapes. Man, you need to use nfs!");
     1276        log_to_screen(_("Too many tapes. Man, you need to use nfs!"));
    12781277    }
    12791278    if (bkpinfo->backup_media_type == cdstream) {
     
    12881287        paranoid_free(command);
    12891288        if (!g_tape_stream) {
    1290             log_to_screen("Failed to openout to cdstream (fifo)");
     1289            log_to_screen(_("Failed to openout to cdstream (fifo)"));
    12911290            return (1);
    12921291        }
     
    12981297                                    bkpinfo->internal_tape_block_size))) {
    12991298            log_OS_error(g_tape_fifo);
    1300             log_to_screen("Cannot openin stream device");
     1299            log_to_screen(_("Cannot openin stream device"));
    13011300            return (1);
    13021301        }
     
    13791378    /*@ end vars *************************************************** */
    13801379
    1381     open_evalcall_form("Writing data disks to tape");
    1382     log_to_screen("Writing data disks to tape");
     1380    open_evalcall_form(_("Writing data disks to tape"));
     1381    log_to_screen(_("Writing data disks to tape"));
    13831382    log_it("Data disks = %s", fname);
    13841383    if (!does_file_exist(fname)) {
    1385         asprintf(&tmp, "Cannot find %s", fname);
     1384        asprintf(&tmp, _("Cannot find %s"), fname);
    13861385        log_to_screen(tmp);
    13871386        paranoid_free(tmp);
     
    15681567    if (!g_tape_stream) {
    15691568        log_to_screen
    1570             ("You're not backing up to tape. Why write a tape header?");
     1569            (_("You're not backing up to tape. Why write a tape header?"));
    15711570        return (1);
    15721571    }
     
    16021601
    16031602    /*@ end vars *************************************************** */
    1604     asprintf(&tmp, "Wrong marker! (Should be %s, is actually %s)",
     1603    asprintf(&tmp, _("Wrong marker! (Should be %s, is actually %s)"),
    16051604             marker_to_string(should_be), marker_to_string(it_is));
    16061605    log_to_screen(tmp);
Note: See TracChangeset for help on using the changeset viewer.