Changeset 507


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

merge -r489:506 $SVN_M/branches/stable

Location:
trunk
Files:
4 deleted
31 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk/documentation/Makefile.howto

    r408 r507  
    3434    @rm -fr $(TARGET)
    3535    @docbook2html -d $(TARGET).dsl'#html' -o $(TARGET) $(TARGET).sgml
     36    @ln -sf $(IMAGESDIR) $(TARGET)
    3637
    3738$(TARGET).html: $(SRC) $(DSL) $(IMAGES)
     
    6364    @echo "Delivering mondorescue howto"
    6465    @echo ""
    65     @if [ "${INSTALLDIR}" != "" ]; then mkdir -p ${INSTALLDIR} ; cp -a $(TARGET).{html,pdf,ps,txt,rtf} $(TARGET) ${INSTALLDIR} ; cp -a ${IMAGESDIR} ${INSTALLDIR}/$(TARGET) ; else echo "No INSTALLDIR specified aborting install"; fi
     66    @if [ "${INSTALLDIR}" != "" ]; then mkdir -p ${INSTALLDIR} ; cp -a $(TARGET).{html,pdf,ps,txt,rtf} $(TARGET) ${INSTALLDIR} ; else echo "No INSTALLDIR specified aborting install"; fi
  • trunk/mondo/ChangeLog

    r309 r507  
    99  needed + remove memory leaks)
    1010
    11 v2.07 ()
     11v2.2.0 (2006-05-01)
     12=======
     13
     14- Internationalization (A huge thank to rene-marc dolhen
     15<rmd_at_mecreant.org> who achieved that big task)
     16- Fixed verify for NFS (Andree Leidenfrost)
     17- Fix for Bug #6975 (Bruno Cornec)
     18- Fix a bug when restoring interactively and having file names with blank
     19  (Bruno Cornec)
     20- Fix options -I and -E of mondoarchive which were not working
     21  (Bruno Cornec)
     22- Removed 'ax' options from ps call in busybox (Andree Leidenfrost)
     23
     24v2.0.7 (2006-02-23)
    1225- useless cat, sort|uniq commands removed
    1326  (Bruno Cornec/Sébastien Aperghis-Tramoni)
  • trunk/mondo/Makefile.am

    r426 r507  
    11AUTOMAKE_OPTIONS = 1.7
    2 SUBDIRS        = mondo
     2SUBDIRS        = mondo po
    33man8_MANS      = docs/man/mondoarchive.8 docs/man/mondorestore.8
     4
     5ACLOCAL_AMFLAGS = -I m4
     6
     7EXTRA_DIST = config.rpath  config.rpath
  • trunk/mondo/bootstrap

    r35 r507  
    2828make maintainer-clean >/dev/null 2>&1
    2929libtoolize -f -c --automake
    30 aclocal
     30cp /usr/bin/gettextize .
     31perl -pi -e 's~read dummy < /dev/tty~~' gettextize
     32./gettextize -c -f --no-changelog < /dev/null
     33rm -f gettextize
     34aclocal -I m4
    3135autoheader
    3236automake
  • trunk/mondo/configure.in

    r489 r507  
    3030AC_PROG_MAKE_SET
    3131
     32AM_GNU_GETTEXT([external])
     33ALL_LINGUAS="fr"
    3234
    3335dnl --with/--enable stuff
  • trunk/mondo/distributions/rpm/mondo.spec

    r461 r507  
    9090%attr(755,root,root) %{_datadir}/%{name}/autorun
    9191%attr(755,root,root) %{_datadir}/%{name}/post-nuke.sample/usr/bin/post-nuke
     92%{_datadir}/locale/*/LC_MESSAGES/mondo.mo
    9293%{_datadir}/%{name}/*
    9394%{_mandir}/man8/*
  • trunk/mondo/mkinstalldirs

    r30 r507  
    11#! /bin/sh
    22# mkinstalldirs --- make directory hierarchy
    3 # Author: Noah Friedman <friedman@prep.ai.mit.edu>
     3
     4scriptversion=2004-02-15.20
     5
     6# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
    47# Created: 1993-05-16
    5 # Public domain
     8# Public domain.
     9#
     10# This file is maintained in Automake, please report
     11# bugs to <bug-automake@gnu.org> or send patches to
     12# <automake-patches@gnu.org>.
    613
    714errstatus=0
     
    916
    1017usage="\
    11 Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
     18Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
     19
     20Create each directory DIR (with mode MODE, if specified), including all
     21leading file name components.
     22
     23Report bugs to <bug-automake@gnu.org>."
    1224
    1325# process command line arguments
    1426while test $# -gt 0 ; do
    15    case "${1}" in
    16      -h | --help | --h* )           # -h for help
    17     echo "${usage}" 1>&2; exit 0 ;;
    18      -m )                   # -m PERM arg
    19     shift
    20     test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
    21     dirmode="${1}"
    22     shift ;;
    23      -- ) shift; break ;;           # stop option processing
    24      -* ) echo "${usage}" 1>&2; exit 1 ;;   # unknown option
    25      * )  break ;;              # first non-opt arg
    26    esac
     27  case $1 in
     28    -h | --help | --h*)         # -h for help
     29      echo "$usage"
     30      exit 0
     31      ;;
     32    -m)                         # -m PERM arg
     33      shift
     34      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
     35      dirmode=$1
     36      shift
     37      ;;
     38    --version)
     39      echo "$0 $scriptversion"
     40      exit 0
     41      ;;
     42    --)                         # stop option processing
     43      shift
     44      break
     45      ;;
     46    -*)                         # unknown option
     47      echo "$usage" 1>&2
     48      exit 1
     49      ;;
     50    *)                          # first non-opt arg
     51      break
     52      ;;
     53  esac
    2754done
    2855
     
    3764
    3865case $# in
    39 0) exit 0 ;;
     66  0) exit 0 ;;
    4067esac
    4168
     69# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
     70# mkdir -p a/c at the same time, both will detect that a is missing,
     71# one will create a, then the other will try to create a and die with
     72# a "File exists" error.  This is a problem when calling mkinstalldirs
     73# from a parallel make.  We use --version in the probe to restrict
     74# ourselves to GNU mkdir, which is thread-safe.
    4275case $dirmode in
    43 '')
    44   if mkdir -p -- . 2>/dev/null; then
    45     echo "mkdir -p -- $*"
    46     exec mkdir -p -- "$@"
    47   fi ;;
    48 *)
    49   if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
    50     echo "mkdir -m $dirmode -p -- $*"
    51     exec mkdir -m "$dirmode" -p -- "$@"
    52   fi ;;
     76  '')
     77    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
     78      echo "mkdir -p -- $*"
     79      exec mkdir -p -- "$@"
     80    else
     81      # On NextStep and OpenStep, the `mkdir' command does not
     82      # recognize any option.  It will interpret all options as
     83      # directories to create, and then abort because `.' already
     84      # exists.
     85      test -d ./-p && rmdir ./-p
     86      test -d ./--version && rmdir ./--version
     87    fi
     88    ;;
     89  *)
     90    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
     91       test ! -d ./--version; then
     92      echo "mkdir -m $dirmode -p -- $*"
     93      exec mkdir -m "$dirmode" -p -- "$@"
     94    else
     95      # Clean up after NextStep and OpenStep mkdir.
     96      for d in ./-m ./-p ./--version "./$dirmode";
     97      do
     98        test -d $d && rmdir $d
     99      done
     100    fi
     101    ;;
    53102esac
    54103
    55104for file
    56105do
    57    set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
    58    shift
     106  set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
     107  shift
    59108
    60    pathcomp=
    61    for d
    62    do
    63      pathcomp="$pathcomp$d"
    64      case "$pathcomp" in
    65        -* ) pathcomp=./$pathcomp ;;
    66      esac
     109  pathcomp=
     110  for d
     111  do
     112    pathcomp="$pathcomp$d"
     113    case $pathcomp in
     114      -*) pathcomp=./$pathcomp ;;
     115    esac
    67116
    68      if test ! -d "$pathcomp"; then
    69     echo "mkdir $pathcomp"
     117    if test ! -d "$pathcomp"; then
     118      echo "mkdir $pathcomp"
    70119
    71     mkdir "$pathcomp" || lasterr=$?
     120      mkdir "$pathcomp" || lasterr=$?
    72121
    73     if test ! -d "$pathcomp"; then
    74       errstatus=$lasterr
    75     else
    76       if test ! -z "$dirmode"; then
    77          echo "chmod $dirmode $pathcomp"
     122      if test ! -d "$pathcomp"; then
     123    errstatus=$lasterr
     124      else
     125    if test ! -z "$dirmode"; then
     126      echo "chmod $dirmode $pathcomp"
     127      lasterr=""
     128      chmod "$dirmode" "$pathcomp" || lasterr=$?
    78129
    79          lasterr=""
    80          chmod "$dirmode" "$pathcomp" || lasterr=$?
    81 
    82          if test ! -z "$lasterr"; then
    83            errstatus=$lasterr
    84          fi
     130      if test ! -z "$lasterr"; then
     131        errstatus=$lasterr
    85132      fi
    86133    fi
    87      fi
     134      fi
     135    fi
    88136
    89      pathcomp="$pathcomp/"
    90    done
     137    pathcomp="$pathcomp/"
     138  done
    91139done
    92140
     
    95143# Local Variables:
    96144# mode: shell-script
    97 # sh-indentation: 3
     145# sh-indentation: 2
     146# eval: (add-hook 'write-file-hooks 'time-stamp)
     147# time-stamp-start: "scriptversion="
     148# time-stamp-format: "%:y-%02m-%02d.%02H"
     149# time-stamp-end: "$"
    98150# End:
    99 # mkinstalldirs ends here
  • trunk/mondo/mondo/common/Makefile.am

    r426 r507  
    1414                       libmondo-archive.h libmondo-devices.h \
    1515                       libmondo-filelist.h libmondo-files.h libmondo-fork.h \
    16                        libmondo-gui.h libmondo-mountlist.h libmondo-raid.h \
     16                       libmondo-mountlist.h libmondo-raid.h \
    1717                       libmondo-stream.h libmondo-string.h libmondo-tools.h \
    1818                       libmondo-verify.h libmondo-fifo.h \
     
    2020                       libmondo-devices-EXT.h libmondo-fifo-EXT.h \
    2121                       libmondo-files-EXT.h libmondo-fork-EXT.h \
    22                        libmondo-gui-EXT.h libmondo-filelist-EXT.h \
     22                       libmondo-filelist-EXT.h \
    2323                       libmondo-mountlist-EXT.h libmondo-raid-EXT.h  \
    2424                       libmondo-string-EXT.h libmondo-tools-EXT.h \
  • trunk/mondo/mondo/common/libmondo-archive.c

    r426 r507  
    1616#include "libmondo-devices-EXT.h"
    1717#include "libmondo-tools-EXT.h"
    18 #include "libmondo-gui-EXT.h"
     18#include "newt-specific-EXT.h"
    1919#include "libmondo-fork-EXT.h"
    2020#include "libmondo-files-EXT.h"
     
    2323#include "libmondo-verify-EXT.h"
    2424#include "libmondo-archive.h"
    25 #include "lib-common-externs.h"
    2625#include <sys/sem.h>
    2726#include <sys/types.h>
     
    14571456    log_to_screen("Archiving regular files");
    14581457    log_msg(5, "Go, Shorty. It's your birthday.");
    1459     open_progress_form("Backing up filesystem",
    1460                        "I am backing up your live filesystem now.",
    1461                        "Please wait. This may take a couple of hours.",
    1462                        "Working...",
     1458    open_progress_form(_("Backing up filesystem"),
     1459                       _("I am backing up your live filesystem now."),
     1460                       _("Please wait. This may take a couple of hours."),
     1461                       _("Working..."),
    14631462                       get_last_filelist_number(bkpinfo) + 1);
    14641463
     
    16651664
    16661665    if (bkpinfo->backup_media_type == iso && bkpinfo->manual_cd_tray) {
    1667         popup_and_OK("Please insert new media and press Enter.");
     1666        popup_and_OK(_("Please insert new media and press Enter."));
    16681667    }
    16691668
     
    21482147    log_to_screen("Archiving regular files");
    21492148
    2150     open_progress_form("Backing up filesystem",
    2151                        "I am backing up your live filesystem now.",
    2152                        "Please wait. This may take a couple of hours.",
    2153                        "Working...",
     2149    open_progress_form(_("Backing up filesystem"),
     2150                       _("I am backing up your live filesystem now."),
     2151                       _("Please wait. This may take a couple of hours."),
     2152                       _("Working..."),
    21542153                       get_last_filelist_number(bkpinfo) + 1);
    21552154
  • trunk/mondo/mondo/common/libmondo-devices.c

    r309 r507  
    1111#include "libmondo-files-EXT.h"
    1212#include "libmondo-devices.h"
    13 #include "lib-common-externs.h"
    1413#include "libmondo-string-EXT.h"
    1514#include "libmondo-tools-EXT.h"
    16 #include "libmondo-gui-EXT.h"
     15#include "newt-specific-EXT.h"
    1716#include "libmondo-fork-EXT.h"
    1817#include "libmondo-stream-EXT.h"
     
    139138            && !does_file_exist("/tmp/mountlist.txt.sample")) {
    140139            log_to_screen
    141                 ("Using /dev/root is stupid of you but I'll forgive you.");
     140                (_("Using /dev/root is stupid of you but I'll forgive you."));
    142141            is_this_a_ramdisk = FALSE;
    143142        }
     
    165164    switch (bt) {
    166165    case none:
    167         asprintf(&output, "none");
     166        asprintf(&output, _("none"));
    168167        break;
    169168    case iso:
    170         asprintf(&output, "iso");
     169        asprintf(&output, _("iso"));
    171170        break;
    172171    case cdr:
    173         asprintf(&output, "cdr");
     172        asprintf(&output, _("cdr"));
    174173        break;
    175174    case cdrw:
    176         asprintf(&output, "cdrw");
     175        asprintf(&output, _("cdrw"));
    177176        break;
    178177    case cdstream:
    179         asprintf(&output, "cdstream");
     178        asprintf(&output, _("cdstream"));
    180179        break;
    181180    case nfs:
    182         asprintf(&output, "nfs");
     181        asprintf(&output, _("nfs"));
    183182        break;
    184183    case tape:
    185         asprintf(&output, "tape");
     184        asprintf(&output, _("tape"));
    186185        break;
    187186    case udev:
    188         asprintf(&output, "udev");
     187        asprintf(&output, _("udev"));
    189188        break;
    190189    default:
    191         asprintf(&output, "default");
     190        asprintf(&output, _("default"));
    192191    }
    193192    return (output);
     
    470469    if ((dev == NULL) || (! mount_CDROM_here(dev, mountpoint))) {
    471470        if (!popup_and_get_string
    472             ("CD-ROM device", "Please enter your CD-ROM's /dev device",
     471            (_("CD-ROM device"), _("Please enter your CD-ROM's /dev device"),
    473472             dev, MAX_STR_LEN / 4)) {
    474473            res = FALSE;
     
    478477    }
    479478    if (res) {
    480         log_msg(1, "mount failed");
    481     } else {
    482         log_msg(1, "mount succeeded with %s", dev);
     479        log_msg(1, _("mount failed"));
     480    } else {
     481        log_msg(1, _("mount succeeded with %s"), dev);
    483482    }
    484483    paranoid_free(dev);
     
    13701369            }
    13711370            if (res) {
    1372                 log_to_screen("WARNING - failed to unmount CD-ROM drive");
     1371                log_to_screen(_("WARNING - failed to unmount CD-ROM drive"));
    13731372            }
    13741373            if (!bkpinfo->please_dont_eject) {
     
    13781377            }
    13791378            if (res) {
    1380                 log_to_screen("WARNING - failed to eject CD-ROM disk");
     1379                log_to_screen(_("WARNING - failed to eject CD-ROM disk"));
    13811380            }
    13821381            popup_and_OK(request);
     
    14281427        which_backup_media_type(bkpinfo->restore_data);
    14291428    if (bkpinfo->backup_media_type == none) {
    1430         log_to_screen("User has chosen not to backup the PC");
     1429        log_to_screen(_("User has chosen not to backup the PC"));
    14311430        finish(1);
    14321431    }
    14331432    if (bkpinfo->backup_media_type == tape && bkpinfo->restore_data) {
    1434         popup_and_OK("Please remove CD/floppy from drive(s)");
     1433        popup_and_OK(_("Please remove CD/floppy from drive(s)"));
    14351434    }
    14361435    log_msg(3, "media type = %s",
     
    14671466        if (archiving_to_media) {
    14681467            if (ask_me_yes_or_no
    1469                 ("Is your computer a laptop, or does the CD writer incorporate BurnProof technology?"))
     1468                (_("Is your computer a laptop, or does the CD writer incorporate BurnProof technology?")))
    14701469            {
    14711470                bkpinfo->manual_cd_tray = TRUE;
     
    14731472            if ((bkpinfo->compression_level =
    14741473                 which_compression_level()) == -1) {
    1475                 log_to_screen("User has chosen not to backup the PC");
     1474                log_to_screen(_("User has chosen not to backup the PC"));
    14761475                finish(1);
    14771476            }
    1478             asprintf(&comment, "What speed is your %s (re)writer?",
     1477            asprintf(&comment, _("What speed is your %s (re)writer?"),
    14791478                    media_descriptor_string(bkpinfo->backup_media_type));
    14801479            if (bkpinfo->backup_media_type == dvd) {
     
    14911490            }
    14921491            if (bkpinfo->backup_media_type != dvd) {
    1493                 if (!popup_and_get_string("Speed", comment, tmp, 4)) {
    1494                     log_to_screen("User has chosen not to backup the PC");
     1492                if (!popup_and_get_string(_("Speed"), comment, tmp, 4)) {
     1493                    log_to_screen(_("User has chosen not to backup the PC"));
    14951494                    finish(1);
    14961495                }
     
    15021501
    15031502            asprintf(&comment,
    1504                     "How much data (in Megabytes) will each %s store?",
     1503                    _("How much data (in Megabytes) will each %s store?"),
    15051504                    media_descriptor_string(bkpinfo->backup_media_type));
    15061505
    15071506            if (!popup_and_get_string("Size", comment, sz_size, 5)) {
    1508                 log_to_screen("User has chosen not to backup the PC");
     1507                log_to_screen(_("User has chosen not to backup the PC"));
    15091508                finish(1);
    15101509            }
     
    15151514            }
    15161515            if (bkpinfo->media_size[0] <= 0) {
    1517                 log_to_screen("User has chosen not to backup the PC");
     1516                log_to_screen(_("User has chosen not to backup the PC"));
    15181517                finish(1);
    15191518            }
     
    15391538                        bkpinfo->media_device);
    15401539                asprintf(&comment,
    1541                         "Please specify your %s drive's /dev entry",
     1540                        _("Please specify your %s drive's /dev entry"),
    15421541                        media_descriptor_string(bkpinfo->
    15431542                                                backup_media_type));
    15441543                if (!popup_and_get_string
    1545                     ("Device?", comment, bkpinfo->media_device,
     1544                    (_("Device?"), comment, bkpinfo->media_device,
    15461545                     MAX_STR_LEN / 4)) {
    1547                     log_to_screen("User has chosen not to backup the PC");
     1546                    log_to_screen(_("User has chosen not to backup the PC"));
    15481547                    finish(1);
    15491548                }
     
    15581557            if (bkpinfo->media_device != NULL) {
    15591558                asprintf(&tmp,
    1560                         "I think I've found your %s burner at SCSI node %s; am I right on the money?",
     1559                        _("I think I've found your %s burner at SCSI node %s; am I right on the money?"),
    15611560                        media_descriptor_string(bkpinfo->
    15621561                                                backup_media_type),
     
    15681567            } else {
    15691568                if (g_kernel_version < 2.6) {
    1570                     i = popup_and_get_string("Device node?",
    1571                                              "What is the SCSI node of your CD (re)writer, please?",
     1569                    i = popup_and_get_string(_("Device node?"),
     1570                                             _("What is the SCSI node of your CD (re)writer, please?"),
    15721571                                             bkpinfo->media_device,
    15731572                                             MAX_STR_LEN / 4);
    15741573                } else {
    1575                     i = popup_and_get_string("/dev entry?",
    1576                                              "What is the /dev entry of your CD (re)writer, please?",
     1574                    i = popup_and_get_string(_("/dev entry?"),
     1575                                             _("What is the /dev entry of your CD (re)writer, please?"),
    15771576                                             bkpinfo->media_device,
    15781577                                             MAX_STR_LEN / 4);
    15791578                }
    15801579                if (!i) {
    1581                     log_to_screen("User has chosen not to backup the PC");
     1580                    log_to_screen(_("User has chosen not to backup the PC"));
    15821581                    finish(1);
    15831582                }
     
    15921591    case udev:
    15931592        if (!ask_me_yes_or_no
    1594             ("This option is for advanced users only. Are you sure?")) {
    1595             log_to_screen("User has chosen not to backup the PC");
     1593            (_("This option is for advanced users only. Are you sure?"))) {
     1594            log_to_screen(_("User has chosen not to backup the PC"));
    15961595            finish(1);
    15971596        }
     
    16001599        paranoid_free(bkpinfo->media_device);
    16011600        if (find_tape_device_and_size(bkpinfo->media_device, sz_size)) {
    1602             log_msg(3, "Ok, using vanilla scsi tape.");
     1601            log_msg(3, _("Ok, using vanilla scsi tape."));
    16031602            paranoid_alloc(bkpinfo->media_device,VANILLA_SCSI_TAPE );
    16041603            if ((fin = fopen(bkpinfo->media_device, "r"))) {
     
    16181617            }
    16191618            asprintf(&tmp,
    1620                     "I think I've found your tape streamer at %s; am I right on the money?",
     1619                    _("I think I've found your tape streamer at %s; am I right on the money?"),
    16211620                    bkpinfo->media_device);
    16221621            if (!ask_me_yes_or_no(tmp)) {
     
    16271626        if (bkpinfo->media_device == NULL) {
    16281627            if (!popup_and_get_string
    1629                 ("Device name?",
    1630                  "What is the /dev entry of your tape streamer?",
     1628                (_("Device name?"),
     1629                 _("What is the /dev entry of your tape streamer?"),
    16311630                 bkpinfo->media_device, MAX_STR_LEN / 4)) {
    1632                 log_to_screen("User has chosen not to backup the PC");
     1631                log_to_screen(_("User has chosen not to backup the PC"));
    16331632                finish(1);
    16341633            }
     
    16361635        asprintf(&tmp, "ls -l %s", bkpinfo->media_device);
    16371636        if (run_program_and_log_output(tmp, FALSE)) {
    1638             log_to_screen("User has not specified a valid /dev entry");
     1637            log_to_screen(_("User has not specified a valid /dev entry"));
    16391638            finish(1);
    16401639        }
     
    16531652            if ((bkpinfo->compression_level =
    16541653                 which_compression_level()) == -1) {
    1655                 log_to_screen("User has chosen not to backup the PC");
     1654                log_to_screen(_("User has chosen not to backup the PC"));
    16561655                finish(1);
    16571656            }
     
    16741673        {
    16751674            if (!popup_and_get_string
    1676                 ("NFS dir.",
    1677                  "Please enter path and directory where archives are stored remotely. (Mondo has taken a guess at the correct value. If it is incorrect, delete it and type the correct one.)",
     1675                (_("NFS dir."),
     1676                 _("Please enter path and directory where archives are stored remotely. (Mondo has taken a guess at the correct value. If it is incorrect, delete it and type the correct one.)"),
    16781677                 bkpinfo->nfs_mount, MAX_STR_LEN / 4)) {
    1679                 log_to_screen("User has chosen not to backup the PC");
     1678                log_to_screen(_("User has chosen not to backup the PC"));
    16801679                finish(1);
    16811680            }
     
    16831682                if ((bkpinfo->compression_level =
    16841683                     which_compression_level()) == -1) {
    1685                     log_to_screen("User has chosen not to backup the PC");
     1684                    log_to_screen(_("User has chosen not to backup the PC"));
    16861685                    finish(1);
    16871686                }
     
    16991698
    17001699            asprintf(&comment,
    1701                     "How much data (in Megabytes) will each media store?");
    1702             if (!popup_and_get_string("Size", comment, sz_size, 5)) {
    1703                 log_to_screen("User has chosen not to backup the PC");
     1700                    _("How much data (in Megabytes) will each media store?"));
     1701            if (!popup_and_get_string(_("Size"), comment, sz_size, 5)) {
     1702                log_to_screen(_("User has chosen not to backup the PC"));
    17041703                finish(1);
    17051704            }
     
    17081707            }
    17091708            if (bkpinfo->media_size[0] <= 0) {
    1710                 log_to_screen("User has chosen not to backup the PC");
     1709                log_to_screen(_("User has chosen not to backup the PC"));
    17111710                finish(1);
    17121711            }
     
    17161715            system("umount /tmp/isodir 2> /dev/null");
    17171716            if (!popup_and_get_string
    1718                 ("NFS share", "Which remote NFS share should I mount?",
     1717                (_("NFS share"), _("Which remote NFS share should I mount?"),
    17191718                 bkpinfo->nfs_mount, MAX_STR_LEN)) {
    1720                 log_to_screen("User has chosen not to backup the PC");
     1719                log_to_screen(_("User has chosen not to backup the PC"));
    17211720                finish(1);
    17221721            }
     
    17381737        if (!is_this_device_mounted(bkpinfo->nfs_mount)) {
    17391738            popup_and_OK
    1740                 ("Please mount that partition before you try to backup to or restore from it.");
     1739                (_("Please mount that partition before you try to backup to or restore from it."));
    17411740            finish(1);
    17421741        }
    17431742        asprintf(&tmp, bkpinfo->nfs_remote_dir);
    17441743        if (!popup_and_get_string
    1745             ("Directory", "Which directory within that mountpoint?", tmp,
     1744            (_("Directory"), _("Which directory within that mountpoint?"), tmp,
    17461745             MAX_STR_LEN)) {
    1747             log_to_screen("User has chosen not to backup the PC");
     1746            log_to_screen(_("User has chosen not to backup the PC"));
    17481747            finish(1);
    17491748        }
     
    17601759            asprintf(&tmp, bkpinfo->nfs_remote_dir);
    17611760            asprintf(&prompt,
    1762                      "Directory '%s' under mountpoint '%s' does not exist or is not writable. You can fix this or change the directory and retry or cancel the backup.",
     1761                     _("Directory '%s' under mountpoint '%s' does not exist or is not writable. You can fix this or change the directory and retry or cancel the backup."),
    17631762                     bkpinfo->nfs_remote_dir, bkpinfo->isodir);
    17641763            if (!popup_and_get_string
    1765                 ("Directory", prompt, tmp, MAX_STR_LEN)) {
    1766                 log_to_screen("User has chosen not to backup the PC");
     1764                (_("Directory"), prompt, tmp, MAX_STR_LEN)) {
     1765                log_to_screen(_("User has chosen not to backup the PC"));
    17671766                finish(1);
    17681767            }
     
    17781777
    17791778        if (!popup_and_get_string
    1780             ("Prefix.",
    1781              "Please enter the prefix that will be prepended to your ISO filename.  Example: machine1 to obtain machine1-[1-9]*.iso files",
     1779            (_("Prefix."),
     1780             _("Please enter the prefix that will be prepended to your ISO filename.  Example: machine1 to obtain machine1-[1-9]*.iso files"),
    17821781            bkpinfo->prefix, MAX_STR_LEN / 4)) {
    1783             log_to_screen("User has chosen not to backup the PC");
     1782            log_to_screen(_("User has chosen not to backup the PC"));
    17841783            finish(1);
    17851784        }
     
    17971796        if (!bkpinfo->disaster_recovery) {
    17981797            if (!popup_and_get_string
    1799                 ("Storage dir.",
    1800                  "Please enter the full path that contains your ISO images.  Example: /mnt/raid0_0",
     1798                (_("Storage dir."),
     1799                 _("Please enter the full path that contains your ISO images.  Example: /mnt/raid0_0"),
    18011800                 bkpinfo->isodir, MAX_STR_LEN / 4)) {
    1802                 log_to_screen("User has chosen not to backup the PC");
     1801                log_to_screen(_("User has chosen not to backup the PC"));
    18031802                finish(1);
    18041803            }
     
    18061805                if ((bkpinfo->compression_level =
    18071806                     which_compression_level()) == -1) {
    1808                     log_to_screen("User has chosen not to backup the PC");
     1807                    log_to_screen(_("User has chosen not to backup the PC"));
    18091808                    finish(1);
    18101809                }
    18111810                if (!popup_and_get_string
    1812                     ("ISO size.",
    1813                      "Please enter how big you want each ISO image to be (in megabytes). This should be less than or equal to the size of the CD-R[W]'s or DVD's you plan to backup to.",
     1811                    (_("ISO size."),
     1812                     _("Please enter how big you want each ISO image to be (in megabytes). This should be less than or equal to the size of the CD-R[W]'s or DVD's you plan to backup to."),
    18141813                     sz_size, 16)) {
    1815                     log_to_screen("User has chosen not to backup the PC");
     1814                    log_to_screen(_("User has chosen not to backup the PC"));
    18161815                    finish(1);
    18171816                }
     
    18221821
    18231822                if (!popup_and_get_string
    1824                     ("Prefix.",
    1825                      "Please enter the prefix that will be prepended to your ISO filename.  Example: machine1 to obtain machine1-[1-9]*.iso files",
     1823                    (_("Prefix."),
     1824                     _("Please enter the prefix that will be prepended to your ISO filename.  Example: machine1 to obtain machine1-[1-9]*.iso files"),
    18261825                     bkpinfo->prefix, MAX_STR_LEN / 4)) {
    18271826                    log_to_screen("User has chosen not to backup the PC");
     
    18571856#ifdef __FreeBSD__
    18581857            if (!popup_and_get_string
    1859                 ("Boot device",
    1860                  "What is your boot device? (e.g. /dev/ad0)",
     1858                (_("Boot device"),
     1859                 _("What is your boot device? (e.g. /dev/ad0)"),
    18611860                 bkpinfo->boot_device, MAX_STR_LEN / 4)) {
    1862                 log_to_screen("User has chosen not to backup the PC");
     1861                log_to_screen(_("User has chosen not to backup the PC"));
    18631862                finish(1);
    18641863            }
     
    18661865#else
    18671866            if (!popup_and_get_string
    1868                 ("Boot device",
    1869                  "What is your boot device? (e.g. /dev/hda)",
     1867                (_("Boot device"),
     1868                 _("What is your boot device? (e.g. /dev/hda)"),
    18701869                 bkpinfo->boot_device, MAX_STR_LEN / 4)) {
    1871                 log_to_screen("User has chosen not to backup the PC");
     1870                log_to_screen(_("User has chosen not to backup the PC"));
    18721871                finish(1);
    18731872            }
     
    18891888            if (i == 'U') {
    18901889                if (ask_me_yes_or_no
    1891                     ("Unidentified boot loader. Shall I restore it byte-for-byte at restore time and hope for the best?"))
     1890                    (_("Unidentified boot loader. Shall I restore it byte-for-byte at restore time and hope for the best?")))
    18921891                {
    18931892                    i = 'R';    // raw
    18941893                } else {
    18951894                    log_to_screen
    1896                         ("I cannot find your boot loader. Please run mondoarchive with parameters.");
     1895                        (_("I cannot find your boot loader. Please run mondoarchive with parameters."));
    18971896                    finish(1);
    18981897                }
     
    19021901        strcpy(bkpinfo->include_paths, "/");
    19031902        if (!popup_and_get_string
    1904             ("Backup paths",
    1905              "Please enter paths which you want me to backup. The default is '/' (i.e. everything).",
     1903            (_("Backup paths"),
     1904             _("Please enter paths which you want me to backup. The default is '/' (i.e. everything)."),
    19061905             bkpinfo->include_paths, MAX_STR_LEN)) {
    1907             log_to_screen("User has chosen not to backup the PC");
     1906            log_to_screen(_("User has chosen not to backup the PC"));
    19081907            finish(1);
    19091908        }
     
    19221921        if (strlen(tmp) > 2) {
    19231922            if (!popup_and_get_string
    1924                 ("NTFS partitions",
    1925                  "Please enter/confirm the NTFS partitions you wish to backup as well.",
     1923                (_("NTFS partitions"),
     1924                 _("Please enter/confirm the NTFS partitions you wish to backup as well."),
    19261925                 tmp, MAX_STR_LEN / 4)) {
    1927                 log_to_screen("User has chosen not to backup the PC");
     1926                log_to_screen(_("User has chosen not to backup the PC"));
    19281927                finish(1);
    19291928            }
     
    19331932
    19341933        if (!popup_and_get_string
    1935             ("Exclude paths",
    1936              "Please enter paths which you do NOT want to backup. Separate them with spaces. NB: /tmp and /proc are always excluded. :-) Just hit 'Enter' if you want to do a full system backup.",
     1934            (_("Exclude paths"),
     1935             _("Please enter paths which you do NOT want to backup. Separate them with spaces. NB: /tmp and /proc are always excluded. :-) Just hit 'Enter' if you want to do a full system backup."),
    19371936             bkpinfo->exclude_paths, MAX_STR_LEN)) {
    1938             log_to_screen("User has chosen not to backup the PC");
     1937            log_to_screen(_("User has chosen not to backup the PC"));
    19391938            finish(1);
    19401939        }
     
    19431942        bkpinfo->verify_data =
    19441943            ask_me_yes_or_no
    1945             ("Will you want to verify your backups after Mondo has created them?");
     1944            (_("Will you want to verify your backups after Mondo has created them?"));
    19461945
    19471946#ifndef __FreeBSD__
    19481947        if (!ask_me_yes_or_no
    1949             ("Are you confident that your kernel is a sane, sensible, standard Linux kernel? Say 'no' if you are using a Gentoo <1.4 or Debian <3.0, please.")) {
     1948            (_("Are you confident that your kernel is a sane, sensible, standard Linux kernel? Say 'no' if you are using a Gentoo <1.4 or Debian <3.0, please."))){
    19501949            paranoid_alloc(bkpinfo->kernel_path, "FAILSAFE");
    19511950        }
     
    19531952
    19541953        if (!ask_me_yes_or_no
    1955             ("Are you sure you want to proceed? Hit 'no' to abort.")) {
    1956             log_to_screen("User has chosen not to backup the PC");
     1954            (_("Are you sure you want to proceed? Hit 'no' to abort."))) {
     1955            log_to_screen(_("User has chosen not to backup the PC"));
    19571956            finish(1);
    19581957        }
  • trunk/mondo/mondo/common/libmondo-fifo.c

    r142 r507  
    9696    if (!res) {
    9797        bufsize++;
    98         asprintf(&tmp, "Negotiated max buffer of %d MB ", bufsize);
     98        asprintf(&tmp, _("Negotiated max buffer of %d MB ", bufsize));
    9999        log_to_screen(tmp);
    100100        paranoid_free(tmp);
     
    103103        res = 0;
    104104        log_to_screen
    105             ("Cannot negotiate a buffer of ANY size. Using dd instead.");
     105            (_("Cannot negotiate a buffer of ANY size. Using dd instead."));
    106106    }
    107107    if (direction == 'r') {
     
    143143    if (run_program_and_log_output(tmp, 1)) {
    144144        fres = NULL;
    145         log_to_screen("Failed to open tape streamer. Buffer error.");
    146     } else {
    147         log_to_screen("Buffer successfully started.");
     145        log_to_screen(_("Failed to open tape streamer. Buffer error."));
     146    } else {
     147        log_to_screen(_("Buffer successfully started."));
    148148    }
    149149    paranoid_free(tmp);
  • trunk/mondo/mondo/common/libmondo-filelist.c

    r334 r507  
    1111#include "my-stuff.h"
    1212#include "mondostructures.h"
    13 #include "lib-common-externs.h"
    1413#include "libmondo-filelist.h"
    1514#include "libmondo-string-EXT.h"
    1615#include "libmondo-files-EXT.h"
    1716#include "libmondo-fork-EXT.h"
    18 #include "libmondo-gui-EXT.h"
     17#include "newt-specific-EXT.h"
    1918#include "libmondo-tools-EXT.h"
    2019
     
    9190    int i, retval = 0;
    9291
    93     mvaddstr_and_log_it(g_currentY, 0, "Dividing filelist into sets");
    94 
    95     log_to_screen("Dividing filelist into sets. Please wait.");
     92    mvaddstr_and_log_it(g_currentY, 0, _("Dividing filelist into sets"));
     93
     94    log_to_screen(_("Dividing filelist into sets. Please wait."));
    9695    i = 0;
    9796/*
     
    376375    if (depth == 0) {
    377376        open_evalcall_form("Freeing memory");
    378         log_to_screen("Freeing memory formerly occupied by filelist");
     377        log_to_screen(_("Freeing memory formerly occupied by filelist"));
    379378    }
    380379    depth++;
     
    789788    // add here
    790789    if (!(newnode = (struct s_node *) malloc(sizeof(struct s_node)))) {
    791         log_to_screen("failed to malloc");
     790        log_to_screen(_("failed to malloc"));
    792791        depth--;
    793792        return (1);
     
    821820            (node->down =
    822821             (struct s_node *) malloc(sizeof(struct s_node)))) {
    823             log_to_screen("%s - failed to malloc", string_to_add);
     822            log_to_screen(_("%s - failed to malloc"), string_to_add);
    824823            return (1);
    825824        }
     
    873872        fatal_error("filelist does not exist -- cannot load it");
    874873    }
    875     log_to_screen("Loading filelist");
     874    log_to_screen(_("Loading filelist"));
    876875    asprintf(&command_to_open_fname, "gzip -dc %s", filelist_fname);
    877876    asprintf(&tmp, "zcat %s | wc -l", filelist_fname);
     
    882881
    883882    if (lines_in_filelist < 3) {
    884         log_to_screen("Warning - surprisingly short filelist.");
     883        log_to_screen(_("Warning - surprisingly short filelist."));
    885884    }
    886885    g_original_noof_lines_in_filelist = lines_in_filelist;
     
    901900    paranoid_free(command_to_open_fname);
    902901
    903     open_evalcall_form("Loading filelist from disk");
     902    open_evalcall_form(_("Loading filelist from disk"));
    904903    for (getline(&fname, &n, pin); !feof(pin); getline(&fname, &n, pin)) {
    905904        if ((fname[strlen(fname) - 1] == 13
     
    10151014    assert(outfname != NULL);   // will be zerolength if save_filelist() is called by itself
    10161015    if (depth == 0) {
    1017         log_to_screen("Saving filelist");
     1016        log_to_screen(_("Saving filelist"));
    10181017        if (!(fout = fopen(outfname, "w"))) {
    10191018            fatal_error("Cannot openout/save filelist");
    10201019        }
    10211020        lines_in_filelist = g_original_noof_lines_in_filelist;  /* set by load_filelist() */
    1022         open_evalcall_form("Saving selection to disk");
     1021        open_evalcall_form(_("Saving selection to disk"));
    10231022    }
    10241023    for (node = filelist; node != NULL; node = node->right) {
     
    12811280    if (bkpinfo->make_filelist) {
    12821281        mvaddstr_and_log_it(g_currentY, 0,
    1283                             "Making catalog of files to be backed up");
     1282                            _("Making catalog of files to be backed up"));
    12841283    } else {
    12851284        mvaddstr_and_log_it(g_currentY, 0,
    1286                             "Using supplied catalog of files to be backed up");
     1285                            _("Using supplied catalog of files to be backed up"));
    12871286    }
    12881287
     
    13051304        log_OS_error("Call to mondo-makefilelist failed");
    13061305        *p_res++;
    1307         mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
     1306        mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
    13081307    } else {
    1309         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     1308        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
    13101309    }
    13111310    return (res);
     
    13991398#ifndef _XWIN
    14001399                if (!g_text_mode) {
    1401                     asprintf(&tmp, "Reading %-68s", dir);
     1400                    asprintf(&tmp, _("Reading %-68s"), dir);
    14021401                    newtDrawRootText(0, g_noof_rows - 3, tmp);
    14031402                    paranoid_free(tmp);
  • trunk/mondo/mondo/common/libmondo-files.c

    r416 r507  
    1313#include "libmondo-files.h"
    1414
    15 #include "lib-common-externs.h"
    16 
    1715#include "libmondo-tools-EXT.h"
    18 #include "libmondo-gui-EXT.h"
     16#include "newt-specific-EXT.h"
    1917#include "libmondo-devices-EXT.h"
    2018#include "libmondo-fork-EXT.h"
     
    294292    while (!kernel[0]) {
    295293        if (!ask_me_yes_or_no
    296             ("Kernel not found or invalid. Choose another?")) {
     294            (_("Kernel not found or invalid. Choose another?"))) {
    297295            return (1);
    298296        }
    299297        if (!popup_and_get_string
    300             ("Kernel path",
    301              "What is the full path and filename of your kernel, please?",
     298            (_("Kernel path"),
     299             _("What is the full path and filename of your kernel, please?"),
    302300             kernel, MAX_STR_LEN / 4)) {
    303301            fatal_error
     
    489487
    490488    if (!does_file_exist(filename)) {
    491         asprintf(&tmp, "Tring to get last line of nonexistent file (%s)",
     489        asprintf(&tmp, _("Tring to get last line of nonexistent file (%s)"),
    492490                filename);
    493491        log_it(tmp);
     
    884882    if (res) {
    885883        asprintf(&errorstr,
    886             "Please install '%s'. I cannot find it on your system.",
     884            _("Please install '%s'. I cannot find it on your system."),
    887885            fname);
    888886        log_to_screen(errorstr);
    889887        paranoid_free(errorstr);
    890888        log_to_screen
    891             ("There may be an hyperlink at http://www.mondorescue.org which");
    892         log_to_screen("will take you to the relevant (missing) package.");
     889            (_("There may be an hyperlink at http://www.mondorescue.org which"));
     890        log_to_screen(_("will take you to the relevant (missing) package."));
    893891        return (1);
    894892    } else {
     
    998996
    999997    asprintf(&tmp, "%s/payload.tgz", g_mondo_home);
     998
     999    /* i18n */
     1000    asprintf(&command, CP_BIN " --parents /usr/share/locale/*/LC_MESSAGES/mondo.mo %s",bkpinfo->scratchdir);
     1001    log_msg(4, "command = %s", command);
     1002    run_program_and_log_output(command, 1);
     1003    paranoid_free(command);
     1004
    10001005    if (does_file_exist(tmp)) {
    10011006        log_it("Untarring payload %s to scratchdir %s", tmp,
     
    12711276    if (scratchLL <= 1) {
    12721277        asprintf(&tmp,
    1273                 "Your backup will probably occupy a single %s. Maybe two.",
     1278                _("Your backup will probably occupy a single %s. Maybe two."),
    12741279                media_descriptor_string(bkpinfo->backup_media_type));
    12751280    } else {
    1276         asprintf(&tmp, "Your backup will occupy approximately %s media.",
     1281        asprintf(&tmp, _("Your backup will occupy approximately %s media."),
    12771282                number_to_text((int) (scratchLL + 1)));
    12781283    }
  • trunk/mondo/mondo/common/libmondo-fork.c

    r412 r507  
    106106#include "libmondo-fork.h"
    107107#include "libmondo-string-EXT.h"
    108 #include "libmondo-gui-EXT.h"
     108#include "newt-specific-EXT.h"
    109109#include "libmondo-files-EXT.h"
    110110#include "libmondo-tools-EXT.h"
    111 #include "lib-common-externs.h"
    112111
    113112/*@unused@*/
     
    159158}
    160159
    161 #define MONDO_POPMSG  "Your PC will not retract the CD tray automatically. Please call mondoarchive with the -m (manual CD tray) flag."
     160#define MONDO_POPMSG  _("Your PC will not retract the CD tray automatically. Please call mondoarchive with the -m (manual CD tray) flag.")
    162161
    163162/**
     
    223222
    224223    log_to_screen
    225         ("Please be patient. Do not be alarmed by on-screen inactivity.");
     224        (_("Please be patient. Do not be alarmed by on-screen inactivity."));
    226225    log_msg(4, "Calling open_evalcall_form() with what_i_am_doing='%s'",
    227226            what_i_am_doing);
     
    252251        if (retval) {
    253252            log_msg(2, "Basic call '%s' returned an error.", basic_call);
    254             popup_and_OK("Press ENTER to continue.");
     253            popup_and_OK(_("Press ENTER to continue."));
    255254            popup_and_OK
    256                 ("mkisofs and/or cdrecord returned an error. CD was not created");
     255                (_("mkisofs and/or cdrecord returned an error. CD was not created"));
    257256        }
    258257    }
     
    426425    if (!(fin = popen(command, "r"))) {
    427426        log_OS_error("Unable to popen-in command");
    428         asprintf(&tmp, "Failed utterly to call '%s'", command);
     427        asprintf(&tmp, _("Failed utterly to call '%s'", command));
    429428        log_to_screen(tmp);
    430429        paranoid_free(tmp);
     
    436435
    437436    if (!does_file_exist(lockfile)) {
    438         log_to_screen("Waiting for external binary to start");
     437        log_to_screen(_("Waiting for external binary to start"));
    439438        for (i = 0; i < 60 && !does_file_exist(lockfile); sleep(1), i++) {
    440439            log_msg(3, "Waiting for lockfile %s to exist", lockfile);
     
    687686        if (pcno <= 5 && last_pcno > 40) {
    688687            close_evalcall_form();
    689             open_evalcall_form("Verifying...");
     688            open_evalcall_form("_(Verifying..."));
    690689        }
    691690        last_pcno = pcno;
     
    764763        if (pcno <= 5 && last_pcno >= 40) {
    765764            close_evalcall_form();
    766             open_evalcall_form("Verifying...");
     765            open_evalcall_form(_("Verifying..."));
    767766        }
    768767        if (counter++ >= 5) {
  • trunk/mondo/mondo/common/libmondo-mountlist.c

    r280 r507  
    1111#include "mondostructures.h"
    1212#include "libmondo-mountlist.h"
    13 #include "lib-common-externs.h"
    1413#include "libmondo-raid-EXT.h"
    1514#include "libmondo-devices-EXT.h"
    1615#include "libmondo-tools-EXT.h"
    1716#include "libmondo-string-EXT.h"
    18 #include "libmondo-gui-EXT.h"
     17#include "newt-specific-EXT.h"
    1918
    2019/*@unused@*/
     
    921920    if (!(fin = fopen(fname, "r"))) {
    922921        log_it("Unable to open mountlist - '%s'", fname);
    923         log_to_screen("Cannot open mountlist");
     922        log_to_screen(_("Cannot open mountlist"));
    924923        paranoid_free(siz);
    925924        return (1);
     
    962961            && mountlist->el[items].device[0] != '#') {
    963962            if (items >= ARBITRARY_MAXIMUM) {
    964                 log_to_screen("Too many lines in mountlist.. ABORTING");
     963                log_to_screen(_("Too many lines in mountlist.. ABORTING"));
    965964                finish(1);
    966965            }
  • trunk/mondo/mondo/common/libmondo-raid.c

    r274 r507  
    1010#include "my-stuff.h"
    1111#include "mondostructures.h"
    12 #include "libmondo-gui-EXT.h"
     12#include "newt-specific-EXT.h"
    1313#include "libmondo-files-EXT.h"
    1414#include "libmondo-tools-EXT.h"
    1515#include "libmondo-string-EXT.h"
    16 #include "lib-common-externs.h"
    1716#include "libmondo-raid.h"
    1817
     
    885884                    ("Oh my gosh. You actually think a YOTTABYTE will get you anywhere? What're you going to do with 1,208,925,819,614,629,174,706,176 bytes?!?!");
    886885                popup_and_OK
    887                     ("That sizespec is more than 1,208,925,819,614,629,174,706,176 bytes. You have a shocking amount of data. Please send a screenshot to the list :-)");
     886                    (_("That sizespec is more than 1,208,925,819,614,629,174,706,176 bytes. You have a shocking amount of data. Please send a screenshot to the list :-)"));
    888887                return size * sign * 1024 * 1024 * 1024 * 1024 * 1024 *
    889888                    1024 * 1024 * 1024;
     
    10371036        // FIXME --- the above line does not allow for spare disks
    10381037        log_to_screen
    1039             ("FIXME - create_raidtab_from_mdstat does not allow for spare disks");
     1038            (_("FIXME - create_raidtab_from_mdstat does not allow for spare disks"));
    10401039    }
    10411040    raidlist->entries = i;
  • 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);
  • trunk/mondo/mondo/common/libmondo-string.c

    r171 r507  
    1212#include "mondostructures.h"
    1313#include "libmondo-string.h"
    14 #include "lib-common-externs.h"
    1514#include "libmondo-files-EXT.h"
    16 #include "libmondo-gui-EXT.h"
     15#include "newt-specific-EXT.h"
    1716#include "libmondo-tools-EXT.h"
    1817
     
    246245            ("Oh my gosh. You actually think a YOTTABYTE will get you anywhere? What're you going to do with 1,208,925,819,614,629,174,706,176 bytes of data?!?!");
    247246        popup_and_OK
    248             ("That sizespec is more than 1,208,925,819,614,629,174,706,176 bytes. You have a shocking amount of data. Please send a screenshot to the list :-)");
     247            (_("That sizespec is more than 1,208,925,819,614,629,174,706,176 bytes. You have a shocking amount of data. Please send a screenshot to the list :-)"));
    249248        fatal_error("Integer overflow.");
    250249    } else if (ch != 'm' && ch != 'M') {
     
    901900        sev = 2;
    902901        asprintf(&reason,
    903                  "/var's contents will change regularly, inevitably.");
     902                 _("/var's contents will change regularly, inevitably."));
    904903    }
    905904    if (!strncmp(filename, "/home", 5)) {
    906905        sev = 2;
    907906        asprintf(&reason,
    908                  "It's in your /home partiton. Therefore, it is important.");
     907                 _("It's in your /home partiton. Therefore, it is important."));
    909908    }
    910909    if (!strncmp(filename, "/usr/", 5)) {
    911910        sev = 3;
    912911        asprintf(&reason,
    913                  "You may have installed/removed software during the backup.");
     912                 _("You may have installed/removed software during the backup."));
    914913    }
    915914    if (!strncmp(filename, "/etc/", 5)) {
    916915        sev = 3;
    917916        asprintf(&reason,
    918                  "Do not edit config files while backing up your PC.");
     917                 _("Do not edit config files while backing up your PC."));
    919918    }
    920919    if (!strcmp(filename, "/etc/adjtime")
    921920        || !strcmp(filename, "/etc/mtab")) {
    922921        sev = 1;
    923         asprintf(&reason, "This file changes all the time. It's OK.");
     922        asprintf(&reason, _("This file changes all the time. It's OK."));
    924923    }
    925924    if (!strncmp(filename, "/root/", 6)) {
    926925        sev = 3;
    927926        asprintf(&reason,
    928                  "Were you compiling/editing something in /root?");
     927                 _("Were you compiling/editing something in /root?"));
    929928    }
    930929    if (!strncmp(filename, "/root/.", 7)) {
    931930        sev = 2;
    932         asprintf(&reason, "Temp or 'dot' files changed in /root.");
     931        asprintf(&reason, _("Temp or 'dot' files changed in /root."));
    933932    }
    934933    if (!strncmp(filename, "/var/lib/", 9)) {
    935934        sev = 2;
    936         asprintf(&reason, "Did you add/remove software during backing?");
     935        asprintf(&reason, _("Did you add/remove software during backing?"));
    937936    }
    938937    if (!strncmp(filename, "/var/lib/rpm", 12)) {
    939938        sev = 3;
    940         asprintf(&reason, "Did you add/remove software during backing?");
     939        asprintf(&reason, _("Did you add/remove software during backing?"));
    941940    }
    942941    if (!strncmp(filename, "/var/lib/slocate", 16)) {
    943942        sev = 1;
    944943        asprintf(&reason,
    945                  "The 'update' daemon ran during backup. This does not affect the integrity of your backup.");
     944                 _("The 'update' daemon ran during backup. This does not affect the integrity of your backup."));
    946945    }
    947946    if (!strncmp(filename, "/var/log/", 9)
     
    950949        sev = 1;
    951950        asprintf(&reason,
    952                  "Log files change frequently as the computer runs. Fret not.");
     951                 _("Log files change frequently as the computer runs. Fret not."));
    953952    }
    954953    if (!strncmp(filename, "/var/spool", 10)) {
    955954        sev = 1;
    956955        asprintf(&reason,
    957                  "Background processes or printers were active. This does not affect the integrity of your backup.");
     956                 _("Background processes or printers were active. This does not affect the integrity of your backup."));
    958957    }
    959958    if (!strncmp(filename, "/var/spool/mail", 10)) {
    960959        sev = 2;
    961         asprintf(&reason, "Mail was sent/received during backup.");
     960        asprintf(&reason, _("Mail was sent/received during backup."));
    962961    }
    963962    if (filename[strlen(filename) - 1] == '~') {
    964963        sev = 1;
    965964        asprintf(&reason,
    966                  "Backup copy of another file which was modified recently.");
     965                 _("Backup copy of another file which was modified recently."));
    967966    }
    968967    if (strstr(filename, "cache")) {
    969968        sev = 1;
    970969        asprintf(&reason,
    971                  "Part of a cache of data. Caches change from time to time. Don't worry.");
     970                 _("Part of a cache of data. Caches change from time to time. Don't worry."));
    972971    }
    973972    if (!strncmp(filename, "/var/run/", 9)
     
    984983        sev = 3;
    985984        asprintf(&reason,
    986                  "Changed since backup. Consider running a differential backup in a day or two.");
     985                 _("Changed since backup. Consider running a differential backup in a day or two."));
    987986    }
    988987
     
    10431042    if (bkpinfo->media_size[g_current_media_number] <= 0) {
    10441043        asprintf(&tmp, "%lld", g_tape_posK);
    1045         asprintf(&outstr, "Volume %d: %s kilobytes archived so far",
     1044        asprintf(&outstr, _("Volume %d: %s kilobytes archived so far"),
    10461045                 g_current_media_number, commarize(tmp));
    10471046        paranoid_free(tmp);
     1047
    10481048        return (outstr);
    10491049    }
     
    10541054            (int) (g_tape_posK / 10 /
    10551055                   bkpinfo->media_size[g_current_media_number]);
    1056         asprintf(&prepstr, "Volume %d: [", g_current_media_number);
     1056        asprintf(&prepstr, _("Volume %d: ["), g_current_media_number);
    10571057    } else {
    10581058        percentage =
     
    10861086       asprintf(&outstr, "%s%s%s] %3d%% used", prepstr, tmp1, tmp2, percentage);
    10871087     */
    1088     asprintf(&outstr, "%s%s%s] %3d percent used", prepstr, tmp1, tmp2,
     1088    asprintf(&outstr, _("%s%s%s] %3d percent used"), prepstr, tmp1, tmp2,
    10891089             percentage);
    10901090    paranoid_free(prepstr);
  • trunk/mondo/mondo/common/libmondo-tools.c

    r426 r507  
    1010#include "my-stuff.h"
    1111#include "mondostructures.h"
    12 #include "lib-common-externs.h"
    1312#include "libmondo-tools.h"
    14 #include "libmondo-gui-EXT.h"
     13#include "newt-specific-EXT.h"
    1514#include "libmondo-files-EXT.h"
    1615#include "libmondo-fork-EXT.h"
     
    109108        newtSuspend();
    110109#endif
    111     printf("ASSERTION FAILED: `%s'\n", exp);
    112     printf("\tat %s:%d in %s\n\n", file, line, function);
    113     printf("(I)gnore, ignore (A)ll, (D)ebug, a(B)ort, or (E)xit? ");
     110    printf(_("ASSERTION FAILED: `%s'\n"), exp);
     111    printf(_("\tat %s:%d in %s\n\n"), file, line, function);
     112    printf(_("(I)gnore, ignore (A)ll, (D)ebug, a(B)ort, or (E)xit? "));
    114113    do {
    115114        is_valid = TRUE;
     
    138137        case '\n':
    139138            printf
    140                 ("(I)gnore, ignore (A)ll, (D)ebug, a(B)ort, or (E)xit? ");
     139                (_("(I)gnore, ignore (A)ll, (D)ebug, a(B)ort, or (E)xit? "));
    141140            break;
    142141        default:
    143142            is_valid = FALSE;
    144             printf("Invalid choice.\n");
     143            printf(_("Invalid choice.\n"));
    145144            break;
    146145        }
     
    840839    if (atol(tmp) < 35000) {
    841840        retval++;
    842         log_to_screen("You must have at least 32MB of RAM to use Mondo.");
     841        log_to_screen(_("You must have at least 32MB of RAM to use Mondo."));
    843842    }
    844843    if (atol(tmp) < 66000) {
    845844        log_to_screen
    846             ("WARNING! You have very little RAM. Please upgrade to 64MB or more.");
     845            (_("WARNING! You have very little RAM. Please upgrade to 64MB or more."));
    847846    }
    848847    paranoid_free(tmp);
     
    872871        ("grep ramdisk /proc/devices", FALSE)) {
    873872        if (!ask_me_yes_or_no
    874             ("Your kernel has no ramdisk support. That's mind-numbingly stupid but I'll allow it if you're planning to use a failsafe kernel. Are you?"))
     873            (_("Your kernel has no ramdisk support. That's mind-numbingly stupid but I'll allow it if you're planning to use a failsafe kernel. Are you?")))
    875874        {
    876875            //          retval++;
    877876            log_to_screen
    878                 ("It looks as if your kernel lacks ramdisk and initrd support.");
     877                (_("It looks as if your kernel lacks ramdisk and initrd support."));
    879878            log_to_screen
    880                 ("I'll allow you to proceed but FYI, if I'm right, your kernel is broken.");
     879                (_("I'll allow you to proceed but FYI, if I'm right, your kernel is broken."));
    881880        }
    882881    }
     
    900899        !run_program_and_log_output
    901900        ("mount | grep -w dos | grep -v /dev/fd | grep -v nexdisk", 0)) {
    902         log_to_screen("I think you have a Windows 9x partition.");
     901        log_to_screen(_("I think you have a Windows 9x partition."));
    903902        retval += whine_if_not_found("parted");
    904903#ifndef __IA64__
     
    906905        // retval +=
    907906        if (!find_home_of_exe("ms-sys")) {
    908             log_to_screen("Please install ms-sys just in case.");
     907            log_to_screen(_("Please install ms-sys just in case."));
    909908        }
    910909#endif
     
    916915        } else {
    917916            log_to_screen
    918                 ("Your system lacks the 'cmp' binary. I'll create a dummy cmp for you.");
     917                (_("Your system lacks the 'cmp' binary. I'll create a dummy cmp for you."));
    919918            if (run_program_and_log_output
    920919                ("cp -f `which true` /usr/bin/cmp", 0)) {
     
    931930        if (strstr(tmp, "autofs")) {
    932931            log_to_screen
    933                 ("Your CD-ROM is mounted via autofs. I therefore cannot tell");
     932                (_("Your CD-ROM is mounted via autofs. I therefore cannot tell"));
    934933            log_to_screen
    935                 ("if a CD actually is inserted. If a CD is inserted, please");
    936             log_to_screen("eject it. Thank you.");
     934                (_("if a CD actually is inserted. If a CD is inserted, please"));
     935            log_to_screen(_("eject it. Thank you."));
    937936            log_it
    938937                ("Ignoring autofs CD-ROM 'mount' since we hope nothing's in it.");
     
    961960            retval++;
    962961            log_to_screen
    963                 ("Please find out what happened to /etc/modules.conf");
     962                (_("Please find out what happened to /etc/modules.conf"));
    964963        }
    965964    }
     
    974973
    975974    if (run_program_and_log_output("mindi -V", 1)) {
    976         log_to_screen("Could not ascertain mindi's version number.");
     975        log_to_screen(_("Could not ascertain mindi's version number."));
    977976        log_to_screen
    978             ("You have not installed Mondo and/or Mindi properly.");
    979         log_to_screen("Please uninstall and reinstall them both.");
     977            (_("You have not installed Mondo and/or Mindi properly."));
     978        log_to_screen(_("Please uninstall and reinstall them both."));
    980979        fatal_error("Please reinstall Mondo and Mindi.");
    981980    }
     
    983982        ("mindi --makemountlist /tmp/mountlist.txt.test", 5)) {
    984983        log_to_screen
    985             ("Mindi --makemountlist /tmp/mountlist.txt.test failed for some reason.");
     984            (_("Mindi --makemountlist /tmp/mountlist.txt.test failed for some reason."));
    986985        log_to_screen
    987             ("Please run that command by hand and examine /var/log/mindi.log");
     986            (_("Please run that command by hand and examine /var/log/mindi.log"));
    988987        log_to_screen
    989             ("for more information. Perhaps your /etc/fstab file is insane.");
     988            (_("for more information. Perhaps your /etc/fstab file is insane."));
    990989        log_to_screen
    991             ("Perhaps Mindi's MakeMountlist() subroutine has a bug. We'll see.");
     990            (_("Perhaps Mindi's MakeMountlist() subroutine has a bug. We'll see."));
    992991        retval++;
    993992    }
     
    996995        && !does_file_exist("/etc/raidtab")) {
    997996        log_to_screen
    998             ("You have RAID partitions but no /etc/raidtab - creating one from /proc/mdstat");
     997            (_("You have RAID partitions but no /etc/raidtab - creating one from /proc/mdstat"));
    999998        create_raidtab_from_mdstat("/etc/raidtab", "/proc/mdstat");
    1000999    }
    10011000
    10021001    if (retval) {
    1003         mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
     1002        mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
    10041003    } else {
    1005         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     1004        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
    10061005    }
    10071006    return (retval);
  • trunk/mondo/mondo/common/libmondo-verify.c

    r485 r507  
    99#include "mondostructures.h"
    1010#include "libmondo-verify.h"
    11 #include "libmondo-gui-EXT.h"
     11#include "newt-specific-EXT.h"
    1212#include "libmondo-files-EXT.h"
    1313#include "libmondo-fork-EXT.h"
     
    1616#include "libmondo-devices-EXT.h"
    1717#include "libmondo-tools-EXT.h"
    18 #include "lib-common-externs.h"
    1918
    2019/*@unused@*/
     
    669668            paranoid_free(tmp);
    670669
    671             asprintf(&tmp, "%s has changed on live filesystem",
     670            asprintf(&tmp, _("%s has changed on live filesystem"),
    672671                     biggie_fname);
    673672            log_to_screen(tmp);
     
    719718    asprintf(&curr_acl_list_fname, ACL_BIGGLST_FNAME_RAW_SZ,
    720719             bkpinfo->tmpdir);
    721     log_to_screen("Verifying regular archives on tape");
     720    log_to_screen(_("Verifying regular archives on tape"));
    722721    total_afioballs = get_last_filelist_number(bkpinfo) + 1;
    723     open_progress_form("Verifying filesystem",
    724                        "I am verifying archives against your live filesystem now.",
    725                        "Please wait. This may take a couple of hours.", "",
     722    open_progress_form(_("Verifying filesystem"),
     723                       _("I am verifying archives against your live filesystem now."),
     724                       _("Please wait. This may take a couple of hours."), "",
    726725                       total_afioballs);
    727726    res = read_header_block_from_stream(&size, NULL, &ctrl_chr);
     
    771770        res = verify_an_afioball_from_stream(bkpinfo, fname, size);
    772771        if (res) {
    773             asprintf(&tmp, "Afioball %ld differs from live filesystem",
     772            asprintf(&tmp, _("Afioball %ld differs from live filesystem"),
    774773                     current_afioball_number);
    775774            log_to_screen(tmp);
     
    857856    noof_biggiefiles = (long) size;
    858857    log_msg(1, "noof_biggiefiles = %ld", noof_biggiefiles);
    859     open_progress_form("Verifying big files", comment,
    860                        "Please wait. This may take some time.", "",
     858    open_progress_form(_("Verifying big files"), comment,
     859                       _("Please wait. This may take some time."), "",
    861860                       noof_biggiefiles);
    862861    paranoid_free(comment);
     
    876875            p++;
    877876        }
    878         asprintf(&comment, "Verifying bigfile #%ld (%ld K)",
     877        asprintf(&comment, _("Verifying bigfile #%ld (%ld K)"),
    879878                 current_biggiefile_number, (long) size >> 10);
    880879        update_progress_form(comment);
     
    949948
    950949        if (bkpinfo->manual_cd_tray) {
    951             popup_and_OK("Please push CD tray closed.");
     950            popup_and_OK(_("Please push CD tray closed."));
    952951        }
    953952        if (find_and_mount_actual_cd(bkpinfo, mountpoint)) {
    954             log_to_screen("failed to mount actual CD");
     953            log_to_screen(_("failed to mount actual CD"));
    955954            return (1);
    956955        }
     
    964963        mddevice = make_vn(fname);
    965964        if (ret) {
    966             asprintf(&tmp, "make_vn of %s failed; unable to verify ISO\n",
     965            asprintf(&tmp, _("make_vn of %s failed; unable to verify ISO\n"),
    967966                     fname);
    968967            log_to_screen(tmp);
     
    976975#endif
    977976        if (run_program_and_log_output(command, FALSE)) {
    978             asprintf(&tmp, "%s failed; unable to mount ISO image\n",
     977            asprintf(&tmp, _("%s failed; unable to mount ISO image\n"),
    979978                     command);
    980979            log_to_screen(tmp);
     
    10651064
    10661065    log_msg(3, "verify_tape_backups --- starting");
    1067     log_to_screen("Verifying backups");
     1066    log_to_screen(_("Verifying backups"));
    10681067    openin_tape(bkpinfo);
    10691068
     
    10931092            && length_of_file(changed_files_fname) > 2) {
    10941093            log_to_screen
    1095                 ("Warning - unable to check logfile to derive list of changed files");
     1094                (_("Warning - unable to check logfile to derive list of changed files"));
    10961095        } else {
    10971096            log_to_screen
    1098                 ("No differences found. Therefore, no 'changed.files' text file.");
     1097                (_("No differences found. Therefore, no 'changed.files' text file."));
    10991098        }
    11001099    }
     
    11191118
    11201119        log_to_screen
    1121             ("See /tmp/changed.files for a list of nonmatching files.");
     1120            (_("See /tmp/changed.files for a list of nonmatching files."));
    11221121        log_to_screen
    1123             ("The files probably changed on filesystem, not on backup media.");
     1122            (_("The files probably changed on filesystem, not on backup media."));
    11241123        //      retval++;
    11251124    }
  • trunk/mondo/mondo/common/libmondo.h

    r59 r507  
    99#include "libmondo-files-EXT.h"
    1010#include "libmondo-fork-EXT.h"
    11 #include "libmondo-gui-EXT.h"
     11#include "newt-specific-EXT.h"
    1212#include "libmondo-mountlist-EXT.h"
    1313#include "libmondo-raid-EXT.h"
  • trunk/mondo/mondo/common/my-stuff.h

    r426 r507  
    7272#endif
    7373#include <assert.h>
     74
     75#include "../../config.h"
    7476
    7577#if defined(DEBUG) && !__cplusplus
     
    239241 * Welcome string displayed at the top of the newt interface.
    240242 */
    241 #define WELCOME_STRING "W E L C O M E   T O   M O N D O   R E S C U E"
     243#define WELCOME_STRING _("W E L C O M E   T O   M O N D O   R E S C U E")
    242244
    243245/**
     
    397399#define DEFAULT_MR_LOGLEVEL 4
    398400
     401#ifdef ENABLE_NLS 
     402# include <libintl.h> 
     403# undef _ 
     404# define _(String) dgettext (PACKAGE, String)
     405# ifdef gettext_noop 
     406#  define N_(String) gettext_noop (String) 
     407# else 
     408#  define N_(String) (String) 
     409# endif 
     410#else 
     411# define textdomain(String) (String) 
     412# define gettext(String) (String) 
     413# define dgettext(Domain,Message) (Message) 
     414# define dcgettext(Domain,Message,Type) (Message) 
     415# define bindtextdomain(Domain,Directory) (Domain) 
     416# define _(String) (String) 
     417# define N_(String) (String) 
     418
     419#endif
     420
     421
     422
    399423#endif                          /* _MY_STUFF_H_ */
  • trunk/mondo/mondo/common/newt-specific.c

    r300 r507  
    2525#include "libmondo-tools-EXT.h"
    2626#include "libmondo-fork-EXT.h"
    27 #include "libmondo-gui-EXT.h"
    28 #include "lib-common-externs.h"
     27#include "newt-specific-EXT.h"
    2928
    3029/*@unused@*/
     
    124123                    tmp[i - 1] = '\0';
    125124                }
    126                 if (strstr("yesYES", tmp)) {
     125                if (strstr(_("yesYES"), tmp)) {
    127126                    paranoid_free(tmp);
    128127                    return (TRUE);
    129                 } else if (strstr("NOno", tmp)) {
     128                } else if (strstr(_("NOno"), tmp)) {
    130129                    paranoid_free(tmp);
    131130                    return (FALSE);
     
    133132                    system("sync");
    134133                    printf
    135                         ("Please enter either YES or NO (or yes or no, or y or n, or...)\n");
     134                        (_("Please enter either YES or NO (or yes or no, or y or n, or...)\n"));
    136135                }
    137136            }
    138137        } else {
    139             return (popup_with_buttons(prompt, "Yes", "No"));
     138            return (popup_with_buttons(prompt, _("Yes"), _("No")));
    140139        }
    141140    }
     
    169168                tmp[i - 1] = '\0';
    170169            }
    171             if (strstr("okOKOkYESyes", tmp)) {
     170            if (strstr(_("okOKOkYESyes"), tmp)) {
    172171                paranoid_free(tmp);
    173172                return (TRUE);
     
    177176            }
    178177        } else {
    179             return (popup_with_buttons(prompt, " Okay ", "Cancel"));
     178            return (popup_with_buttons(prompt, _(" Okay "), _("Cancel")));
    180179        }
    181180    }
     
    313312            ("gzip -9c "MONDO_LOGFILE" > /tmp/MA.log.gz 2> /dev/null");
    314313        printf
    315                 ("If you require technical support, please contact the mailing list.\n");
    316         printf("See http://www.mondorescue.org for details.\n");
     314                (_("If you require technical support, please contact the mailing list.\n"));
     315        printf(_("See http://www.mondorescue.org for details.\n"));
    317316        printf
    318                 ("The list's members can help you, if you attach that file to your e-mail.\n");
    319         printf("Log file: %s\n", MONDO_LOGFILE);
     317                (_("The list's members can help you, if you attach that file to your e-mail.\n"));
     318        printf(_("Log file: %s\n"), MONDO_LOGFILE);
    320319        if (does_file_exist("/tmp/MA.log.gz")) {
    321320            printf
    322                 ("FYI, I have gzipped the log and saved it to /tmp/MA.log.gz\n");
    323         }
    324         printf("Mondo has aborted.\n");
     321                (_("FYI, I have gzipped the log and saved it to /tmp/MA.log.gz\n"));
     322        }
     323        printf(_("Mondo has aborted.\n"));
    325324        register_pid(0, "mondo");   // finish() does this too, FYI
    326325        if (!g_main_pid) {
     
    375374//  system("clear");
    376375//  iamhere("Finished calling newtFinished");
    377         printf("Execution run ended; result=%d\n", signal);
    378         printf("Type 'less %s' to see the output log\n", MONDO_LOGFILE);
     376        printf(_("Execution run ended; result=%d\n"), signal);
     377        printf(_("Type 'less %s' to see the output log\n"), MONDO_LOGFILE);
    379378        free_libmondo_global_strings();
    380379        exit(signal);
     
    662661            while (((ch = getchar()) != '\n') && (ch != EOF));
    663662        } else {
    664             (void) popup_with_buttons(prompt, " OK ", "");
     663            (void) popup_with_buttons(prompt, _(" OK "), "");
    665664        }
    666665    }
     
    718717#endif
    719718            );
    720         b_1 = newtButton(6, newtTextboxGetNumLines(text) + 4, "  OK  ");
    721         b_2 = newtButton(18, newtTextboxGetNumLines(text) + 4, "Cancel");
     719        b_1 = newtButton(6, newtTextboxGetNumLines(text) + 4, _("  OK  "));
     720        b_2 = newtButton(18, newtTextboxGetNumLines(text) + 4, _("Cancel"));
    722721        //  newtOpenWindow (8, 5, 54, newtTextboxGetNumLines (text) + 9, title);
    723722        newtCenteredWindow(54, newtTextboxGetNumLines(text) + 9, title);
     
    806805        }
    807806        //  newtOpenWindow (25, 5, 46, newtTextboxGetNumLines (text) + 7, "Alert");
    808         newtCenteredWindow(46, newtTextboxGetNumLines(text) + 7, "Alert");
     807        newtCenteredWindow(46, newtTextboxGetNumLines(text) + 7, _("Alert"));
    809808        myForm = newtForm(NULL, NULL, 0);
    810809        newtFormAddComponents(myForm, text, b_1, b_2, NULL);
     
    870869            newtCls();
    871870            newtPushHelpLine
    872                 ("Welcome to Mondo Rescue, by Hugo Rabson and the Internet. All rights reversed.");
     871                (_("Welcome to Mondo Rescue, by Hugo Rabson and the Internet. All rights reversed."));
    873872            /*  newtDrawRootText(28,0,"Welcome to Mondo Rescue"); */
    874873            newtDrawRootText(18, 0, WELCOME_STRING);
     
    947946            g_isoform_old_progress = percentage;
    948947            asprintf(&timeline_str,
    949                      "%2ld:%02ld taken            %2ld:%02ld remaining",
     948                     _("%2ld:%02ld taken            %2ld:%02ld remaining"),
    950949                     time_taken / 60, time_taken % 60, time_remaining / 60,
    951950                     time_remaining % 60);
     
    977976            } else {
    978977                asprintf(&pcline_str,
    979                          " %3d%% done              %3d%% to go",
     978                         _(" %3d%% done              %3d%% to go"),
    980979                         percentage, 100 - percentage);
    981980            }
     
    11201119
    11211120        if (g_text_mode) {
    1122             printf("---progress-form---1--- %s\r\n", blurb1);
    1123             printf("---progress-form---2--- %s\r\n", blurb2);
    1124             printf("---progress-form---3--- %s\r\n", blurb3);
    1125             printf("---progress-form---E---\n");
     1121            printf(_("---progress-form---1--- %s%s"), blurb1, "\r\n");
     1122            printf(_("---progress-form---2--- %s%s"), blurb2, "\r\n");
     1123            printf(_("---progress-form---3--- %s%s"), blurb3, "\r\n");
     1124            printf(_("---progress-form---E---\n"));
    11261125
    11271126            j = trunc(percentage / 5);
     
    11391138
    11401139            if (percentage > 100) {
    1141                 log_msg(2, "percentage = %d", percentage);
     1140                log_msg(2, _("percentage = %d"), percentage);
    11421141            }
    11431142            asprintf(&taskprogress,
    1144                      "TASK:  [%s%s] %3d%% done; %2ld:%02ld to go", tmp1,
     1143                     _("TASK:  [%s%s] %3d%% done; %2ld:%02ld to go"), tmp1,
    11451144                     tmp2, percentage, time_remaining / 60,
    11461145                     time_remaining % 60);
    11471146
    1148             printf("---progress-form---4--- %s\r\n", taskprogress);
     1147            printf(_("---progress-form---4--- %s\r\n"), taskprogress);
    11491148            paranoid_free(taskprogress);
    11501149        } else {
     
    12111210        if (g_text_mode) {
    12121211            for (backup_type = none; backup_type == none;) {
    1213                 printf("Backup type (");
     1212                printf(_("Backup type ("));
    12141213                for (i = 0; possible_responses[i]; i++) {
    12151214                    printf("%c%s", (i == 0) ? '\0' : ' ',
     
    12311230        if (restoring) {
    12321231            asprintf(&title_sz,
    1233                      "Please choose the backup media from which you want to read data.");
    1234             asprintf(&minimsg_sz, "Read from:");
     1232                     _("Please choose the backup media from which you want to read data."));
     1233            asprintf(&minimsg_sz, _("Read from:"));
    12351234        } else {
    12361235            asprintf(&title_sz,
    1237                      "Please choose the backup media to which you want to archive data.");
    1238             asprintf(&minimsg_sz, "Backup to:");
     1236                     _("Please choose the backup media to which you want to archive data."));
     1237            asprintf(&minimsg_sz, _("Backup to:"));
    12391238        }
    12401239        newtPushHelpLine(title_sz);
     
    12451244        paranoid_free(minimsg_sz);
    12461245
    1247         b1 = newtButton(1, 1, "CD-R disks ");
    1248         b2 = newtButton(17, 1, "CD-RW disks");
    1249         b3 = newtButton(1, 9, "Tape drive ");
    1250         b4 = newtButton(17, 5, "CD streamer");
    1251         b5 = newtButton(1, 5, " DVD disks ");
    1252         b6 = newtButton(17, 9, " NFS mount ");
    1253         b7 = newtButton(1, 13, " Hard disk ");
    1254         b8 = newtButton(17, 13, "    Exit   ");
     1246        b1 = newtButton(1, 1, _("CD-R disks "));
     1247        b2 = newtButton(17, 1, _("CD-RW disks"));
     1248        b3 = newtButton(1, 9, _("Tape drive "));
     1249        b4 = newtButton(17, 5, _("CD streamer"));
     1250        b5 = newtButton(1, 5, _(" DVD disks "));
     1251        b6 = newtButton(17, 9, _(" NFS mount "));
     1252        b7 = newtButton(1, 13, _(" Hard disk "));
     1253        b8 = newtButton(17, 13, _("    Exit   "));
    12551254        myForm = newtForm(NULL, NULL, 0);
    12561255        newtFormAddComponents(myForm, b1, b5, b3, b7, b2, b4, b6, b8,
     
    13051304        newtDrawRootText(18, 0, WELCOME_STRING);
    13061305        newtPushHelpLine
    1307             ("   Please specify the level of compression that you want.");
     1306            (_("   Please specify the level of compression that you want."));
    13081307        //  newtOpenWindow (23, 3, 34, 13, "How much compression?");
    1309         newtCenteredWindow(34, 13, "How much compression?");
    1310         b1 = newtButton(4, 1, "Maximum");
    1311         b2 = newtButton(18, 1, "Average");
    1312         b3 = newtButton(4, 5, "Minumum");
    1313         b4 = newtButton(18, 5, " None  ");
    1314         b5 = newtButton(4, 9, "         Exit        ");
     1308        newtCenteredWindow(34, 13, _("How much compression?"));
     1309        b1 = newtButton(4, 1, _("Maximum"));
     1310        b2 = newtButton(18, 1, _("Average"));
     1311        b3 = newtButton(4, 5, _("Minimum"));
     1312        b4 = newtButton(18, 5, _(" None  "));
     1313        b5 = newtButton(4, 9, _("         Exit        "));
    13151314        myForm = newtForm(NULL, NULL, 0);
    13161315        newtFormAddComponents(myForm, b1, b3, b2, b4, b5, NULL);
     
    13961395        paranoid_fclose(fin);
    13971396        if (filelist->entries >= ARBITRARY_MAXIMUM) {
    1398             log_to_screen("Arbitrary limits suck, man!");
     1397            log_to_screen(_("Arbitrary limits suck, man!"));
    13991398            paranoid_free(tmp);
    14001399            return (1);
     
    15271526        }
    15281527        asprintf(&differ_sz,
    1529                  "  %d files differ. Hit 'Select' to pick a file. Hit 'Close' to quit the list.",
     1528                 _("  %d files differ. Hit 'Select' to pick a file. Hit 'Close' to quit the list."),
    15301529                 i);
    15311530        newtPushHelpLine(differ_sz);
    15321531        paranoid_free(differ_sz);
    15331532
    1534         bClose = newtCompactButton(10, 15, " Close  ");
    1535         bSelect = newtCompactButton(30, 15, " Select ");
    1536         asprintf(&tmp, "%-10s               %-20s", "Priority",
    1537                  "Filename");
     1533        bClose = newtCompactButton(10, 15, _(" Close  "));
     1534        bSelect = newtCompactButton(30, 15, _(" Select "));
     1535        asprintf(&tmp, "%-10s               %-20s", _("Priority"),
     1536                 _("Filename"));
    15381537        headerMsg = newtLabel(2, 1, tmp);
    15391538        paranoid_free(tmp);
    15401539
    1541         newtOpenWindow(5, 4, 70, 16, "Non-matching files");
     1540        newtOpenWindow(5, 4, 70, 16, _("Non-matching files"));
    15421541        myForm = newtForm(NULL, NULL, 0);
    15431542        newtFormAddComponents(myForm, headerMsg, fileListbox, bClose,
     
    15531552                     i++);
    15541553                if (i == filelist->entries && filelist->entries > 0) {
    1555                     log_to_screen("I don't know what that button does!");
     1554                    log_to_screen(_("I don't know what that button does!"));
    15561555                } else {
    15571556                    currline = i;
  • trunk/mondo/mondo/mondoarchive/main.c

    r426 r507  
    138138    char *say_at_end = NULL;
    139139
     140#ifdef ENABLE_NLS
     141    setlocale(LC_ALL, "");
     142    (void) textdomain("mondo");
     143#endif
    140144/* Make sure I'm root; abort if not */
    141145    if (getuid() != 0) {
    142         fprintf(stderr, "Please run as root.\r\n");
     146        fprintf(stderr, _("Please run as root.\n"));
    143147        exit(127);
    144148    }
     
    148152        && (!strcmp(argv[argc - 1], "-v") || !strcmp(argv[argc - 1], "-V")
    149153            || !strcmp(argv[argc - 1], "--version"))) {
    150         printf("mondoarchive v%s\nSee man page for help\n", PACKAGE_VERSION);
     154        printf(_("mondoarchive v%s\nSee man page for help\n"), PACKAGE_VERSION);
    151155        exit(0);
    152156    }
     
    157161
    158162    diffs = 0;
    159     printf("Initializing...\n");
     163    printf(_("Initializing...\n"));
    160164    if (!(bkpinfo = malloc(sizeof(struct s_bkpinfo)))) {
    161165        fatal_error("Cannot malloc bkpinfo");
     
    197201        setup_newt_stuff();
    198202        if (!strstr(argv[2], "filelist")) {
    199             printf("Sorry - filelist goes first\n");
     203            printf(_("Sorry - filelist goes first\n"));
    200204            finish(1);
    201205        } else {
     
    226230        setup_newt_stuff();
    227231        if (!strstr(argv[2], "filelist")) {
    228             printf("Sorry - filelist goes first\n");
     232            printf(_("Sorry - filelist goes first\n"));
    229233            finish(1);
    230234        } else {
     
    245249        setup_newt_stuff();
    246250        if ((tmp = find_cdrw_device()) == NULL) {
    247             printf("Failed to find CDR-RW drive\n");
    248         } else {
    249             printf("CD-RW is at %s\n", tmp);
     251            printf(_("Failed to find CDR-RW drive\n"));
     252        } else {
     253            printf(_("CD-RW is at %s\n"), tmp);
    250254        }
    251255        paranoid_free(tmp);
    252256
    253257        if ((tmp = find_cdrom_device(FALSE)) == NULL) {
    254             printf("Failed to find CD-ROM drive\n");
    255         } else {
    256             printf("CD-ROM is at %s\n", tmp);
     258            printf(_("Failed to find CD-ROM drive\n"));
     259        } else {
     260            printf(_("CD-ROM is at %s\n"), tmp);
    257261        }
    258262        paranoid_free(tmp);
     
    265269        setup_newt_stuff();
    266270        if ((tmp = find_dvd_device()) == NULL) {
    267             printf("Failed to find DVD drive\n");
    268         } else {
    269             printf("DVD is at %s\n", tmp);
     271            printf(_("Failed to find DVD drive\n"));
     272        } else {
     273            printf(_("DVD is at %s\n"), tmp);
    270274        }
    271275        paranoid_free(tmp);
     
    279283    if (argc > 2 && !strcmp(argv[1], "test-dev")) {
    280284        if (is_dev_an_NTFS_dev(argv[2])) {
    281             printf("%s is indeed an NTFS dev\n", argv[2]);
    282         } else {
    283             printf("%s is _not_ an NTFS dev\n", argv[2]);
     285            printf(_("%s is indeed an NTFS dev\n"), argv[2]);
     286        } else {
     287            printf(_("%s is _not_ an NTFS dev\n"), argv[2]);
    284288        }
    285289        finish(0);
     
    304308        if (res) {
    305309            printf
    306                 ("Errors were detected in the command line you supplied.\n");
    307             printf("Please review the log file - " MONDO_LOGFILE "\n");
     310                (_("Errors were detected in the command line you supplied.\n"));
     311            printf(_("Please review the log file - %s \n"),MONDO_LOGFILE);
    308312            log_msg(1, "Mondoarchive will now exit.");
    309313            finish(1);
     
    319323
    320324    log_to_screen
    321         ("BusyBox's sources are available from http://www.busybox.net");
     325        (_("BusyBox's sources are available from http://www.busybox.net"));
    322326
    323327    /* If we're meant to backup then backup */
     
    327331        if (res) {
    328332            asprintf(&say_at_end,
    329                    "Data archived. Please check the logs, just as a precaution. ");
    330         } else {
    331             asprintf(&say_at_end, "Data archived OK. ");
     333                   _("Data archived. Please check the logs, just as a precaution. "));
     334        } else {
     335            asprintf(&say_at_end, _("Data archived OK. "));
    332336        }
    333337    }
     
    337341        res = verify_data(bkpinfo);
    338342        if (res < 0) {
    339             asprintf(&say_at_end, "%d difference%c found.", -res,
     343            asprintf(&say_at_end, _("%d difference%c found."), -res,
    340344                    (-res != 1) ? 's' : ' ');
    341345            res = 0;
     
    353357    if (retval == 0) {
    354358        mvaddstr_and_log_it(g_currentY++, 0,
    355                             "Backup and/or verify ran to completion. Everything appears to be fine.");
     359                            _("Backup and/or verify ran to completion. Everything appears to be fine."));
    356360    } else {
    357361        mvaddstr_and_log_it(g_currentY++, 0,
    358                             "Backup and/or verify ran to completion. However, errors did occur.");
     362                            _("Backup and/or verify ran to completion. However, errors did occur."));
    359363    }
    360364
    361365    if (does_file_exist("/root/images/mindi/mondorescue.iso")) {
    362366        log_to_screen
    363             ("/root/images/mindi/mondorescue.iso, a boot/utility CD, is available if you want it.");
     367            (_("/root/images/mindi/mondorescue.iso, a boot/utility CD, is available if you want it."));
    364368    }
    365369
     
    368372        if (g_text_mode) {
    369373            log_to_screen
    370                 ("Type 'less /tmp/changed.files' to see which files don't match the archives");
     374                (_("Type 'less /tmp/changed.files' to see which files don't match the archives"));
    371375        } else {
    372376            log_msg(1,
    373                     "Type 'less /tmp/changed.files' to see which files don't match the archives");
     377                    _("Type 'less /tmp/changed.files' to see which files don't match the archives"));
    374378            log_msg(2, "Calling popup_changelist_from_file()");
    375379            popup_changelist_from_file("/tmp/changed.files");
     
    395399    system("rm -Rf /tmp.mondo.* /mondo.scratch.*");
    396400    if (retval == 0) {
    397         printf("Mondoarchive ran OK.\n");
     401        printf(_("Mondoarchive ran OK.\n"));
    398402    } else {
    399         printf("Errors occurred during backup. Please check logfile.\n");
     403        printf(_("Errors occurred during backup. Please check logfile.\n"));
    400404    }
    401405    distro_specific_kludges_at_end_of_mondoarchive();
     
    414418    if (!g_text_mode) {
    415419        popup_and_OK
    416             ("Mondo Archive has finished its run. Please press ENTER to return to the shell prompt.");
    417         log_to_screen("See %s for details of backup run.", MONDO_LOGFILE);
     420            (_("Mondo Archive has finished its run. Please press ENTER to return to the shell prompt."));
     421        log_to_screen(_("See %s for details of backup run."), MONDO_LOGFILE);
    418422        finish(retval);
    419423    } else {
    420         printf("See %s for details of backup run.\n", MONDO_LOGFILE);
     424        printf(_("See %s for details of backup run.\n"), MONDO_LOGFILE);
    421425        exit(retval);
    422426    }
  • trunk/mondo/mondo/mondoarchive/mondo-cli.c

    r489 r507  
    236236    if (i == 0) {
    237237        retval++;
    238         log_to_screen("You must specify the media type\n");
     238        log_to_screen(_("You must specify the media type\n"));
    239239    }
    240240    if (i > 1) {
    241241        retval++;
    242         log_to_screen("Please specify only one media type\n");
     242        log_to_screen(_("Please specify only one media type\n"));
    243243    }
    244244    if (flag_set['K']) {
     
    250250    if (flag_set['L'] && flag_set['0']) {
    251251        retval++;
    252         log_to_screen("You cannot have 'no compression' _and_ LZOP.\n");
     252        log_to_screen(_("You cannot have 'no compression' _and_ LZOP.\n"));
    253253    }
    254254    bkpinfo->backup_data = flag_set['O'];
    255255    bkpinfo->verify_data = flag_set['V'];
    256256    if (flag_set['I'] && !bkpinfo->backup_data) {
    257         log_to_screen("-I switch is ignored if just verifying");
     257        log_to_screen(_("-I switch is ignored if just verifying"));
    258258    }
    259259    if (flag_set['E'] && !bkpinfo->backup_data) {
    260         log_to_screen("-E switch is ignored if just verifying");
     260        log_to_screen(_("-E switch is ignored if just verifying"));
    261261    }
    262262
     
    286286        if (flag_set['f'] || flag_set['l']) {
    287287            log_to_screen
    288                 ("You don't need to specify bootloader or bootdevice");
     288                (_("You don't need to specify bootloader or bootdevice"));
    289289        }
    290290    }
     
    331331        if (bkpinfo->include_paths[0] == '-') {
    332332            retval++;
    333             log_to_screen("Please supply a sensible value with '-I'\n");
     333            log_to_screen(_("Please supply a sensible value with '-I'\n"));
    334334        }
    335335    }
     
    346346            retval++;
    347347            log_to_screen
    348                 ("Please do not use -J in combination with -I. If you want to make a list of files to backup, that's fine, use -J <filename> but please don't muddy the waters by combining -J with -I. Thanks. :-)");
     348                (_("Please do not use -J in combination with -I. If you want to make a list of files to backup, that's fine, use -J <filename> but please don't combine -J with -I. Thanks. :-)"));
    349349        }
    350350        bkpinfo->make_filelist = FALSE;
     
    364364        if (g_kernel_version >= 2.6 && !strstr(flag_val['d'], "/dev/")) {
    365365            log_to_screen
    366                 ("Linus says 2.6 has a broken ide-scsi module. Proceed at your own risk...");
     366                (_("Linus says 2.6 has a broken ide-scsi module. Proceed at your own risk..."));
    367367        }
    368368
     
    380380            if (!flag_set['L']) {
    381381                log_to_screen
    382                     ("You must use -L with -C. Therefore I am setting it for you.");
     382                    (_("You must use -L with -C. Therefore I am setting it for you."));
    383383                flag_set['L'] = 1;
    384384                flag_val['L'] = NULL;
     
    411411
    412412        asprintf(&tmp,
    413                 "You didn't specify a tape streamer device. I'm assuming %s",
     413                _("You didn't specify a tape streamer device. I'm assuming %s"),
    414414                flag_val['d']);
    415415        log_to_screen(tmp);
     
    427427            if ((flag_val['d'] = find_dvd_device()) != NULL) {
    428428                flag_set['d'] = TRUE;
    429                 log_to_screen("I guess DVD drive is at %s", flag_val['d']);
     429                log_to_screen(_("I guess DVD drive is at %s"), flag_val['d']);
    430430            }
    431431        }
     
    445445            asprintf(&flag_val['s'], "%dm", DEFAULT_DVD_DISK_SIZE); // 4.7 salesman's GB = 4.482 real GB = 4582 MB
    446446            log_to_screen
    447                 ("You did not specify a size (-s) for DVD. I'm guessing %s.",
     447                (_("You did not specify a size (-s) for DVD. I'm guessing %s."),
    448448                 flag_val['s']);
    449449            flag_set['s'] = 1;
     
    499499        if (strlen(bkpinfo->isodir) < 3) {
    500500            retval++;
    501             log_to_screen("NFS share is not mounted. Please mount it.\n");
     501            log_to_screen(_("NFS share is not mounted. Please mount it.\n"));
    502502        }
    503503        log_msg(3, "mount = %s", bkpinfo->nfs_mount);
     
    627627                retval++;
    628628                asprintf(&tmp,
    629                     "You specified kernel '%s', which does not exist\n",
     629                    _("You specified kernel '%s', which does not exist\n"),
    630630                    bkpinfo->kernel_path);
    631631                log_to_screen(tmp);
     
    669669            paranoid_free(tmp);
    670670            asprintf(&tmp,
    671                     "Are you sure directory '%s' exists in remote dir '%s'?\nIf so, do you have rights to write to it?\n",
     671                    _("Are you sure directory '%s' exists in remote dir '%s'?\nIf so, do you have rights to write to it?\n"),
    672672                    bkpinfo->nfs_remote_dir, bkpinfo->nfs_mount);
    673673            log_to_screen(tmp);
     
    680680        if (g_kernel_version >= 2.6) {
    681681            if (popup_and_get_string
    682                 ("Device", "Please specify the device",
     682                (_("Device"), _("Please specify the device"),
    683683                 bkpinfo->media_device, MAX_STR_LEN / 4)) {
    684684                retval++;
    685                 log_to_screen("User opted to cancel.");
     685                log_to_screen(_("User opted to cancel."));
    686686            }
    687687        } else if ((tmp = find_cdrw_device()) ==  NULL) {
     
    690690            retval++;
    691691            log_to_screen
    692                 ("Tried and failed to find CD-R[W] drive automatically.\n");
     692                (_("Tried and failed to find CD-R[W] drive automatically.\n"));
    693693        } else {
    694694            flag_set['d'] = TRUE;
     
    699699    if (!flag_set['d'] && !flag_set['n'] && !flag_set['C']) {
    700700        retval++;
    701         log_to_screen("Please specify the backup device/directory.\n");
     701        log_to_screen(_("Please specify the backup device/directory.\n"));
    702702        fatal_error
    703703            ("You didn't use -d to specify the backup device/directory.");
     
    722722            retval++;
    723723            log_to_screen
    724                 ("Please specify a tempdir which I can write to. :)");
     724                (_("Please specify a tempdir which I can write to. :)"));
    725725            fatal_error("I cannot write to the tempdir you specified.");
    726726        }
     
    732732            retval++;
    733733            log_to_screen
    734                 ("Please don't specify a SAMBA or VFAT or NFS tmpdir.");
     734                (_("Please don't specify a SAMBA or VFAT or NFS tmpdir."));
    735735            fatal_error("I cannot write to the tempdir you specified.");
    736736        }
     
    782782        i = which_boot_loader(tmp);
    783783        log_msg(3, "boot loader is %c, residing at %s", i, tmp);
    784         printf("boot loader is %c, residing at %s\n", i, tmp);
     784        printf(_("boot loader is %c, residing at %s\n"), i, tmp);
    785785        finish(0);
    786786    }
     
    796796            retval++;
    797797            log_to_screen
    798                 ("Please install LZOP. You can't use '-L' until you do.\n");
     798                (_("Please install LZOP. You can't use '-L' until you do.\n"));
    799799        }
    800800    }
     
    806806        bkpinfo->make_cd_use_lilo = TRUE;
    807807        log_to_screen
    808             ("Forcing you to use LILO. SuSE 9.0 (64-bit) has a broken mkfs.vfat binary.");
     808            (_("Forcing you to use LILO. SuSE 9.0 (64-bit) has a broken mkfs.vfat binary."));
    809809    }
    810810    if (flag_set['o']) {
     
    816816            bkpinfo->make_cd_use_lilo = TRUE;
    817817            log_to_screen
    818                 ("Your kernel appears not to support vfat filesystems. I am therefore");
    819             log_to_screen
    820                 ("using LILO instead of SYSLINUX as the CD/floppy's boot loader.");
     818                (_("Your kernel appears not to support vfat filesystems. I am therefore"));
     819            log_to_screen
     820                (_("using LILO instead of SYSLINUX as the CD/floppy's boot loader."));
    821821        }
    822822        if (run_program_and_log_output("which mkfs.vfat", FALSE)) {
     
    824824#ifdef __IA32__
    825825            log_to_screen
    826                 ("Your filesystem is missing 'mkfs.vfat', so I cannot use SYSLINUX as");
    827             log_to_screen
    828                 ("your boot loader. I shall therefore use LILO instead.");
     826                (_("Your filesystem is missing 'mkfs.vfat', so I cannot use SYSLINUX as"));
     827            log_to_screen
     828                (_("your boot loader. I shall therefore use LILO instead."));
    829829#endif
    830830#ifdef __IA64__
    831831            log_to_screen
    832                 ("Your filesystem is missing 'mkfs.vfat', so I cannot prepare the EFI");
    833             log_to_screen("environment correctly. Please install it.");
     832                (_("Your filesystem is missing 'mkfs.vfat', so I cannot prepare the EFI"));
     833            log_to_screen(_("environment correctly. Please install it."));
    834834            fatal_error("Aborting");
    835835#endif
     
    849849    if (i == 0) {
    850850        retval++;
    851         log_to_screen("Specify backup (-O), verify (-V) or both (-OV).\n");
     851        log_to_screen(_("Specify backup (-O), verify (-V) or both (-OV).\n"));
    852852    }
    853853
     
    901901            if (flag_set[optopt]) {
    902902                bad_switches = TRUE;
    903                 asprintf(&tmp, "Switch -%c previously defined as %s\n", opt,
     903                asprintf(&tmp, _("Switch -%c previously defined as %s\n"), opt,
    904904                        flag_val[i]);
    905905                log_to_screen(tmp);
     
    912912                        optarg[--len] = '\0';
    913913                        log_to_screen
    914                             ("Warning - param '%s' should not have trailing slash!",
     914                            (_("Warning - param '%s' should not have trailing slash!"),
    915915                             optarg);
    916916                    }
     
    919919                            && flag_val[opt][0] != '/') {
    920920                            asprintf(&tmp,
    921                                     "-%c flag --- must be absolute path --- '%s' isn't absolute",
     921                                    _("-%c flag --- must be absolute path --- '%s' isn't absolute"),
    922922                                    opt, flag_val[opt]);
    923923                            log_to_screen(tmp);
     
    933933    for (i = optind; i < argc; i++) {
    934934        bad_switches = TRUE;
    935         asprintf(&tmp, "Invalid arg -- %s\n", argv[i]);
     935        asprintf(&tmp, _("Invalid arg -- %s\n"), argv[i]);
    936936        log_to_screen(tmp);
    937937        paranoid_free(tmp);
     
    964964    switch (sig) {
    965965    case SIGINT:
    966         asprintf(&tmp, "SIGINT signal received from OS");
    967         asprintf(&tmp2, "You interrupted me :-)");
     966        asprintf(&tmp, _("SIGINT signal received from OS"));
     967        asprintf(&tmp2, _("You interrupted me :-)"));
    968968        break;
    969969    case SIGKILL:
    970         asprintf(&tmp, "SIGKILL signal received from OS");
     970        asprintf(&tmp, _("SIGKILL signal received from OS"));
    971971        asprintf(&tmp2,
    972                "I seriously have no clue how this signal even got to me. Something's wrong with your system.");
     972               _("I seriously have no clue how this signal even got to me. Something's wrong with your system."));
    973973        break;
    974974    case SIGTERM:
    975         asprintf(&tmp, "SIGTERM signal received from OS");
    976         asprintf(&tmp2, "Got terminate signal");
     975        asprintf(&tmp, _("SIGTERM signal received from OS"));
     976        asprintf(&tmp2, _("Got terminate signal"));
    977977        break;
    978978    case SIGHUP:
    979         asprintf(&tmp, "SIGHUP signal received from OS");
    980         asprintf(&tmp2, "Hangup on line");
     979        asprintf(&tmp, _("SIGHUP signal received from OS"));
     980        asprintf(&tmp2, _("Hangup on line"));
    981981        break;
    982982    case SIGSEGV:
    983         asprintf(&tmp, "SIGSEGV signal received from OS");
     983        asprintf(&tmp, _("SIGSEGV signal received from OS"));
    984984        asprintf(&tmp2,
    985                "Internal programming error. Please send a backtrace as well as your log.");
     985               _("Internal programming error. Please send a backtrace as well as your log."));
    986986        break;
    987987    case SIGPIPE:
    988         asprintf(&tmp, "SIGPIPE signal received from OS");
    989         asprintf(&tmp2, "Pipe was broken");
     988        asprintf(&tmp, _("SIGPIPE signal received from OS"));
     989        asprintf(&tmp2, _("Pipe was broken"));
    990990        break;
    991991    case SIGABRT:
    992         asprintf(&tmp, "SIGABRT signal received from OS");
     992        asprintf(&tmp, _("SIGABRT signal received from OS"));
    993993        asprintf(&tmp2,
    994                 "Abort - probably failed assertion. I'm sleeping for a few seconds so you can read the message.");
     994                _("Abort - probably failed assertion. I'm sleeping for a few seconds so you can read the message."));
    995995        break;
    996996    default:
    997         asprintf(&tmp, "(Unknown)");
    998         asprintf(&tmp2, "(Unknown)");
     997        asprintf(&tmp, _("(Unknown)"));
     998        asprintf(&tmp2, _("(Unknown)"));
    999999    }
    10001000
  • trunk/mondo/mondo/mondorestore/mondo-prep.c

    r197 r507  
    239239// zero & reboot
    240240            log_to_screen
    241                 ("I am sorry for the inconvenience but I must ask you to reboot.");
     241                (_("I am sorry for the inconvenience but I must ask you to reboot."));
    242242            log_to_screen
    243                 ("I need to reset the Master Boot Record; in order to be");
     243                (_("I need to reset the Master Boot Record; in order to be"));
    244244            log_to_screen
    245                 ("sure the kernel notices, I must reboot after doing it.");
     245                (_("sure the kernel notices, I must reboot after doing it."));
    246246            log_to_screen("Please hit 'Enter' to reboot.");
    247247            for (lino = 0; lino < drivelist->entries; lino++) {
     
    269269            system("sync");
    270270            popup_and_OK
    271                 ("I must now reboot. Please leave the boot media in the drive and repeat your actions - e.g. type 'nuke' - and it should work fine.");
     271                (_("I must now reboot. Please leave the boot media in the drive and repeat your actions - e.g. type 'nuke' - and it should work fine."));
    272272            system("reboot");
    273273        }
     
    615615#ifdef __FreeBSD__
    616616    log_to_screen
    617         ("I don't know how to extrapolate the mountlist on FreeBSD. Sorry.");
     617        (_("I don't know how to extrapolate the mountlist on FreeBSD. Sorry."));
    618618    return (1);
    619619#endif
     
    624624            if (!does_file_exist("/etc/raidtab")) {
    625625                log_to_screen
    626                     ("Cannot find /etc/raidtab - cannot extrapolate the fdisk entries");
     626                    (_("Cannot find /etc/raidtab - cannot extrapolate the fdisk entries"));
    627627                finish(1);
    628628            }
     
    749749    }
    750750    if (is_this_device_mounted(device)) {
    751         sprintf(tmp, "%s is mounted - cannot format it       ", device);
     751        sprintf(tmp, _("%s is mounted - cannot format it       "), device);
    752752        log_to_screen(tmp);
    753753        paranoid_free(program);
     
    761761            if (!does_file_exist("/tmp/raidconf.txt")) {
    762762                log_to_screen
    763                     ("/tmp/raidconf.txt does not exist. I therefore cannot start Vinum.");
     763                    (_("/tmp/raidconf.txt does not exist. I therefore cannot start Vinum."));
    764764            } else {
    765765                int res;
     
    769769                if (res) {
    770770                    log_to_screen
    771                         ("`vinum create /tmp/raidconf.txt' returned errors. Please fix them and re-run mondorestore.");
     771                        (_("`vinum create /tmp/raidconf.txt' returned errors. Please fix them and re-run mondorestore."));
    772772                    finish(1);
    773773                }
     
    780780            char line[MAX_STR_LEN];
    781781            sprintf(tmp,
    782                     "Initializing Vinum device %s (this may take a *long* time)",
     782                    _("Initializing Vinum device %s (this may take a *long* time)"),
    783783                    device);
    784784            log_to_screen(tmp);
     
    823823        }
    824824#else
    825         sprintf(tmp, "Initializing RAID device %s", device);
     825        sprintf(tmp, _("Initializing RAID device %s"), device);
    826826        log_to_screen(tmp);
    827827
    828828// Shouldn't be necessary.
    829         log_to_screen("Stopping %s", device);
     829        log_to_screen(_("Stopping %s"), device);
    830830        stop_raid_device(device);
    831831        system("sync");
     
    900900    retval += res;
    901901    if (retval) {
    902         strcat(tmp, "...failed");
     902        strcat(tmp, _("...failed"));
    903903    } else {
    904         strcat(tmp, "...OK");
     904        strcat(tmp, _("...OK"));
    905905    }
    906906
     
    951951            (interactively) ? "true" : "false");
    952952    log_it(tmp);
    953     mvaddstr_and_log_it(g_currentY, 0, "Formatting partitions     ");
    954     open_progress_form("Formatting partitions",
    955                        "I am now formatting your hard disk partitions.",
    956                        "This may take up to five minutes.", "",
     953    mvaddstr_and_log_it(g_currentY, 0, _("Formatting partitions     "));
     954    open_progress_form(_("Formatting partitions"),
     955                       _("I am now formatting your hard disk partitions."),
     956                       _("This may take up to five minutes."), "",
    957957                       mountlist->entries + 1);
    958958
     
    10011001    if (does_file_exist("/tmp/i-want-my-lvm")) {
    10021002        wait_until_software_raids_are_prepped("/proc/mdstat", 10);
    1003         log_to_screen("Configuring LVM");
     1003        log_to_screen(_("Configuring LVM"));
    10041004        if (!g_text_mode) {
    10051005            newtSuspend();
     
    10921092
    10931093    if (retval) {
    1094         mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
     1094        mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
    10951095        log_to_screen
    1096             ("Errors occurred during the formatting of your hard drives.");
     1096            (_("Errors occurred during the formatting of your hard drives."));
    10971097    } else {
    1098         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     1098        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
    10991099    }
    11001100
     
    11071107//123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789
    11081108            log_to_screen
    1109                 ("Partition table locked up %d times. At least one 'mkfs' (format) command",
     1109                (_("Partition table locked up %d times. At least one 'mkfs' (format) command"),
    11101110                 g_partition_table_locked_up);
    11111111            log_to_screen
    1112                 ("failed. I think these two events are related. Sometimes, fdisk's ioctl() call");
     1112                (_("failed. I think these two events are related. Sometimes, fdisk's ioctl() call"));
    11131113            log_to_screen
    1114                 ("to refresh its copy of the partition table causes the kernel to lock the ");
     1114                (_("to refresh its copy of the partition table causes the kernel to lock the "));
    11151115            log_to_screen
    1116                 ("partition table. I believe this has just happened.");
     1116                (_("partition table. I believe this has just happened."));
    11171117            if (ask_me_yes_or_no
    1118                 ("Please choose 'yes' to reboot and try again; or 'no' to ignore this warning and continue."))
     1118                (_("Please choose 'yes' to reboot and try again; or 'no' to ignore this warning and continue.")))
    11191119            {
    11201120                system("sync");
     
    11251125        } else {
    11261126            log_to_screen
    1127                 ("Partition table locked up %d time%c. However, disk formatting succeeded.",
     1127                (_("Partition table locked up %d time%c. However, disk formatting succeeded."),
    11281128                 g_partition_table_locked_up,
    11291129                 (g_partition_table_locked_up == 1) ? '.' : 's');
     
    15281528    pout_to_fdisk = popen(tmp, "w");
    15291529    if (!pout_to_fdisk) {
    1530         log_to_screen("Cannot call parted2fdisk to configure %s", drivename);
     1530        log_to_screen(_("Cannot call parted2fdisk to configure %s"), drivename);
    15311531        paranoid_free(device_str);
    15321532        paranoid_free(format);
     
    15641564                    if (system(command)) {
    15651565                        log_to_screen
    1566                             ("Warning! Unable to make the drive bootable.");
     1566                            (_("Warning! Unable to make the drive bootable."));
    15671567                    }
    15681568                    paranoid_free(device_str);
     
    16141614            if (!file) {
    16151615                sprintf(tmp,
    1616                         "Warning - unable to open %s for wiping it's partition table",
     1616                        _("Warning - unable to open %s for wiping it's partition table"),
    16171617                        drivename);
    16181618                log_to_screen(tmp);
     
    16211621            for (i = 0; i < 512; i++) {
    16221622                if (!write(file, "\0", 1)) {
    1623                     sprintf(tmp, "Warning - unable to write to %s",
     1623                    sprintf(tmp, _("Warning - unable to write to %s"),
    16241624                            drivename);
    16251625                    log_to_screen(tmp);
     
    16551655        if (current_devno == 5 && previous_devno == 4) {
    16561656            log_to_screen
    1657                 ("You must leave at least one partition spare as the Extended partition.");
     1657                (_("You must leave at least one partition spare as the Extended partition."));
    16581658            paranoid_free(device_str);
    16591659            paranoid_free(format);
     
    16721672            if (system(tmp)) {
    16731673                log_to_screen
    1674                     ("Warning! Unable to make the slice bootable.");
     1674                    (_("Warning! Unable to make the slice bootable."));
    16751675            }
    16761676        }
     
    17001700            g_partition_table_locked_up++;
    17011701            log_to_screen
    1702                 ("A flaw in the Linux kernel has locked the partition table.");
     1702                (_("A flaw in the Linux kernel has locked the partition table."));
    17031703        }
    17041704    }
     
    17731773
    17741774    if (is_this_device_mounted(partition_name)) {
    1775         sprintf(tmp, "%s is mounted, and should not be partitioned",
     1775        sprintf(tmp, _("%s is mounted, and should not be partitioned"),
    17761776                partition_name);
    17771777        log_to_screen(tmp);
     
    18101810                if (prev_partno >= 4) {
    18111811                    log_to_screen
    1812                         ("You need to leave at least one partition free, for 'extended/logical'");
     1812                        (_("You need to leave at least one partition free, for 'extended/logical'"));
    18131813                    paranoid_free(program);
    18141814                    paranoid_free(partition_name);
     
    20012001*/
    20022002
    2003     open_progress_form("Partitioning devices",
    2004                        "I am now going to partition all your drives.",
    2005                        "This should not take more than five minutes.", "",
     2003    open_progress_form(_("Partitioning devices"),
     2004                       _("I am now going to partition all your drives."),
     2005                       _("This should not take more than five minutes."), "",
    20062006                       mountlist->entries);
    20072007
     
    20152015    close_progress_form();
    20162016    if (retval) {
    2017         mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
     2017        mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
    20182018        log_to_screen
    2019             ("Errors occurred during the partitioning of your hard drives.");
     2019            (_("Errors occurred during the partitioning of your hard drives."));
    20202020    } else {
    2021         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     2021        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
    20222022        paranoid_system("rm -f /tmp/fdisk*.log 2> /dev/null");
    20232023    }
     
    25312531        return;
    25322532    }
    2533     sprintf(tmp, "Expanding entries to suit drive %s (%ld MB)", drive_name,
     2533    sprintf(tmp, _("Expanding entries to suit drive %s (%ld MB)"), drive_name,
    25342534            current_size_of_drive);
    25352535    log_to_screen(tmp);
     
    25502550
    25512551    if (original_size_of_drive <= 0) {
    2552         sprintf(tmp, "Cannot resize %s's entries. Drive not found.",
     2552        sprintf(tmp, _("Cannot resize %s's entries. Drive not found."),
    25532553                drive_name);
    25542554        log_to_screen(tmp);
     
    25802580            newsizL = (long) new_size;
    25812581        }
    2582         sprintf(tmp, "Changing %s from %lld KB to %ld KB",
     2582        sprintf(tmp, _("Changing %s from %lld KB to %ld KB"),
    25832583                drivemntlist->el[partno]->device,
    25842584                drivemntlist->el[partno]->size, newsizL);
     
    25872587    }
    25882588    final_size = get_phys_size_of_drive(drive_name);
    2589     sprintf(tmp, "final_size = %ld MB", final_size);
     2589    sprintf(tmp, _("final_size = %ld MB"), final_size);
    25902590    log_to_screen(tmp);
    25912591    paranoid_free(tmp);
     
    26282628                                                        device);
    26292629    }
    2630     log_to_screen("Mountlist adjusted to suit current hard drive(s)");
     2630    log_to_screen(_("Mountlist adjusted to suit current hard drive(s)"));
    26312631    paranoid_free(drivelist);
    26322632}
  • trunk/mondo/mondo/mondorestore/mondo-restore.c

    r489 r507  
    507507 * The message to display if we detect that the user is using a Compaq Proliant.
    508508 */
    509 #define COMPAQ_PROLIANTS_SUCK "Partition and format your disk using Compaq's disaster recovery CD. After you've done that, please reboot with your Mondo CD/floppy in Interactive Mode."
     509#define COMPAQ_PROLIANTS_SUCK _("Partition and format your disk using Compaq's disaster recovery CD. After you've done that, please reboot with your Mondo CD/floppy in Interactive Mode.")
    510510
    511511
     
    537537    if (!does_file_exist(g_mountlist_fname)) {
    538538        log_to_screen(g_mountlist_fname);
    539         log_to_screen("does not exist");
     539        log_to_screen(_("does not exist"));
    540540        return (1);
    541541    }
     
    545545    if (retval) {
    546546        log_to_screen
    547             ("Warning - load_raidtab_into_raidlist returned an error");
     547            (_("Warning - load_raidtab_into_raidlist returned an error"));
    548548    }
    549549    res = edit_mountlist(g_mountlist_fname, mountlist, raidlist);
     
    555555    save_raidlist_to_raidtab(raidlist, RAIDTAB_FNAME);
    556556
    557     log_to_screen("I have finished editing the mountlist for you.");
     557    log_to_screen(_("I have finished editing the mountlist for you."));
    558558
    559559    return (retval);
     
    604604    popup_and_OK(COMPAQ_PROLIANTS_SUCK);
    605605    if (ask_me_yes_or_no
    606         ("Would you like to reboot and use your Compaq CD to prep your hard drive?"))
     606        (_("Would you like to reboot and use your Compaq CD to prep your hard drive?")))
    607607    {
    608608        fatal_error
    609             ("Aborting. Please reboot and prep your hard drive with your Compaq CD.");
     609            (_("Aborting. Please reboot and prep your hard drive with your Compaq CD."));
    610610    }
    611611}
     
    644644        interactively_obtain_media_parameters_from_user(bkpinfo, FALSE);
    645645    } else {
    646         popup_and_OK("No restoring or comparing will take place today.");
     646        popup_and_OK(_("No restoring or comparing will take place today."));
    647647        if (is_this_device_mounted("/mnt/cdrom")) {
    648648            run_program_and_log_output("umount /mnt/cdrom", FALSE);
     
    776776    if (g_text_mode) {
    777777        if (!ask_me_yes_or_no
    778             ("Interactive Mode + textonly = experimental! Proceed anyway?"))
     778            (_("Interactive Mode + textonly = experimental! Proceed anyway?")))
    779779        {
    780780            fatal_error("Wise move.");
     
    817817        save_mountlist_to_disk(mountlist, g_mountlist_fname);
    818818        save_raidlist_to_raidtab(raidlist, RAIDTAB_FNAME);
    819         mvaddstr_and_log_it(1, 30, "Restoring Interactively");
     819        mvaddstr_and_log_it(1, 30, _("Restoring Interactively"));
    820820        if (bkpinfo->differential) {
    821             log_to_screen("Because this is a differential backup, disk");
     821            log_to_screen(_("Because this is a differential backup, disk"));
    822822            log_to_screen
    823                 (" partitioning and formatting will not take place.");
     823                (_(" partitioning and formatting will not take place."));
    824824            done = TRUE;
    825825        } else {
    826826            if (ask_me_yes_or_no
    827                 ("Do you want to erase and partition your hard drives?")) {
     827                (_("Do you want to erase and partition your hard drives?"))) {
    828828                if (partition_table_contains_Compaq_diagnostic_partition
    829829                    (mountlist)) {
     
    836836                    if (ptn_errs) {
    837837                        log_to_screen
    838                             ("Warning. Errors occurred during disk partitioning.");
     838                            (_("Warning. Errors occurred during disk partitioning."));
    839839                    }
    840840
     
    842842                    if (!fmt_errs) {
    843843                        log_to_screen
    844                             ("Errors during disk partitioning were handled OK.");
     844                            (_("Errors during disk partitioning were handled OK."));
    845845                        log_to_screen
    846                             ("Partitions were formatted OK despite those errors.");
     846                            (_("Partitions were formatted OK despite those errors."));
    847847                        ptn_errs = 0;
    848848                    }
     
    854854            } else {
    855855                mvaddstr_and_log_it(g_currentY++, 0,
    856                                     "User opted not to partition the devices");
     856                                    _("User opted not to partition the devices"));
    857857                if (ask_me_yes_or_no
    858                     ("Do you want to format your hard drives?")) {
     858                    (_("Do you want to format your hard drives?"))) {
    859859                    fmt_errs = format_everything(mountlist, TRUE);
    860860                    if (!fmt_errs) {
     
    869869                mvaddstr_and_log_it(g_currentY++,
    870870                                    0,
    871                                     "Errors occurred. Please repartition and format drives manually.");
     871                                    _("Errors occurred. Please repartition and format drives manually."));
    872872                done = FALSE;
    873873            }
     
    875875                mvaddstr_and_log_it(g_currentY++,
    876876                                    0,
    877                                     "Errors occurred during partitioning. Formatting, however, went OK.");
     877                                    _("Errors occurred during partitioning. Formatting, however, went OK."));
    878878                done = TRUE;
    879879            }
    880880            if (!done) {
    881                 if (!ask_me_yes_or_no("Re-edit the mountlist?")) {
     881                if (!ask_me_yes_or_no(_("Re-edit the mountlist?"))) {
    882882                    retval++;
    883883                    goto end_of_func;
     
    895895    /* restore */
    896896    if ((restore_all =
    897          ask_me_yes_or_no("Do you want me to restore all of your data?")))
     897         ask_me_yes_or_no(_("Do you want me to restore all of your data?"))))
    898898    {
    899899        log_msg(1, "Restoring all data");
     
    902902        if ((restore_all =
    903903             ask_me_yes_or_no
    904              ("Do you want me to restore _some_ of your data?"))) {
     904             (_("Do you want me to restore _some_ of your data?")))) {
    905905        strcpy(old_restpath, bkpinfo->restore_path);
    906906        for (done = FALSE; !done;) {
     
    915915// (NB: %s is where your filesystem is mounted now, by default)", MNT_RESTORING);
    916916                if (popup_and_get_string
    917                     ("Restore path", "Restore files to where?", tmp,
     917                    (_("Restore path"), _("Restore files to where?"), tmp,
    918918                     MAX_STR_LEN / 4)) {
    919919                    if (!strcmp(tmp, "/")) {
    920                         if (!ask_me_yes_or_no("Are you sure?")) {
     920                        if (!ask_me_yes_or_no(_("Are you sure?"))) {
    921921                            goto gotos_suck;
    922922                        }
     
    932932                }
    933933                if (!ask_me_yes_or_no
    934                     ("Restore another subset of your backup?")) {
     934                    (_("Restore another subset of your backup?"))) {
    935935                    done = TRUE;
    936936                }
     
    943943        mvaddstr_and_log_it(g_currentY++,
    944944                            0,
    945                             "User opted not to restore any data.                                  ");
     945                            _("User opted not to restore any data.                                  "));
    946946    }
    947947    if (retval) {
    948948        mvaddstr_and_log_it(g_currentY++,
    949949                            0,
    950                             "Errors occurred during the restore phase.            ");
    951     }
    952 
    953     if (ask_me_yes_or_no("Initialize the boot loader?")) {
     950                            _("Errors occurred during the restore phase.            "));
     951    }
     952
     953    if (ask_me_yes_or_no(_("Initialize the boot loader?"))) {
    954954        run_boot_loader(TRUE);
    955955    } else {
    956956        mvaddstr_and_log_it(g_currentY++,
    957957                            0,
    958                             "User opted not to initialize the boot loader.");
     958                            _("User opted not to initialize the boot loader."));
    959959    }
    960960
     
    965965    /*  if (restore_some || restore_all || */
    966966    if (ask_me_yes_or_no
    967         ("Label your ext2 and ext3 partitions if necessary?")) {
     967        (_("Label your ext2 and ext3 partitions if necessary?"))) {
    968968        mvaddstr_and_log_it(g_currentY, 0,
    969                             "Using e2label to label your ext2,3 partitions");
     969                            _("Using e2label to label your ext2,3 partitions"));
    970970        if (does_file_exist("/tmp/fstab.new")) {
    971971            strcpy(fstab_fname, "/tmp/fstab.new");
     
    980980        if (res) {
    981981            log_to_screen
    982                 ("label-partitions-as-necessary returned an error");
    983             mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
     982                (_("label-partitions-as-necessary returned an error"));
     983            mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
    984984        } else {
    985985            mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     
    992992        mvaddstr_and_log_it(g_currentY++,
    993993                            0,
    994                             "Warning - errors occurred during the restore phase.");
     994                            _("Warning - errors occurred during the restore phase."));
    995995    }
    996996  end_of_func:
     
    10441044            retval += compare_mode(bkpinfo, mountlist, raidlist);
    10451045        } else {
    1046             log_to_screen("OK, I shan't restore/compare any files.");
     1046            log_to_screen(_("OK, I shan't restore/compare any files."));
    10471047        }
    10481048    }
     
    10541054    if (system("umount /tmp/isodir 2> /dev/null")) {
    10551055        log_to_screen
    1056             ("WARNING - unable to unmount device where the ISO files are stored.");
     1056            (_("WARNING - unable to unmount device where the ISO files are stored."));
    10571057    }
    10581058//    }
     
    11151115    if (!evaluate_mountlist(mountlist, tmpA, tmpB, tmpC)) {
    11161116        sprintf(tmp,
    1117                 "Mountlist analyzed. Result: \"%s %s %s\" Switch to Interactive Mode?",
     1117                _("Mountlist analyzed. Result: \"%s %s %s\" Switch to Interactive Mode?"),
    11181118                tmpA, tmpB, tmpC);
    11191119        if (ask_me_yes_or_no(tmp)) {
     
    11251125    }
    11261126    save_mountlist_to_disk(mountlist, g_mountlist_fname);
    1127     mvaddstr_and_log_it(1, 30, "Restoring Automatically");
     1127    mvaddstr_and_log_it(1, 30, _("Restoring Automatically"));
    11281128    if (bkpinfo->differential) {
    1129         log_to_screen("Because this is a differential backup, disk");
    1130         log_to_screen("partitioning and formatting will not take place.");
     1129        log_to_screen(_("Because this is a differential backup, disk"));
     1130        log_to_screen(_("partitioning and formatting will not take place."));
    11311131        res = 0;
    11321132    } else {
     
    11541154                if (res) {
    11551155                    log_to_screen
    1156                         ("Warning. Errors occurred during partitioning.");
     1156                        (_("Warning. Errors occurred during partitioning."));
    11571157                    res = 0;
    11581158                }
     
    11601160            retval += res;
    11611161            if (!res) {
    1162                 log_to_screen("Preparing to format your disk(s)");
     1162                log_to_screen(_("Preparing to format your disk(s)"));
    11631163                sleep(1);
    11641164                system("sync");
    1165                 log_to_screen("Please wait. This may take a few minutes.");
     1165                log_to_screen(_("Please wait. This may take a few minutes."));
    11661166                res += format_everything(mountlist, FALSE);
    11671167            }
     
    11731173        mvaddstr_and_log_it(g_currentY++,
    11741174                            0,
    1175                             "Failed to partition and/or format your hard drives.");
    1176 
    1177         if (ask_me_yes_or_no("Try in interactive mode instead?")) {
     1175                            _("Failed to partition and/or format your hard drives."));
     1176
     1177        if (ask_me_yes_or_no(_("Try in interactive mode instead?"))) {
    11781178            retval = interactive_mode(bkpinfo, mountlist, raidlist);
    11791179            goto after_the_nuke;
    11801180        } else
    11811181            if (!ask_me_yes_or_no
    1182                 ("Would you like to try to proceed anyway?")) {
     1182                (_("Would you like to try to proceed anyway?"))) {
    11831183            return (retval);
    11841184        }
     
    11881188        unmount_all_devices(mountlist);
    11891189        log_to_screen
    1190             ("Unable to mount all partitions. Sorry, I cannot proceed.");
     1190            (_("Unable to mount all partitions. Sorry, I cannot proceed."));
    11911191        return (retval);
    11921192    }
     
    12041204    mvaddstr_and_log_it(g_currentY,
    12051205                        0,
    1206                         "Using e2label to label your ext2,3 partitions");
     1206                        _("Using e2label to label your ext2,3 partitions"));
    12071207
    12081208    sprintf(tmp, "label-partitions-as-necessary %s < /tmp/fstab",
     
    12101210    res = run_program_and_log_output(tmp, TRUE);
    12111211    if (res) {
    1212         log_to_screen("label-partitions-as-necessary returned an error");
    1213         mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
     1212        log_to_screen(_("label-partitions-as-necessary returned an error"));
     1213        mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
    12141214    } else {
    1215         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     1215        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
    12161216    }
    12171217    retval += res;
     
    12191219  after_the_nuke:
    12201220    if (retval) {
    1221         log_to_screen("Errors occurred during the nuke phase.");
     1221        log_to_screen(_("Errors occurred during the nuke phase."));
    12221222    } else if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "RESTORE"))    // Bruno's thing
    12231223    {
    12241224        log_to_screen
    1225             ("PC was restored successfully. Thank you for using Mondo Rescue.");
     1225            (_("PC was restored successfully. Thank you for using Mondo Rescue."));
    12261226        log_to_screen
    1227             ("Please visit our website at http://www.mondorescue.org for more information.");
     1227            (_("Please visit our website at http://www.mondorescue.org for more information."));
    12281228    } else {
    1229         strcpy(tmp," Mondo has restored your system. Please remove the backup media and reboot.\n\nPlease visit our website at http://www.mondorescue.org for more information.");
     1229        strcpy(tmp,_(" Mondo has restored your system. Please remove the backup media and reboot.\n\nPlease visit our website at http://www.mondorescue.org for more information."));
    12301230        if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "restore") == NULL) {
    12311231            popup_and_OK(tmp);
    12321232        }
    12331233        log_to_screen
    1234             ("Mondo has restored your system. Please remove the backup media and reboot.");
     1234            (_("Mondo has restored your system. Please remove the backup media and reboot."));
    12351235        log_to_screen
    1236             ("Please visit our website at http://www.mondorescue.org for more information.");
     1236            (_("Please visit our website at http://www.mondorescue.org for more information."));
    12371237    }
    12381238    g_I_have_just_nuked = TRUE;
     
    12831283    if (!g_restoring_live_from_cd) {
    12841284        popup_and_OK
    1285             ("Please insert tape/CD/boot floppy, then hit 'OK' to continue.");
     1285            (_("Please insert tape/CD/boot floppy, then hit 'OK' to continue."));
    12861286        sleep(1);
    12871287    }
     
    12961296    log_msg(2, "bkpinfo->isodir = %s", bkpinfo->isodir);
    12971297
    1298     open_evalcall_form("Thinking...");
     1298    open_evalcall_form(_("Thinking..."));
    12991299
    13001300    get_cfg_file_from_archive_or_bust(bkpinfo);
     
    13091309        save_filelist(filelist, "/tmp/selected-files.txt");
    13101310        strcpy(old_restpath, bkpinfo->restore_path);
    1311         if (popup_and_get_string("Restore path",
    1312                                  "Restore files to where? )",
     1311        if (popup_and_get_string(_("Restore path"),
     1312                                 _("Restore files to where? )"),
    13131313                                 bkpinfo->restore_path, MAX_STR_LEN / 4)) {
    13141314            iamhere("Restoring everything");
     
    14061406
    14071407    if (!(fin = fopen(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""), "r"))) {
    1408         log_to_screen("Cannot even open bigfile's info file");
     1408        log_to_screen(_("Cannot even open bigfile's info file"));
    14091409        return (1);
    14101410    }
     
    15191519    log_msg(3, "file_to_openout = %s", file_to_openout);
    15201520    if (!(fout = fopen(file_to_openout, "w"))) {
    1521         log_to_screen("Cannot openout outfile_fname - hard disk full?");
     1521        log_to_screen(_("Cannot openout outfile_fname - hard disk full?"));
    15221522        return (1);
    15231523    }
     
    15421542                    g_current_media_number, sliceno);
    15431543            log_msg(2, tmp);
    1544             sprintf(tmp, "Restoring from %s #%d",
     1544            sprintf(tmp, _("Restoring from %s #%d"),
    15451545                    media_descriptor_string(bkpinfo->backup_media_type),
    15461546                    g_current_media_number);
    15471547            log_to_screen(tmp);
    15481548            insist_on_this_cd_number(bkpinfo, g_current_media_number);
    1549             log_to_screen("Continuing to restore.");
     1549            log_to_screen(_("Continuing to restore."));
    15501550        } else {
    15511551            strcpy(tmp,
     
    15761576                    strcpy(suffix, "");
    15771577                } else {
    1578                     log_to_screen("OK, that's pretty fsck0red...");
     1578                    log_to_screen(_("OK, that's pretty fsck0red..."));
    15791579                    return (1);
    15801580                }
     
    20342034            if (run_program_and_log_output(tmp, FALSE)) {
    20352035                log_to_screen
    2036                     ("(compare_a_tarball) Compression program not found - oh no!");
     2036                    (_("(compare_a_tarball) Compression program not found - oh no!"));
    20372037                paranoid_MR_finish(1);
    20382038            }
     
    20922092            if (res) {
    20932093                log_to_screen
    2094                     ("Errors occurred while setting extended attributes");
     2094                    (_("Errors occurred while setting extended attributes"));
    20952095            } else {
    20962096                log_msg(1, "I set xattr OK");
     
    21032103            if (res) {
    21042104                log_to_screen
    2105                     ("Errors occurred while setting access control lists");
     2105                    (_("Errors occurred while setting access control lists"));
    21062106            } else {
    21072107                log_msg(1, "I set ACL OK");
     
    21202120    if (does_file_exist("/PAUSE")) {
    21212121        popup_and_OK
    2122             ("Press ENTER to go on. Delete /PAUSE to stop these pauses.");
     2122            (_("Press ENTER to go on. Delete /PAUSE to stop these pauses."));
    21232123    }
    21242124    unlink(filelist_subset_fname);
     
    23172317
    23182318    if (does_file_exist("/PAUSE") && current_tarball_number >= 50) {
    2319         log_to_screen("Paused after set %ld", current_tarball_number);
    2320         popup_and_OK("Pausing. Press ENTER to continue.");
     2319        log_to_screen(_("Paused after set %ld"), current_tarball_number);
     2320        popup_and_OK(_("Pausing. Press ENTER to continue."));
    23212321    }
    23222322
     
    23812381    read_cfg_var(g_mondo_cfg_file, "total-slices", tmp);
    23822382    total_slices = atol(tmp);
    2383     sprintf(tmp, "Reassembling large files      ");
     2383    sprintf(tmp, _("Reassembling large files      "));
    23842384    mvaddstr_and_log_it(g_currentY, 0, tmp);
    23852385    if (length_of_file(BIGGIELIST) < 6) {
     
    23972397    log_msg(2, tmp);
    23982398
    2399     open_progress_form("Reassembling large files",
    2400                        "I am now reassembling all the large files.",
    2401                        "Please wait. This may take some time.",
     2399    open_progress_form(_("Reassembling large files"),
     2400                       _("I am now reassembling all the large files."),
     2401                       _("Please wait. This may take some time."),
    24022402                       "", total_slices);
    24032403    for (bigfileno = 0, finished = FALSE; !finished;) {
     
    24202420                insist_on_this_cd_number(bkpinfo,
    24212421                                         ++g_current_media_number);
    2422                 sprintf(tmp, "Restoring from %s #%d",
     2422                sprintf(tmp, _("Restoring from %s #%d"),
    24232423                        media_descriptor_string(bkpinfo->
    24242424                                                backup_media_type),
     
    24342434        } else {
    24352435            just_changed_cds = FALSE;
    2436             sprintf(tmp, "Restoring big file %ld", bigfileno + 1);
     2436            sprintf(tmp, _("Restoring big file %ld"), bigfileno + 1);
    24372437            update_progress_form(tmp);
    24382438            res =
     
    24632463    if (does_file_exist("/PAUSE")) {
    24642464        popup_and_OK
    2465             ("Press ENTER to go on. Delete /PAUSE to stop these pauses.");
     2465            (_("Press ENTER to go on. Delete /PAUSE to stop these pauses."));
    24662466    }
    24672467    close_progress_form();
    24682468    if (retval) {
    2469         mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
     2469        mvaddstr_and_log_it(g_currentY++, 74, _("Errors."));
    24702470    } else {
    2471         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     2471        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
    24722472    }
    24732473    paranoid_free(xattr_fname);
     
    25172517    assert(bkpinfo != NULL);
    25182518
    2519     mvaddstr_and_log_it(g_currentY, 0, "Restoring from archives");
     2519    mvaddstr_and_log_it(g_currentY, 0, _("Restoring from archives"));
    25202520    log_msg(2,
    25212521            "Insisting on 1st CD, so that I can have a look at LAST-FILELIST-NUMBER");
     
    25272527    read_cfg_var(g_mondo_cfg_file, "last-filelist-number", tmp);
    25282528    max_val = atol(tmp) + 1;
    2529     sprintf(progress_str, "Restoring from %s #%d",
     2529    sprintf(progress_str, _("Restoring from %s #%d"),
    25302530            media_descriptor_string(bkpinfo->backup_media_type),
    25312531            g_current_media_number);
    25322532    log_to_screen(progress_str);
    2533     open_progress_form("Restoring from archives",
    2534                        "Restoring data from the archives.",
    2535                        "Please wait. This may take some time.",
     2533    open_progress_form(_("Restoring from archives"),
     2534                       _("Restoring data from the archives."),
     2535                       _("Please wait. This may take some time."),
    25362536                       progress_str, max_val);
    25372537    for (;;) {
     
    25592559            if (current_tarball_number == 0) {
    25602560                log_to_screen
    2561                     ("No tarballs. Strange. Maybe you only backed up freakin' big files?");
     2561                    (_("No tarballs. Strange. Maybe you only backed up freakin' big files?"));
    25622562                return (0);
    25632563            }
     
    25692569            }
    25702570            g_current_media_number++;
    2571             sprintf(progress_str, "Restoring from %s #%d",
     2571            sprintf(progress_str, _("Restoring from %s #%d"),
    25722572                    media_descriptor_string(bkpinfo->backup_media_type),
    25732573                    g_current_media_number);
    25742574            log_to_screen(progress_str);
    25752575        } else {
    2576             sprintf(progress_str, "Restoring from fileset #%ld on %s #%d",
     2576            sprintf(progress_str, _("Restoring from fileset #%ld on %s #%d"),
    25772577                    current_tarball_number,
    25782578                    media_descriptor_string(bkpinfo->backup_media_type),
     
    25862586                                              filelist);
    25872587            }
    2588             sprintf(tmp, "%s #%d, fileset #%ld - restore ",
     2588            sprintf(tmp, _("%s #%d, fileset #%ld - restore "),
    25892589                    media_descriptor_string(bkpinfo->backup_media_type),
    25902590                    g_current_media_number, current_tarball_number);
    25912591            if (res) {
    2592                 strcat(tmp, "reported errors");
     2592                strcat(tmp, _("reported errors"));
    25932593            } else if (attempts > 1) {
    2594                 strcat(tmp, "succeeded");
     2594                strcat(tmp, _("succeeded"));
    25952595            } else {
    2596                 strcat(tmp, "succeeded");
     2596                strcat(tmp, _("succeeded"));
    25972597            }
    25982598            if (attempts > 1) {
    2599                 sprintf(tmp + strlen(tmp), " (%d attempts) - review logs",
     2599                sprintf(tmp + strlen(tmp), _(" (%d attempts) - review logs"),
    26002600                        attempts);
    26012601            }
     
    26122612    close_progress_form();
    26132613    if (retval) {
    2614         mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
     2614        mvaddstr_and_log_it(g_currentY++, 74, _("Errors."));
    26152615    } else {
    2616         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     2616        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
    26172617    }
    26182618    paranoid_free(tmp);
     
    26972697            noof_biggiefiles);
    26982698    log_msg(2, tmp);
    2699     open_progress_form("Reassembling large files",
    2700                        "I am now reassembling all the large files.",
    2701                        "Please wait. This may take some time.",
     2699    open_progress_form(_("Reassembling large files"),
     2700                       _("I am now reassembling all the large files."),
     2701                       _("Please wait. This may take some time."),
    27022702                       "", total_slices);
    27032703
     
    27192719            p++;
    27202720        }
    2721         sprintf(tmp, "Restoring big file %ld (%lld K)",
     2721        sprintf(tmp, _("Restoring big file %ld (%lld K)"),
    27222722                current_bigfile_number + 1, biggie_size / 1024);
    27232723        update_progress_form(tmp);
     
    27702770    if (does_file_exist("/PAUSE")) {
    27712771        popup_and_OK
    2772             ("Press ENTER to go on. Delete /PAUSE to stop these pauses.");
     2772            (_("Press ENTER to go on. Delete /PAUSE to stop these pauses."));
    27732773    }
    27742774
    27752775    close_progress_form();
    27762776    if (retval) {
    2777         mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
     2777        mvaddstr_and_log_it(g_currentY++, 74, _("Errors."));
    27782778    } else {
    2779         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     2779        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
    27802780    }
    27812781    paranoid_free(biggies_whose_EXATs_we_should_set);
     
    28332833    malloc_string(xattr_fname);
    28342834    malloc_string(acl_fname);
    2835     mvaddstr_and_log_it(g_currentY, 0, "Restoring from archives");
     2835    mvaddstr_and_log_it(g_currentY, 0, _("Restoring from archives"));
    28362836    read_cfg_var(g_mondo_cfg_file, "last-filelist-number", tmp);
    28372837    max_val = atol(tmp) + 1;
     
    28412841    run_program_and_log_output("pwd", 5);
    28422842
    2843     sprintf(progress_str, "Restoring from media #%d",
     2843    sprintf(progress_str, _("Restoring from media #%d"),
    28442844            g_current_media_number);
    28452845    log_to_screen(progress_str);
    2846     open_progress_form("Restoring from archives",
    2847                        "Restoring data from the archives.",
    2848                        "Please wait. This may take some time.",
     2846    open_progress_form(_("Restoring from archives"),
     2847                       _("Restoring data from the archives."),
     2848                       _("Please wait. This may take some time."),
    28492849                       progress_str, max_val);
    28502850
     
    28802880        }
    28812881        sprintf(tmp,
    2882                 "Restoring from fileset #%ld (name=%s, size=%ld K)",
     2882                _("Restoring from fileset #%ld (name=%s, size=%ld K)"),
    28832883                current_afioball_number, tmp_fname, (long) tmp_size >> 10);
    28842884        res =
     
    28892889        retval += res;
    28902890        if (res) {
    2891             sprintf(tmp, "Fileset %ld - errors occurred",
     2891            sprintf(tmp, _("Fileset %ld - errors occurred"),
    28922892                    current_afioball_number);
    28932893            log_to_screen(tmp);
     
    29012901        current_afioball_number++;
    29022902        g_current_progress++;
    2903         sprintf(progress_str, "Restoring from fileset #%ld on %s #%d",
     2903        sprintf(progress_str, _("Restoring from fileset #%ld on %s #%d"),
    29042904                current_afioball_number,
    29052905                media_descriptor_string(bkpinfo->backup_media_type),
     
    29132913    close_progress_form();
    29142914    if (retval) {
    2915         mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
     2915        mvaddstr_and_log_it(g_currentY++, 74, _("Errors."));
    29162916    } else {
    2917         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     2917        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
    29182918    }
    29192919    paranoid_free(tmp);
     
    29662966    if (!find_home_of_exe("petris") && !g_text_mode) {
    29672967        newtDrawRootText(0, g_noof_rows - 2,
    2968                          "Press ALT-<left cursor> twice to play Petris :-) ");
     2968                         _("Press ALT-<left cursor> twice to play Petris :-) "));
    29692969        newtRefresh();
    29702970    }
    2971     mvaddstr_and_log_it(g_currentY, 0, "Preparing to read your archives");
     2971    mvaddstr_and_log_it(g_currentY, 0, _("Preparing to read your archives"));
    29722972    if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
    29732973        mount_cdrom(bkpinfo);
    29742974        mvaddstr_and_log_it(g_currentY++, 0,
    2975                             "Restoring OS and data from streaming media");
     2975                            _("Restoring OS and data from streaming media"));
    29762976        if (bkpinfo->backup_media_type == cdstream) {
    29772977            openin_cdstream(bkpinfo);
     
    29902990    } else {
    29912991        mvaddstr_and_log_it(g_currentY++, 0,
    2992                             "Restoring OS and data from CD       ");
     2992                            _("Restoring OS and data from CD       "));
    29932993        mount_cdrom(bkpinfo);
    29942994        resA = restore_all_tarballs_from_CD(bkpinfo, filelist);
     
    29972997    chdir(cwd);
    29982998    if (resA + resB) {
    2999         log_to_screen("Errors occurred while data was being restored.");
     2999        log_to_screen(_("Errors occurred while data was being restored."));
    30003000    }
    30013001    if (length_of_file("/etc/raidtab") > 0) {
     
    31083108        retval++;
    31093109        log_to_screen
    3110             ("Error(s) occurred while processing filelist and wildcard");
     3110            (_("Error(s) occurred while processing filelist and wildcard"));
    31113111    }
    31123112    iamhere("FIXME");
     
    32033203   *                                                                        *
    32043204   **************************************************************************/
     3205
     3206#ifdef ENABLE_NLS
     3207    setlocale(LC_ALL, "");
     3208    (void) textdomain("mondo");
     3209#endif
     3210
    32053211    if (getuid() != 0) {
    3206         fprintf(stderr, "Please run as root.\r\n");
     3212        fprintf(stderr, _("Please run as root.\n"));
    32073213        exit(127);
    32083214    }
     
    33493355        strcpy(bkpinfo->restore_path, "/tmp/TESTING");
    33503356        bkpinfo->backup_media_type = dvd;
    3351         open_progress_form("Reassembling /dev/hda1",
    3352                            "Shark is a bit of a silly person.",
    3353                            "Please wait. This may take some time.",
     3357        open_progress_form(_("Reassembling /dev/hda1"),
     3358                           _("Shark is a bit of a silly person."),
     3359                           _("Please wait. This may take some time."),
    33543360                           "", 1999);
    33553361        system("rm -Rf /tmp/*pih*");
     
    34273433        retval = run_grub(FALSE, "/dev/hda");
    34283434        if (retval) {
    3429             log_to_screen("Failed to write Master Boot Record");
     3435            log_to_screen(_("Failed to write Master Boot Record"));
    34303436        }
    34313437        paranoid_MR_finish(0);
     
    34383444        if (argc != 1) {
    34393445            popup_and_OK
    3440                 ("Live mode doesn't support command-line parameters yet.");
     3446                (_("Live mode doesn't support command-line parameters yet."));
    34413447            paranoid_MR_finish(1);
    34423448//    return(1);
     
    34703476        log_msg(2, "FYI, MOUNTLIST_FNAME = %s ", g_mountlist_fname);
    34713477        if (argc == 3 && strcmp(argv[1], "--monitas-memorex") == 0) {
    3472             log_to_screen("Uh, that hasn't been implemented yet.");
     3478            log_to_screen(_("Uh, that hasn't been implemented yet."));
    34733479            paranoid_MR_finish(1);
    34743480        }
     
    34993505        if (retval) {
    35003506            log_to_screen
    3501                 ("Warning - load_raidtab_into_raidlist returned an error");
     3507                (_("Warning - load_raidtab_into_raidlist returned an error"));
    35023508        }
    35033509
     
    35533559            }
    35543560            if (retval) {
    3555                 log_to_screen("Failed to write Master Boot Record");
     3561                log_to_screen(_("Failed to write Master Boot Record"));
    35563562            }
    35573563        } else if (argc == 2 && strcmp(argv[1], "--isonuke") == 0) {
     
    35593565            retval = iso_mode(bkpinfo, mountlist, raidlist, TRUE);
    35603566        } else if (argc != 1) {
    3561             log_to_screen("Invalid paremeters");
     3567            log_to_screen(_("Invalid paremeters"));
    35623568            paranoid_MR_finish(1);
    35633569        } else {
     
    35713577        if (does_file_exist("/tmp/changed.files")) {
    35723578            log_to_screen
    3573                 ("See /tmp/changed.files for list of files that have changed.");
     3579                (_("See /tmp/changed.files for list of files that have changed."));
    35743580        }
    35753581        mvaddstr_and_log_it(g_currentY++,
    35763582                            0,
    3577                             "Run complete. Errors were reported. Please review the logfile.");
     3583                            _("Run complete. Errors were reported. Please review the logfile."));
    35783584    } else {
    35793585        if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
    35803586            mvaddstr_and_log_it(g_currentY++,
    35813587                                0,
    3582                                 "Run complete. Please remove floppy/CD/media and reboot.");
     3588                                _("Run complete. Please remove floppy/CD/media and reboot."));
    35833589        } else {
    35843590            run_program_and_log_output("sync", FALSE);
     
    36013607            mvaddstr_and_log_it(g_currentY++,
    36023608                                0,
    3603                                 "Run complete. Please remove media and reboot.");
     3609                                _("Run complete. Please remove media and reboot."));
    36043610        }
    36053611    }
     
    36113617            if (mount_all_devices(mountlist, TRUE)) {
    36123618                log_to_screen
    3613                     ("Unable to re-mount partitions for post-nuke stuff");
     3619                    (_("Unable to re-mount partitions for post-nuke stuff"));
    36143620            } else {
    36153621                log_msg(1, "Re-mounted partitions for post-nuke stuff");
     
    36443650    run_program_and_log_output(tmp, FALSE);
    36453651    log_to_screen
    3646         ("Restore log copied to /tmp/mondo-restore.log on your hard disk");
     3652        (_("Restore log copied to /tmp/mondo-restore.log on your hard disk"));
    36473653    sprintf(tmp,
    3648             "Mondo-restore is exiting (retval=%d)                                      ",
     3654            _("Mondo-restore is exiting (retval=%d)                                      "),
    36493655            retval);
    36503656    log_to_screen(tmp);
  • trunk/mondo/mondo/mondorestore/mondo-rstr-compare.c

    r278 r507  
    137137    if (!(fin = fopen(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""), "r"))) {
    138138        sprintf(tmp_ptr,
    139                 "Cannot open bigfile %ld (%s)'s info file",
     139                _("Cannot open bigfile %ld (%s)'s info file"),
    140140                bigfileno + 1, bigfile_fname_ptr);
    141141        log_to_screen(tmp_ptr);
     
    151151    log_msg(2, "biggiestruct.checksum = %s", biggiestruct.checksum);
    152152
    153     sprintf(tmp_ptr, "Comparing %s", bigfile_fname_ptr);
     153    sprintf(tmp_ptr, _("Comparing %s"), bigfile_fname_ptr);
    154154
    155155    if (!g_text_mode) {
     
    255255    mvaddstr_and_log_it(g_currentY, 0,
    256256                        "Comparing large files                                                  ");
    257     open_progress_form("Comparing large files",
    258                        "I am now comparing the large files",
    259                        "against the filesystem. Please wait.", "",
     257    open_progress_form(_("Comparing large files"),
     258                       _("I am now comparing the large files"),
     259                       _("against the filesystem. Please wait."), "",
    260260                       noof_biggiefiles);
    261261    for (bigfileno = 0; bigfileno < noof_biggiefiles; bigfileno++) {
     
    434434
    435435    max_val = atol(tmp);
    436     sprintf(progress_str, "Comparing with %s #%d ",
     436    sprintf(progress_str, _("Comparing with %s #%d "),
    437437            media_descriptor_string(bkpinfo->backup_media_type),
    438438            g_current_media_number);
    439439
    440     open_progress_form("Comparing files",
    441                        "Comparing tarballs against filesystem.",
    442                        "Please wait. This may take some time.",
     440    open_progress_form(_("Comparing files"),
     441                       _("Comparing tarballs against filesystem."),
     442                       _("Please wait. This may take some time."),
    443443                       progress_str, max_val);
    444444
     
    477477            log_msg(2, "OK, I think it's time for another CD...");
    478478            g_current_media_number++;
    479             sprintf(progress_str, "Comparing with %s #%d ",
     479            sprintf(progress_str, _("Comparing with %s #%d "),
    480480                    media_descriptor_string(bkpinfo->backup_media_type),
    481481                    g_current_media_number);
     
    543543    noof_changed_files = count_lines_in_file("/tmp/changed.txt");
    544544    if (noof_changed_files) {
    545         sprintf(tmp, "%ld files do not match the backup            ",
     545        sprintf(tmp, _("%ld files do not match the backup            "),
    546546                noof_changed_files);
    547547        //      mvaddstr_and_log_it( g_currentY++, 0, tmp );
     
    550550        paranoid_system(command);
    551551    } else {
    552         sprintf(tmp, "All files match the backup                     ");
     552        sprintf(tmp, _("All files match the backup                     "));
    553553        mvaddstr_and_log_it(g_currentY++, 0, tmp);
    554554        log_to_screen(tmp);
     
    600600    while (get_cfg_file_from_archive(bkpinfo)) {
    601601        if (!ask_me_yes_or_no
    602             ("Failed to find config file/archives. Choose another source?"))
     602            (_("Failed to find config file/archives. Choose another source?")))
    603603        {
    604604            fatal_error("Unable to find config file/archives. Aborting.");
     
    641641                                "...but they were logfiles and temporary files. Your archives are fine.");
    642642            log_to_screen
    643                 ("The differences were logfiles and temporary files. Your archives are fine.");
     643                (_("The differences were logfiles and temporary files. Your archives are fine."));
    644644        } else {
    645645            q = count_lines_in_file("/tmp/changed.files");
    646             sprintf(tmp, "%ld significant difference%s found.", q,
     646            sprintf(tmp, _("%ld significant difference%s found."), q,
    647647                    (q != 1) ? "s" : "");
    648648            mvaddstr_and_log_it(g_currentY++, 0, tmp);
     
    650650
    651651            strcpy(tmp,
    652                    "Type 'less /tmp/changed.files' for a list of non-matching files");
     652                   _("Type 'less /tmp/changed.files' for a list of non-matching files"));
    653653            mvaddstr_and_log_it(g_currentY++, 0, tmp);
    654654            log_to_screen(tmp);
     
    660660    } else {
    661661        log_to_screen
    662             ("No significant differences were found. Your backup is perfect.");
     662            (_("No significant differences were found. Your backup is perfect."));
    663663    }
    664664    kill_petris();
  • trunk/mondo/mondo/mondorestore/mondo-rstr-newt.c

    r274 r507  
    8282
    8383    newtPushHelpLine
    84         ("   Add one of the following unallocated RAID partitions to this RAID device.");
    85     asprintf(&tmp, "%-26s %s", "Device", "Size");
     84        (_("   Add one of the following unallocated RAID partitions to this RAID device."));
     85    asprintf(&tmp, "%-26s %s", _("Device"), _("Size"));
    8686    headerMsg = newtLabel(1, 1, tmp);
    8787    paranoid_free(tmp);
     
    9292                             partitionsListbox);
    9393    i = 7;
    94     bOK = newtCompactButton(i, 9, "  OK  ");
    95     bCancel = newtCompactButton(i += 9, 9, "Cancel");
    96     newtOpenWindow(22, 6, 36, 10, "Unallocated RAID partitions");
     94    bOK = newtCompactButton(i, 9, _("  OK  "));
     95    bCancel = newtCompactButton(i += 9, 9, _("Cancel"));
     96    newtOpenWindow(22, 6, 36, 10, _("Unallocated RAID partitions"));
    9797    myForm = newtForm(NULL, NULL, 0);
    9898    newtFormAddComponents(myForm, headerMsg, partitionsListbox, bOK,
     
    182182    asprintf(&format_str, "ext2");
    183183#endif
    184     newtOpenWindow(20, 5, 48, 10, "Add entry");
    185     label0 = newtLabel(2, 1, "Device:    ");
    186     label1 = newtLabel(2, 2, "Mountpoint:");
    187     label2 = newtLabel(2, 3, "Size (MB): ");
    188     label3 = newtLabel(2, 4, "Format:    ");
     184    newtOpenWindow(20, 5, 48, 10, _("Add entry"));
     185    label0 = newtLabel(2, 1, _("Device:    "));
     186    label1 = newtLabel(2, 2, _("Mountpoint:"));
     187    label2 = newtLabel(2, 3, _("Size (MB): "));
     188    label3 = newtLabel(2, 4, _("Format:    "));
    189189    deviceComp =
    190190        newtEntry(14, 1, device_str, 30, (void *) &device_here, 0);
     
    195195        newtEntry(14, 4, format_str, 15, (void *) &format_here, 0);
    196196    sizeComp = newtEntry(14, 3, size_str, 10, (void *) &size_here, 0);
    197     bOK = newtButton(5, 6, "  OK  ");
    198     bCancel = newtButton(17, 6, "Cancel");
     197    bOK = newtButton(5, 6, _("  OK  "));
     198    bCancel = newtButton(17, 6, _("Cancel"));
    199199    newtPushHelpLine
    200         ("To add an entry to the mountlist, please fill in these fields and then hit 'OK'");
     200        (_("To add an entry to the mountlist, please fill in these fields and then hit 'OK'"));
    201201    myForm = newtForm(NULL, NULL, 0);
    202202    newtFormAddComponents(myForm, deviceComp, mountpointComp, sizeComp,
     
    224224        if (b_res == bOK) {
    225225            if (device_str[strlen(device_str) - 1] == '/') {
    226                 popup_and_OK("You left the device nearly blank!");
     226                popup_and_OK(_("You left the device nearly blank!"));
    227227                b_res = NULL;
    228228            }
    229229            if (size_of_specific_device_in_mountlist(mountlist, device_str)
    230230                >= 0) {
    231                 popup_and_OK("Can't add this - you've got one already!");
     231                popup_and_OK(_("Can't add this - you've got one already!"));
    232232                b_res = NULL;
    233233            }
     
    286286
    287287    if (popup_and_get_string
    288         ("Add variable", "Enter the name of the variable to add", sz_out,
     288        ("Add variable", _("Enter the name of the variable to add"), sz_out,
    289289         MAX_STR_LEN)) {
    290290        strip_spaces(sz_out);
     
    295295        if (i < items) {
    296296            popup_and_OK
    297                 ("No need to add that variable. It is already listed here.");
     297                (_("No need to add that variable. It is already listed here."));
    298298        } else {
    299299            strcpy(raidrec->additional_vars.el[items].label, sz_out);
     
    500500
    501501    asprintf(&prompt,
    502             "Please enter the RAID level you want. (concat, striped, raid5)");
     502            _("Please enter the RAID level you want. (concat, striped, raid5)"));
    503503    if (raidrec->raidlevel == -1) {
    504504        asprintf(&tmp, "concat");
     
    556556    strcpy(personalities,
    557557           last_line_of_file("/tmp/raid-personalities.txt"));
    558     asprintf(&prompt, "Please enter the RAID level you want. %s",
     558    asprintf(&prompt, _("Please enter the RAID level you want. %s"),
    559559            personalities);
    560560    if (raidrec->raid_level == -1) {
     
    566566         out != -1 && out != 0 && out != 1 && out != 4 && out != 5
    567567         && out != 10;) {
    568         res = popup_and_get_string("Specify RAID level", prompt, tmp, 10);
     568        res = popup_and_get_string(_("Specify RAID level"), prompt, tmp, 10);
    569569        if (!res) {
    570570            return;
     
    591591        } else {
    592592            if (ask_me_yes_or_no
    593                 ("You have chosen a RAID personality which is not registered with the kernel. Make another selection?"))
     593                (_("You have chosen a RAID personality which is not registered with the kernel. Make another selection?")))
    594594            {
    595595                out = 999;
     
    670670    assert_string_is_neither_NULL_nor_zerolength(raid_device);
    671671
    672     asprintf(&tmp, "Delete %s from RAID device %s - are you sure?",
     672    asprintf(&tmp, _("Delete %s from RAID device %s - are you sure?"),
    673673            disklist->el[currline].device, raid_device);
    674674    if (!ask_me_yes_or_no(tmp)) {
     
    718718                                                  device);
    719719    if (pos >= 0) {
    720         asprintf(&tmp, "Cannot delete %s: it is in use by RAID device %s",
     720        asprintf(&tmp, _("Cannot delete %s: it is in use by RAID device %s"),
    721721                mountlist->el[currline].device,
    722722                raidlist->el[pos].OSSWAP(raid_device, volname));
     
    725725        return;
    726726    }
    727     asprintf(&tmp, "Delete %s - are you sure?",
     727    asprintf(&tmp, _("Delete %s - are you sure?"),
    728728            mountlist->el[currline].device);
    729729    if (!ask_me_yes_or_no(tmp)) {
     
    785785        return;
    786786    }
    787     asprintf(&tmp, "Do you want me to delete %s's partitions, too?", device);
     787    asprintf(&tmp, _("Do you want me to delete %s's partitions, too?", device));
    788788    delete_partitions_too = ask_me_yes_or_no(tmp);
    789789    if (delete_partitions_too) {
     
    854854
    855855    av = &raidrec->additional_vars;
    856     asprintf(&tmp, "Delete %s - are you sure?", av->el[lino].label);
     856    asprintf(&tmp, _("Delete %s - are you sure?", av->el[lino].label));
    857857    if (ask_me_yes_or_no(tmp)) {
    858858        if (!strcmp(av->el[lino].label, "persistent-superblock")
    859859            || !strcmp(av->el[lino].label, "chunk-size")) {
    860860            paranoid_free(tmp);
    861             asprintf(&tmp, "%s must not be deleted. It would be bad.",
     861            asprintf(&tmp, _("%s must not be deleted. It would be bad."),
    862862                    av->el[lino].label);
    863863            popup_and_OK(tmp);
     
    927927                    warned_already = TRUE;
    928928                    asprintf(&tmp,
    929                             "Too many lines. Displaying first %d entries only. Close a directory to see more.",
     929                            _("Too many lines. Displaying first %d entries only. Close a directory to see more."),
    930930                            ARBITRARY_MAXIMUM);
    931931                    popup_and_OK(tmp);
     
    10721072    assert(filelist != NULL);
    10731073
    1074     log_to_screen("Editing filelist");
     1074    log_to_screen(_("Editing filelist"));
    10751075    newtPushHelpLine
    1076         ("   Please edit the filelist to your satisfaction, then click OK or Cancel.");
     1076        (_("   Please edit the filelist to your satisfaction, then click OK or Cancel."));
    10771077    j = 4;
    1078     bLess = newtCompactButton(j, 17, " Less ");
    1079     bMore = newtCompactButton(j += 12, 17, " More ");
    1080     bToggle = newtCompactButton(j += 12, 17, "Toggle");
    1081     bRegex = newtCompactButton(j += 12, 17, "RegEx");
    1082     bCancel = newtCompactButton(j += 12, 17, "Cancel");
    1083     bOK = newtCompactButton(j += 12, 17, "  OK  ");
     1078    bLess = newtCompactButton(j, 17, _(" Less "));
     1079    bMore = newtCompactButton(j += 12, 17, _(" More "));
     1080    bToggle = newtCompactButton(j += 12, 17, _("Toggle"));
     1081    bRegex = newtCompactButton(j += 12, 17, _("RegEx"));
     1082    bCancel = newtCompactButton(j += 12, 17, _("Cancel"));
     1083    bOK = newtCompactButton(j += 12, 17, _("  OK  "));
    10841084    filelistListbox =
    10851085        newtListbox(2, 1, 15, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
     
    10871087    lines_in_flist_window =
    10881088        redraw_filelist(filelist, keylist, filelistListbox);
    1089     newtOpenWindow(1, 3, 77, 18, "Editing filelist");
     1089    newtOpenWindow(1, 3, 77, 18, _("Editing filelist"));
    10901090    myForm = newtForm(NULL, NULL, 0);
    10911091    newtFormAddComponents(myForm, filelistListbox, bLess, bMore, bToggle,
     
    10961096            finished =
    10971097                ask_me_yes_or_no
    1098                 ("Are you happy with your file selection?");
     1098                (_("Are you happy with your file selection?"));
    10991099        } else if (b_res == bCancel) {
    11001100            finished = TRUE;
    11011101        } else if (b_res == bRegex) {
    1102             popup_and_OK("I haven't implemented this yet...");
     1102            popup_and_OK(_("I haven't implemented this yet..."));
    11031103        } else {
    11041104            curr_choice = newtListboxGetCurrent(filelistListbox);
     
    12361236    sprintf(size_str, "%lld", mountlist->el[currline].size / 1024);
    12371237    newtOpenWindow(20, 5, 48, 10, "Edit entry");
    1238     label0 = newtLabel(2, 1, "Device:");
    1239     label1 = newtLabel(2, 2, "Mountpoint:");
    1240     label2 = newtLabel(2, 3, "Size (MB): ");
    1241     label3 = newtLabel(2, 4, "Format:    ");
     1238    label0 = newtLabel(2, 1, _("Device:"));
     1239    label1 = newtLabel(2, 2, _("Mountpoint:"));
     1240    label2 = newtLabel(2, 3, _("Size (MB): "));
     1241    label3 = newtLabel(2, 4, _("Format:    "));
    12421242    deviceComp =
    12431243        newtEntry(14, 1, device_str, 30, (void *) &device_here, 0);
     
    12521252        sizeComp = newtEntry(14, 3, size_str, 10, (void *) &size_here, 0);
    12531253    }
    1254     bOK = newtButton(2, 6, "  OK  ");
    1255     bCancel = newtButton(14, 6, "Cancel");
     1254    bOK = newtButton(2, 6, _("  OK  "));
     1255    bCancel = newtButton(14, 6, _("Cancel"));
    12561256    if (strstr(mountlist->el[currline].device, RAID_DEVICE_STUB)) {
    12571257        b_raid = newtButton(26, 6, "RAID..");
    12581258    }
    12591259    newtPushHelpLine
    1260         ("       Edit this partition's mountpoint, size and format; then click 'OK'.");
     1260        (_("       Edit this partition's mountpoint, size and format; then click 'OK'."));
    12611261    myForm = newtForm(NULL, NULL, 0);
    12621262    newtFormAddComponents(myForm, deviceComp, mountpointComp, sizeComp,
     
    12741274            && strstr(device_used_to_be, RAID_DEVICE_STUB)
    12751275            && strcmp(device_str, device_used_to_be)) {
    1276             popup_and_OK("You can't change /dev/mdX to /dev/mdY.");
     1276            popup_and_OK(_("You can't change /dev/mdX to /dev/mdY."));
    12771277            b_res = NULL;
    12781278            continue;
    12791279        } else if (b_res == bOK && !strcmp(mountpoint_str, "image")
    12801280                   && strcmp(mountpt_used_to_be, "image")) {
    1281             popup_and_OK("You can't change a regular device to an image.");
     1281            popup_and_OK(_("You can't change a regular device to an image."));
    12821282            b_res = NULL;
    12831283            continue;
     
    13021302                 */
    13031303                popup_and_OK
    1304                     ("You cannot edit the RAID settings until you have OK'd your change to the device node.");
     1304                    (_("You cannot edit the RAID settings until you have OK'd your change to the device node."));
    13051305            } else {
    13061306                j = find_raid_device_in_raidlist(raidlist,
     
    13091309                if (j < 0) {
    13101310                    sprintf(tmp,
    1311                             "/etc/raidtab does not have an entry for %s; please delete it and add it again",
     1311                            _("/etc/raidtab does not have an entry for %s; please delete it and add it again"),
    13121312                            mountlist->el[currline].device);
    13131313                    popup_and_OK(tmp);
    13141314                } else {
    1315                     log_it("edit_raidlist_entry - calling");
     1315                    log_it(_("edit_raidlist_entry - calling"));
    13161316                    edit_raidlist_entry(mountlist, raidlist,
    13171317                                        &raidlist->el[j], currline);
     
    13631363    else if (strcmp(device_used_to_be, device_str)) {
    13641364        popup_and_OK
    1365             ("You are renaming a RAID device as another RAID device. I don't like it but I'll allow it.");
     1365            (_("You are renaming a RAID device as another RAID device. I don't like it but I'll allow it."));
    13661366    }
    13671367#endif
     
    14731473    int currline2 = 0;
    14741474
    1475     log_it("Started edit_raidlist_entry");
     1475    log_it(_("Started edit_raidlist_entry"));
    14761476    memcpy((void *) &bkp_raidrec, (void *) raidrec,
    14771477           sizeof(struct vinum_volume));
    1478     sprintf(title_of_editraidForm_window, "Plexes on %s",
     1478    sprintf(title_of_editraidForm_window, _("Plexes on %s"),
    14791479            raidrec->volname);
    1480     newtPushHelpLine("   Please select a plex to edit");
     1480    newtPushHelpLine(_("   Please select a plex to edit"));
    14811481    newtOpenWindow(13, 5, 54, 15, title_of_editraidForm_window);
    14821482    for (;;) {
     
    14841484        char headerstr[MAX_STR_LEN];
    14851485        snprintf(headerstr, MAX_STR_LEN, "%-14s %-8s  %11s  %8s",
    1486                  "Plex", "Level", "Stripe Size", "Subdisks");
    1487 
    1488         bOK = newtCompactButton(2, 13, "  OK  ");
    1489         bCancel = newtCompactButton(12, 13, "Cancel");
    1490         bAdd = newtCompactButton(22, 13, " Add ");
    1491         bEdit = newtCompactButton(32, 13, " Edit ");
    1492         bDelete = newtCompactButton(42, 13, "Delete");
     1486                 _("Plex"), _("Level",) _("Stripe Size"), _("Subdisks"));
     1487
     1488        bOK = newtCompactButton(2, 13, _("  OK  "));
     1489        bCancel = newtCompactButton(12, 13, _("Cancel"));
     1490        bAdd = newtCompactButton(22, 13, _(" Add "));
     1491        bEdit = newtCompactButton(32, 13, _(" Edit "));
     1492        bDelete = newtCompactButton(42, 13, _("Delete"));
    14931493
    14941494        plexesListbox =
     
    15501550        if (b_res == bDelete) {
    15511551            char msg[MAX_STR_LEN];
    1552             sprintf(msg, "Are you sure you want to delete %s.p%i?",
     1552            sprintf(msg, _("Are you sure you want to delete %s.p%i?"),
    15531553                    raidrec->volname, currline2);
    15541554            if (ask_me_yes_or_no(msg)) {
    1555                 log_it("Deleting RAID plex");
     1555                log_it(_("Deleting RAID plex"));
    15561556                memcpy((void *) &raidrec->plex[currline2],
    15571557                       (void *) &raidrec->plex[raidrec->plexes - 1],
     
    16271627    for (;;) {
    16281628        log_msg(2, "Main loop");
    1629         sprintf(title_of_editraidForm_window, "Edit %s",
     1629        sprintf(title_of_editraidForm_window, _("Edit %s"),
    16301630                raidrec->raid_device);
    16311631        strcpy(sz_raid_level,
     
    16331633        strcpy(sz_data_disks,
    16341634               number_of_disks_as_string(raidrec->data_disks.entries,
    1635                                          "data"));
     1635                                         _("data")));
    16361636        strcpy(sz_spare_disks,
    16371637               number_of_disks_as_string(raidrec->spare_disks.entries,
    1638                                          "spare"));
     1638                                         _("spare")));
    16391639        strcpy(sz_parity_disks,
    16401640               number_of_disks_as_string(raidrec->parity_disks.entries,
    1641                                          "parity"));
     1641                                         _("parity")));
    16421642        strcpy(sz_failed_disks,
    16431643               number_of_disks_as_string(raidrec->failed_disks.entries,
    1644                                          "failed"));
     1644                                         _("failed")));
    16451645        bSelectData = newtButton(1, 1, sz_data_disks);
    16461646        bSelectSpare = newtButton(20, 1, sz_spare_disks);
     
    16481648        bSelectFailed = newtButton(20, 5, sz_failed_disks);
    16491649        bChangeRaid = newtButton(1, 9, sz_raid_level);
    1650         bOK = newtButton(16 + (raidrec->raid_level == -1), 9, "  OK  ");
    1651         bCancel = newtButton(28, 9, "Cancel");
     1650        bOK = newtButton(16 + (raidrec->raid_level == -1), 9, _("  OK  "));
     1651        bCancel = newtButton(28, 9, _("Cancel"));
    16521652        bAdditional =
    16531653            newtCompactButton(1, 13,
    1654                               "Additional settings and information");
     1654                              _("Additional settings and information"));
    16551655        newtPushHelpLine
    1656             ("  Edit the RAID device's settings to your heart's content, then hit OK/Cancel.");
     1656            (_("  Edit the RAID device's settings to your heart's content, then hit OK/Cancel."));
    16571657        editraidForm = newtForm(NULL, NULL, 0);
    16581658        newtFormAddComponents(editraidForm, bSelectData, bSelectParity,
     
    16631663            choose_raid_level(raidrec);
    16641664        } else if (b_res == bSelectData) {
    1665             select_raid_disks(mountlist, raidlist, raidrec, "data",
     1665            select_raid_disks(mountlist, raidlist, raidrec, _("data"),
    16661666                              &raidrec->data_disks);
    16671667        } else if (b_res == bSelectSpare) {
    1668             select_raid_disks(mountlist, raidlist, raidrec, "spare",
     1668            select_raid_disks(mountlist, raidlist, raidrec, _("spare"),
    16691669                              &raidrec->spare_disks);
    16701670        } else if (b_res == bSelectParity) {
    1671             select_raid_disks(mountlist, raidlist, raidrec, "parity",
     1671            select_raid_disks(mountlist, raidlist, raidrec, _("parity"),
    16721672                              &raidrec->parity_disks);
    16731673        } else if (b_res == bSelectFailed) {
    1674             select_raid_disks(mountlist, raidlist, raidrec, "failed",
     1674            select_raid_disks(mountlist, raidlist, raidrec, _("failed"),
    16751675                              &raidrec->failed_disks);
    16761676        } else if (b_res == bAdditional) {
     
    17531753            raidlist->el[currline].volname, currline2);
    17541754    newtPushHelpLine
    1755         ("   Please select a subdisk to edit, or edit this plex's parameters");
     1755        (_("   Please select a subdisk to edit, or edit this plex's parameters"));
    17561756    newtOpenWindow(13, 3, 54, 18, title_of_editraidForm_window);
    17571757    for (;;) {
     
    17591759        char headerstr[MAX_STR_LEN];
    17601760        char tmp[64];
    1761         snprintf(headerstr, MAX_STR_LEN, "%-24s %s", "Subdisk", "Device");
     1761        snprintf(headerstr, MAX_STR_LEN, "%-24s %s", _("Subdisk"), _("Device"));
    17621762
    17631763
     
    17731773            break;
    17741774        default:
    1775             sprintf(tmp, "unknown (%i)", raidrec->raidlevel);
     1775            sprintf(tmp, _("unknown (%i)"), raidrec->raidlevel);
    17761776            break;
    17771777        }
    1778         bLevel = newtCompactButton(2, 2, " RAID level ");
     1778        bLevel = newtCompactButton(2, 2, _(" RAID level "));
    17791779        sLevel = newtLabel(19, 2, tmp);
    17801780
    17811781        if (raidrec->raidlevel >= 0) {
    17821782            sprintf(tmp, "%ik", raidrec->stripesize);
    1783             bStripeSize = newtCompactButton(2, 4, " Stripe size ");
     1783            bStripeSize = newtCompactButton(2, 4, _(" Stripe size "));
    17841784        } else {
    17851785            strcpy(tmp, "N/A");
    1786             bStripeSize = newtLabel(2, 4, "Stripe size:");
     1786            bStripeSize = newtLabel(2, 4, _("Stripe size:"));
    17871787        }
    17881788        sStripeSize = newtLabel(19, 4, tmp);
    17891789
    1790         bOK = newtCompactButton(2, 16, "  OK  ");
    1791         bCancel = newtCompactButton(12, 16, "Cancel");
    1792         bAdd = newtCompactButton(22, 16, " Add ");
    1793         bEdit = newtCompactButton(32, 16, " Edit ");
    1794         bDelete = newtCompactButton(42, 16, "Delete");
     1790        bOK = newtCompactButton(2, 16, _("  OK  "));
     1791        bCancel = newtCompactButton(12, 16, _("Cancel"));
     1792        bAdd = newtCompactButton(22, 16, _(" Add "));
     1793        bEdit = newtCompactButton(32, 16, _(" Edit "));
     1794        bDelete = newtCompactButton(42, 16, _("Delete"));
    17951795
    17961796
     
    18781878            sprintf(tmp, "%i", raidrec->stripesize);
    18791879            if (popup_and_get_string
    1880                 ("Stripe size",
    1881                  "Please enter the stripe size in kilobytes.", tmp, 20)) {
     1880                (_("Stripe size"),
     1881                 _("Please enter the stripe size in kilobytes."), tmp, 20)) {
    18821882                raidrec->stripesize = atoi(tmp);
    18831883            }
     
    19301930
    19311931    strcpy(sz_out, raidrec->additional_vars.el[lino].value);
    1932     sprintf(header, "Edit %s", raidrec->additional_vars.el[lino].label);
    1933     sprintf(comment, "Please set %s's value (currently '%s')",
     1932    sprintf(header, _("Edit %s"), raidrec->additional_vars.el[lino].label);
     1933    sprintf(comment, _("Please set %s's value (currently '%s')"),
    19341934            raidrec->additional_vars.el[lino].label, sz_out);
    19351935    if (popup_and_get_string(header, comment, sz_out, MAX_STR_LEN)) {
     
    19931993    strcpy(flaws_str_C, "xxxxxxxxx");
    19941994    if (mountlist->entries > ARBITRARY_MAXIMUM) {
    1995         log_to_screen("Arbitrary limits suck, man!");
     1995        log_to_screen(_("Arbitrary limits suck, man!"));
    19961996        finish(1);
    19971997    }
    19981998    newtPushHelpLine
    1999         ("   Please edit the mountlist to your satisfaction, then click OK or Cancel.");
     1999        (_("   Please edit the mountlist to your satisfaction, then click OK or Cancel."));
    20002000    i = 4;
    2001     bAdd = newtCompactButton(i, 17, " Add ");
    2002     bEdit = newtCompactButton(i += 11, 17, " Edit ");
    2003     bDelete = newtCompactButton(i += 12, 17, "Delete");
    2004     bReload = newtCompactButton(i += 12, 17, "Reload");
    2005     bCancel = newtCompactButton(i += 12, 17, "Cancel");
    2006     bOK = newtCompactButton(i += 12, 17, "  OK  ");
    2007     sprintf(tmp, "%-24s %-24s %-8s  %s", "Device", "Mountpoint", "Format",
    2008             "Size (MB)");
     2001    bAdd = newtCompactButton(i, 17, _(" Add "));
     2002    bEdit = newtCompactButton(i += 11, 17, _(" Edit "));
     2003    bDelete = newtCompactButton(i += 12, 17, _("Delete"));
     2004    bReload = newtCompactButton(i += 12, 17, _("Reload"));
     2005    bCancel = newtCompactButton(i += 12, 17, _("Cancel"));
     2006    bOK = newtCompactButton(i += 12, 17, _("  OK  "));
     2007    sprintf(tmp, "%-24s %-24s %-8s  %s", _("Device"), _("Mountpoint"), _("Format"),
     2008            _("Size (MB)"));
    20092009    headerMsg = newtLabel(2, 1, tmp);
    20102010    flawsLabelA = newtLabel(2, 13, flaws_str_A);
     
    20142014        newtListbox(2, 2, 10, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
    20152015    redraw_mountlist(mountlist, keylist, partitionsListbox);
    2016     newtOpenWindow(1, 3, 77, 18, "Editing mountlist");
     2016    newtOpenWindow(1, 3, 77, 18, _("Editing mountlist"));
    20172017    myForm = newtForm(NULL, NULL, 0);
    20182018    newtFormAddComponents(myForm, headerMsg, partitionsListbox,
     
    20312031                finished =
    20322032                    ask_me_yes_or_no
    2033                     ("Your mountlist might not work. Continue anyway?");
     2033                    (_("Your mountlist might not work. Continue anyway?"));
    20342034            } else {
    20352035                finished =
    20362036                    ask_me_yes_or_no
    2037                     ("Are you sure you want to save your mountlist and continue? (No changes will be made to your partition table at this time.)");
     2037                    (_("Are you sure you want to save your mountlist and continue? (No changes will be made to your partition table at this time.)"));
    20382038            }
    20392039        } else if (b_res == bCancel) {
    20402040            finished = TRUE;
    20412041        } else if (b_res == bReload) {
    2042             if (ask_me_yes_or_no("Reload original mountlist?")) {
     2042            if (ask_me_yes_or_no(_("Reload original mountlist?"))) {
    20432043/*
    20442044This would be really dumb. RAIDTAB_FNAME is #define'd.   --- Hugo, 2003/04/24
     
    20582058                 i < mountlist->entries && keylist[i] != curr_choice; i++);
    20592059            if (i == mountlist->entries && mountlist->entries > 0) {
    2060                 log_to_screen("I don't know what that button does!");
     2060                log_to_screen(_("I don't know what that button does!"));
    20612061            } else {
    20622062                currline = i;
     
    20762076                    } else {
    20772077                        popup_and_OK
    2078                             ("Please add an entry. Then press ENTER to edit it.");
     2078                            (_("Please add an entry. Then press ENTER to edit it."));
    20792079                    }
    20802080                }
     
    20862086    newtPopHelpLine();
    20872087    if (b_res == bOK) {
    2088         log_it("You pushed 'OK'. I shall now continue.");
     2088        log_it(_("You pushed 'OK'. I shall now continue."));
    20892089        return (0);
    20902090    } else {
     
    21652165    sprintf(title_of_window, "Additional variables");
    21662166    newtPushHelpLine
    2167         ("  Edit the additional fields to your heart's content, then click OK or Cancel.");
    2168     headerMsg = newtLabel(1, 1, "Label                            Value");
     2167        (_("  Edit the additional fields to your heart's content, then click OK or Cancel."));
     2168    headerMsg = newtLabel(1, 1, _("Label                            Value"));
    21692169    varsListbox =
    21702170        newtListbox(1, 2, 6, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
    21712171    i = 1;
    2172     bAdd = newtCompactButton(i, 9, " Add ");
    2173     bEdit = newtCompactButton(i += 8, 9, " Edit ");
    2174     bDelete = newtCompactButton(i += 9, 9, "Delete");
    2175     bOK = newtCompactButton(i += 9, 9, "  OK  ");
    2176     bCancel = newtCompactButton(i += 9, 9, "Cancel");
     2172    bAdd = newtCompactButton(i, 9, _(" Add "));
     2173    bEdit = newtCompactButton(i += 8, 9, _(" Edit "));
     2174    bDelete = newtCompactButton(i += 9, 9, _("Delete"));
     2175    bOK = newtCompactButton(i += 9, 9, _("  OK  "));
     2176    bCancel = newtCompactButton(i += 9, 9, _("Cancel"));
    21772177    newtOpenWindow(17, 7, 46, 10, title_of_window);
    21782178    myForm = newtForm(NULL, NULL, 0);
     
    23272327
    23282328    if (popup_and_get_string
    2329         ("ISO Mode - device", "On what device do the ISO files live?",
     2329        (_("ISO Mode - device"), _("On what device do the ISO files live?"),
    23302330         isodir_device, MAX_STR_LEN / 4)) {
    23312331        if (popup_and_get_string
    2332             ("ISO Mode - format",
    2333              "What is the disk format of the device? (Hit ENTER if you don't know.)",
     2332            (_("ISO Mode - format"),
     2333             _("What is the disk format of the device? (Hit ENTER if you don't know.)"),
    23342334             isodir_format, 16)) {
    23352335            if (popup_and_get_string
    2336                 ("ISO Mode - path",
    2337                  "At what path on this device can the ISO files be found?",
     2336                (_("ISO Mode - path"),
     2337                 _("At what path on this device can the ISO files be found?"),
    23382338                 isodir_path, MAX_STR_LEN / 4)) {
    23392339                strip_spaces(isodir_device);
     
    24332433
    24342434    newtPushHelpLine
    2435         ("This is where I nuke your hard drives. Mhahahahaha. No-one can stop Mojo Jojo!");
    2436     newtOpenWindow(24, 3, 32, 13, "Nuking");
    2437     b1 = newtButton(7, 1, "Slowly");
    2438     b2 = newtButton(7, 5, "Medium");
    2439     b3 = newtButton(7, 9, "Quickly");
     2435        (_("This is where I nuke your hard drives. Mhahahahaha. No-one can stop Mojo Jojo!"));
     2436    newtOpenWindow(24, 3, 32, 13, _("Nuking"));
     2437    b1 = newtButton(7, 1, _("Slowly"));
     2438    b2 = newtButton(7, 5, _("Medium"));
     2439    b3 = newtButton(7, 9, _("Quickly"));
    24402440    myForm = newtForm(NULL, NULL, 0);
    24412441    newtFormAddComponents(myForm, b1, b2, b3, NULL);
     
    28022802    iamhere("Post-malloc");
    28032803    strcpy(help_text,
    2804            "   Edit this RAID device's list of partitions. Choose OK or Cancel when done.");
    2805     sprintf(header_text, "%-24s    %s", "Device", "Index");
    2806     sprintf(title_of_window, "%s contains...", raidrec->raid_device);
     2804           _("   Edit this RAID device's list of partitions. Choose OK or Cancel when done."));
     2805    sprintf(header_text, "%-24s    %s", _("Device"), _("Index"));
     2806    sprintf(title_of_window, _("%s contains..."), raidrec->raid_device);
    28072807    newtPushHelpLine(help_text);
    28082808    for (b_res = (newtComponent) 12345; b_res != bOK && b_res != bCancel;) {
     
    28122812        redraw_disklist(disklist, keylist, partitionsListbox);
    28132813        i = 1;
    2814         bAdd = newtCompactButton(i, 9, " Add ");
    2815         bDelete = newtCompactButton(i += 8, 9, "Delete");
    2816         bOK = newtCompactButton(i += 9, 9, "  OK  ");
    2817         bCancel = newtCompactButton(i += 9, 9, "Cancel");
     2814        bAdd = newtCompactButton(i, 9, _(" Add "));
     2815        bDelete = newtCompactButton(i += 8, 9, _("Delete"));
     2816        bOK = newtCompactButton(i += 9, 9, _("  OK  "));
     2817        bCancel = newtCompactButton(i += 9, 9, _("Cancel"));
    28182818        newtOpenWindow(21, 7, 38, 10, title_of_window);
    28192819        myForm = newtForm(NULL, NULL, 0);
     
    28342834                 i++);
    28352835            if (i == disklist->entries && disklist->entries > 0) {
    2836                 log_to_screen("I don't know what that button does!");
     2836                log_to_screen(_("I don't know what that button does!"));
    28372837            } else {
    28382838                currline = i;
    28392839                if (b_res == bAdd) {
    2840                     log_it("Making list of unallocated RAID slices");
     2840                    log_it(_("Making list of unallocated RAID slices"));
    28412841                    make_list_of_unallocated_raid_partitions
    28422842                        (unallocated_raid_partitions, mountlist_dontedit,
     
    28442844                    if (unallocated_raid_partitions->entries <= 0) {
    28452845                        popup_and_OK
    2846                             ("There are no unallocated partitions marked for RAID.");
     2846                            (_("There are no unallocated partitions marked for RAID."));
    28472847                    } else {
    28482848                        log_it
    2849                             ("Done. The user may add one or more of the above to RAID device");
     2849                            (_("Done. The user may add one or more of the above to RAID device"));
    28502850                        add_disklist_entry(disklist, raidrec->raid_device,
    28512851                                           unallocated_raid_partitions);
    2852                         log_it("I have finished adding a disklist entry.");
     2852                        log_it(_("I have finished adding a disklist entry."));
    28532853                        redraw_disklist(disklist, keylist,
    28542854                                        partitionsListbox);
     
    28592859                    redraw_disklist(disklist, keylist, partitionsListbox);
    28602860                } else {
    2861                     sprintf(tmp, "%s's index is %d. What should it be?",
     2861                    sprintf(tmp, _("%s's index is %d. What should it be?"),
    28622862                            raidrec->raid_device,
    28632863                            disklist->el[currline].index);
    28642864                    sprintf(sz_res, "%d", disklist->el[currline].index);
    2865                     if (popup_and_get_string("Set index", tmp, sz_res, 10)) {
     2865                    if (popup_and_get_string(_("Set index"), tmp, sz_res, 10)) {
    28662866                        disklist->el[currline].index = atoi(sz_res);
    28672867                    }
     
    29202920        for (output = 'z'; !strchr("AICE", output); output = tmp[0]) {
    29212921            printf
    2922                 ("Which mode - (A)utomatic, (I)nteractive, \n(C)ompare only, or (E)xit to shell?\n--> ");
     2922                (_("Which mode - (A)utomatic, (I)nteractive, \n(C)ompare only, or (E)xit to shell?\n--> "));
    29232923            fgets(tmp, MAX_STR_LEN - 1, stdin);
    29242924        }
     
    29272927
    29282928    newtPushHelpLine
    2929         ("   Do you want to 'nuke' your system, restore interactively, or just compare?");
    2930     newtOpenWindow(24, 3, 32, 17, "How should I restore?");
    2931     b1 = newtButton(7, 1, "Automatically");
    2932     b2 = newtButton(7, 5, "Interactively");
    2933     b3 = newtButton(7, 9, "Compare only!");
    2934     b4 = newtButton(7, 13, "Exit to shell");
     2929        (_("   Do you want to 'nuke' your system, restore interactively, or just compare?"));
     2930    newtOpenWindow(24, 3, 32, 17, _("How should I restore?"));
     2931    b1 = newtButton(7, 1, _("Automatically"));
     2932    b2 = newtButton(7, 5, _("Interactively"));
     2933    b3 = newtButton(7, 9, _("Compare only!"));
     2934    b4 = newtButton(7, 13, _("Exit to shell"));
    29352935    myForm = newtForm(NULL, NULL, 0);
    29362936    newtFormAddComponents(myForm, b1, b2, b3, b4, NULL);
  • trunk/mondo/mondo/mondorestore/mondo-rstr-newt.h

    r59 r507  
    2525#endif /*__FreeBSD__*/
    2626
    27 #define NO_FLAWS_DETECTED "No flaws detected in mountlist at this time. Hit 'OK' to proceed."
     27#define NO_FLAWS_DETECTED _("No flaws detected in mountlist at this time. Hit 'OK' to proceed.")
    2828
    2929
  • trunk/mondo/mondo/mondorestore/mondo-rstr-tools.c

    r426 r507  
    225225
    226226        asprintf(&question,
    227                 "Should I restore the image of %s ?", incoming);
     227                _("Should I restore the image of %s ?", incoming));
    228228
    229229        if (ask_me_yes_or_no(question)) {
     
    337337    while (get_cfg_file_from_archive(bkpinfo)) {
    338338        if (!ask_me_yes_or_no
    339             ("Failed to find config file/archives. Choose another source?"))
     339            (_("Failed to find config file/archives. Choose another source?")))
    340340        {
    341341            fatal_error("Could not find config file/archives. Aborting.");
     
    441441
    442442    if (is_this_device_mounted(g_isodir_device)) {
    443         log_to_screen("WARNING - isodir is already mounted");
     443        log_to_screen(_("WARNING - isodir is already mounted"));
    444444        already_mounted = TRUE;
    445445    } else {
     
    458458        if (run_program_and_log_output(mount_isodir_command, FALSE)) {
    459459            popup_and_OK
    460                 ("Cannot mount the device where the ISO files are stored.");
     460                (_("Cannot mount the device where the ISO files are stored."));
    461461            return (1);
    462462        }
    463463        log_to_screen
    464             ("I have mounted the device where the ISO files are stored.");
     464            (_("I have mounted the device where the ISO files are stored."));
    465465    }
    466466    if (!IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
     
    473473    if (i < 0) {
    474474        popup_and_OK
    475             ("Cannot find ISO images in the directory you specified.");
     475            (_("Cannot find ISO images in the directory you specified."));
    476476        retval = 1;
    477477    }
     
    599599    these_failed[0] = '\0';
    600600
    601     mvaddstr_and_log_it(g_currentY, 0, "Mounting devices         ");
    602     open_progress_form("Mounting devices",
    603                        "I am now mounting all the drives.",
    604                        "This should not take long.",
     601    mvaddstr_and_log_it(g_currentY, 0, _("Mounting devices         "));
     602    open_progress_form(_("Mounting devices"),
     603                       _("I am now mounting all the drives."),
     604                       _("This should not take long."),
    605605                       "", mountlist->entries);
    606606
     
    610610                    "Again with the /proc - why is this in your mountlist?");
    611611        } else if (is_this_device_mounted(mountlist->el[lino].device)) {
    612             sprintf(tmp, "%s is already mounted",
     612            sprintf(tmp, _("%s is already mounted"),
    613613                    mountlist->el[lino].device);
    614614            log_to_screen(tmp);
     
    639639        if (g_partition_table_locked_up > 0) {
    640640            log_to_screen
    641                 ("fdisk's ictol() call to refresh its copy of the partition table causes the kernel to");
     641                (_("fdisk's ioctl() call to refresh its copy of the partition table causes the kernel to"));
    642642            log_to_screen
    643                 ("lock up the partition table. You might have to reboot and use Interactive Mode to");
     643                (_("lock up the partition table. You might have to reboot and use Interactive Mode to"));
    644644            log_to_screen
    645                 ("format and restore *without* partitioning first. Sorry for the inconvenience.");
    646         }
    647         sprintf(tmp, "Could not mount devices %s- shall I abort?",
     645                (_("format and restore *without* partitioning first. Sorry for the inconvenience."));
     646        }
     647        sprintf(tmp, _("Could not mount devices %s- shall I abort?"),
    648648                these_failed);
    649649        if (!ask_me_yes_or_no(tmp)) {
    650650            retval = 0;
    651651            log_to_screen
    652                 ("Continuing, although some devices failed to be mounted");
    653             mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     652                (_("Continuing, although some devices failed to be mounted"));
     653            mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
    654654        } else {
    655             mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
     655            mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
    656656            log_to_screen
    657                 ("Unable to mount some or all of your partitions.");
     657                (_("Unable to mount some or all of your partitions."));
    658658        }
    659659    } else {
    660         log_to_screen("All partitions were mounted OK.");
    661         mvaddstr_and_log_it(g_currentY++, 74, "Done.");
     660        log_to_screen(_("All partitions were mounted OK."));
     661        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
    662662    }
    663663    run_program_and_log_output("df -P -m", 3);
     
    13221322    if (am_I_in_disaster_recovery_mode()
    13231323        &&
    1324         ask_me_yes_or_no("Do you want to retrieve the mountlist as well?"))
     1324        ask_me_yes_or_no(_("Do you want to retrieve the mountlist as well?")))
    13251325    {
    13261326//      sprintf(command, "cp -f tmp/mountlist.txt /tmp");
     
    13481348
    13491349    case 0: