Changeset 507 in MondoRescue

Timestamp:

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

Author:

bcornec

Message:

merge -r489:506 $SVN_M/branches/stable

Location:

trunk

Files:

• documentation/Makefile.howto (modified) (2 diffs)
• mondo/ChangeLog (modified) (1 diff)
• mondo/Makefile.am (modified) (1 diff)
• mondo/bootstrap (modified) (1 diff)
• mondo/configure.in (modified) (1 diff)
• mondo/distributions/rpm/mondo.spec (modified) (1 diff)
• mondo/mkinstalldirs (modified) (4 diffs)
• mondo/mondo/common/Makefile.am (modified) (2 diffs)
• mondo/mondo/common/lib-common-externs.h (deleted)
• mondo/mondo/common/libmondo-archive.c (modified) (5 diffs)
• mondo/mondo/common/libmondo-devices.c (modified) (41 diffs)
• mondo/mondo/common/libmondo-fifo.c (modified) (3 diffs)
• mondo/mondo/common/libmondo-filelist.c (modified) (12 diffs)
• mondo/mondo/common/libmondo-files.c (modified) (6 diffs)
• mondo/mondo/common/libmondo-fork.c (modified) (8 diffs)
• mondo/mondo/common/libmondo-gui-EXT.h (deleted)
• mondo/mondo/common/libmondo-gui.c (deleted)
• mondo/mondo/common/libmondo-gui.h (deleted)
• mondo/mondo/common/libmondo-mountlist.c (modified) (3 diffs)
• mondo/mondo/common/libmondo-raid.c (modified) (3 diffs)
• mondo/mondo/common/libmondo-stream.c (modified) (15 diffs)
• mondo/mondo/common/libmondo-string.c (modified) (8 diffs)
• mondo/mondo/common/libmondo-tools.c (modified) (13 diffs)
• mondo/mondo/common/libmondo-verify.c (modified) (13 diffs)
• mondo/mondo/common/libmondo.h (modified) (1 diff)
• mondo/mondo/common/my-stuff.h (modified) (3 diffs)
• mondo/mondo/common/newt-specific.c (modified) (22 diffs)
• mondo/mondo/mondoarchive/main.c (modified) (16 diffs)
• mondo/mondo/mondoarchive/mondo-cli.c (modified) (29 diffs)
• mondo/mondo/mondorestore/mondo-prep.c (modified) (31 diffs)
• mondo/mondo/mondorestore/mondo-restore.c (modified) (80 diffs)
• mondo/mondo/mondorestore/mondo-rstr-compare.c (modified) (11 diffs)
• mondo/mondo/mondorestore/mondo-rstr-newt.c (modified) (54 diffs)
• mondo/mondo/mondorestore/mondo-rstr-newt.h (modified) (1 diff)
• mondo/mondo/mondorestore/mondo-rstr-tools.c (modified) (43 diffs)
• mondo/po (copied) (copied from branches/stable/mondo/po )

trunk/documentation/Makefile.howto

@@ -34 +34 @@
     @rm -fr $(TARGET)
     @docbook2html -d $(TARGET).dsl'#html' -o $(TARGET) $(TARGET).sgml
+    @ln -sf $(IMAGESDIR) $(TARGET)
 
 $(TARGET).html: $(SRC) $(DSL) $(IMAGES)
@@ -63 +64 @@
     @echo "Delivering mondorescue howto"
     @echo ""
-    @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
+    @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

@@ -9 +9 @@
   needed + remove memory leaks)
 
-v2.07 ()
+v2.2.0 (2006-05-01) 
+=======
+
+- Internationalization (A huge thank to rene-marc dolhen
+<rmd_at_mecreant.org> who achieved that big task)
+- Fixed verify for NFS (Andree Leidenfrost)
+- Fix for Bug #6975 (Bruno Cornec)
+- Fix a bug when restoring interactively and having file names with blank
+  (Bruno Cornec)
+- Fix options -I and -E of mondoarchive which were not working 
+  (Bruno Cornec)
+- Removed 'ax' options from ps call in busybox (Andree Leidenfrost)
+
+v2.0.7 (2006-02-23)
 - useless cat, sort|uniq commands removed 
   (Bruno Cornec/Sébastien Aperghis-Tramoni)

trunk/mondo/Makefile.am

@@ -1 +1 @@
 AUTOMAKE_OPTIONS = 1.7
-SUBDIRS        = mondo
+SUBDIRS        = mondo po
 man8_MANS      = docs/man/mondoarchive.8 docs/man/mondorestore.8
+
+ACLOCAL_AMFLAGS = -I m4
+
+EXTRA_DIST = config.rpath  config.rpath

trunk/mondo/bootstrap

@@ -28 +28 @@
 make maintainer-clean >/dev/null 2>&1
 libtoolize -f -c --automake
-aclocal
+cp /usr/bin/gettextize .
+perl -pi -e 's~read dummy < /dev/tty~~' gettextize
+./gettextize -c -f --no-changelog < /dev/null
+rm -f gettextize
+aclocal -I m4
 autoheader
 automake

trunk/mondo/configure.in

@@ -30 +30 @@
 AC_PROG_MAKE_SET
 
+AM_GNU_GETTEXT([external])
+ALL_LINGUAS="fr"
 
 dnl --with/--enable stuff

trunk/mondo/distributions/rpm/mondo.spec

@@ -90 +90 @@
 %attr(755,root,root) %{_datadir}/%{name}/autorun
 %attr(755,root,root) %{_datadir}/%{name}/post-nuke.sample/usr/bin/post-nuke
+%{_datadir}/locale/*/LC_MESSAGES/mondo.mo
 %{_datadir}/%{name}/*
 %{_mandir}/man8/*

trunk/mondo/mkinstalldirs

@@ -1 +1 @@
 #! /bin/sh
 # mkinstalldirs --- make directory hierarchy
-# Author: Noah Friedman <friedman@prep.ai.mit.edu>
+
+scriptversion=2004-02-15.20
+
+# Original author: Noah Friedman <friedman@prep.ai.mit.edu>
 # Created: 1993-05-16
-# Public domain
+# Public domain.
+#
+# This file is maintained in Automake, please report
+# bugs to <bug-automake@gnu.org> or send patches to
+# <automake-patches@gnu.org>.
 
 errstatus=0
@@ -9 +16 @@
 
 usage="\
-Usage: mkinstalldirs [-h] [--help] [-m mode] dir ..."
+Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
+
+Create each directory DIR (with mode MODE, if specified), including all
+leading file name components.
+
+Report bugs to <bug-automake@gnu.org>."
 
 # process command line arguments
 while test $# -gt 0 ; do
-   case "${1}" in
-     -h | --help | --h* )           # -h for help
-    echo "${usage}" 1>&2; exit 0 ;;
-     -m )                   # -m PERM arg
-    shift
-    test $# -eq 0 && { echo "${usage}" 1>&2; exit 1; }
-    dirmode="${1}"
-    shift ;;
-     -- ) shift; break ;;           # stop option processing
-     -* ) echo "${usage}" 1>&2; exit 1 ;;   # unknown option
-     * )  break ;;              # first non-opt arg
-   esac
+  case $1 in
+    -h | --help | --h*)         # -h for help
+      echo "$usage"
+      exit 0
+      ;;
+    -m)                         # -m PERM arg
+      shift
+      test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
+      dirmode=$1
+      shift
+      ;;
+    --version)
+      echo "$0 $scriptversion"
+      exit 0
+      ;;
+    --)                         # stop option processing
+      shift
+      break
+      ;;
+    -*)                         # unknown option
+      echo "$usage" 1>&2
+      exit 1
+      ;;
+    *)                          # first non-opt arg
+      break
+      ;;
+  esac
 done
 
@@ -37 +64 @@
 
 case $# in
-0) exit 0 ;;
+  0) exit 0 ;;
 esac
 
+# Solaris 8's mkdir -p isn't thread-safe.  If you mkdir -p a/b and
+# mkdir -p a/c at the same time, both will detect that a is missing,
+# one will create a, then the other will try to create a and die with
+# a "File exists" error.  This is a problem when calling mkinstalldirs
+# from a parallel make.  We use --version in the probe to restrict
+# ourselves to GNU mkdir, which is thread-safe.
 case $dirmode in
-'')
-  if mkdir -p -- . 2>/dev/null; then
-    echo "mkdir -p -- $*"
-    exec mkdir -p -- "$@"
-  fi ;;
-*)
-  if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
-    echo "mkdir -m $dirmode -p -- $*"
-    exec mkdir -m "$dirmode" -p -- "$@"
-  fi ;;
+  '')
+    if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
+      echo "mkdir -p -- $*"
+      exec mkdir -p -- "$@"
+    else
+      # On NextStep and OpenStep, the `mkdir' command does not
+      # recognize any option.  It will interpret all options as
+      # directories to create, and then abort because `.' already
+      # exists.
+      test -d ./-p && rmdir ./-p
+      test -d ./--version && rmdir ./--version
+    fi
+    ;;
+  *)
+    if mkdir -m "$dirmode" -p --version . >/dev/null 2>&1 &&
+       test ! -d ./--version; then
+      echo "mkdir -m $dirmode -p -- $*"
+      exec mkdir -m "$dirmode" -p -- "$@"
+    else
+      # Clean up after NextStep and OpenStep mkdir.
+      for d in ./-m ./-p ./--version "./$dirmode";
+      do
+        test -d $d && rmdir $d
+      done
+    fi
+    ;;
 esac
 
 for file
 do
-   set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-   shift
+  set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
+  shift
 
-   pathcomp=
-   for d
-   do
-     pathcomp="$pathcomp$d"
-     case "$pathcomp" in
-       -* ) pathcomp=./$pathcomp ;;
-     esac
+  pathcomp=
+  for d
+  do
+    pathcomp="$pathcomp$d"
+    case $pathcomp in
+      -*) pathcomp=./$pathcomp ;;
+    esac
 
-     if test ! -d "$pathcomp"; then
-    echo "mkdir $pathcomp"
+    if test ! -d "$pathcomp"; then
+      echo "mkdir $pathcomp"
 
-    mkdir "$pathcomp" || lasterr=$?
+      mkdir "$pathcomp" || lasterr=$?
 
-    if test ! -d "$pathcomp"; then
-      errstatus=$lasterr
-    else
-      if test ! -z "$dirmode"; then
-         echo "chmod $dirmode $pathcomp"
+      if test ! -d "$pathcomp"; then
+    errstatus=$lasterr
+      else
+    if test ! -z "$dirmode"; then
+      echo "chmod $dirmode $pathcomp"
+      lasterr=""
+      chmod "$dirmode" "$pathcomp" || lasterr=$?
 
-         lasterr=""
-         chmod "$dirmode" "$pathcomp" || lasterr=$?
-
-         if test ! -z "$lasterr"; then
-           errstatus=$lasterr
-         fi
+      if test ! -z "$lasterr"; then
+        errstatus=$lasterr
       fi
     fi
-     fi
+      fi
+    fi
 
-     pathcomp="$pathcomp/"
-   done
+    pathcomp="$pathcomp/"
+  done
 done
 
@@ -95 +143 @@
 # Local Variables:
 # mode: shell-script
-# sh-indentation: 3
+# sh-indentation: 2
+# eval: (add-hook 'write-file-hooks 'time-stamp)
+# time-stamp-start: "scriptversion="
+# time-stamp-format: "%:y-%02m-%02d.%02H"
+# time-stamp-end: "$"
 # End:
-# mkinstalldirs ends here

trunk/mondo/mondo/common/Makefile.am

@@ -14 +14 @@
                        libmondo-archive.h libmondo-devices.h \
                        libmondo-filelist.h libmondo-files.h libmondo-fork.h \
-                       libmondo-gui.h libmondo-mountlist.h libmondo-raid.h \
+                       libmondo-mountlist.h libmondo-raid.h \
                        libmondo-stream.h libmondo-string.h libmondo-tools.h \
                        libmondo-verify.h libmondo-fifo.h \
@@ -20 +20 @@
                        libmondo-devices-EXT.h libmondo-fifo-EXT.h \
                        libmondo-files-EXT.h libmondo-fork-EXT.h \
-                       libmondo-gui-EXT.h libmondo-filelist-EXT.h \
+                       libmondo-filelist-EXT.h \
                        libmondo-mountlist-EXT.h libmondo-raid-EXT.h  \
                        libmondo-string-EXT.h libmondo-tools-EXT.h \

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

@@ -16 +16 @@
 #include "libmondo-devices-EXT.h"
 #include "libmondo-tools-EXT.h"
-#include "libmondo-gui-EXT.h"
+#include "newt-specific-EXT.h"
 #include "libmondo-fork-EXT.h"
 #include "libmondo-files-EXT.h"
@@ -23 +23 @@
 #include "libmondo-verify-EXT.h"
 #include "libmondo-archive.h"
-#include "lib-common-externs.h"
 #include <sys/sem.h>
 #include <sys/types.h>
@@ -1457 +1456 @@
     log_to_screen("Archiving regular files");
     log_msg(5, "Go, Shorty. It's your birthday.");
-    open_progress_form("Backing up filesystem",
-                       "I am backing up your live filesystem now.",
-                       "Please wait. This may take a couple of hours.",
-                       "Working...",
+    open_progress_form(_("Backing up filesystem"),
+                       _("I am backing up your live filesystem now."),
+                       _("Please wait. This may take a couple of hours."),
+                       _("Working..."),
                        get_last_filelist_number(bkpinfo) + 1);
 
@@ -1665 +1664 @@
 
     if (bkpinfo->backup_media_type == iso && bkpinfo->manual_cd_tray) {
-        popup_and_OK("Please insert new media and press Enter.");
+        popup_and_OK(_("Please insert new media and press Enter."));
     }
 
@@ -2148 +2147 @@
     log_to_screen("Archiving regular files");
 
-    open_progress_form("Backing up filesystem",
-                       "I am backing up your live filesystem now.",
-                       "Please wait. This may take a couple of hours.",
-                       "Working...",
+    open_progress_form(_("Backing up filesystem"),
+                       _("I am backing up your live filesystem now."),
+                       _("Please wait. This may take a couple of hours."),
+                       _("Working..."),
                        get_last_filelist_number(bkpinfo) + 1);
 

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

@@ -11 +11 @@
 #include "libmondo-files-EXT.h"
 #include "libmondo-devices.h"
-#include "lib-common-externs.h"
 #include "libmondo-string-EXT.h"
 #include "libmondo-tools-EXT.h"
-#include "libmondo-gui-EXT.h"
+#include "newt-specific-EXT.h"
 #include "libmondo-fork-EXT.h"
 #include "libmondo-stream-EXT.h"
@@ -139 +138 @@
             && !does_file_exist("/tmp/mountlist.txt.sample")) {
             log_to_screen
-                ("Using /dev/root is stupid of you but I'll forgive you.");
+                (_("Using /dev/root is stupid of you but I'll forgive you."));
             is_this_a_ramdisk = FALSE;
         }
@@ -165 +164 @@
     switch (bt) {
     case none:
-        asprintf(&output, "none");
+        asprintf(&output, _("none"));
         break;
     case iso:
-        asprintf(&output, "iso");
+        asprintf(&output, _("iso"));
         break;
     case cdr:
-        asprintf(&output, "cdr");
+        asprintf(&output, _("cdr"));
         break;
     case cdrw:
-        asprintf(&output, "cdrw");
+        asprintf(&output, _("cdrw"));
         break;
     case cdstream:
-        asprintf(&output, "cdstream");
+        asprintf(&output, _("cdstream"));
         break;
     case nfs:
-        asprintf(&output, "nfs");
+        asprintf(&output, _("nfs"));
         break;
     case tape:
-        asprintf(&output, "tape");
+        asprintf(&output, _("tape"));
         break;
     case udev:
-        asprintf(&output, "udev");
+        asprintf(&output, _("udev"));
         break;
     default:
-        asprintf(&output, "default");
+        asprintf(&output, _("default"));
     }
     return (output);
@@ -470 +469 @@
     if ((dev == NULL) || (! mount_CDROM_here(dev, mountpoint))) {
         if (!popup_and_get_string
-            ("CD-ROM device", "Please enter your CD-ROM's /dev device",
+            (_("CD-ROM device"), _("Please enter your CD-ROM's /dev device"),
              dev, MAX_STR_LEN / 4)) {
             res = FALSE;
@@ -478 +477 @@
     }
     if (res) {
-        log_msg(1, "mount failed");
-    } else {
-        log_msg(1, "mount succeeded with %s", dev);
+        log_msg(1, _("mount failed"));
+    } else {
+        log_msg(1, _("mount succeeded with %s"), dev);
     }
     paranoid_free(dev);
@@ -1370 +1369 @@
             }
             if (res) {
-                log_to_screen("WARNING - failed to unmount CD-ROM drive");
+                log_to_screen(_("WARNING - failed to unmount CD-ROM drive"));
             }
             if (!bkpinfo->please_dont_eject) {
@@ -1378 +1377 @@
             }
             if (res) {
-                log_to_screen("WARNING - failed to eject CD-ROM disk");
+                log_to_screen(_("WARNING - failed to eject CD-ROM disk"));
             }
             popup_and_OK(request);
@@ -1428 +1427 @@
         which_backup_media_type(bkpinfo->restore_data);
     if (bkpinfo->backup_media_type == none) {
-        log_to_screen("User has chosen not to backup the PC");
+        log_to_screen(_("User has chosen not to backup the PC"));
         finish(1);
     }
     if (bkpinfo->backup_media_type == tape && bkpinfo->restore_data) {
-        popup_and_OK("Please remove CD/floppy from drive(s)");
+        popup_and_OK(_("Please remove CD/floppy from drive(s)"));
     }
     log_msg(3, "media type = %s",
@@ -1467 +1466 @@
         if (archiving_to_media) {
             if (ask_me_yes_or_no
-                ("Is your computer a laptop, or does the CD writer incorporate BurnProof technology?"))
+                (_("Is your computer a laptop, or does the CD writer incorporate BurnProof technology?")))
             {
                 bkpinfo->manual_cd_tray = TRUE;
@@ -1473 +1472 @@
             if ((bkpinfo->compression_level =
                  which_compression_level()) == -1) {
-                log_to_screen("User has chosen not to backup the PC");
+                log_to_screen(_("User has chosen not to backup the PC"));
                 finish(1);
             }
-            asprintf(&comment, "What speed is your %s (re)writer?",
+            asprintf(&comment, _("What speed is your %s (re)writer?"),
                     media_descriptor_string(bkpinfo->backup_media_type));
             if (bkpinfo->backup_media_type == dvd) {
@@ -1491 +1490 @@
             }
             if (bkpinfo->backup_media_type != dvd) {
-                if (!popup_and_get_string("Speed", comment, tmp, 4)) {
-                    log_to_screen("User has chosen not to backup the PC");
+                if (!popup_and_get_string(_("Speed"), comment, tmp, 4)) {
+                    log_to_screen(_("User has chosen not to backup the PC"));
                     finish(1);
                 }
@@ -1502 +1501 @@
 
             asprintf(&comment,
-                    "How much data (in Megabytes) will each %s store?",
+                    _("How much data (in Megabytes) will each %s store?"),
                     media_descriptor_string(bkpinfo->backup_media_type));
 
             if (!popup_and_get_string("Size", comment, sz_size, 5)) {
-                log_to_screen("User has chosen not to backup the PC");
+                log_to_screen(_("User has chosen not to backup the PC"));
                 finish(1);
             }
@@ -1515 +1514 @@
             }
             if (bkpinfo->media_size[0] <= 0) {
-                log_to_screen("User has chosen not to backup the PC");
+                log_to_screen(_("User has chosen not to backup the PC"));
                 finish(1);
             }
@@ -1539 +1538 @@
                         bkpinfo->media_device);
                 asprintf(&comment,
-                        "Please specify your %s drive's /dev entry",
+                        _("Please specify your %s drive's /dev entry"),
                         media_descriptor_string(bkpinfo->
                                                 backup_media_type));
                 if (!popup_and_get_string
-                    ("Device?", comment, bkpinfo->media_device,
+                    (_("Device?"), comment, bkpinfo->media_device,
                      MAX_STR_LEN / 4)) {
-                    log_to_screen("User has chosen not to backup the PC");
+                    log_to_screen(_("User has chosen not to backup the PC"));
                     finish(1);
                 }
@@ -1558 +1557 @@
             if (bkpinfo->media_device != NULL) {
                 asprintf(&tmp,
-                        "I think I've found your %s burner at SCSI node %s; am I right on the money?",
+                        _("I think I've found your %s burner at SCSI node %s; am I right on the money?"),
                         media_descriptor_string(bkpinfo->
                                                 backup_media_type),
@@ -1568 +1567 @@
             } else {
                 if (g_kernel_version < 2.6) {
-                    i = popup_and_get_string("Device node?",
-                                             "What is the SCSI node of your CD (re)writer, please?",
+                    i = popup_and_get_string(_("Device node?"),
+                                             _("What is the SCSI node of your CD (re)writer, please?"),
                                              bkpinfo->media_device,
                                              MAX_STR_LEN / 4);
                 } else {
-                    i = popup_and_get_string("/dev entry?",
-                                             "What is the /dev entry of your CD (re)writer, please?",
+                    i = popup_and_get_string(_("/dev entry?"),
+                                             _("What is the /dev entry of your CD (re)writer, please?"),
                                              bkpinfo->media_device,
                                              MAX_STR_LEN / 4);
                 }
                 if (!i) {
-                    log_to_screen("User has chosen not to backup the PC");
+                    log_to_screen(_("User has chosen not to backup the PC"));
                     finish(1);
                 }
@@ -1592 +1591 @@
     case udev:
         if (!ask_me_yes_or_no
-            ("This option is for advanced users only. Are you sure?")) {
-            log_to_screen("User has chosen not to backup the PC");
+            (_("This option is for advanced users only. Are you sure?"))) {
+            log_to_screen(_("User has chosen not to backup the PC"));
             finish(1);
         }
@@ -1600 +1599 @@
         paranoid_free(bkpinfo->media_device);
         if (find_tape_device_and_size(bkpinfo->media_device, sz_size)) {
-            log_msg(3, "Ok, using vanilla scsi tape.");
+            log_msg(3, _("Ok, using vanilla scsi tape."));
             paranoid_alloc(bkpinfo->media_device,VANILLA_SCSI_TAPE );
             if ((fin = fopen(bkpinfo->media_device, "r"))) {
@@ -1618 +1617 @@
             }
             asprintf(&tmp,
-                    "I think I've found your tape streamer at %s; am I right on the money?",
+                    _("I think I've found your tape streamer at %s; am I right on the money?"),
                     bkpinfo->media_device);
             if (!ask_me_yes_or_no(tmp)) {
@@ -1627 +1626 @@
         if (bkpinfo->media_device == NULL) {
             if (!popup_and_get_string
-                ("Device name?",
-                 "What is the /dev entry of your tape streamer?",
+                (_("Device name?"),
+                 _("What is the /dev entry of your tape streamer?"),
                  bkpinfo->media_device, MAX_STR_LEN / 4)) {
-                log_to_screen("User has chosen not to backup the PC");
+                log_to_screen(_("User has chosen not to backup the PC"));
                 finish(1);
             }
@@ -1636 +1635 @@
         asprintf(&tmp, "ls -l %s", bkpinfo->media_device);
         if (run_program_and_log_output(tmp, FALSE)) {
-            log_to_screen("User has not specified a valid /dev entry");
+            log_to_screen(_("User has not specified a valid /dev entry"));
             finish(1);
         }
@@ -1653 +1652 @@
             if ((bkpinfo->compression_level =
                  which_compression_level()) == -1) {
-                log_to_screen("User has chosen not to backup the PC");
+                log_to_screen(_("User has chosen not to backup the PC"));
                 finish(1);
             }
@@ -1674 +1673 @@
         {
             if (!popup_and_get_string
-                ("NFS dir.",
-                 "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.)",
+                (_("NFS dir."),
+                 _("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.)"),
                  bkpinfo->nfs_mount, MAX_STR_LEN / 4)) {
-                log_to_screen("User has chosen not to backup the PC");
+                log_to_screen(_("User has chosen not to backup the PC"));
                 finish(1);
             }
@@ -1683 +1682 @@
                 if ((bkpinfo->compression_level =
                      which_compression_level()) == -1) {
-                    log_to_screen("User has chosen not to backup the PC");
+                    log_to_screen(_("User has chosen not to backup the PC"));
                     finish(1);
                 }
@@ -1699 +1698 @@
 
             asprintf(&comment,
-                    "How much data (in Megabytes) will each media store?");
-            if (!popup_and_get_string("Size", comment, sz_size, 5)) {
-                log_to_screen("User has chosen not to backup the PC");
+                    _("How much data (in Megabytes) will each media store?"));
+            if (!popup_and_get_string(_("Size"), comment, sz_size, 5)) {
+                log_to_screen(_("User has chosen not to backup the PC"));
                 finish(1);
             }
@@ -1708 +1707 @@
             }
             if (bkpinfo->media_size[0] <= 0) {
-                log_to_screen("User has chosen not to backup the PC");
+                log_to_screen(_("User has chosen not to backup the PC"));
                 finish(1);
             }
@@ -1716 +1715 @@
             system("umount /tmp/isodir 2> /dev/null");
             if (!popup_and_get_string
-                ("NFS share", "Which remote NFS share should I mount?",
+                (_("NFS share"), _("Which remote NFS share should I mount?"),
                  bkpinfo->nfs_mount, MAX_STR_LEN)) {
-                log_to_screen("User has chosen not to backup the PC");
+                log_to_screen(_("User has chosen not to backup the PC"));
                 finish(1);
             }
@@ -1738 +1737 @@
         if (!is_this_device_mounted(bkpinfo->nfs_mount)) {
             popup_and_OK
-                ("Please mount that partition before you try to backup to or restore from it.");
+                (_("Please mount that partition before you try to backup to or restore from it."));
             finish(1);
         }
         asprintf(&tmp, bkpinfo->nfs_remote_dir);
         if (!popup_and_get_string
-            ("Directory", "Which directory within that mountpoint?", tmp,
+            (_("Directory"), _("Which directory within that mountpoint?"), tmp,
              MAX_STR_LEN)) {
-            log_to_screen("User has chosen not to backup the PC");
+            log_to_screen(_("User has chosen not to backup the PC"));
             finish(1);
         }
@@ -1760 +1759 @@
             asprintf(&tmp, bkpinfo->nfs_remote_dir);
             asprintf(&prompt,
-                     "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.",
+                     _("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."),
                      bkpinfo->nfs_remote_dir, bkpinfo->isodir);
             if (!popup_and_get_string
-                ("Directory", prompt, tmp, MAX_STR_LEN)) {
-                log_to_screen("User has chosen not to backup the PC");
+                (_("Directory"), prompt, tmp, MAX_STR_LEN)) {
+                log_to_screen(_("User has chosen not to backup the PC"));
                 finish(1);
             }
@@ -1778 +1777 @@
 
         if (!popup_and_get_string
-            ("Prefix.",
-             "Please enter the prefix that will be prepended to your ISO filename.  Example: machine1 to obtain machine1-[1-9]*.iso files",
+            (_("Prefix."),
+             _("Please enter the prefix that will be prepended to your ISO filename.  Example: machine1 to obtain machine1-[1-9]*.iso files"),
             bkpinfo->prefix, MAX_STR_LEN / 4)) {
-            log_to_screen("User has chosen not to backup the PC");
+            log_to_screen(_("User has chosen not to backup the PC"));
             finish(1);
         }
@@ -1797 +1796 @@
         if (!bkpinfo->disaster_recovery) {
             if (!popup_and_get_string
-                ("Storage dir.",
-                 "Please enter the full path that contains your ISO images.  Example: /mnt/raid0_0",
+                (_("Storage dir."),
+                 _("Please enter the full path that contains your ISO images.  Example: /mnt/raid0_0"),
                  bkpinfo->isodir, MAX_STR_LEN / 4)) {
-                log_to_screen("User has chosen not to backup the PC");
+                log_to_screen(_("User has chosen not to backup the PC"));
                 finish(1);
             }
@@ -1806 +1805 @@
                 if ((bkpinfo->compression_level =
                      which_compression_level()) == -1) {
-                    log_to_screen("User has chosen not to backup the PC");
+                    log_to_screen(_("User has chosen not to backup the PC"));
                     finish(1);
                 }
                 if (!popup_and_get_string
-                    ("ISO size.",
-                     "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.",
+                    (_("ISO size."),
+                     _("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."),
                      sz_size, 16)) {
-                    log_to_screen("User has chosen not to backup the PC");
+                    log_to_screen(_("User has chosen not to backup the PC"));
                     finish(1);
                 }
@@ -1822 +1821 @@
 
                 if (!popup_and_get_string
-                    ("Prefix.",
-                     "Please enter the prefix that will be prepended to your ISO filename.  Example: machine1 to obtain machine1-[1-9]*.iso files",
+                    (_("Prefix."),
+                     _("Please enter the prefix that will be prepended to your ISO filename.  Example: machine1 to obtain machine1-[1-9]*.iso files"),
                      bkpinfo->prefix, MAX_STR_LEN / 4)) {
                     log_to_screen("User has chosen not to backup the PC");
@@ -1857 +1856 @@
 #ifdef __FreeBSD__
             if (!popup_and_get_string
-                ("Boot device",
-                 "What is your boot device? (e.g. /dev/ad0)",
+                (_("Boot device"),
+                 _("What is your boot device? (e.g. /dev/ad0)"),
                  bkpinfo->boot_device, MAX_STR_LEN / 4)) {
-                log_to_screen("User has chosen not to backup the PC");
+                log_to_screen(_("User has chosen not to backup the PC"));
                 finish(1);
             }
@@ -1866 +1865 @@
 #else
             if (!popup_and_get_string
-                ("Boot device",
-                 "What is your boot device? (e.g. /dev/hda)",
+                (_("Boot device"),
+                 _("What is your boot device? (e.g. /dev/hda)"),
                  bkpinfo->boot_device, MAX_STR_LEN / 4)) {
-                log_to_screen("User has chosen not to backup the PC");
+                log_to_screen(_("User has chosen not to backup the PC"));
                 finish(1);
             }
@@ -1889 +1888 @@
             if (i == 'U') {
                 if (ask_me_yes_or_no
-                    ("Unidentified boot loader. Shall I restore it byte-for-byte at restore time and hope for the best?"))
+                    (_("Unidentified boot loader. Shall I restore it byte-for-byte at restore time and hope for the best?")))
                 {
                     i = 'R';    // raw
                 } else {
                     log_to_screen
-                        ("I cannot find your boot loader. Please run mondoarchive with parameters.");
+                        (_("I cannot find your boot loader. Please run mondoarchive with parameters."));
                     finish(1);
                 }
@@ -1902 +1901 @@
         strcpy(bkpinfo->include_paths, "/");
         if (!popup_and_get_string
-            ("Backup paths",
-             "Please enter paths which you want me to backup. The default is '/' (i.e. everything).",
+            (_("Backup paths"),
+             _("Please enter paths which you want me to backup. The default is '/' (i.e. everything)."),
              bkpinfo->include_paths, MAX_STR_LEN)) {
-            log_to_screen("User has chosen not to backup the PC");
+            log_to_screen(_("User has chosen not to backup the PC"));
             finish(1);
         }
@@ -1922 +1921 @@
         if (strlen(tmp) > 2) {
             if (!popup_and_get_string
-                ("NTFS partitions",
-                 "Please enter/confirm the NTFS partitions you wish to backup as well.",
+                (_("NTFS partitions"),
+                 _("Please enter/confirm the NTFS partitions you wish to backup as well."),
                  tmp, MAX_STR_LEN / 4)) {
-                log_to_screen("User has chosen not to backup the PC");
+                log_to_screen(_("User has chosen not to backup the PC"));
                 finish(1);
             }
@@ -1933 +1932 @@
 
         if (!popup_and_get_string
-            ("Exclude paths",
-             "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.",
+            (_("Exclude paths"),
+             _("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."),
              bkpinfo->exclude_paths, MAX_STR_LEN)) {
-            log_to_screen("User has chosen not to backup the PC");
+            log_to_screen(_("User has chosen not to backup the PC"));
             finish(1);
         }
@@ -1943 +1942 @@
         bkpinfo->verify_data =
             ask_me_yes_or_no
-            ("Will you want to verify your backups after Mondo has created them?");
+            (_("Will you want to verify your backups after Mondo has created them?"));
 
 #ifndef __FreeBSD__
         if (!ask_me_yes_or_no
-            ("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.")) {
+            (_("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."))){
             paranoid_alloc(bkpinfo->kernel_path, "FAILSAFE");
         }
@@ -1953 +1952 @@
 
         if (!ask_me_yes_or_no
-            ("Are you sure you want to proceed? Hit 'no' to abort.")) {
-            log_to_screen("User has chosen not to backup the PC");
+            (_("Are you sure you want to proceed? Hit 'no' to abort."))) {
+            log_to_screen(_("User has chosen not to backup the PC"));
             finish(1);
         }

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

@@ -96 +96 @@
     if (!res) {
         bufsize++;
-        asprintf(&tmp, "Negotiated max buffer of %d MB ", bufsize);
+        asprintf(&tmp, _("Negotiated max buffer of %d MB ", bufsize));
         log_to_screen(tmp);
         paranoid_free(tmp);
@@ -103 +103 @@
         res = 0;
         log_to_screen
-            ("Cannot negotiate a buffer of ANY size. Using dd instead.");
+            (_("Cannot negotiate a buffer of ANY size. Using dd instead."));
     }
     if (direction == 'r') {
@@ -143 +143 @@
     if (run_program_and_log_output(tmp, 1)) {
         fres = NULL;
-        log_to_screen("Failed to open tape streamer. Buffer error.");
-    } else {
-        log_to_screen("Buffer successfully started.");
+        log_to_screen(_("Failed to open tape streamer. Buffer error."));
+    } else {
+        log_to_screen(_("Buffer successfully started."));
     }
     paranoid_free(tmp);

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

@@ -11 +11 @@
 #include "my-stuff.h"
 #include "mondostructures.h"
-#include "lib-common-externs.h"
 #include "libmondo-filelist.h"
 #include "libmondo-string-EXT.h"
 #include "libmondo-files-EXT.h"
 #include "libmondo-fork-EXT.h"
-#include "libmondo-gui-EXT.h"
+#include "newt-specific-EXT.h"
 #include "libmondo-tools-EXT.h"
 
@@ -91 +90 @@
     int i, retval = 0;
 
-    mvaddstr_and_log_it(g_currentY, 0, "Dividing filelist into sets");
-
-    log_to_screen("Dividing filelist into sets. Please wait.");
+    mvaddstr_and_log_it(g_currentY, 0, _("Dividing filelist into sets"));
+
+    log_to_screen(_("Dividing filelist into sets. Please wait."));
     i = 0;
 /*
@@ -376 +375 @@
     if (depth == 0) {
         open_evalcall_form("Freeing memory");
-        log_to_screen("Freeing memory formerly occupied by filelist");
+        log_to_screen(_("Freeing memory formerly occupied by filelist"));
     }
     depth++;
@@ -789 +788 @@
     // add here
     if (!(newnode = (struct s_node *) malloc(sizeof(struct s_node)))) {
-        log_to_screen("failed to malloc");
+        log_to_screen(_("failed to malloc"));
         depth--;
         return (1);
@@ -821 +820 @@
             (node->down =
              (struct s_node *) malloc(sizeof(struct s_node)))) {
-            log_to_screen("%s - failed to malloc", string_to_add);
+            log_to_screen(_("%s - failed to malloc"), string_to_add);
             return (1);
         }
@@ -873 +872 @@
         fatal_error("filelist does not exist -- cannot load it");
     }
-    log_to_screen("Loading filelist");
+    log_to_screen(_("Loading filelist"));
     asprintf(&command_to_open_fname, "gzip -dc %s", filelist_fname);
     asprintf(&tmp, "zcat %s | wc -l", filelist_fname);
@@ -882 +881 @@
 
     if (lines_in_filelist < 3) {
-        log_to_screen("Warning - surprisingly short filelist.");
+        log_to_screen(_("Warning - surprisingly short filelist."));
     }
     g_original_noof_lines_in_filelist = lines_in_filelist;
@@ -901 +900 @@
     paranoid_free(command_to_open_fname);
 
-    open_evalcall_form("Loading filelist from disk");
+    open_evalcall_form(_("Loading filelist from disk"));
     for (getline(&fname, &n, pin); !feof(pin); getline(&fname, &n, pin)) {
         if ((fname[strlen(fname) - 1] == 13
@@ -1015 +1014 @@
     assert(outfname != NULL);   // will be zerolength if save_filelist() is called by itself
     if (depth == 0) {
-        log_to_screen("Saving filelist");
+        log_to_screen(_("Saving filelist"));
         if (!(fout = fopen(outfname, "w"))) {
             fatal_error("Cannot openout/save filelist");
         }
         lines_in_filelist = g_original_noof_lines_in_filelist;  /* set by load_filelist() */
-        open_evalcall_form("Saving selection to disk");
+        open_evalcall_form(_("Saving selection to disk"));
     }
     for (node = filelist; node != NULL; node = node->right) {
@@ -1281 +1280 @@
     if (bkpinfo->make_filelist) {
         mvaddstr_and_log_it(g_currentY, 0,
-                            "Making catalog of files to be backed up");
+                            _("Making catalog of files to be backed up"));
     } else {
         mvaddstr_and_log_it(g_currentY, 0,
-                            "Using supplied catalog of files to be backed up");
+                            _("Using supplied catalog of files to be backed up"));
     }
 
@@ -1305 +1304 @@
         log_OS_error("Call to mondo-makefilelist failed");
         *p_res++;
-        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
+        mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
     } else {
-        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     }
     return (res);
@@ -1399 +1398 @@
 #ifndef _XWIN
                 if (!g_text_mode) {
-                    asprintf(&tmp, "Reading %-68s", dir);
+                    asprintf(&tmp, _("Reading %-68s"), dir);
                     newtDrawRootText(0, g_noof_rows - 3, tmp);
                     paranoid_free(tmp);

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

@@ -13 +13 @@
 #include "libmondo-files.h"
 
-#include "lib-common-externs.h"
-
 #include "libmondo-tools-EXT.h"
-#include "libmondo-gui-EXT.h"
+#include "newt-specific-EXT.h"
 #include "libmondo-devices-EXT.h"
 #include "libmondo-fork-EXT.h"
@@ -294 +292 @@
     while (!kernel[0]) {
         if (!ask_me_yes_or_no
-            ("Kernel not found or invalid. Choose another?")) {
+            (_("Kernel not found or invalid. Choose another?"))) {
             return (1);
         }
         if (!popup_and_get_string
-            ("Kernel path",
-             "What is the full path and filename of your kernel, please?",
+            (_("Kernel path"),
+             _("What is the full path and filename of your kernel, please?"),
              kernel, MAX_STR_LEN / 4)) {
             fatal_error
@@ -489 +487 @@
 
     if (!does_file_exist(filename)) {
-        asprintf(&tmp, "Tring to get last line of nonexistent file (%s)",
+        asprintf(&tmp, _("Tring to get last line of nonexistent file (%s)"),
                 filename);
         log_it(tmp);
@@ -884 +882 @@
     if (res) {
         asprintf(&errorstr,
-            "Please install '%s'. I cannot find it on your system.",
+            _("Please install '%s'. I cannot find it on your system."),
             fname);
         log_to_screen(errorstr);
         paranoid_free(errorstr);
         log_to_screen
-            ("There may be an hyperlink at http://www.mondorescue.org which");
-        log_to_screen("will take you to the relevant (missing) package.");
+            (_("There may be an hyperlink at http://www.mondorescue.org which"));
+        log_to_screen(_("will take you to the relevant (missing) package."));
         return (1);
     } else {
@@ -998 +996 @@
 
     asprintf(&tmp, "%s/payload.tgz", g_mondo_home);
+
+    /* i18n */
+    asprintf(&command, CP_BIN " --parents /usr/share/locale/*/LC_MESSAGES/mondo.mo %s",bkpinfo->scratchdir);
+    log_msg(4, "command = %s", command);
+    run_program_and_log_output(command, 1);
+    paranoid_free(command);
+
     if (does_file_exist(tmp)) {
         log_it("Untarring payload %s to scratchdir %s", tmp,
@@ -1271 +1276 @@
     if (scratchLL <= 1) {
         asprintf(&tmp,
-                "Your backup will probably occupy a single %s. Maybe two.",
+                _("Your backup will probably occupy a single %s. Maybe two."),
                 media_descriptor_string(bkpinfo->backup_media_type));
     } else {
-        asprintf(&tmp, "Your backup will occupy approximately %s media.",
+        asprintf(&tmp, _("Your backup will occupy approximately %s media."),
                 number_to_text((int) (scratchLL + 1)));
     }

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

@@ -106 +106 @@
 #include "libmondo-fork.h"
 #include "libmondo-string-EXT.h"
-#include "libmondo-gui-EXT.h"
+#include "newt-specific-EXT.h"
 #include "libmondo-files-EXT.h"
 #include "libmondo-tools-EXT.h"
-#include "lib-common-externs.h"
 
 /*@unused@*/
@@ -159 +158 @@
 }
 
-#define MONDO_POPMSG  "Your PC will not retract the CD tray automatically. Please call mondoarchive with the -m (manual CD tray) flag."
+#define MONDO_POPMSG  _("Your PC will not retract the CD tray automatically. Please call mondoarchive with the -m (manual CD tray) flag.")
 
 /**
@@ -223 +222 @@
 
     log_to_screen
-        ("Please be patient. Do not be alarmed by on-screen inactivity.");
+        (_("Please be patient. Do not be alarmed by on-screen inactivity."));
     log_msg(4, "Calling open_evalcall_form() with what_i_am_doing='%s'",
             what_i_am_doing);
@@ -252 +251 @@
         if (retval) {
             log_msg(2, "Basic call '%s' returned an error.", basic_call);
-            popup_and_OK("Press ENTER to continue.");
+            popup_and_OK(_("Press ENTER to continue."));
             popup_and_OK
-                ("mkisofs and/or cdrecord returned an error. CD was not created");
+                (_("mkisofs and/or cdrecord returned an error. CD was not created"));
         }
     }
@@ -426 +425 @@
     if (!(fin = popen(command, "r"))) {
         log_OS_error("Unable to popen-in command");
-        asprintf(&tmp, "Failed utterly to call '%s'", command);
+        asprintf(&tmp, _("Failed utterly to call '%s'", command));
         log_to_screen(tmp);
         paranoid_free(tmp);
@@ -436 +435 @@
 
     if (!does_file_exist(lockfile)) {
-        log_to_screen("Waiting for external binary to start");
+        log_to_screen(_("Waiting for external binary to start"));
         for (i = 0; i < 60 && !does_file_exist(lockfile); sleep(1), i++) {
             log_msg(3, "Waiting for lockfile %s to exist", lockfile);
@@ -687 +686 @@
         if (pcno <= 5 && last_pcno > 40) {
             close_evalcall_form();
-            open_evalcall_form("Verifying...");
+            open_evalcall_form("_(Verifying..."));
         }
         last_pcno = pcno;
@@ -764 +763 @@
         if (pcno <= 5 && last_pcno >= 40) {
             close_evalcall_form();
-            open_evalcall_form("Verifying...");
+            open_evalcall_form(_("Verifying..."));
         }
         if (counter++ >= 5) {

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

@@ -11 +11 @@
 #include "mondostructures.h"
 #include "libmondo-mountlist.h"
-#include "lib-common-externs.h"
 #include "libmondo-raid-EXT.h"
 #include "libmondo-devices-EXT.h"
 #include "libmondo-tools-EXT.h"
 #include "libmondo-string-EXT.h"
-#include "libmondo-gui-EXT.h"
+#include "newt-specific-EXT.h"
 
 /*@unused@*/
@@ -921 +920 @@
     if (!(fin = fopen(fname, "r"))) {
         log_it("Unable to open mountlist - '%s'", fname);
-        log_to_screen("Cannot open mountlist");
+        log_to_screen(_("Cannot open mountlist"));
         paranoid_free(siz);
         return (1);
@@ -962 +961 @@
             && mountlist->el[items].device[0] != '#') {
             if (items >= ARBITRARY_MAXIMUM) {
-                log_to_screen("Too many lines in mountlist.. ABORTING");
+                log_to_screen(_("Too many lines in mountlist.. ABORTING"));
                 finish(1);
             }

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

@@ -10 +10 @@
 #include "my-stuff.h"
 #include "mondostructures.h"
-#include "libmondo-gui-EXT.h"
+#include "newt-specific-EXT.h"
 #include "libmondo-files-EXT.h"
 #include "libmondo-tools-EXT.h"
 #include "libmondo-string-EXT.h"
-#include "lib-common-externs.h"
 #include "libmondo-raid.h"
 
@@ -885 +884 @@
                     ("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?!?!");
                 popup_and_OK
-                    ("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 :-)");
+                    (_("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 :-)"));
                 return size * sign * 1024 * 1024 * 1024 * 1024 * 1024 *
                     1024 * 1024 * 1024;
@@ -1037 +1036 @@
         // FIXME --- the above line does not allow for spare disks
         log_to_screen
-            ("FIXME - create_raidtab_from_mdstat does not allow for spare disks");
+            (_("FIXME - create_raidtab_from_mdstat does not allow for spare disks"));
     }
     raidlist->entries = i;

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

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

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

@@ -12 +12 @@
 #include "mondostructures.h"
 #include "libmondo-string.h"
-#include "lib-common-externs.h"
 #include "libmondo-files-EXT.h"
-#include "libmondo-gui-EXT.h"
+#include "newt-specific-EXT.h"
 #include "libmondo-tools-EXT.h"
 
@@ -246 +245 @@
             ("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?!?!");
         popup_and_OK
-            ("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 :-)");
+            (_("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 :-)"));
         fatal_error("Integer overflow.");
     } else if (ch != 'm' && ch != 'M') {
@@ -901 +900 @@
         sev = 2;
         asprintf(&reason,
-                 "/var's contents will change regularly, inevitably.");
+                 _("/var's contents will change regularly, inevitably."));
     }
     if (!strncmp(filename, "/home", 5)) {
         sev = 2;
         asprintf(&reason,
-                 "It's in your /home partiton. Therefore, it is important.");
+                 _("It's in your /home partiton. Therefore, it is important."));
     }
     if (!strncmp(filename, "/usr/", 5)) {
         sev = 3;
         asprintf(&reason,
-                 "You may have installed/removed software during the backup.");
+                 _("You may have installed/removed software during the backup."));
     }
     if (!strncmp(filename, "/etc/", 5)) {
         sev = 3;
         asprintf(&reason,
-                 "Do not edit config files while backing up your PC.");
+                 _("Do not edit config files while backing up your PC."));
     }
     if (!strcmp(filename, "/etc/adjtime")
         || !strcmp(filename, "/etc/mtab")) {
         sev = 1;
-        asprintf(&reason, "This file changes all the time. It's OK.");
+        asprintf(&reason, _("This file changes all the time. It's OK."));
     }
     if (!strncmp(filename, "/root/", 6)) {
         sev = 3;
         asprintf(&reason,
-                 "Were you compiling/editing something in /root?");
+                 _("Were you compiling/editing something in /root?"));
     }
     if (!strncmp(filename, "/root/.", 7)) {
         sev = 2;
-        asprintf(&reason, "Temp or 'dot' files changed in /root.");
+        asprintf(&reason, _("Temp or 'dot' files changed in /root."));
     }
     if (!strncmp(filename, "/var/lib/", 9)) {
         sev = 2;
-        asprintf(&reason, "Did you add/remove software during backing?");
+        asprintf(&reason, _("Did you add/remove software during backing?"));
     }
     if (!strncmp(filename, "/var/lib/rpm", 12)) {
         sev = 3;
-        asprintf(&reason, "Did you add/remove software during backing?");
+        asprintf(&reason, _("Did you add/remove software during backing?"));
     }
     if (!strncmp(filename, "/var/lib/slocate", 16)) {
         sev = 1;
         asprintf(&reason,
-                 "The 'update' daemon ran during backup. This does not affect the integrity of your backup.");
+                 _("The 'update' daemon ran during backup. This does not affect the integrity of your backup."));
     }
     if (!strncmp(filename, "/var/log/", 9)
@@ -950 +949 @@
         sev = 1;
         asprintf(&reason,
-                 "Log files change frequently as the computer runs. Fret not.");
+                 _("Log files change frequently as the computer runs. Fret not."));
     }
     if (!strncmp(filename, "/var/spool", 10)) {
         sev = 1;
         asprintf(&reason,
-                 "Background processes or printers were active. This does not affect the integrity of your backup.");
+                 _("Background processes or printers were active. This does not affect the integrity of your backup."));
     }
     if (!strncmp(filename, "/var/spool/mail", 10)) {
         sev = 2;
-        asprintf(&reason, "Mail was sent/received during backup.");
+        asprintf(&reason, _("Mail was sent/received during backup."));
     }
     if (filename[strlen(filename) - 1] == '~') {
         sev = 1;
         asprintf(&reason,
-                 "Backup copy of another file which was modified recently.");
+                 _("Backup copy of another file which was modified recently."));
     }
     if (strstr(filename, "cache")) {
         sev = 1;
         asprintf(&reason,
-                 "Part of a cache of data. Caches change from time to time. Don't worry.");
+                 _("Part of a cache of data. Caches change from time to time. Don't worry."));
     }
     if (!strncmp(filename, "/var/run/", 9)
@@ -984 +983 @@
         sev = 3;
         asprintf(&reason,
-                 "Changed since backup. Consider running a differential backup in a day or two.");
+                 _("Changed since backup. Consider running a differential backup in a day or two."));
     }
 
@@ -1043 +1042 @@
     if (bkpinfo->media_size[g_current_media_number] <= 0) {
         asprintf(&tmp, "%lld", g_tape_posK);
-        asprintf(&outstr, "Volume %d: %s kilobytes archived so far",
+        asprintf(&outstr, _("Volume %d: %s kilobytes archived so far"),
                  g_current_media_number, commarize(tmp));
         paranoid_free(tmp);
+
         return (outstr);
     }
@@ -1054 +1054 @@
             (int) (g_tape_posK / 10 /
                    bkpinfo->media_size[g_current_media_number]);
-        asprintf(&prepstr, "Volume %d: [", g_current_media_number);
+        asprintf(&prepstr, _("Volume %d: ["), g_current_media_number);
     } else {
         percentage =
@@ -1086 +1086 @@
        asprintf(&outstr, "%s%s%s] %3d%% used", prepstr, tmp1, tmp2, percentage);
      */
-    asprintf(&outstr, "%s%s%s] %3d percent used", prepstr, tmp1, tmp2,
+    asprintf(&outstr, _("%s%s%s] %3d percent used"), prepstr, tmp1, tmp2,
              percentage);
     paranoid_free(prepstr);

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

@@ -10 +10 @@
 #include "my-stuff.h"
 #include "mondostructures.h"
-#include "lib-common-externs.h"
 #include "libmondo-tools.h"
-#include "libmondo-gui-EXT.h"
+#include "newt-specific-EXT.h"
 #include "libmondo-files-EXT.h"
 #include "libmondo-fork-EXT.h"
@@ -109 +108 @@
         newtSuspend();
 #endif
-    printf("ASSERTION FAILED: `%s'\n", exp);
-    printf("\tat %s:%d in %s\n\n", file, line, function);
-    printf("(I)gnore, ignore (A)ll, (D)ebug, a(B)ort, or (E)xit? ");
+    printf(_("ASSERTION FAILED: `%s'\n"), exp);
+    printf(_("\tat %s:%d in %s\n\n"), file, line, function);
+    printf(_("(I)gnore, ignore (A)ll, (D)ebug, a(B)ort, or (E)xit? "));
     do {
         is_valid = TRUE;
@@ -138 +137 @@
         case '\n':
             printf
-                ("(I)gnore, ignore (A)ll, (D)ebug, a(B)ort, or (E)xit? ");
+                (_("(I)gnore, ignore (A)ll, (D)ebug, a(B)ort, or (E)xit? "));
             break;
         default:
             is_valid = FALSE;
-            printf("Invalid choice.\n");
+            printf(_("Invalid choice.\n"));
             break;
         }
@@ -840 +839 @@
     if (atol(tmp) < 35000) {
         retval++;
-        log_to_screen("You must have at least 32MB of RAM to use Mondo.");
+        log_to_screen(_("You must have at least 32MB of RAM to use Mondo."));
     }
     if (atol(tmp) < 66000) {
         log_to_screen
-            ("WARNING! You have very little RAM. Please upgrade to 64MB or more.");
+            (_("WARNING! You have very little RAM. Please upgrade to 64MB or more."));
     }
     paranoid_free(tmp);
@@ -872 +871 @@
         ("grep ramdisk /proc/devices", FALSE)) {
         if (!ask_me_yes_or_no
-            ("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?"))
+            (_("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?")))
         {
             //          retval++;
             log_to_screen
-                ("It looks as if your kernel lacks ramdisk and initrd support.");
+                (_("It looks as if your kernel lacks ramdisk and initrd support."));
             log_to_screen
-                ("I'll allow you to proceed but FYI, if I'm right, your kernel is broken.");
+                (_("I'll allow you to proceed but FYI, if I'm right, your kernel is broken."));
         }
     }
@@ -900 +899 @@
         !run_program_and_log_output
         ("mount | grep -w dos | grep -v /dev/fd | grep -v nexdisk", 0)) {
-        log_to_screen("I think you have a Windows 9x partition.");
+        log_to_screen(_("I think you have a Windows 9x partition."));
         retval += whine_if_not_found("parted");
 #ifndef __IA64__
@@ -906 +905 @@
         // retval += 
         if (!find_home_of_exe("ms-sys")) {
-            log_to_screen("Please install ms-sys just in case.");
+            log_to_screen(_("Please install ms-sys just in case."));
         }
 #endif
@@ -916 +915 @@
         } else {
             log_to_screen
-                ("Your system lacks the 'cmp' binary. I'll create a dummy cmp for you.");
+                (_("Your system lacks the 'cmp' binary. I'll create a dummy cmp for you."));
             if (run_program_and_log_output
                 ("cp -f `which true` /usr/bin/cmp", 0)) {
@@ -931 +930 @@
         if (strstr(tmp, "autofs")) {
             log_to_screen
-                ("Your CD-ROM is mounted via autofs. I therefore cannot tell");
+                (_("Your CD-ROM is mounted via autofs. I therefore cannot tell"));
             log_to_screen
-                ("if a CD actually is inserted. If a CD is inserted, please");
-            log_to_screen("eject it. Thank you.");
+                (_("if a CD actually is inserted. If a CD is inserted, please"));
+            log_to_screen(_("eject it. Thank you."));
             log_it
                 ("Ignoring autofs CD-ROM 'mount' since we hope nothing's in it.");
@@ -961 +960 @@
             retval++;
             log_to_screen
-                ("Please find out what happened to /etc/modules.conf");
+                (_("Please find out what happened to /etc/modules.conf"));
         }
     }
@@ -974 +973 @@
 
     if (run_program_and_log_output("mindi -V", 1)) {
-        log_to_screen("Could not ascertain mindi's version number.");
+        log_to_screen(_("Could not ascertain mindi's version number."));
         log_to_screen
-            ("You have not installed Mondo and/or Mindi properly.");
-        log_to_screen("Please uninstall and reinstall them both.");
+            (_("You have not installed Mondo and/or Mindi properly."));
+        log_to_screen(_("Please uninstall and reinstall them both."));
         fatal_error("Please reinstall Mondo and Mindi.");
     }
@@ -983 +982 @@
         ("mindi --makemountlist /tmp/mountlist.txt.test", 5)) {
         log_to_screen
-            ("Mindi --makemountlist /tmp/mountlist.txt.test failed for some reason.");
+            (_("Mindi --makemountlist /tmp/mountlist.txt.test failed for some reason."));
         log_to_screen
-            ("Please run that command by hand and examine /var/log/mindi.log");
+            (_("Please run that command by hand and examine /var/log/mindi.log"));
         log_to_screen
-            ("for more information. Perhaps your /etc/fstab file is insane.");
+            (_("for more information. Perhaps your /etc/fstab file is insane."));
         log_to_screen
-            ("Perhaps Mindi's MakeMountlist() subroutine has a bug. We'll see.");
+            (_("Perhaps Mindi's MakeMountlist() subroutine has a bug. We'll see."));
         retval++;
     }
@@ -996 +995 @@
         && !does_file_exist("/etc/raidtab")) {
         log_to_screen
-            ("You have RAID partitions but no /etc/raidtab - creating one from /proc/mdstat");
+            (_("You have RAID partitions but no /etc/raidtab - creating one from /proc/mdstat"));
         create_raidtab_from_mdstat("/etc/raidtab", "/proc/mdstat");
     }
 
     if (retval) {
-        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
+        mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
     } else {
-        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     }
     return (retval);

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

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

trunk/mondo/mondo/common/libmondo.h

@@ -9 +9 @@
 #include "libmondo-files-EXT.h"
 #include "libmondo-fork-EXT.h"
-#include "libmondo-gui-EXT.h"
+#include "newt-specific-EXT.h"
 #include "libmondo-mountlist-EXT.h"
 #include "libmondo-raid-EXT.h"

trunk/mondo/mondo/common/my-stuff.h

@@ -72 +72 @@
 #endif
 #include <assert.h>
+
+#include "../../config.h"
 
 #if defined(DEBUG) && !__cplusplus
@@ -239 +241 @@
  * Welcome string displayed at the top of the newt interface.
  */
-#define WELCOME_STRING "W E L C O M E   T O   M O N D O   R E S C U E"
+#define WELCOME_STRING _("W E L C O M E   T O   M O N D O   R E S C U E")
 
 /**
@@ -397 +399 @@
 #define DEFAULT_MR_LOGLEVEL 4
 
+#ifdef ENABLE_NLS  
+# include <libintl.h>  
+# undef _  
+# define _(String) dgettext (PACKAGE, String)
+# ifdef gettext_noop  
+#  define N_(String) gettext_noop (String)  
+# else  
+#  define N_(String) (String)  
+# endif  
+#else  
+# define textdomain(String) (String)  
+# define gettext(String) (String)  
+# define dgettext(Domain,Message) (Message)  
+# define dcgettext(Domain,Message,Type) (Message)  
+# define bindtextdomain(Domain,Directory) (Domain)  
+# define _(String) (String)  
+# define N_(String) (String)  
+
+#endif 
+
+
+
 #endif                          /* _MY_STUFF_H_ */

trunk/mondo/mondo/common/newt-specific.c

@@ -25 +25 @@
 #include "libmondo-tools-EXT.h"
 #include "libmondo-fork-EXT.h"
-#include "libmondo-gui-EXT.h"
-#include "lib-common-externs.h"
+#include "newt-specific-EXT.h"
 
 /*@unused@*/
@@ -124 +123 @@
                     tmp[i - 1] = '\0';
                 }
-                if (strstr("yesYES", tmp)) {
+                if (strstr(_("yesYES"), tmp)) {
                     paranoid_free(tmp);
                     return (TRUE);
-                } else if (strstr("NOno", tmp)) {
+                } else if (strstr(_("NOno"), tmp)) {
                     paranoid_free(tmp);
                     return (FALSE);
@@ -133 +132 @@
                     system("sync");
                     printf
-                        ("Please enter either YES or NO (or yes or no, or y or n, or...)\n");
+                        (_("Please enter either YES or NO (or yes or no, or y or n, or...)\n"));
                 }
             }
         } else {
-            return (popup_with_buttons(prompt, "Yes", "No"));
+            return (popup_with_buttons(prompt, _("Yes"), _("No")));
         }
     }
@@ -169 +168 @@
                 tmp[i - 1] = '\0';
             }
-            if (strstr("okOKOkYESyes", tmp)) {
+            if (strstr(_("okOKOkYESyes"), tmp)) {
                 paranoid_free(tmp);
                 return (TRUE);
@@ -177 +176 @@
             }
         } else {
-            return (popup_with_buttons(prompt, " Okay ", "Cancel"));
+            return (popup_with_buttons(prompt, _(" Okay "), _("Cancel")));
         }
     }
@@ -313 +312 @@
             ("gzip -9c "MONDO_LOGFILE" > /tmp/MA.log.gz 2> /dev/null");
         printf
-                ("If you require technical support, please contact the mailing list.\n");
-        printf("See http://www.mondorescue.org for details.\n");
+                (_("If you require technical support, please contact the mailing list.\n"));
+        printf(_("See http://www.mondorescue.org for details.\n"));
         printf
-                ("The list's members can help you, if you attach that file to your e-mail.\n");
-        printf("Log file: %s\n", MONDO_LOGFILE);
+                (_("The list's members can help you, if you attach that file to your e-mail.\n"));
+        printf(_("Log file: %s\n"), MONDO_LOGFILE);
         if (does_file_exist("/tmp/MA.log.gz")) {
             printf
-                ("FYI, I have gzipped the log and saved it to /tmp/MA.log.gz\n");
-        }
-        printf("Mondo has aborted.\n");
+                (_("FYI, I have gzipped the log and saved it to /tmp/MA.log.gz\n"));
+        }
+        printf(_("Mondo has aborted.\n"));
         register_pid(0, "mondo");   // finish() does this too, FYI
         if (!g_main_pid) {
@@ -375 +374 @@
 //  system("clear");
 //  iamhere("Finished calling newtFinished");
-        printf("Execution run ended; result=%d\n", signal);
-        printf("Type 'less %s' to see the output log\n", MONDO_LOGFILE);
+        printf(_("Execution run ended; result=%d\n"), signal);
+        printf(_("Type 'less %s' to see the output log\n"), MONDO_LOGFILE);
         free_libmondo_global_strings();
         exit(signal);
@@ -662 +661 @@
             while (((ch = getchar()) != '\n') && (ch != EOF));
         } else {
-            (void) popup_with_buttons(prompt, " OK ", "");
+            (void) popup_with_buttons(prompt, _(" OK "), "");
         }
     }
@@ -718 +717 @@
 #endif
             );
-        b_1 = newtButton(6, newtTextboxGetNumLines(text) + 4, "  OK  ");
-        b_2 = newtButton(18, newtTextboxGetNumLines(text) + 4, "Cancel");
+        b_1 = newtButton(6, newtTextboxGetNumLines(text) + 4, _("  OK  "));
+        b_2 = newtButton(18, newtTextboxGetNumLines(text) + 4, _("Cancel"));
         //  newtOpenWindow (8, 5, 54, newtTextboxGetNumLines (text) + 9, title);
         newtCenteredWindow(54, newtTextboxGetNumLines(text) + 9, title);
@@ -806 +805 @@
         }
         //  newtOpenWindow (25, 5, 46, newtTextboxGetNumLines (text) + 7, "Alert");
-        newtCenteredWindow(46, newtTextboxGetNumLines(text) + 7, "Alert");
+        newtCenteredWindow(46, newtTextboxGetNumLines(text) + 7, _("Alert"));
         myForm = newtForm(NULL, NULL, 0);
         newtFormAddComponents(myForm, text, b_1, b_2, NULL);
@@ -870 +869 @@
             newtCls();
             newtPushHelpLine
-                ("Welcome to Mondo Rescue, by Hugo Rabson and the Internet. All rights reversed.");
+                (_("Welcome to Mondo Rescue, by Hugo Rabson and the Internet. All rights reversed."));
             /*  newtDrawRootText(28,0,"Welcome to Mondo Rescue"); */
             newtDrawRootText(18, 0, WELCOME_STRING);
@@ -947 +946 @@
             g_isoform_old_progress = percentage;
             asprintf(&timeline_str,
-                     "%2ld:%02ld taken            %2ld:%02ld remaining",
+                     _("%2ld:%02ld taken            %2ld:%02ld remaining"),
                      time_taken / 60, time_taken % 60, time_remaining / 60,
                      time_remaining % 60);
@@ -977 +976 @@
             } else {
                 asprintf(&pcline_str,
-                         " %3d%% done              %3d%% to go",
+                         _(" %3d%% done              %3d%% to go"),
                          percentage, 100 - percentage);
             }
@@ -1120 +1119 @@
 
         if (g_text_mode) {
-            printf("---progress-form---1--- %s\r\n", blurb1);
-            printf("---progress-form---2--- %s\r\n", blurb2);
-            printf("---progress-form---3--- %s\r\n", blurb3);
-            printf("---progress-form---E---\n");
+            printf(_("---progress-form---1--- %s%s"), blurb1, "\r\n");
+            printf(_("---progress-form---2--- %s%s"), blurb2, "\r\n");
+            printf(_("---progress-form---3--- %s%s"), blurb3, "\r\n");
+            printf(_("---progress-form---E---\n"));
 
             j = trunc(percentage / 5);
@@ -1139 +1138 @@
 
             if (percentage > 100) {
-                log_msg(2, "percentage = %d", percentage);
+                log_msg(2, _("percentage = %d"), percentage);
             }
             asprintf(&taskprogress,
-                     "TASK:  [%s%s] %3d%% done; %2ld:%02ld to go", tmp1,
+                     _("TASK:  [%s%s] %3d%% done; %2ld:%02ld to go"), tmp1,
                      tmp2, percentage, time_remaining / 60,
                      time_remaining % 60);
 
-            printf("---progress-form---4--- %s\r\n", taskprogress);
+            printf(_("---progress-form---4--- %s\r\n"), taskprogress);
             paranoid_free(taskprogress);
         } else {
@@ -1211 +1210 @@
         if (g_text_mode) {
             for (backup_type = none; backup_type == none;) {
-                printf("Backup type (");
+                printf(_("Backup type ("));
                 for (i = 0; possible_responses[i]; i++) {
                     printf("%c%s", (i == 0) ? '\0' : ' ',
@@ -1231 +1230 @@
         if (restoring) {
             asprintf(&title_sz,
-                     "Please choose the backup media from which you want to read data.");
-            asprintf(&minimsg_sz, "Read from:");
+                     _("Please choose the backup media from which you want to read data."));
+            asprintf(&minimsg_sz, _("Read from:"));
         } else {
             asprintf(&title_sz,
-                     "Please choose the backup media to which you want to archive data.");
-            asprintf(&minimsg_sz, "Backup to:");
+                     _("Please choose the backup media to which you want to archive data."));
+            asprintf(&minimsg_sz, _("Backup to:"));
         }
         newtPushHelpLine(title_sz);
@@ -1245 +1244 @@
         paranoid_free(minimsg_sz);
 
-        b1 = newtButton(1, 1, "CD-R disks ");
-        b2 = newtButton(17, 1, "CD-RW disks");
-        b3 = newtButton(1, 9, "Tape drive ");
-        b4 = newtButton(17, 5, "CD streamer");
-        b5 = newtButton(1, 5, " DVD disks ");
-        b6 = newtButton(17, 9, " NFS mount ");
-        b7 = newtButton(1, 13, " Hard disk ");
-        b8 = newtButton(17, 13, "    Exit   ");
+        b1 = newtButton(1, 1, _("CD-R disks "));
+        b2 = newtButton(17, 1, _("CD-RW disks"));
+        b3 = newtButton(1, 9, _("Tape drive "));
+        b4 = newtButton(17, 5, _("CD streamer"));
+        b5 = newtButton(1, 5, _(" DVD disks "));
+        b6 = newtButton(17, 9, _(" NFS mount "));
+        b7 = newtButton(1, 13, _(" Hard disk "));
+        b8 = newtButton(17, 13, _("    Exit   "));
         myForm = newtForm(NULL, NULL, 0);
         newtFormAddComponents(myForm, b1, b5, b3, b7, b2, b4, b6, b8,
@@ -1305 +1304 @@
         newtDrawRootText(18, 0, WELCOME_STRING);
         newtPushHelpLine
-            ("   Please specify the level of compression that you want.");
+            (_("   Please specify the level of compression that you want."));
         //  newtOpenWindow (23, 3, 34, 13, "How much compression?");
-        newtCenteredWindow(34, 13, "How much compression?");
-        b1 = newtButton(4, 1, "Maximum");
-        b2 = newtButton(18, 1, "Average");
-        b3 = newtButton(4, 5, "Minumum");
-        b4 = newtButton(18, 5, " None  ");
-        b5 = newtButton(4, 9, "         Exit        ");
+        newtCenteredWindow(34, 13, _("How much compression?"));
+        b1 = newtButton(4, 1, _("Maximum"));
+        b2 = newtButton(18, 1, _("Average"));
+        b3 = newtButton(4, 5, _("Minimum"));
+        b4 = newtButton(18, 5, _(" None  "));
+        b5 = newtButton(4, 9, _("         Exit        "));
         myForm = newtForm(NULL, NULL, 0);
         newtFormAddComponents(myForm, b1, b3, b2, b4, b5, NULL);
@@ -1396 +1395 @@
         paranoid_fclose(fin);
         if (filelist->entries >= ARBITRARY_MAXIMUM) {
-            log_to_screen("Arbitrary limits suck, man!");
+            log_to_screen(_("Arbitrary limits suck, man!"));
             paranoid_free(tmp);
             return (1);
@@ -1527 +1526 @@
         }
         asprintf(&differ_sz,
-                 "  %d files differ. Hit 'Select' to pick a file. Hit 'Close' to quit the list.",
+                 _("  %d files differ. Hit 'Select' to pick a file. Hit 'Close' to quit the list."),
                  i);
         newtPushHelpLine(differ_sz);
         paranoid_free(differ_sz);
 
-        bClose = newtCompactButton(10, 15, " Close  ");
-        bSelect = newtCompactButton(30, 15, " Select ");
-        asprintf(&tmp, "%-10s               %-20s", "Priority",
-                 "Filename");
+        bClose = newtCompactButton(10, 15, _(" Close  "));
+        bSelect = newtCompactButton(30, 15, _(" Select "));
+        asprintf(&tmp, "%-10s               %-20s", _("Priority"),
+                 _("Filename"));
         headerMsg = newtLabel(2, 1, tmp);
         paranoid_free(tmp);
 
-        newtOpenWindow(5, 4, 70, 16, "Non-matching files");
+        newtOpenWindow(5, 4, 70, 16, _("Non-matching files"));
         myForm = newtForm(NULL, NULL, 0);
         newtFormAddComponents(myForm, headerMsg, fileListbox, bClose,
@@ -1553 +1552 @@
                      i++);
                 if (i == filelist->entries && filelist->entries > 0) {
-                    log_to_screen("I don't know what that button does!");
+                    log_to_screen(_("I don't know what that button does!"));
                 } else {
                     currline = i;

trunk/mondo/mondo/mondoarchive/main.c

@@ -138 +138 @@
     char *say_at_end = NULL;
 
+#ifdef ENABLE_NLS
+    setlocale(LC_ALL, "");
+    (void) textdomain("mondo");
+#endif
 /* Make sure I'm root; abort if not */
     if (getuid() != 0) {
-        fprintf(stderr, "Please run as root.\r\n");
+        fprintf(stderr, _("Please run as root.\n"));
         exit(127);
     }
@@ -148 +152 @@
         && (!strcmp(argv[argc - 1], "-v") || !strcmp(argv[argc - 1], "-V")
             || !strcmp(argv[argc - 1], "--version"))) {
-        printf("mondoarchive v%s\nSee man page for help\n", PACKAGE_VERSION);
+        printf(_("mondoarchive v%s\nSee man page for help\n"), PACKAGE_VERSION);
         exit(0);
     }
@@ -157 +161 @@
 
     diffs = 0;
-    printf("Initializing...\n");
+    printf(_("Initializing...\n"));
     if (!(bkpinfo = malloc(sizeof(struct s_bkpinfo)))) {
         fatal_error("Cannot malloc bkpinfo");
@@ -197 +201 @@
         setup_newt_stuff();
         if (!strstr(argv[2], "filelist")) {
-            printf("Sorry - filelist goes first\n");
+            printf(_("Sorry - filelist goes first\n"));
             finish(1);
         } else {
@@ -226 +230 @@
         setup_newt_stuff();
         if (!strstr(argv[2], "filelist")) {
-            printf("Sorry - filelist goes first\n");
+            printf(_("Sorry - filelist goes first\n"));
             finish(1);
         } else {
@@ -245 +249 @@
         setup_newt_stuff();
         if ((tmp = find_cdrw_device()) == NULL) {
-            printf("Failed to find CDR-RW drive\n");
-        } else {
-            printf("CD-RW is at %s\n", tmp);
+            printf(_("Failed to find CDR-RW drive\n"));
+        } else {
+            printf(_("CD-RW is at %s\n"), tmp);
         }
         paranoid_free(tmp);
 
         if ((tmp = find_cdrom_device(FALSE)) == NULL) {
-            printf("Failed to find CD-ROM drive\n");
-        } else {
-            printf("CD-ROM is at %s\n", tmp);
+            printf(_("Failed to find CD-ROM drive\n"));
+        } else {
+            printf(_("CD-ROM is at %s\n"), tmp);
         }
         paranoid_free(tmp);
@@ -265 +269 @@
         setup_newt_stuff();
         if ((tmp = find_dvd_device()) == NULL) {
-            printf("Failed to find DVD drive\n");
-        } else {
-            printf("DVD is at %s\n", tmp);
+            printf(_("Failed to find DVD drive\n"));
+        } else {
+            printf(_("DVD is at %s\n"), tmp);
         }
         paranoid_free(tmp);
@@ -279 +283 @@
     if (argc > 2 && !strcmp(argv[1], "test-dev")) {
         if (is_dev_an_NTFS_dev(argv[2])) {
-            printf("%s is indeed an NTFS dev\n", argv[2]);
-        } else {
-            printf("%s is _not_ an NTFS dev\n", argv[2]);
+            printf(_("%s is indeed an NTFS dev\n"), argv[2]);
+        } else {
+            printf(_("%s is _not_ an NTFS dev\n"), argv[2]);
         }
         finish(0);
@@ -304 +308 @@
         if (res) {
             printf
-                ("Errors were detected in the command line you supplied.\n");
-            printf("Please review the log file - " MONDO_LOGFILE "\n");
+                (_("Errors were detected in the command line you supplied.\n"));
+            printf(_("Please review the log file - %s \n"),MONDO_LOGFILE);
             log_msg(1, "Mondoarchive will now exit.");
             finish(1);
@@ -319 +323 @@
 
     log_to_screen
-        ("BusyBox's sources are available from http://www.busybox.net");
+        (_("BusyBox's sources are available from http://www.busybox.net"));
 
     /* If we're meant to backup then backup */
@@ -327 +331 @@
         if (res) {
             asprintf(&say_at_end,
-                   "Data archived. Please check the logs, just as a precaution. ");
-        } else {
-            asprintf(&say_at_end, "Data archived OK. ");
+                   _("Data archived. Please check the logs, just as a precaution. "));
+        } else {
+            asprintf(&say_at_end, _("Data archived OK. "));
         }
     }
@@ -337 +341 @@
         res = verify_data(bkpinfo);
         if (res < 0) {
-            asprintf(&say_at_end, "%d difference%c found.", -res,
+            asprintf(&say_at_end, _("%d difference%c found."), -res,
                     (-res != 1) ? 's' : ' ');
             res = 0;
@@ -353 +357 @@
     if (retval == 0) {
         mvaddstr_and_log_it(g_currentY++, 0,
-                            "Backup and/or verify ran to completion. Everything appears to be fine.");
+                            _("Backup and/or verify ran to completion. Everything appears to be fine."));
     } else {
         mvaddstr_and_log_it(g_currentY++, 0,
-                            "Backup and/or verify ran to completion. However, errors did occur.");
+                            _("Backup and/or verify ran to completion. However, errors did occur."));
     }
 
     if (does_file_exist("/root/images/mindi/mondorescue.iso")) {
         log_to_screen
-            ("/root/images/mindi/mondorescue.iso, a boot/utility CD, is available if you want it.");
+            (_("/root/images/mindi/mondorescue.iso, a boot/utility CD, is available if you want it."));
     }
 
@@ -368 +372 @@
         if (g_text_mode) {
             log_to_screen
-                ("Type 'less /tmp/changed.files' to see which files don't match the archives");
+                (_("Type 'less /tmp/changed.files' to see which files don't match the archives"));
         } else {
             log_msg(1,
-                    "Type 'less /tmp/changed.files' to see which files don't match the archives");
+                    _("Type 'less /tmp/changed.files' to see which files don't match the archives"));
             log_msg(2, "Calling popup_changelist_from_file()");
             popup_changelist_from_file("/tmp/changed.files");
@@ -395 +399 @@
     system("rm -Rf /tmp.mondo.* /mondo.scratch.*");
     if (retval == 0) {
-        printf("Mondoarchive ran OK.\n");
+        printf(_("Mondoarchive ran OK.\n"));
     } else {
-        printf("Errors occurred during backup. Please check logfile.\n");
+        printf(_("Errors occurred during backup. Please check logfile.\n"));
     }
     distro_specific_kludges_at_end_of_mondoarchive();
@@ -414 +418 @@
     if (!g_text_mode) {
         popup_and_OK
-            ("Mondo Archive has finished its run. Please press ENTER to return to the shell prompt.");
-        log_to_screen("See %s for details of backup run.", MONDO_LOGFILE);
+            (_("Mondo Archive has finished its run. Please press ENTER to return to the shell prompt."));
+        log_to_screen(_("See %s for details of backup run."), MONDO_LOGFILE);
         finish(retval);
     } else {
-        printf("See %s for details of backup run.\n", MONDO_LOGFILE);
+        printf(_("See %s for details of backup run.\n"), MONDO_LOGFILE);
         exit(retval);
     }

trunk/mondo/mondo/mondoarchive/mondo-cli.c

@@ -236 +236 @@
     if (i == 0) {
         retval++;
-        log_to_screen("You must specify the media type\n");
+        log_to_screen(_("You must specify the media type\n"));
     }
     if (i > 1) {
         retval++;
-        log_to_screen("Please specify only one media type\n");
+        log_to_screen(_("Please specify only one media type\n"));
     }
     if (flag_set['K']) {
@@ -250 +250 @@
     if (flag_set['L'] && flag_set['0']) {
         retval++;
-        log_to_screen("You cannot have 'no compression' _and_ LZOP.\n");
+        log_to_screen(_("You cannot have 'no compression' _and_ LZOP.\n"));
     }
     bkpinfo->backup_data = flag_set['O'];
     bkpinfo->verify_data = flag_set['V'];
     if (flag_set['I'] && !bkpinfo->backup_data) {
-        log_to_screen("-I switch is ignored if just verifying");
+        log_to_screen(_("-I switch is ignored if just verifying"));
     }
     if (flag_set['E'] && !bkpinfo->backup_data) {
-        log_to_screen("-E switch is ignored if just verifying");
+        log_to_screen(_("-E switch is ignored if just verifying"));
     }
 
@@ -286 +286 @@
         if (flag_set['f'] || flag_set['l']) {
             log_to_screen
-                ("You don't need to specify bootloader or bootdevice");
+                (_("You don't need to specify bootloader or bootdevice"));
         }
     }
@@ -331 +331 @@
         if (bkpinfo->include_paths[0] == '-') {
             retval++;
-            log_to_screen("Please supply a sensible value with '-I'\n");
+            log_to_screen(_("Please supply a sensible value with '-I'\n"));
         }
     }
@@ -346 +346 @@
             retval++;
             log_to_screen
-                ("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. :-)");
+                (_("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. :-)"));
         }
         bkpinfo->make_filelist = FALSE;
@@ -364 +364 @@
         if (g_kernel_version >= 2.6 && !strstr(flag_val['d'], "/dev/")) {
             log_to_screen
-                ("Linus says 2.6 has a broken ide-scsi module. Proceed at your own risk...");
+                (_("Linus says 2.6 has a broken ide-scsi module. Proceed at your own risk..."));
         }
 
@@ -380 +380 @@
             if (!flag_set['L']) {
                 log_to_screen
-                    ("You must use -L with -C. Therefore I am setting it for you.");
+                    (_("You must use -L with -C. Therefore I am setting it for you."));
                 flag_set['L'] = 1;
                 flag_val['L'] = NULL;
@@ -411 +411 @@
 
         asprintf(&tmp,
-                "You didn't specify a tape streamer device. I'm assuming %s",
+                _("You didn't specify a tape streamer device. I'm assuming %s"),
                 flag_val['d']);
         log_to_screen(tmp);
@@ -427 +427 @@
             if ((flag_val['d'] = find_dvd_device()) != NULL) {
                 flag_set['d'] = TRUE;
-                log_to_screen("I guess DVD drive is at %s", flag_val['d']);
+                log_to_screen(_("I guess DVD drive is at %s"), flag_val['d']);
             }
         }
@@ -445 +445 @@
             asprintf(&flag_val['s'], "%dm", DEFAULT_DVD_DISK_SIZE); // 4.7 salesman's GB = 4.482 real GB = 4582 MB
             log_to_screen
-                ("You did not specify a size (-s) for DVD. I'm guessing %s.",
+                (_("You did not specify a size (-s) for DVD. I'm guessing %s."),
                  flag_val['s']);
             flag_set['s'] = 1;
@@ -499 +499 @@
         if (strlen(bkpinfo->isodir) < 3) {
             retval++;
-            log_to_screen("NFS share is not mounted. Please mount it.\n");
+            log_to_screen(_("NFS share is not mounted. Please mount it.\n"));
         }
         log_msg(3, "mount = %s", bkpinfo->nfs_mount);
@@ -627 +627 @@
                 retval++;
                 asprintf(&tmp,
-                    "You specified kernel '%s', which does not exist\n",
+                    _("You specified kernel '%s', which does not exist\n"),
                     bkpinfo->kernel_path);
                 log_to_screen(tmp);
@@ -669 +669 @@
             paranoid_free(tmp);
             asprintf(&tmp,
-                    "Are you sure directory '%s' exists in remote dir '%s'?\nIf so, do you have rights to write to it?\n",
+                    _("Are you sure directory '%s' exists in remote dir '%s'?\nIf so, do you have rights to write to it?\n"),
                     bkpinfo->nfs_remote_dir, bkpinfo->nfs_mount);
             log_to_screen(tmp);
@@ -680 +680 @@
         if (g_kernel_version >= 2.6) {
             if (popup_and_get_string
-                ("Device", "Please specify the device",
+                (_("Device"), _("Please specify the device"),
                  bkpinfo->media_device, MAX_STR_LEN / 4)) {
                 retval++;
-                log_to_screen("User opted to cancel.");
+                log_to_screen(_("User opted to cancel."));
             }
         } else if ((tmp = find_cdrw_device()) ==  NULL) {
@@ -690 +690 @@
             retval++;
             log_to_screen
-                ("Tried and failed to find CD-R[W] drive automatically.\n");
+                (_("Tried and failed to find CD-R[W] drive automatically.\n"));
         } else {
             flag_set['d'] = TRUE;
@@ -699 +699 @@
     if (!flag_set['d'] && !flag_set['n'] && !flag_set['C']) {
         retval++;
-        log_to_screen("Please specify the backup device/directory.\n");
+        log_to_screen(_("Please specify the backup device/directory.\n"));
         fatal_error
             ("You didn't use -d to specify the backup device/directory.");
@@ -722 +722 @@
             retval++;
             log_to_screen
-                ("Please specify a tempdir which I can write to. :)");
+                (_("Please specify a tempdir which I can write to. :)"));
             fatal_error("I cannot write to the tempdir you specified.");
         }
@@ -732 +732 @@
             retval++;
             log_to_screen
-                ("Please don't specify a SAMBA or VFAT or NFS tmpdir.");
+                (_("Please don't specify a SAMBA or VFAT or NFS tmpdir."));
             fatal_error("I cannot write to the tempdir you specified.");
         }
@@ -782 +782 @@
         i = which_boot_loader(tmp);
         log_msg(3, "boot loader is %c, residing at %s", i, tmp);
-        printf("boot loader is %c, residing at %s\n", i, tmp);
+        printf(_("boot loader is %c, residing at %s\n"), i, tmp);
         finish(0);
     }
@@ -796 +796 @@
             retval++;
             log_to_screen
-                ("Please install LZOP. You can't use '-L' until you do.\n");
+                (_("Please install LZOP. You can't use '-L' until you do.\n"));
         }
     }
@@ -806 +806 @@
         bkpinfo->make_cd_use_lilo = TRUE;
         log_to_screen
-            ("Forcing you to use LILO. SuSE 9.0 (64-bit) has a broken mkfs.vfat binary.");
+            (_("Forcing you to use LILO. SuSE 9.0 (64-bit) has a broken mkfs.vfat binary."));
     }
     if (flag_set['o']) {
@@ -816 +816 @@
             bkpinfo->make_cd_use_lilo = TRUE;
             log_to_screen
-                ("Your kernel appears not to support vfat filesystems. I am therefore");
-            log_to_screen
-                ("using LILO instead of SYSLINUX as the CD/floppy's boot loader.");
+                (_("Your kernel appears not to support vfat filesystems. I am therefore"));
+            log_to_screen
+                (_("using LILO instead of SYSLINUX as the CD/floppy's boot loader."));
         }
         if (run_program_and_log_output("which mkfs.vfat", FALSE)) {
@@ -824 +824 @@
 #ifdef __IA32__
             log_to_screen
-                ("Your filesystem is missing 'mkfs.vfat', so I cannot use SYSLINUX as");
-            log_to_screen
-                ("your boot loader. I shall therefore use LILO instead.");
+                (_("Your filesystem is missing 'mkfs.vfat', so I cannot use SYSLINUX as"));
+            log_to_screen
+                (_("your boot loader. I shall therefore use LILO instead."));
 #endif
 #ifdef __IA64__
             log_to_screen
-                ("Your filesystem is missing 'mkfs.vfat', so I cannot prepare the EFI");
-            log_to_screen("environment correctly. Please install it.");
+                (_("Your filesystem is missing 'mkfs.vfat', so I cannot prepare the EFI"));
+            log_to_screen(_("environment correctly. Please install it."));
             fatal_error("Aborting");
 #endif
@@ -849 +849 @@
     if (i == 0) {
         retval++;
-        log_to_screen("Specify backup (-O), verify (-V) or both (-OV).\n");
+        log_to_screen(_("Specify backup (-O), verify (-V) or both (-OV).\n"));
     }
 
@@ -901 +901 @@
             if (flag_set[optopt]) {
                 bad_switches = TRUE;
-                asprintf(&tmp, "Switch -%c previously defined as %s\n", opt,
+                asprintf(&tmp, _("Switch -%c previously defined as %s\n"), opt,
                         flag_val[i]);
                 log_to_screen(tmp);
@@ -912 +912 @@
                         optarg[--len] = '\0';
                         log_to_screen
-                            ("Warning - param '%s' should not have trailing slash!",
+                            (_("Warning - param '%s' should not have trailing slash!"),
                              optarg);
                     }
@@ -919 +919 @@
                             && flag_val[opt][0] != '/') {
                             asprintf(&tmp,
-                                    "-%c flag --- must be absolute path --- '%s' isn't absolute",
+                                    _("-%c flag --- must be absolute path --- '%s' isn't absolute"),
                                     opt, flag_val[opt]);
                             log_to_screen(tmp);
@@ -933 +933 @@
     for (i = optind; i < argc; i++) {
         bad_switches = TRUE;
-        asprintf(&tmp, "Invalid arg -- %s\n", argv[i]);
+        asprintf(&tmp, _("Invalid arg -- %s\n"), argv[i]);
         log_to_screen(tmp);
         paranoid_free(tmp);
@@ -964 +964 @@
     switch (sig) {
     case SIGINT:
-        asprintf(&tmp, "SIGINT signal received from OS");
-        asprintf(&tmp2, "You interrupted me :-)");
+        asprintf(&tmp, _("SIGINT signal received from OS"));
+        asprintf(&tmp2, _("You interrupted me :-)"));
         break;
     case SIGKILL:
-        asprintf(&tmp, "SIGKILL signal received from OS");
+        asprintf(&tmp, _("SIGKILL signal received from OS"));
         asprintf(&tmp2,
-               "I seriously have no clue how this signal even got to me. Something's wrong with your system.");
+               _("I seriously have no clue how this signal even got to me. Something's wrong with your system."));
         break;
     case SIGTERM:
-        asprintf(&tmp, "SIGTERM signal received from OS");
-        asprintf(&tmp2, "Got terminate signal");
+        asprintf(&tmp, _("SIGTERM signal received from OS"));
+        asprintf(&tmp2, _("Got terminate signal"));
         break;
     case SIGHUP:
-        asprintf(&tmp, "SIGHUP signal received from OS");
-        asprintf(&tmp2, "Hangup on line");
+        asprintf(&tmp, _("SIGHUP signal received from OS"));
+        asprintf(&tmp2, _("Hangup on line"));
         break;
     case SIGSEGV:
-        asprintf(&tmp, "SIGSEGV signal received from OS");
+        asprintf(&tmp, _("SIGSEGV signal received from OS"));
         asprintf(&tmp2,
-               "Internal programming error. Please send a backtrace as well as your log.");
+               _("Internal programming error. Please send a backtrace as well as your log."));
         break;
     case SIGPIPE:
-        asprintf(&tmp, "SIGPIPE signal received from OS");
-        asprintf(&tmp2, "Pipe was broken");
+        asprintf(&tmp, _("SIGPIPE signal received from OS"));
+        asprintf(&tmp2, _("Pipe was broken"));
         break;
     case SIGABRT:
-        asprintf(&tmp, "SIGABRT signal received from OS");
+        asprintf(&tmp, _("SIGABRT signal received from OS"));
         asprintf(&tmp2,
-                "Abort - probably failed assertion. I'm sleeping for a few seconds so you can read the message.");
+                _("Abort - probably failed assertion. I'm sleeping for a few seconds so you can read the message."));
         break;
     default:
-        asprintf(&tmp, "(Unknown)");
-        asprintf(&tmp2, "(Unknown)");
+        asprintf(&tmp, _("(Unknown)"));
+        asprintf(&tmp2, _("(Unknown)"));
     }
 

trunk/mondo/mondo/mondorestore/mondo-prep.c

@@ -239 +239 @@
 // zero & reboot
             log_to_screen
-                ("I am sorry for the inconvenience but I must ask you to reboot.");
+                (_("I am sorry for the inconvenience but I must ask you to reboot."));
             log_to_screen
-                ("I need to reset the Master Boot Record; in order to be");
+                (_("I need to reset the Master Boot Record; in order to be"));
             log_to_screen
-                ("sure the kernel notices, I must reboot after doing it.");
+                (_("sure the kernel notices, I must reboot after doing it."));
             log_to_screen("Please hit 'Enter' to reboot.");
             for (lino = 0; lino < drivelist->entries; lino++) {
@@ -269 +269 @@
             system("sync");
             popup_and_OK
-                ("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.");
+                (_("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."));
             system("reboot");
         }
@@ -615 +615 @@
 #ifdef __FreeBSD__
     log_to_screen
-        ("I don't know how to extrapolate the mountlist on FreeBSD. Sorry.");
+        (_("I don't know how to extrapolate the mountlist on FreeBSD. Sorry."));
     return (1);
 #endif
@@ -624 +624 @@
             if (!does_file_exist("/etc/raidtab")) {
                 log_to_screen
-                    ("Cannot find /etc/raidtab - cannot extrapolate the fdisk entries");
+                    (_("Cannot find /etc/raidtab - cannot extrapolate the fdisk entries"));
                 finish(1);
             }
@@ -749 +749 @@
     }
     if (is_this_device_mounted(device)) {
-        sprintf(tmp, "%s is mounted - cannot format it       ", device);
+        sprintf(tmp, _("%s is mounted - cannot format it       "), device);
         log_to_screen(tmp);
         paranoid_free(program);
@@ -761 +761 @@
             if (!does_file_exist("/tmp/raidconf.txt")) {
                 log_to_screen
-                    ("/tmp/raidconf.txt does not exist. I therefore cannot start Vinum.");
+                    (_("/tmp/raidconf.txt does not exist. I therefore cannot start Vinum."));
             } else {
                 int res;
@@ -769 +769 @@
                 if (res) {
                     log_to_screen
-                        ("`vinum create /tmp/raidconf.txt' returned errors. Please fix them and re-run mondorestore.");
+                        (_("`vinum create /tmp/raidconf.txt' returned errors. Please fix them and re-run mondorestore."));
                     finish(1);
                 }
@@ -780 +780 @@
             char line[MAX_STR_LEN];
             sprintf(tmp,
-                    "Initializing Vinum device %s (this may take a *long* time)",
+                    _("Initializing Vinum device %s (this may take a *long* time)"),
                     device);
             log_to_screen(tmp);
@@ -823 +823 @@
         }
 #else
-        sprintf(tmp, "Initializing RAID device %s", device);
+        sprintf(tmp, _("Initializing RAID device %s"), device);
         log_to_screen(tmp);
 
 // Shouldn't be necessary.
-        log_to_screen("Stopping %s", device);
+        log_to_screen(_("Stopping %s"), device);
         stop_raid_device(device);
         system("sync");
@@ -900 +900 @@
     retval += res;
     if (retval) {
-        strcat(tmp, "...failed");
+        strcat(tmp, _("...failed"));
     } else {
-        strcat(tmp, "...OK");
+        strcat(tmp, _("...OK"));
     }
 
@@ -951 +951 @@
             (interactively) ? "true" : "false");
     log_it(tmp);
-    mvaddstr_and_log_it(g_currentY, 0, "Formatting partitions     ");
-    open_progress_form("Formatting partitions",
-                       "I am now formatting your hard disk partitions.",
-                       "This may take up to five minutes.", "",
+    mvaddstr_and_log_it(g_currentY, 0, _("Formatting partitions     "));
+    open_progress_form(_("Formatting partitions"),
+                       _("I am now formatting your hard disk partitions."),
+                       _("This may take up to five minutes."), "",
                        mountlist->entries + 1);
 
@@ -1001 +1001 @@
     if (does_file_exist("/tmp/i-want-my-lvm")) {
         wait_until_software_raids_are_prepped("/proc/mdstat", 10);
-        log_to_screen("Configuring LVM");
+        log_to_screen(_("Configuring LVM"));
         if (!g_text_mode) {
             newtSuspend();
@@ -1092 +1092 @@
 
     if (retval) {
-        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
+        mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
         log_to_screen
-            ("Errors occurred during the formatting of your hard drives.");
+            (_("Errors occurred during the formatting of your hard drives."));
     } else {
-        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     }
 
@@ -1107 +1107 @@
 //123456789 123456789 123456789 123456789 123456789 123456789 123456789 123456789 
             log_to_screen
-                ("Partition table locked up %d times. At least one 'mkfs' (format) command",
+                (_("Partition table locked up %d times. At least one 'mkfs' (format) command"),
                  g_partition_table_locked_up);
             log_to_screen
-                ("failed. I think these two events are related. Sometimes, fdisk's ioctl() call");
+                (_("failed. I think these two events are related. Sometimes, fdisk's ioctl() call"));
             log_to_screen
-                ("to refresh its copy of the partition table causes the kernel to lock the ");
+                (_("to refresh its copy of the partition table causes the kernel to lock the "));
             log_to_screen
-                ("partition table. I believe this has just happened.");
+                (_("partition table. I believe this has just happened."));
             if (ask_me_yes_or_no
-                ("Please choose 'yes' to reboot and try again; or 'no' to ignore this warning and continue."))
+                (_("Please choose 'yes' to reboot and try again; or 'no' to ignore this warning and continue.")))
             {
                 system("sync");
@@ -1125 +1125 @@
         } else {
             log_to_screen
-                ("Partition table locked up %d time%c. However, disk formatting succeeded.",
+                (_("Partition table locked up %d time%c. However, disk formatting succeeded."),
                  g_partition_table_locked_up,
                  (g_partition_table_locked_up == 1) ? '.' : 's');
@@ -1528 +1528 @@
     pout_to_fdisk = popen(tmp, "w");
     if (!pout_to_fdisk) {
-        log_to_screen("Cannot call parted2fdisk to configure %s", drivename);
+        log_to_screen(_("Cannot call parted2fdisk to configure %s"), drivename);
         paranoid_free(device_str);
         paranoid_free(format);
@@ -1564 +1564 @@
                     if (system(command)) {
                         log_to_screen
-                            ("Warning! Unable to make the drive bootable.");
+                            (_("Warning! Unable to make the drive bootable."));
                     }
                     paranoid_free(device_str);
@@ -1614 +1614 @@
             if (!file) {
                 sprintf(tmp,
-                        "Warning - unable to open %s for wiping it's partition table",
+                        _("Warning - unable to open %s for wiping it's partition table"),
                         drivename);
                 log_to_screen(tmp);
@@ -1621 +1621 @@
             for (i = 0; i < 512; i++) {
                 if (!write(file, "\0", 1)) {
-                    sprintf(tmp, "Warning - unable to write to %s",
+                    sprintf(tmp, _("Warning - unable to write to %s"),
                             drivename);
                     log_to_screen(tmp);
@@ -1655 +1655 @@
         if (current_devno == 5 && previous_devno == 4) {
             log_to_screen
-                ("You must leave at least one partition spare as the Extended partition.");
+                (_("You must leave at least one partition spare as the Extended partition."));
             paranoid_free(device_str);
             paranoid_free(format);
@@ -1672 +1672 @@
             if (system(tmp)) {
                 log_to_screen
-                    ("Warning! Unable to make the slice bootable.");
+                    (_("Warning! Unable to make the slice bootable."));
             }
         }
@@ -1700 +1700 @@
             g_partition_table_locked_up++;
             log_to_screen
-                ("A flaw in the Linux kernel has locked the partition table.");
+                (_("A flaw in the Linux kernel has locked the partition table."));
         }
     }
@@ -1773 +1773 @@
 
     if (is_this_device_mounted(partition_name)) {
-        sprintf(tmp, "%s is mounted, and should not be partitioned",
+        sprintf(tmp, _("%s is mounted, and should not be partitioned"),
                 partition_name);
         log_to_screen(tmp);
@@ -1810 +1810 @@
                 if (prev_partno >= 4) {
                     log_to_screen
-                        ("You need to leave at least one partition free, for 'extended/logical'");
+                        (_("You need to leave at least one partition free, for 'extended/logical'"));
                     paranoid_free(program);
                     paranoid_free(partition_name);
@@ -2001 +2001 @@
 */
 
-    open_progress_form("Partitioning devices",
-                       "I am now going to partition all your drives.",
-                       "This should not take more than five minutes.", "",
+    open_progress_form(_("Partitioning devices"),
+                       _("I am now going to partition all your drives."),
+                       _("This should not take more than five minutes."), "",
                        mountlist->entries);
 
@@ -2015 +2015 @@
     close_progress_form();
     if (retval) {
-        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
+        mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
         log_to_screen
-            ("Errors occurred during the partitioning of your hard drives.");
+            (_("Errors occurred during the partitioning of your hard drives."));
     } else {
-        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
         paranoid_system("rm -f /tmp/fdisk*.log 2> /dev/null");
     }
@@ -2531 +2531 @@
         return;
     }
-    sprintf(tmp, "Expanding entries to suit drive %s (%ld MB)", drive_name,
+    sprintf(tmp, _("Expanding entries to suit drive %s (%ld MB)"), drive_name,
             current_size_of_drive);
     log_to_screen(tmp);
@@ -2550 +2550 @@
 
     if (original_size_of_drive <= 0) {
-        sprintf(tmp, "Cannot resize %s's entries. Drive not found.",
+        sprintf(tmp, _("Cannot resize %s's entries. Drive not found."),
                 drive_name);
         log_to_screen(tmp);
@@ -2580 +2580 @@
             newsizL = (long) new_size;
         }
-        sprintf(tmp, "Changing %s from %lld KB to %ld KB",
+        sprintf(tmp, _("Changing %s from %lld KB to %ld KB"),
                 drivemntlist->el[partno]->device,
                 drivemntlist->el[partno]->size, newsizL);
@@ -2587 +2587 @@
     }
     final_size = get_phys_size_of_drive(drive_name);
-    sprintf(tmp, "final_size = %ld MB", final_size);
+    sprintf(tmp, _("final_size = %ld MB"), final_size);
     log_to_screen(tmp);
     paranoid_free(tmp);
@@ -2628 +2628 @@
                                                         device);
     }
-    log_to_screen("Mountlist adjusted to suit current hard drive(s)");
+    log_to_screen(_("Mountlist adjusted to suit current hard drive(s)"));
     paranoid_free(drivelist);
 }

trunk/mondo/mondo/mondorestore/mondo-restore.c

@@ -507 +507 @@
  * The message to display if we detect that the user is using a Compaq Proliant.
  */
-#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."
+#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.")
 
 
@@ -537 +537 @@
     if (!does_file_exist(g_mountlist_fname)) {
         log_to_screen(g_mountlist_fname);
-        log_to_screen("does not exist");
+        log_to_screen(_("does not exist"));
         return (1);
     }
@@ -545 +545 @@
     if (retval) {
         log_to_screen
-            ("Warning - load_raidtab_into_raidlist returned an error");
+            (_("Warning - load_raidtab_into_raidlist returned an error"));
     }
     res = edit_mountlist(g_mountlist_fname, mountlist, raidlist);
@@ -555 +555 @@
     save_raidlist_to_raidtab(raidlist, RAIDTAB_FNAME);
 
-    log_to_screen("I have finished editing the mountlist for you.");
+    log_to_screen(_("I have finished editing the mountlist for you."));
 
     return (retval);
@@ -604 +604 @@
     popup_and_OK(COMPAQ_PROLIANTS_SUCK);
     if (ask_me_yes_or_no
-        ("Would you like to reboot and use your Compaq CD to prep your hard drive?"))
+        (_("Would you like to reboot and use your Compaq CD to prep your hard drive?")))
     {
         fatal_error
-            ("Aborting. Please reboot and prep your hard drive with your Compaq CD.");
+            (_("Aborting. Please reboot and prep your hard drive with your Compaq CD."));
     }
 }
@@ -644 +644 @@
         interactively_obtain_media_parameters_from_user(bkpinfo, FALSE);
     } else {
-        popup_and_OK("No restoring or comparing will take place today.");
+        popup_and_OK(_("No restoring or comparing will take place today."));
         if (is_this_device_mounted("/mnt/cdrom")) {
             run_program_and_log_output("umount /mnt/cdrom", FALSE);
@@ -776 +776 @@
     if (g_text_mode) {
         if (!ask_me_yes_or_no
-            ("Interactive Mode + textonly = experimental! Proceed anyway?"))
+            (_("Interactive Mode + textonly = experimental! Proceed anyway?")))
         {
             fatal_error("Wise move.");
@@ -817 +817 @@
         save_mountlist_to_disk(mountlist, g_mountlist_fname);
         save_raidlist_to_raidtab(raidlist, RAIDTAB_FNAME);
-        mvaddstr_and_log_it(1, 30, "Restoring Interactively");
+        mvaddstr_and_log_it(1, 30, _("Restoring Interactively"));
         if (bkpinfo->differential) {
-            log_to_screen("Because this is a differential backup, disk");
+            log_to_screen(_("Because this is a differential backup, disk"));
             log_to_screen
-                (" partitioning and formatting will not take place.");
+                (_(" partitioning and formatting will not take place."));
             done = TRUE;
         } else {
             if (ask_me_yes_or_no
-                ("Do you want to erase and partition your hard drives?")) {
+                (_("Do you want to erase and partition your hard drives?"))) {
                 if (partition_table_contains_Compaq_diagnostic_partition
                     (mountlist)) {
@@ -836 +836 @@
                     if (ptn_errs) {
                         log_to_screen
-                            ("Warning. Errors occurred during disk partitioning.");
+                            (_("Warning. Errors occurred during disk partitioning."));
                     }
 
@@ -842 +842 @@
                     if (!fmt_errs) {
                         log_to_screen
-                            ("Errors during disk partitioning were handled OK.");
+                            (_("Errors during disk partitioning were handled OK."));
                         log_to_screen
-                            ("Partitions were formatted OK despite those errors.");
+                            (_("Partitions were formatted OK despite those errors."));
                         ptn_errs = 0;
                     }
@@ -854 +854 @@
             } else {
                 mvaddstr_and_log_it(g_currentY++, 0,
-                                    "User opted not to partition the devices");
+                                    _("User opted not to partition the devices"));
                 if (ask_me_yes_or_no
-                    ("Do you want to format your hard drives?")) {
+                    (_("Do you want to format your hard drives?"))) {
                     fmt_errs = format_everything(mountlist, TRUE);
                     if (!fmt_errs) {
@@ -869 +869 @@
                 mvaddstr_and_log_it(g_currentY++,
                                     0,
-                                    "Errors occurred. Please repartition and format drives manually.");
+                                    _("Errors occurred. Please repartition and format drives manually."));
                 done = FALSE;
             }
@@ -875 +875 @@
                 mvaddstr_and_log_it(g_currentY++,
                                     0,
-                                    "Errors occurred during partitioning. Formatting, however, went OK.");
+                                    _("Errors occurred during partitioning. Formatting, however, went OK."));
                 done = TRUE;
             }
             if (!done) {
-                if (!ask_me_yes_or_no("Re-edit the mountlist?")) {
+                if (!ask_me_yes_or_no(_("Re-edit the mountlist?"))) {
                     retval++;
                     goto end_of_func;
@@ -895 +895 @@
     /* restore */
     if ((restore_all =
-         ask_me_yes_or_no("Do you want me to restore all of your data?")))
+         ask_me_yes_or_no(_("Do you want me to restore all of your data?"))))
     {
         log_msg(1, "Restoring all data");
@@ -902 +902 @@
         if ((restore_all =
              ask_me_yes_or_no
-             ("Do you want me to restore _some_ of your data?"))) {
+             (_("Do you want me to restore _some_ of your data?")))) {
         strcpy(old_restpath, bkpinfo->restore_path);
         for (done = FALSE; !done;) {
@@ -915 +915 @@
 // (NB: %s is where your filesystem is mounted now, by default)", MNT_RESTORING);
                 if (popup_and_get_string
-                    ("Restore path", "Restore files to where?", tmp,
+                    (_("Restore path"), _("Restore files to where?"), tmp,
                      MAX_STR_LEN / 4)) {
                     if (!strcmp(tmp, "/")) {
-                        if (!ask_me_yes_or_no("Are you sure?")) {
+                        if (!ask_me_yes_or_no(_("Are you sure?"))) {
                             goto gotos_suck;
                         }
@@ -932 +932 @@
                 }
                 if (!ask_me_yes_or_no
-                    ("Restore another subset of your backup?")) {
+                    (_("Restore another subset of your backup?"))) {
                     done = TRUE;
                 }
@@ -943 +943 @@
         mvaddstr_and_log_it(g_currentY++,
                             0,
-                            "User opted not to restore any data.                                  ");
+                            _("User opted not to restore any data.                                  "));
     }
     if (retval) {
         mvaddstr_and_log_it(g_currentY++,
                             0,
-                            "Errors occurred during the restore phase.            ");
-    }
-
-    if (ask_me_yes_or_no("Initialize the boot loader?")) {
+                            _("Errors occurred during the restore phase.            "));
+    }
+
+    if (ask_me_yes_or_no(_("Initialize the boot loader?"))) {
         run_boot_loader(TRUE);
     } else {
         mvaddstr_and_log_it(g_currentY++,
                             0,
-                            "User opted not to initialize the boot loader.");
+                            _("User opted not to initialize the boot loader."));
     }
 
@@ -965 +965 @@
     /*  if (restore_some || restore_all || */
     if (ask_me_yes_or_no
-        ("Label your ext2 and ext3 partitions if necessary?")) {
+        (_("Label your ext2 and ext3 partitions if necessary?"))) {
         mvaddstr_and_log_it(g_currentY, 0,
-                            "Using e2label to label your ext2,3 partitions");
+                            _("Using e2label to label your ext2,3 partitions"));
         if (does_file_exist("/tmp/fstab.new")) {
             strcpy(fstab_fname, "/tmp/fstab.new");
@@ -980 +980 @@
         if (res) {
             log_to_screen
-                ("label-partitions-as-necessary returned an error");
-            mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
+                (_("label-partitions-as-necessary returned an error"));
+            mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
         } else {
             mvaddstr_and_log_it(g_currentY++, 74, "Done.");
@@ -992 +992 @@
         mvaddstr_and_log_it(g_currentY++,
                             0,
-                            "Warning - errors occurred during the restore phase.");
+                            _("Warning - errors occurred during the restore phase."));
     }
   end_of_func:
@@ -1044 +1044 @@
             retval += compare_mode(bkpinfo, mountlist, raidlist);
         } else {
-            log_to_screen("OK, I shan't restore/compare any files.");
+            log_to_screen(_("OK, I shan't restore/compare any files."));
         }
     }
@@ -1054 +1054 @@
     if (system("umount /tmp/isodir 2> /dev/null")) {
         log_to_screen
-            ("WARNING - unable to unmount device where the ISO files are stored.");
+            (_("WARNING - unable to unmount device where the ISO files are stored."));
     }
 //    }
@@ -1115 +1115 @@
     if (!evaluate_mountlist(mountlist, tmpA, tmpB, tmpC)) {
         sprintf(tmp,
-                "Mountlist analyzed. Result: \"%s %s %s\" Switch to Interactive Mode?",
+                _("Mountlist analyzed. Result: \"%s %s %s\" Switch to Interactive Mode?"),
                 tmpA, tmpB, tmpC);
         if (ask_me_yes_or_no(tmp)) {
@@ -1125 +1125 @@
     }
     save_mountlist_to_disk(mountlist, g_mountlist_fname);
-    mvaddstr_and_log_it(1, 30, "Restoring Automatically");
+    mvaddstr_and_log_it(1, 30, _("Restoring Automatically"));
     if (bkpinfo->differential) {
-        log_to_screen("Because this is a differential backup, disk");
-        log_to_screen("partitioning and formatting will not take place.");
+        log_to_screen(_("Because this is a differential backup, disk"));
+        log_to_screen(_("partitioning and formatting will not take place."));
         res = 0;
     } else {
@@ -1154 +1154 @@
                 if (res) {
                     log_to_screen
-                        ("Warning. Errors occurred during partitioning.");
+                        (_("Warning. Errors occurred during partitioning."));
                     res = 0;
                 }
@@ -1160 +1160 @@
             retval += res;
             if (!res) {
-                log_to_screen("Preparing to format your disk(s)");
+                log_to_screen(_("Preparing to format your disk(s)"));
                 sleep(1);
                 system("sync");
-                log_to_screen("Please wait. This may take a few minutes.");
+                log_to_screen(_("Please wait. This may take a few minutes."));
                 res += format_everything(mountlist, FALSE);
             }
@@ -1173 +1173 @@
         mvaddstr_and_log_it(g_currentY++,
                             0,
-                            "Failed to partition and/or format your hard drives.");
-
-        if (ask_me_yes_or_no("Try in interactive mode instead?")) {
+                            _("Failed to partition and/or format your hard drives."));
+
+        if (ask_me_yes_or_no(_("Try in interactive mode instead?"))) {
             retval = interactive_mode(bkpinfo, mountlist, raidlist);
             goto after_the_nuke;
         } else
             if (!ask_me_yes_or_no
-                ("Would you like to try to proceed anyway?")) {
+                (_("Would you like to try to proceed anyway?"))) {
             return (retval);
         }
@@ -1188 +1188 @@
         unmount_all_devices(mountlist);
         log_to_screen
-            ("Unable to mount all partitions. Sorry, I cannot proceed.");
+            (_("Unable to mount all partitions. Sorry, I cannot proceed."));
         return (retval);
     }
@@ -1204 +1204 @@
     mvaddstr_and_log_it(g_currentY,
                         0,
-                        "Using e2label to label your ext2,3 partitions");
+                        _("Using e2label to label your ext2,3 partitions"));
 
     sprintf(tmp, "label-partitions-as-necessary %s < /tmp/fstab",
@@ -1210 +1210 @@
     res = run_program_and_log_output(tmp, TRUE);
     if (res) {
-        log_to_screen("label-partitions-as-necessary returned an error");
-        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
+        log_to_screen(_("label-partitions-as-necessary returned an error"));
+        mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
     } else {
-        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     }
     retval += res;
@@ -1219 +1219 @@
   after_the_nuke:
     if (retval) {
-        log_to_screen("Errors occurred during the nuke phase.");
+        log_to_screen(_("Errors occurred during the nuke phase."));
     } else if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "RESTORE"))    // Bruno's thing
     {
         log_to_screen
-            ("PC was restored successfully. Thank you for using Mondo Rescue.");
+            (_("PC was restored successfully. Thank you for using Mondo Rescue."));
         log_to_screen
-            ("Please visit our website at http://www.mondorescue.org for more information.");
+            (_("Please visit our website at http://www.mondorescue.org for more information."));
     } else {
-        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.");
+        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."));
         if (strstr(call_program_and_get_last_line_of_output("cat /proc/cmdline"), "restore") == NULL) {
             popup_and_OK(tmp);
         }
         log_to_screen
-            ("Mondo has restored your system. Please remove the backup media and reboot.");
+            (_("Mondo has restored your system. Please remove the backup media and reboot."));
         log_to_screen
-            ("Please visit our website at http://www.mondorescue.org for more information.");
+            (_("Please visit our website at http://www.mondorescue.org for more information."));
     }
     g_I_have_just_nuked = TRUE;
@@ -1283 +1283 @@
     if (!g_restoring_live_from_cd) {
         popup_and_OK
-            ("Please insert tape/CD/boot floppy, then hit 'OK' to continue.");
+            (_("Please insert tape/CD/boot floppy, then hit 'OK' to continue."));
         sleep(1);
     }
@@ -1296 +1296 @@
     log_msg(2, "bkpinfo->isodir = %s", bkpinfo->isodir);
 
-    open_evalcall_form("Thinking...");
+    open_evalcall_form(_("Thinking..."));
 
     get_cfg_file_from_archive_or_bust(bkpinfo);
@@ -1309 +1309 @@
         save_filelist(filelist, "/tmp/selected-files.txt");
         strcpy(old_restpath, bkpinfo->restore_path);
-        if (popup_and_get_string("Restore path",
-                                 "Restore files to where? )",
+        if (popup_and_get_string(_("Restore path"),
+                                 _("Restore files to where? )"),
                                  bkpinfo->restore_path, MAX_STR_LEN / 4)) {
             iamhere("Restoring everything");
@@ -1406 +1406 @@
 
     if (!(fin = fopen(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""), "r"))) {
-        log_to_screen("Cannot even open bigfile's info file");
+        log_to_screen(_("Cannot even open bigfile's info file"));
         return (1);
     }
@@ -1519 +1519 @@
     log_msg(3, "file_to_openout = %s", file_to_openout);
     if (!(fout = fopen(file_to_openout, "w"))) {
-        log_to_screen("Cannot openout outfile_fname - hard disk full?");
+        log_to_screen(_("Cannot openout outfile_fname - hard disk full?"));
         return (1);
     }
@@ -1542 +1542 @@
                     g_current_media_number, sliceno);
             log_msg(2, tmp);
-            sprintf(tmp, "Restoring from %s #%d",
+            sprintf(tmp, _("Restoring from %s #%d"),
                     media_descriptor_string(bkpinfo->backup_media_type),
                     g_current_media_number);
             log_to_screen(tmp);
             insist_on_this_cd_number(bkpinfo, g_current_media_number);
-            log_to_screen("Continuing to restore.");
+            log_to_screen(_("Continuing to restore."));
         } else {
             strcpy(tmp,
@@ -1576 +1576 @@
                     strcpy(suffix, "");
                 } else {
-                    log_to_screen("OK, that's pretty fsck0red...");
+                    log_to_screen(_("OK, that's pretty fsck0red..."));
                     return (1);
                 }
@@ -2034 +2034 @@
             if (run_program_and_log_output(tmp, FALSE)) {
                 log_to_screen
-                    ("(compare_a_tarball) Compression program not found - oh no!");
+                    (_("(compare_a_tarball) Compression program not found - oh no!"));
                 paranoid_MR_finish(1);
             }
@@ -2092 +2092 @@
             if (res) {
                 log_to_screen
-                    ("Errors occurred while setting extended attributes");
+                    (_("Errors occurred while setting extended attributes"));
             } else {
                 log_msg(1, "I set xattr OK");
@@ -2103 +2103 @@
             if (res) {
                 log_to_screen
-                    ("Errors occurred while setting access control lists");
+                    (_("Errors occurred while setting access control lists"));
             } else {
                 log_msg(1, "I set ACL OK");
@@ -2120 +2120 @@
     if (does_file_exist("/PAUSE")) {
         popup_and_OK
-            ("Press ENTER to go on. Delete /PAUSE to stop these pauses.");
+            (_("Press ENTER to go on. Delete /PAUSE to stop these pauses."));
     }
     unlink(filelist_subset_fname);
@@ -2317 +2317 @@
 
     if (does_file_exist("/PAUSE") && current_tarball_number >= 50) {
-        log_to_screen("Paused after set %ld", current_tarball_number);
-        popup_and_OK("Pausing. Press ENTER to continue.");
+        log_to_screen(_("Paused after set %ld"), current_tarball_number);
+        popup_and_OK(_("Pausing. Press ENTER to continue."));
     }
 
@@ -2381 +2381 @@
     read_cfg_var(g_mondo_cfg_file, "total-slices", tmp);
     total_slices = atol(tmp);
-    sprintf(tmp, "Reassembling large files      ");
+    sprintf(tmp, _("Reassembling large files      "));
     mvaddstr_and_log_it(g_currentY, 0, tmp);
     if (length_of_file(BIGGIELIST) < 6) {
@@ -2397 +2397 @@
     log_msg(2, tmp);
 
-    open_progress_form("Reassembling large files",
-                       "I am now reassembling all the large files.",
-                       "Please wait. This may take some time.",
+    open_progress_form(_("Reassembling large files"),
+                       _("I am now reassembling all the large files."),
+                       _("Please wait. This may take some time."),
                        "", total_slices);
     for (bigfileno = 0, finished = FALSE; !finished;) {
@@ -2420 +2420 @@
                 insist_on_this_cd_number(bkpinfo,
                                          ++g_current_media_number);
-                sprintf(tmp, "Restoring from %s #%d",
+                sprintf(tmp, _("Restoring from %s #%d"),
                         media_descriptor_string(bkpinfo->
                                                 backup_media_type),
@@ -2434 +2434 @@
         } else {
             just_changed_cds = FALSE;
-            sprintf(tmp, "Restoring big file %ld", bigfileno + 1);
+            sprintf(tmp, _("Restoring big file %ld"), bigfileno + 1);
             update_progress_form(tmp);
             res =
@@ -2463 +2463 @@
     if (does_file_exist("/PAUSE")) {
         popup_and_OK
-            ("Press ENTER to go on. Delete /PAUSE to stop these pauses.");
+            (_("Press ENTER to go on. Delete /PAUSE to stop these pauses."));
     }
     close_progress_form();
     if (retval) {
-        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
+        mvaddstr_and_log_it(g_currentY++, 74, _("Errors."));
     } else {
-        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     }
     paranoid_free(xattr_fname);
@@ -2517 +2517 @@
     assert(bkpinfo != NULL);
 
-    mvaddstr_and_log_it(g_currentY, 0, "Restoring from archives");
+    mvaddstr_and_log_it(g_currentY, 0, _("Restoring from archives"));
     log_msg(2,
             "Insisting on 1st CD, so that I can have a look at LAST-FILELIST-NUMBER");
@@ -2527 +2527 @@
     read_cfg_var(g_mondo_cfg_file, "last-filelist-number", tmp);
     max_val = atol(tmp) + 1;
-    sprintf(progress_str, "Restoring from %s #%d",
+    sprintf(progress_str, _("Restoring from %s #%d"),
             media_descriptor_string(bkpinfo->backup_media_type),
             g_current_media_number);
     log_to_screen(progress_str);
-    open_progress_form("Restoring from archives",
-                       "Restoring data from the archives.",
-                       "Please wait. This may take some time.",
+    open_progress_form(_("Restoring from archives"),
+                       _("Restoring data from the archives."),
+                       _("Please wait. This may take some time."),
                        progress_str, max_val);
     for (;;) {
@@ -2559 +2559 @@
             if (current_tarball_number == 0) {
                 log_to_screen
-                    ("No tarballs. Strange. Maybe you only backed up freakin' big files?");
+                    (_("No tarballs. Strange. Maybe you only backed up freakin' big files?"));
                 return (0);
             }
@@ -2569 +2569 @@
             }
             g_current_media_number++;
-            sprintf(progress_str, "Restoring from %s #%d",
+            sprintf(progress_str, _("Restoring from %s #%d"),
                     media_descriptor_string(bkpinfo->backup_media_type),
                     g_current_media_number);
             log_to_screen(progress_str);
         } else {
-            sprintf(progress_str, "Restoring from fileset #%ld on %s #%d",
+            sprintf(progress_str, _("Restoring from fileset #%ld on %s #%d"),
                     current_tarball_number,
                     media_descriptor_string(bkpinfo->backup_media_type),
@@ -2586 +2586 @@
                                               filelist);
             }
-            sprintf(tmp, "%s #%d, fileset #%ld - restore ",
+            sprintf(tmp, _("%s #%d, fileset #%ld - restore "),
                     media_descriptor_string(bkpinfo->backup_media_type),
                     g_current_media_number, current_tarball_number);
             if (res) {
-                strcat(tmp, "reported errors");
+                strcat(tmp, _("reported errors"));
             } else if (attempts > 1) {
-                strcat(tmp, "succeeded");
+                strcat(tmp, _("succeeded"));
             } else {
-                strcat(tmp, "succeeded");
+                strcat(tmp, _("succeeded"));
             }
             if (attempts > 1) {
-                sprintf(tmp + strlen(tmp), " (%d attempts) - review logs",
+                sprintf(tmp + strlen(tmp), _(" (%d attempts) - review logs"),
                         attempts);
             }
@@ -2612 +2612 @@
     close_progress_form();
     if (retval) {
-        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
+        mvaddstr_and_log_it(g_currentY++, 74, _("Errors."));
     } else {
-        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     }
     paranoid_free(tmp);
@@ -2697 +2697 @@
             noof_biggiefiles);
     log_msg(2, tmp);
-    open_progress_form("Reassembling large files",
-                       "I am now reassembling all the large files.",
-                       "Please wait. This may take some time.",
+    open_progress_form(_("Reassembling large files"),
+                       _("I am now reassembling all the large files."),
+                       _("Please wait. This may take some time."),
                        "", total_slices);
 
@@ -2719 +2719 @@
             p++;
         }
-        sprintf(tmp, "Restoring big file %ld (%lld K)",
+        sprintf(tmp, _("Restoring big file %ld (%lld K)"),
                 current_bigfile_number + 1, biggie_size / 1024);
         update_progress_form(tmp);
@@ -2770 +2770 @@
     if (does_file_exist("/PAUSE")) {
         popup_and_OK
-            ("Press ENTER to go on. Delete /PAUSE to stop these pauses.");
+            (_("Press ENTER to go on. Delete /PAUSE to stop these pauses."));
     }
 
     close_progress_form();
     if (retval) {
-        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
+        mvaddstr_and_log_it(g_currentY++, 74, _("Errors."));
     } else {
-        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     }
     paranoid_free(biggies_whose_EXATs_we_should_set);
@@ -2833 +2833 @@
     malloc_string(xattr_fname);
     malloc_string(acl_fname);
-    mvaddstr_and_log_it(g_currentY, 0, "Restoring from archives");
+    mvaddstr_and_log_it(g_currentY, 0, _("Restoring from archives"));
     read_cfg_var(g_mondo_cfg_file, "last-filelist-number", tmp);
     max_val = atol(tmp) + 1;
@@ -2841 +2841 @@
     run_program_and_log_output("pwd", 5);
 
-    sprintf(progress_str, "Restoring from media #%d",
+    sprintf(progress_str, _("Restoring from media #%d"),
             g_current_media_number);
     log_to_screen(progress_str);
-    open_progress_form("Restoring from archives",
-                       "Restoring data from the archives.",
-                       "Please wait. This may take some time.",
+    open_progress_form(_("Restoring from archives"),
+                       _("Restoring data from the archives."),
+                       _("Please wait. This may take some time."),
                        progress_str, max_val);
 
@@ -2880 +2880 @@
         }
         sprintf(tmp,
-                "Restoring from fileset #%ld (name=%s, size=%ld K)",
+                _("Restoring from fileset #%ld (name=%s, size=%ld K)"),
                 current_afioball_number, tmp_fname, (long) tmp_size >> 10);
         res =
@@ -2889 +2889 @@
         retval += res;
         if (res) {
-            sprintf(tmp, "Fileset %ld - errors occurred",
+            sprintf(tmp, _("Fileset %ld - errors occurred"),
                     current_afioball_number);
             log_to_screen(tmp);
@@ -2901 +2901 @@
         current_afioball_number++;
         g_current_progress++;
-        sprintf(progress_str, "Restoring from fileset #%ld on %s #%d",
+        sprintf(progress_str, _("Restoring from fileset #%ld on %s #%d"),
                 current_afioball_number,
                 media_descriptor_string(bkpinfo->backup_media_type),
@@ -2913 +2913 @@
     close_progress_form();
     if (retval) {
-        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
+        mvaddstr_and_log_it(g_currentY++, 74, _("Errors."));
     } else {
-        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     }
     paranoid_free(tmp);
@@ -2966 +2966 @@
     if (!find_home_of_exe("petris") && !g_text_mode) {
         newtDrawRootText(0, g_noof_rows - 2,
-                         "Press ALT-<left cursor> twice to play Petris :-) ");
+                         _("Press ALT-<left cursor> twice to play Petris :-) "));
         newtRefresh();
     }
-    mvaddstr_and_log_it(g_currentY, 0, "Preparing to read your archives");
+    mvaddstr_and_log_it(g_currentY, 0, _("Preparing to read your archives"));
     if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
         mount_cdrom(bkpinfo);
         mvaddstr_and_log_it(g_currentY++, 0,
-                            "Restoring OS and data from streaming media");
+                            _("Restoring OS and data from streaming media"));
         if (bkpinfo->backup_media_type == cdstream) {
             openin_cdstream(bkpinfo);
@@ -2990 +2990 @@
     } else {
         mvaddstr_and_log_it(g_currentY++, 0,
-                            "Restoring OS and data from CD       ");
+                            _("Restoring OS and data from CD       "));
         mount_cdrom(bkpinfo);
         resA = restore_all_tarballs_from_CD(bkpinfo, filelist);
@@ -2997 +2997 @@
     chdir(cwd);
     if (resA + resB) {
-        log_to_screen("Errors occurred while data was being restored.");
+        log_to_screen(_("Errors occurred while data was being restored."));
     }
     if (length_of_file("/etc/raidtab") > 0) {
@@ -3108 +3108 @@
         retval++;
         log_to_screen
-            ("Error(s) occurred while processing filelist and wildcard");
+            (_("Error(s) occurred while processing filelist and wildcard"));
     }
     iamhere("FIXME");
@@ -3203 +3203 @@
    *                                                                        *
    **************************************************************************/
+
+#ifdef ENABLE_NLS
+    setlocale(LC_ALL, "");
+    (void) textdomain("mondo");
+#endif
+
     if (getuid() != 0) {
-        fprintf(stderr, "Please run as root.\r\n");
+        fprintf(stderr, _("Please run as root.\n"));
         exit(127);
     }
@@ -3349 +3355 @@
         strcpy(bkpinfo->restore_path, "/tmp/TESTING");
         bkpinfo->backup_media_type = dvd;
-        open_progress_form("Reassembling /dev/hda1",
-                           "Shark is a bit of a silly person.",
-                           "Please wait. This may take some time.",
+        open_progress_form(_("Reassembling /dev/hda1"),
+                           _("Shark is a bit of a silly person."),
+                           _("Please wait. This may take some time."),
                            "", 1999);
         system("rm -Rf /tmp/*pih*");
@@ -3427 +3433 @@
         retval = run_grub(FALSE, "/dev/hda");
         if (retval) {
-            log_to_screen("Failed to write Master Boot Record");
+            log_to_screen(_("Failed to write Master Boot Record"));
         }
         paranoid_MR_finish(0);
@@ -3438 +3444 @@
         if (argc != 1) {
             popup_and_OK
-                ("Live mode doesn't support command-line parameters yet.");
+                (_("Live mode doesn't support command-line parameters yet."));
             paranoid_MR_finish(1);
 //    return(1);
@@ -3470 +3476 @@
         log_msg(2, "FYI, MOUNTLIST_FNAME = %s ", g_mountlist_fname);
         if (argc == 3 && strcmp(argv[1], "--monitas-memorex") == 0) {
-            log_to_screen("Uh, that hasn't been implemented yet.");
+            log_to_screen(_("Uh, that hasn't been implemented yet."));
             paranoid_MR_finish(1);
         }
@@ -3499 +3505 @@
         if (retval) {
             log_to_screen
-                ("Warning - load_raidtab_into_raidlist returned an error");
+                (_("Warning - load_raidtab_into_raidlist returned an error"));
         }
 
@@ -3553 +3559 @@
             }
             if (retval) {
-                log_to_screen("Failed to write Master Boot Record");
+                log_to_screen(_("Failed to write Master Boot Record"));
             }
         } else if (argc == 2 && strcmp(argv[1], "--isonuke") == 0) {
@@ -3559 +3565 @@
             retval = iso_mode(bkpinfo, mountlist, raidlist, TRUE);
         } else if (argc != 1) {
-            log_to_screen("Invalid paremeters");
+            log_to_screen(_("Invalid paremeters"));
             paranoid_MR_finish(1);
         } else {
@@ -3571 +3577 @@
         if (does_file_exist("/tmp/changed.files")) {
             log_to_screen
-                ("See /tmp/changed.files for list of files that have changed.");
+                (_("See /tmp/changed.files for list of files that have changed."));
         }
         mvaddstr_and_log_it(g_currentY++,
                             0,
-                            "Run complete. Errors were reported. Please review the logfile.");
+                            _("Run complete. Errors were reported. Please review the logfile."));
     } else {
         if (IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
             mvaddstr_and_log_it(g_currentY++,
                                 0,
-                                "Run complete. Please remove floppy/CD/media and reboot.");
+                                _("Run complete. Please remove floppy/CD/media and reboot."));
         } else {
             run_program_and_log_output("sync", FALSE);
@@ -3601 +3607 @@
             mvaddstr_and_log_it(g_currentY++,
                                 0,
-                                "Run complete. Please remove media and reboot.");
+                                _("Run complete. Please remove media and reboot."));
         }
     }
@@ -3611 +3617 @@
             if (mount_all_devices(mountlist, TRUE)) {
                 log_to_screen
-                    ("Unable to re-mount partitions for post-nuke stuff");
+                    (_("Unable to re-mount partitions for post-nuke stuff"));
             } else {
                 log_msg(1, "Re-mounted partitions for post-nuke stuff");
@@ -3644 +3650 @@
     run_program_and_log_output(tmp, FALSE);
     log_to_screen
-        ("Restore log copied to /tmp/mondo-restore.log on your hard disk");
+        (_("Restore log copied to /tmp/mondo-restore.log on your hard disk"));
     sprintf(tmp,
-            "Mondo-restore is exiting (retval=%d)                                      ",
+            _("Mondo-restore is exiting (retval=%d)                                      "),
             retval);
     log_to_screen(tmp);

trunk/mondo/mondo/mondorestore/mondo-rstr-compare.c

@@ -137 +137 @@
     if (!(fin = fopen(slice_fname(bigfileno, 0, ARCHIVES_PATH, ""), "r"))) {
         sprintf(tmp_ptr,
-                "Cannot open bigfile %ld (%s)'s info file",
+                _("Cannot open bigfile %ld (%s)'s info file"),
                 bigfileno + 1, bigfile_fname_ptr);
         log_to_screen(tmp_ptr);
@@ -151 +151 @@
     log_msg(2, "biggiestruct.checksum = %s", biggiestruct.checksum);
 
-    sprintf(tmp_ptr, "Comparing %s", bigfile_fname_ptr);
+    sprintf(tmp_ptr, _("Comparing %s"), bigfile_fname_ptr);
 
     if (!g_text_mode) {
@@ -255 +255 @@
     mvaddstr_and_log_it(g_currentY, 0,
                         "Comparing large files                                                  ");
-    open_progress_form("Comparing large files",
-                       "I am now comparing the large files",
-                       "against the filesystem. Please wait.", "",
+    open_progress_form(_("Comparing large files"),
+                       _("I am now comparing the large files"),
+                       _("against the filesystem. Please wait."), "",
                        noof_biggiefiles);
     for (bigfileno = 0; bigfileno < noof_biggiefiles; bigfileno++) {
@@ -434 +434 @@
 
     max_val = atol(tmp);
-    sprintf(progress_str, "Comparing with %s #%d ",
+    sprintf(progress_str, _("Comparing with %s #%d "),
             media_descriptor_string(bkpinfo->backup_media_type),
             g_current_media_number);
 
-    open_progress_form("Comparing files",
-                       "Comparing tarballs against filesystem.",
-                       "Please wait. This may take some time.",
+    open_progress_form(_("Comparing files"),
+                       _("Comparing tarballs against filesystem."),
+                       _("Please wait. This may take some time."),
                        progress_str, max_val);
 
@@ -477 +477 @@
             log_msg(2, "OK, I think it's time for another CD...");
             g_current_media_number++;
-            sprintf(progress_str, "Comparing with %s #%d ",
+            sprintf(progress_str, _("Comparing with %s #%d "),
                     media_descriptor_string(bkpinfo->backup_media_type),
                     g_current_media_number);
@@ -543 +543 @@
     noof_changed_files = count_lines_in_file("/tmp/changed.txt");
     if (noof_changed_files) {
-        sprintf(tmp, "%ld files do not match the backup            ",
+        sprintf(tmp, _("%ld files do not match the backup            "),
                 noof_changed_files);
         //      mvaddstr_and_log_it( g_currentY++, 0, tmp );
@@ -550 +550 @@
         paranoid_system(command);
     } else {
-        sprintf(tmp, "All files match the backup                     ");
+        sprintf(tmp, _("All files match the backup                     "));
         mvaddstr_and_log_it(g_currentY++, 0, tmp);
         log_to_screen(tmp);
@@ -600 +600 @@
     while (get_cfg_file_from_archive(bkpinfo)) {
         if (!ask_me_yes_or_no
-            ("Failed to find config file/archives. Choose another source?"))
+            (_("Failed to find config file/archives. Choose another source?")))
         {
             fatal_error("Unable to find config file/archives. Aborting.");
@@ -641 +641 @@
                                 "...but they were logfiles and temporary files. Your archives are fine.");
             log_to_screen
-                ("The differences were logfiles and temporary files. Your archives are fine.");
+                (_("The differences were logfiles and temporary files. Your archives are fine."));
         } else {
             q = count_lines_in_file("/tmp/changed.files");
-            sprintf(tmp, "%ld significant difference%s found.", q,
+            sprintf(tmp, _("%ld significant difference%s found."), q,
                     (q != 1) ? "s" : "");
             mvaddstr_and_log_it(g_currentY++, 0, tmp);
@@ -650 +650 @@
 
             strcpy(tmp,
-                   "Type 'less /tmp/changed.files' for a list of non-matching files");
+                   _("Type 'less /tmp/changed.files' for a list of non-matching files"));
             mvaddstr_and_log_it(g_currentY++, 0, tmp);
             log_to_screen(tmp);
@@ -660 +660 @@
     } else {
         log_to_screen
-            ("No significant differences were found. Your backup is perfect.");
+            (_("No significant differences were found. Your backup is perfect."));
     }
     kill_petris();

trunk/mondo/mondo/mondorestore/mondo-rstr-newt.c

@@ -82 +82 @@
 
     newtPushHelpLine
-        ("   Add one of the following unallocated RAID partitions to this RAID device.");
-    asprintf(&tmp, "%-26s %s", "Device", "Size");
+        (_("   Add one of the following unallocated RAID partitions to this RAID device."));
+    asprintf(&tmp, "%-26s %s", _("Device"), _("Size"));
     headerMsg = newtLabel(1, 1, tmp);
     paranoid_free(tmp);
@@ -92 +92 @@
                              partitionsListbox);
     i = 7;
-    bOK = newtCompactButton(i, 9, "  OK  ");
-    bCancel = newtCompactButton(i += 9, 9, "Cancel");
-    newtOpenWindow(22, 6, 36, 10, "Unallocated RAID partitions");
+    bOK = newtCompactButton(i, 9, _("  OK  "));
+    bCancel = newtCompactButton(i += 9, 9, _("Cancel"));
+    newtOpenWindow(22, 6, 36, 10, _("Unallocated RAID partitions"));
     myForm = newtForm(NULL, NULL, 0);
     newtFormAddComponents(myForm, headerMsg, partitionsListbox, bOK,
@@ -182 +182 @@
     asprintf(&format_str, "ext2");
 #endif
-    newtOpenWindow(20, 5, 48, 10, "Add entry");
-    label0 = newtLabel(2, 1, "Device:    ");
-    label1 = newtLabel(2, 2, "Mountpoint:");
-    label2 = newtLabel(2, 3, "Size (MB): ");
-    label3 = newtLabel(2, 4, "Format:    ");
+    newtOpenWindow(20, 5, 48, 10, _("Add entry"));
+    label0 = newtLabel(2, 1, _("Device:    "));
+    label1 = newtLabel(2, 2, _("Mountpoint:"));
+    label2 = newtLabel(2, 3, _("Size (MB): "));
+    label3 = newtLabel(2, 4, _("Format:    "));
     deviceComp =
         newtEntry(14, 1, device_str, 30, (void *) &device_here, 0);
@@ -195 +195 @@
         newtEntry(14, 4, format_str, 15, (void *) &format_here, 0);
     sizeComp = newtEntry(14, 3, size_str, 10, (void *) &size_here, 0);
-    bOK = newtButton(5, 6, "  OK  ");
-    bCancel = newtButton(17, 6, "Cancel");
+    bOK = newtButton(5, 6, _("  OK  "));
+    bCancel = newtButton(17, 6, _("Cancel"));
     newtPushHelpLine
-        ("To add an entry to the mountlist, please fill in these fields and then hit 'OK'");
+        (_("To add an entry to the mountlist, please fill in these fields and then hit 'OK'"));
     myForm = newtForm(NULL, NULL, 0);
     newtFormAddComponents(myForm, deviceComp, mountpointComp, sizeComp,
@@ -224 +224 @@
         if (b_res == bOK) {
             if (device_str[strlen(device_str) - 1] == '/') {
-                popup_and_OK("You left the device nearly blank!");
+                popup_and_OK(_("You left the device nearly blank!"));
                 b_res = NULL;
             }
             if (size_of_specific_device_in_mountlist(mountlist, device_str)
                 >= 0) {
-                popup_and_OK("Can't add this - you've got one already!");
+                popup_and_OK(_("Can't add this - you've got one already!"));
                 b_res = NULL;
             }
@@ -286 +286 @@
 
     if (popup_and_get_string
-        ("Add variable", "Enter the name of the variable to add", sz_out,
+        ("Add variable", _("Enter the name of the variable to add"), sz_out,
          MAX_STR_LEN)) {
         strip_spaces(sz_out);
@@ -295 +295 @@
         if (i < items) {
             popup_and_OK
-                ("No need to add that variable. It is already listed here.");
+                (_("No need to add that variable. It is already listed here."));
         } else {
             strcpy(raidrec->additional_vars.el[items].label, sz_out);
@@ -500 +500 @@
 
     asprintf(&prompt,
-            "Please enter the RAID level you want. (concat, striped, raid5)");
+            _("Please enter the RAID level you want. (concat, striped, raid5)"));
     if (raidrec->raidlevel == -1) {
         asprintf(&tmp, "concat");
@@ -556 +556 @@
     strcpy(personalities,
            last_line_of_file("/tmp/raid-personalities.txt"));
-    asprintf(&prompt, "Please enter the RAID level you want. %s",
+    asprintf(&prompt, _("Please enter the RAID level you want. %s"),
             personalities);
     if (raidrec->raid_level == -1) {
@@ -566 +566 @@
          out != -1 && out != 0 && out != 1 && out != 4 && out != 5
          && out != 10;) {
-        res = popup_and_get_string("Specify RAID level", prompt, tmp, 10);
+        res = popup_and_get_string(_("Specify RAID level"), prompt, tmp, 10);
         if (!res) {
             return;
@@ -591 +591 @@
         } else {
             if (ask_me_yes_or_no
-                ("You have chosen a RAID personality which is not registered with the kernel. Make another selection?"))
+                (_("You have chosen a RAID personality which is not registered with the kernel. Make another selection?")))
             {
                 out = 999;
@@ -670 +670 @@
     assert_string_is_neither_NULL_nor_zerolength(raid_device);
 
-    asprintf(&tmp, "Delete %s from RAID device %s - are you sure?",
+    asprintf(&tmp, _("Delete %s from RAID device %s - are you sure?"),
             disklist->el[currline].device, raid_device);
     if (!ask_me_yes_or_no(tmp)) {
@@ -718 +718 @@
                                                   device);
     if (pos >= 0) {
-        asprintf(&tmp, "Cannot delete %s: it is in use by RAID device %s",
+        asprintf(&tmp, _("Cannot delete %s: it is in use by RAID device %s"),
                 mountlist->el[currline].device,
                 raidlist->el[pos].OSSWAP(raid_device, volname));
@@ -725 +725 @@
         return;
     }
-    asprintf(&tmp, "Delete %s - are you sure?",
+    asprintf(&tmp, _("Delete %s - are you sure?"),
             mountlist->el[currline].device);
     if (!ask_me_yes_or_no(tmp)) {
@@ -785 +785 @@
         return;
     }
-    asprintf(&tmp, "Do you want me to delete %s's partitions, too?", device);
+    asprintf(&tmp, _("Do you want me to delete %s's partitions, too?", device));
     delete_partitions_too = ask_me_yes_or_no(tmp);
     if (delete_partitions_too) {
@@ -854 +854 @@
 
     av = &raidrec->additional_vars;
-    asprintf(&tmp, "Delete %s - are you sure?", av->el[lino].label);
+    asprintf(&tmp, _("Delete %s - are you sure?", av->el[lino].label));
     if (ask_me_yes_or_no(tmp)) {
         if (!strcmp(av->el[lino].label, "persistent-superblock")
             || !strcmp(av->el[lino].label, "chunk-size")) {
             paranoid_free(tmp);
-            asprintf(&tmp, "%s must not be deleted. It would be bad.",
+            asprintf(&tmp, _("%s must not be deleted. It would be bad."),
                     av->el[lino].label);
             popup_and_OK(tmp);
@@ -927 +927 @@
                     warned_already = TRUE;
                     asprintf(&tmp,
-                            "Too many lines. Displaying first %d entries only. Close a directory to see more.",
+                            _("Too many lines. Displaying first %d entries only. Close a directory to see more."),
                             ARBITRARY_MAXIMUM);
                     popup_and_OK(tmp);
@@ -1072 +1072 @@
     assert(filelist != NULL);
 
-    log_to_screen("Editing filelist");
+    log_to_screen(_("Editing filelist"));
     newtPushHelpLine
-        ("   Please edit the filelist to your satisfaction, then click OK or Cancel.");
+        (_("   Please edit the filelist to your satisfaction, then click OK or Cancel."));
     j = 4;
-    bLess = newtCompactButton(j, 17, " Less ");
-    bMore = newtCompactButton(j += 12, 17, " More ");
-    bToggle = newtCompactButton(j += 12, 17, "Toggle");
-    bRegex = newtCompactButton(j += 12, 17, "RegEx");
-    bCancel = newtCompactButton(j += 12, 17, "Cancel");
-    bOK = newtCompactButton(j += 12, 17, "  OK  ");
+    bLess = newtCompactButton(j, 17, _(" Less "));
+    bMore = newtCompactButton(j += 12, 17, _(" More "));
+    bToggle = newtCompactButton(j += 12, 17, _("Toggle"));
+    bRegex = newtCompactButton(j += 12, 17, _("RegEx"));
+    bCancel = newtCompactButton(j += 12, 17, _("Cancel"));
+    bOK = newtCompactButton(j += 12, 17, _("  OK  "));
     filelistListbox =
         newtListbox(2, 1, 15, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
@@ -1087 +1087 @@
     lines_in_flist_window =
         redraw_filelist(filelist, keylist, filelistListbox);
-    newtOpenWindow(1, 3, 77, 18, "Editing filelist");
+    newtOpenWindow(1, 3, 77, 18, _("Editing filelist"));
     myForm = newtForm(NULL, NULL, 0);
     newtFormAddComponents(myForm, filelistListbox, bLess, bMore, bToggle,
@@ -1096 +1096 @@
             finished =
                 ask_me_yes_or_no
-                ("Are you happy with your file selection?");
+                (_("Are you happy with your file selection?"));
         } else if (b_res == bCancel) {
             finished = TRUE;
         } else if (b_res == bRegex) {
-            popup_and_OK("I haven't implemented this yet...");
+            popup_and_OK(_("I haven't implemented this yet..."));
         } else {
             curr_choice = newtListboxGetCurrent(filelistListbox);
@@ -1236 +1236 @@
     sprintf(size_str, "%lld", mountlist->el[currline].size / 1024);
     newtOpenWindow(20, 5, 48, 10, "Edit entry");
-    label0 = newtLabel(2, 1, "Device:");
-    label1 = newtLabel(2, 2, "Mountpoint:");
-    label2 = newtLabel(2, 3, "Size (MB): ");
-    label3 = newtLabel(2, 4, "Format:    ");
+    label0 = newtLabel(2, 1, _("Device:"));
+    label1 = newtLabel(2, 2, _("Mountpoint:"));
+    label2 = newtLabel(2, 3, _("Size (MB): "));
+    label3 = newtLabel(2, 4, _("Format:    "));
     deviceComp =
         newtEntry(14, 1, device_str, 30, (void *) &device_here, 0);
@@ -1252 +1252 @@
         sizeComp = newtEntry(14, 3, size_str, 10, (void *) &size_here, 0);
     }
-    bOK = newtButton(2, 6, "  OK  ");
-    bCancel = newtButton(14, 6, "Cancel");
+    bOK = newtButton(2, 6, _("  OK  "));
+    bCancel = newtButton(14, 6, _("Cancel"));
     if (strstr(mountlist->el[currline].device, RAID_DEVICE_STUB)) {
         b_raid = newtButton(26, 6, "RAID..");
     }
     newtPushHelpLine
-        ("       Edit this partition's mountpoint, size and format; then click 'OK'.");
+        (_("       Edit this partition's mountpoint, size and format; then click 'OK'."));
     myForm = newtForm(NULL, NULL, 0);
     newtFormAddComponents(myForm, deviceComp, mountpointComp, sizeComp,
@@ -1274 +1274 @@
             && strstr(device_used_to_be, RAID_DEVICE_STUB)
             && strcmp(device_str, device_used_to_be)) {
-            popup_and_OK("You can't change /dev/mdX to /dev/mdY.");
+            popup_and_OK(_("You can't change /dev/mdX to /dev/mdY."));
             b_res = NULL;
             continue;
         } else if (b_res == bOK && !strcmp(mountpoint_str, "image")
                    && strcmp(mountpt_used_to_be, "image")) {
-            popup_and_OK("You can't change a regular device to an image.");
+            popup_and_OK(_("You can't change a regular device to an image."));
             b_res = NULL;
             continue;
@@ -1302 +1302 @@
                  */
                 popup_and_OK
-                    ("You cannot edit the RAID settings until you have OK'd your change to the device node.");
+                    (_("You cannot edit the RAID settings until you have OK'd your change to the device node."));
             } else {
                 j = find_raid_device_in_raidlist(raidlist,
@@ -1309 +1309 @@
                 if (j < 0) {
                     sprintf(tmp,
-                            "/etc/raidtab does not have an entry for %s; please delete it and add it again",
+                            _("/etc/raidtab does not have an entry for %s; please delete it and add it again"),
                             mountlist->el[currline].device);
                     popup_and_OK(tmp);
                 } else {
-                    log_it("edit_raidlist_entry - calling");
+                    log_it(_("edit_raidlist_entry - calling"));
                     edit_raidlist_entry(mountlist, raidlist,
                                         &raidlist->el[j], currline);
@@ -1363 +1363 @@
     else if (strcmp(device_used_to_be, device_str)) {
         popup_and_OK
-            ("You are renaming a RAID device as another RAID device. I don't like it but I'll allow it.");
+            (_("You are renaming a RAID device as another RAID device. I don't like it but I'll allow it."));
     }
 #endif
@@ -1473 +1473 @@
     int currline2 = 0;
 
-    log_it("Started edit_raidlist_entry");
+    log_it(_("Started edit_raidlist_entry"));
     memcpy((void *) &bkp_raidrec, (void *) raidrec,
            sizeof(struct vinum_volume));
-    sprintf(title_of_editraidForm_window, "Plexes on %s",
+    sprintf(title_of_editraidForm_window, _("Plexes on %s"),
             raidrec->volname);
-    newtPushHelpLine("   Please select a plex to edit");
+    newtPushHelpLine(_("   Please select a plex to edit"));
     newtOpenWindow(13, 5, 54, 15, title_of_editraidForm_window);
     for (;;) {
@@ -1484 +1484 @@
         char headerstr[MAX_STR_LEN];
         snprintf(headerstr, MAX_STR_LEN, "%-14s %-8s  %11s  %8s",
-                 "Plex", "Level", "Stripe Size", "Subdisks");
-
-        bOK = newtCompactButton(2, 13, "  OK  ");
-        bCancel = newtCompactButton(12, 13, "Cancel");
-        bAdd = newtCompactButton(22, 13, " Add ");
-        bEdit = newtCompactButton(32, 13, " Edit ");
-        bDelete = newtCompactButton(42, 13, "Delete");
+                 _("Plex"), _("Level",) _("Stripe Size"), _("Subdisks"));
+
+        bOK = newtCompactButton(2, 13, _("  OK  "));
+        bCancel = newtCompactButton(12, 13, _("Cancel"));
+        bAdd = newtCompactButton(22, 13, _(" Add "));
+        bEdit = newtCompactButton(32, 13, _(" Edit "));
+        bDelete = newtCompactButton(42, 13, _("Delete"));
 
         plexesListbox =
@@ -1550 +1550 @@
         if (b_res == bDelete) {
             char msg[MAX_STR_LEN];
-            sprintf(msg, "Are you sure you want to delete %s.p%i?",
+            sprintf(msg, _("Are you sure you want to delete %s.p%i?"),
                     raidrec->volname, currline2);
             if (ask_me_yes_or_no(msg)) {
-                log_it("Deleting RAID plex");
+                log_it(_("Deleting RAID plex"));
                 memcpy((void *) &raidrec->plex[currline2],
                        (void *) &raidrec->plex[raidrec->plexes - 1],
@@ -1627 +1627 @@
     for (;;) {
         log_msg(2, "Main loop");
-        sprintf(title_of_editraidForm_window, "Edit %s",
+        sprintf(title_of_editraidForm_window, _("Edit %s"),
                 raidrec->raid_device);
         strcpy(sz_raid_level,
@@ -1633 +1633 @@
         strcpy(sz_data_disks,
                number_of_disks_as_string(raidrec->data_disks.entries,
-                                         "data"));
+                                         _("data")));
         strcpy(sz_spare_disks,
                number_of_disks_as_string(raidrec->spare_disks.entries,
-                                         "spare"));
+                                         _("spare")));
         strcpy(sz_parity_disks,
                number_of_disks_as_string(raidrec->parity_disks.entries,
-                                         "parity"));
+                                         _("parity")));
         strcpy(sz_failed_disks,
                number_of_disks_as_string(raidrec->failed_disks.entries,
-                                         "failed"));
+                                         _("failed")));
         bSelectData = newtButton(1, 1, sz_data_disks);
         bSelectSpare = newtButton(20, 1, sz_spare_disks);
@@ -1648 +1648 @@
         bSelectFailed = newtButton(20, 5, sz_failed_disks);
         bChangeRaid = newtButton(1, 9, sz_raid_level);
-        bOK = newtButton(16 + (raidrec->raid_level == -1), 9, "  OK  ");
-        bCancel = newtButton(28, 9, "Cancel");
+        bOK = newtButton(16 + (raidrec->raid_level == -1), 9, _("  OK  "));
+        bCancel = newtButton(28, 9, _("Cancel"));
         bAdditional =
             newtCompactButton(1, 13,
-                              "Additional settings and information");
+                              _("Additional settings and information"));
         newtPushHelpLine
-            ("  Edit the RAID device's settings to your heart's content, then hit OK/Cancel.");
+            (_("  Edit the RAID device's settings to your heart's content, then hit OK/Cancel."));
         editraidForm = newtForm(NULL, NULL, 0);
         newtFormAddComponents(editraidForm, bSelectData, bSelectParity,
@@ -1663 +1663 @@
             choose_raid_level(raidrec);
         } else if (b_res == bSelectData) {
-            select_raid_disks(mountlist, raidlist, raidrec, "data",
+            select_raid_disks(mountlist, raidlist, raidrec, _("data"),
                               &raidrec->data_disks);
         } else if (b_res == bSelectSpare) {
-            select_raid_disks(mountlist, raidlist, raidrec, "spare",
+            select_raid_disks(mountlist, raidlist, raidrec, _("spare"),
                               &raidrec->spare_disks);
         } else if (b_res == bSelectParity) {
-            select_raid_disks(mountlist, raidlist, raidrec, "parity",
+            select_raid_disks(mountlist, raidlist, raidrec, _("parity"),
                               &raidrec->parity_disks);
         } else if (b_res == bSelectFailed) {
-            select_raid_disks(mountlist, raidlist, raidrec, "failed",
+            select_raid_disks(mountlist, raidlist, raidrec, _("failed"),
                               &raidrec->failed_disks);
         } else if (b_res == bAdditional) {
@@ -1753 +1753 @@
             raidlist->el[currline].volname, currline2);
     newtPushHelpLine
-        ("   Please select a subdisk to edit, or edit this plex's parameters");
+        (_("   Please select a subdisk to edit, or edit this plex's parameters"));
     newtOpenWindow(13, 3, 54, 18, title_of_editraidForm_window);
     for (;;) {
@@ -1759 +1759 @@
         char headerstr[MAX_STR_LEN];
         char tmp[64];
-        snprintf(headerstr, MAX_STR_LEN, "%-24s %s", "Subdisk", "Device");
+        snprintf(headerstr, MAX_STR_LEN, "%-24s %s", _("Subdisk"), _("Device"));
 
 
@@ -1773 +1773 @@
             break;
         default:
-            sprintf(tmp, "unknown (%i)", raidrec->raidlevel);
+            sprintf(tmp, _("unknown (%i)"), raidrec->raidlevel);
             break;
         }
-        bLevel = newtCompactButton(2, 2, " RAID level ");
+        bLevel = newtCompactButton(2, 2, _(" RAID level "));
         sLevel = newtLabel(19, 2, tmp);
 
         if (raidrec->raidlevel >= 0) {
             sprintf(tmp, "%ik", raidrec->stripesize);
-            bStripeSize = newtCompactButton(2, 4, " Stripe size ");
+            bStripeSize = newtCompactButton(2, 4, _(" Stripe size "));
         } else {
             strcpy(tmp, "N/A");
-            bStripeSize = newtLabel(2, 4, "Stripe size:");
+            bStripeSize = newtLabel(2, 4, _("Stripe size:"));
         }
         sStripeSize = newtLabel(19, 4, tmp);
 
-        bOK = newtCompactButton(2, 16, "  OK  ");
-        bCancel = newtCompactButton(12, 16, "Cancel");
-        bAdd = newtCompactButton(22, 16, " Add ");
-        bEdit = newtCompactButton(32, 16, " Edit ");
-        bDelete = newtCompactButton(42, 16, "Delete");
+        bOK = newtCompactButton(2, 16, _("  OK  "));
+        bCancel = newtCompactButton(12, 16, _("Cancel"));
+        bAdd = newtCompactButton(22, 16, _(" Add "));
+        bEdit = newtCompactButton(32, 16, _(" Edit "));
+        bDelete = newtCompactButton(42, 16, _("Delete"));
 
 
@@ -1878 +1878 @@
             sprintf(tmp, "%i", raidrec->stripesize);
             if (popup_and_get_string
-                ("Stripe size",
-                 "Please enter the stripe size in kilobytes.", tmp, 20)) {
+                (_("Stripe size"),
+                 _("Please enter the stripe size in kilobytes."), tmp, 20)) {
                 raidrec->stripesize = atoi(tmp);
             }
@@ -1930 +1930 @@
 
     strcpy(sz_out, raidrec->additional_vars.el[lino].value);
-    sprintf(header, "Edit %s", raidrec->additional_vars.el[lino].label);
-    sprintf(comment, "Please set %s's value (currently '%s')",
+    sprintf(header, _("Edit %s"), raidrec->additional_vars.el[lino].label);
+    sprintf(comment, _("Please set %s's value (currently '%s')"),
             raidrec->additional_vars.el[lino].label, sz_out);
     if (popup_and_get_string(header, comment, sz_out, MAX_STR_LEN)) {
@@ -1993 +1993 @@
     strcpy(flaws_str_C, "xxxxxxxxx");
     if (mountlist->entries > ARBITRARY_MAXIMUM) {
-        log_to_screen("Arbitrary limits suck, man!");
+        log_to_screen(_("Arbitrary limits suck, man!"));
         finish(1);
     }
     newtPushHelpLine
-        ("   Please edit the mountlist to your satisfaction, then click OK or Cancel.");
+        (_("   Please edit the mountlist to your satisfaction, then click OK or Cancel."));
     i = 4;
-    bAdd = newtCompactButton(i, 17, " Add ");
-    bEdit = newtCompactButton(i += 11, 17, " Edit ");
-    bDelete = newtCompactButton(i += 12, 17, "Delete");
-    bReload = newtCompactButton(i += 12, 17, "Reload");
-    bCancel = newtCompactButton(i += 12, 17, "Cancel");
-    bOK = newtCompactButton(i += 12, 17, "  OK  ");
-    sprintf(tmp, "%-24s %-24s %-8s  %s", "Device", "Mountpoint", "Format",
-            "Size (MB)");
+    bAdd = newtCompactButton(i, 17, _(" Add "));
+    bEdit = newtCompactButton(i += 11, 17, _(" Edit "));
+    bDelete = newtCompactButton(i += 12, 17, _("Delete"));
+    bReload = newtCompactButton(i += 12, 17, _("Reload"));
+    bCancel = newtCompactButton(i += 12, 17, _("Cancel"));
+    bOK = newtCompactButton(i += 12, 17, _("  OK  "));
+    sprintf(tmp, "%-24s %-24s %-8s  %s", _("Device"), _("Mountpoint"), _("Format"),
+            _("Size (MB)"));
     headerMsg = newtLabel(2, 1, tmp);
     flawsLabelA = newtLabel(2, 13, flaws_str_A);
@@ -2014 +2014 @@
         newtListbox(2, 2, 10, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
     redraw_mountlist(mountlist, keylist, partitionsListbox);
-    newtOpenWindow(1, 3, 77, 18, "Editing mountlist");
+    newtOpenWindow(1, 3, 77, 18, _("Editing mountlist"));
     myForm = newtForm(NULL, NULL, 0);
     newtFormAddComponents(myForm, headerMsg, partitionsListbox,
@@ -2031 +2031 @@
                 finished =
                     ask_me_yes_or_no
-                    ("Your mountlist might not work. Continue anyway?");
+                    (_("Your mountlist might not work. Continue anyway?"));
             } else {
                 finished =
                     ask_me_yes_or_no
-                    ("Are you sure you want to save your mountlist and continue? (No changes will be made to your partition table at this time.)");
+                    (_("Are you sure you want to save your mountlist and continue? (No changes will be made to your partition table at this time.)"));
             }
         } else if (b_res == bCancel) {
             finished = TRUE;
         } else if (b_res == bReload) {
-            if (ask_me_yes_or_no("Reload original mountlist?")) {
+            if (ask_me_yes_or_no(_("Reload original mountlist?"))) {
 /*
 This would be really dumb. RAIDTAB_FNAME is #define'd.   --- Hugo, 2003/04/24
@@ -2058 +2058 @@
                  i < mountlist->entries && keylist[i] != curr_choice; i++);
             if (i == mountlist->entries && mountlist->entries > 0) {
-                log_to_screen("I don't know what that button does!");
+                log_to_screen(_("I don't know what that button does!"));
             } else {
                 currline = i;
@@ -2076 +2076 @@
                     } else {
                         popup_and_OK
-                            ("Please add an entry. Then press ENTER to edit it.");
+                            (_("Please add an entry. Then press ENTER to edit it."));
                     }
                 }
@@ -2086 +2086 @@
     newtPopHelpLine();
     if (b_res == bOK) {
-        log_it("You pushed 'OK'. I shall now continue.");
+        log_it(_("You pushed 'OK'. I shall now continue."));
         return (0);
     } else {
@@ -2165 +2165 @@
     sprintf(title_of_window, "Additional variables");
     newtPushHelpLine
-        ("  Edit the additional fields to your heart's content, then click OK or Cancel.");
-    headerMsg = newtLabel(1, 1, "Label                            Value");
+        (_("  Edit the additional fields to your heart's content, then click OK or Cancel."));
+    headerMsg = newtLabel(1, 1, _("Label                            Value"));
     varsListbox =
         newtListbox(1, 2, 6, NEWT_FLAG_SCROLL | NEWT_FLAG_RETURNEXIT);
     i = 1;
-    bAdd = newtCompactButton(i, 9, " Add ");
-    bEdit = newtCompactButton(i += 8, 9, " Edit ");
-    bDelete = newtCompactButton(i += 9, 9, "Delete");
-    bOK = newtCompactButton(i += 9, 9, "  OK  ");
-    bCancel = newtCompactButton(i += 9, 9, "Cancel");
+    bAdd = newtCompactButton(i, 9, _(" Add "));
+    bEdit = newtCompactButton(i += 8, 9, _(" Edit "));
+    bDelete = newtCompactButton(i += 9, 9, _("Delete"));
+    bOK = newtCompactButton(i += 9, 9, _("  OK  "));
+    bCancel = newtCompactButton(i += 9, 9, _("Cancel"));
     newtOpenWindow(17, 7, 46, 10, title_of_window);
     myForm = newtForm(NULL, NULL, 0);
@@ -2327 +2327 @@
 
     if (popup_and_get_string
-        ("ISO Mode - device", "On what device do the ISO files live?",
+        (_("ISO Mode - device"), _("On what device do the ISO files live?"),
          isodir_device, MAX_STR_LEN / 4)) {
         if (popup_and_get_string
-            ("ISO Mode - format",
-             "What is the disk format of the device? (Hit ENTER if you don't know.)",
+            (_("ISO Mode - format"),
+             _("What is the disk format of the device? (Hit ENTER if you don't know.)"),
              isodir_format, 16)) {
             if (popup_and_get_string
-                ("ISO Mode - path",
-                 "At what path on this device can the ISO files be found?",
+                (_("ISO Mode - path"),
+                 _("At what path on this device can the ISO files be found?"),
                  isodir_path, MAX_STR_LEN / 4)) {
                 strip_spaces(isodir_device);
@@ -2433 +2433 @@
 
     newtPushHelpLine
-        ("This is where I nuke your hard drives. Mhahahahaha. No-one can stop Mojo Jojo!");
-    newtOpenWindow(24, 3, 32, 13, "Nuking");
-    b1 = newtButton(7, 1, "Slowly");
-    b2 = newtButton(7, 5, "Medium");
-    b3 = newtButton(7, 9, "Quickly");
+        (_("This is where I nuke your hard drives. Mhahahahaha. No-one can stop Mojo Jojo!"));
+    newtOpenWindow(24, 3, 32, 13, _("Nuking"));
+    b1 = newtButton(7, 1, _("Slowly"));
+    b2 = newtButton(7, 5, _("Medium"));
+    b3 = newtButton(7, 9, _("Quickly"));
     myForm = newtForm(NULL, NULL, 0);
     newtFormAddComponents(myForm, b1, b2, b3, NULL);
@@ -2802 +2802 @@
     iamhere("Post-malloc");
     strcpy(help_text,
-           "   Edit this RAID device's list of partitions. Choose OK or Cancel when done.");
-    sprintf(header_text, "%-24s    %s", "Device", "Index");
-    sprintf(title_of_window, "%s contains...", raidrec->raid_device);
+           _("   Edit this RAID device's list of partitions. Choose OK or Cancel when done."));
+    sprintf(header_text, "%-24s    %s", _("Device"), _("Index"));
+    sprintf(title_of_window, _("%s contains..."), raidrec->raid_device);
     newtPushHelpLine(help_text);
     for (b_res = (newtComponent) 12345; b_res != bOK && b_res != bCancel;) {
@@ -2812 +2812 @@
         redraw_disklist(disklist, keylist, partitionsListbox);
         i = 1;
-        bAdd = newtCompactButton(i, 9, " Add ");
-        bDelete = newtCompactButton(i += 8, 9, "Delete");
-        bOK = newtCompactButton(i += 9, 9, "  OK  ");
-        bCancel = newtCompactButton(i += 9, 9, "Cancel");
+        bAdd = newtCompactButton(i, 9, _(" Add "));
+        bDelete = newtCompactButton(i += 8, 9, _("Delete"));
+        bOK = newtCompactButton(i += 9, 9, _("  OK  "));
+        bCancel = newtCompactButton(i += 9, 9, _("Cancel"));
         newtOpenWindow(21, 7, 38, 10, title_of_window);
         myForm = newtForm(NULL, NULL, 0);
@@ -2834 +2834 @@
                  i++);
             if (i == disklist->entries && disklist->entries > 0) {
-                log_to_screen("I don't know what that button does!");
+                log_to_screen(_("I don't know what that button does!"));
             } else {
                 currline = i;
                 if (b_res == bAdd) {
-                    log_it("Making list of unallocated RAID slices");
+                    log_it(_("Making list of unallocated RAID slices"));
                     make_list_of_unallocated_raid_partitions
                         (unallocated_raid_partitions, mountlist_dontedit,
@@ -2844 +2844 @@
                     if (unallocated_raid_partitions->entries <= 0) {
                         popup_and_OK
-                            ("There are no unallocated partitions marked for RAID.");
+                            (_("There are no unallocated partitions marked for RAID."));
                     } else {
                         log_it
-                            ("Done. The user may add one or more of the above to RAID device");
+                            (_("Done. The user may add one or more of the above to RAID device"));
                         add_disklist_entry(disklist, raidrec->raid_device,
                                            unallocated_raid_partitions);
-                        log_it("I have finished adding a disklist entry.");
+                        log_it(_("I have finished adding a disklist entry."));
                         redraw_disklist(disklist, keylist,
                                         partitionsListbox);
@@ -2859 +2859 @@
                     redraw_disklist(disklist, keylist, partitionsListbox);
                 } else {
-                    sprintf(tmp, "%s's index is %d. What should it be?",
+                    sprintf(tmp, _("%s's index is %d. What should it be?"),
                             raidrec->raid_device,
                             disklist->el[currline].index);
                     sprintf(sz_res, "%d", disklist->el[currline].index);
-                    if (popup_and_get_string("Set index", tmp, sz_res, 10)) {
+                    if (popup_and_get_string(_("Set index"), tmp, sz_res, 10)) {
                         disklist->el[currline].index = atoi(sz_res);
                     }
@@ -2920 +2920 @@
         for (output = 'z'; !strchr("AICE", output); output = tmp[0]) {
             printf
-                ("Which mode - (A)utomatic, (I)nteractive, \n(C)ompare only, or (E)xit to shell?\n--> ");
+                (_("Which mode - (A)utomatic, (I)nteractive, \n(C)ompare only, or (E)xit to shell?\n--> "));
             fgets(tmp, MAX_STR_LEN - 1, stdin);
         }
@@ -2927 +2927 @@
 
     newtPushHelpLine
-        ("   Do you want to 'nuke' your system, restore interactively, or just compare?");
-    newtOpenWindow(24, 3, 32, 17, "How should I restore?");
-    b1 = newtButton(7, 1, "Automatically");
-    b2 = newtButton(7, 5, "Interactively");
-    b3 = newtButton(7, 9, "Compare only!");
-    b4 = newtButton(7, 13, "Exit to shell");
+        (_("   Do you want to 'nuke' your system, restore interactively, or just compare?"));
+    newtOpenWindow(24, 3, 32, 17, _("How should I restore?"));
+    b1 = newtButton(7, 1, _("Automatically"));
+    b2 = newtButton(7, 5, _("Interactively"));
+    b3 = newtButton(7, 9, _("Compare only!"));
+    b4 = newtButton(7, 13, _("Exit to shell"));
     myForm = newtForm(NULL, NULL, 0);
     newtFormAddComponents(myForm, b1, b2, b3, b4, NULL);

trunk/mondo/mondo/mondorestore/mondo-rstr-newt.h

@@ -25 +25 @@
 #endif /*__FreeBSD__*/
 
-#define NO_FLAWS_DETECTED "No flaws detected in mountlist at this time. Hit 'OK' to proceed."
+#define NO_FLAWS_DETECTED _("No flaws detected in mountlist at this time. Hit 'OK' to proceed.")
 
 

trunk/mondo/mondo/mondorestore/mondo-rstr-tools.c

@@ -225 +225 @@
 
         asprintf(&question,
-                "Should I restore the image of %s ?", incoming);
+                _("Should I restore the image of %s ?", incoming));
 
         if (ask_me_yes_or_no(question)) {
@@ -337 +337 @@
     while (get_cfg_file_from_archive(bkpinfo)) {
         if (!ask_me_yes_or_no
-            ("Failed to find config file/archives. Choose another source?"))
+            (_("Failed to find config file/archives. Choose another source?")))
         {
             fatal_error("Could not find config file/archives. Aborting.");
@@ -441 +441 @@
 
     if (is_this_device_mounted(g_isodir_device)) {
-        log_to_screen("WARNING - isodir is already mounted");
+        log_to_screen(_("WARNING - isodir is already mounted"));
         already_mounted = TRUE;
     } else {
@@ -458 +458 @@
         if (run_program_and_log_output(mount_isodir_command, FALSE)) {
             popup_and_OK
-                ("Cannot mount the device where the ISO files are stored.");
+                (_("Cannot mount the device where the ISO files are stored."));
             return (1);
         }
         log_to_screen
-            ("I have mounted the device where the ISO files are stored.");
+            (_("I have mounted the device where the ISO files are stored."));
     }
     if (!IS_THIS_A_STREAMING_BACKUP(bkpinfo->backup_media_type)) {
@@ -473 +473 @@
     if (i < 0) {
         popup_and_OK
-            ("Cannot find ISO images in the directory you specified.");
+            (_("Cannot find ISO images in the directory you specified."));
         retval = 1;
     }
@@ -599 +599 @@
     these_failed[0] = '\0';
 
-    mvaddstr_and_log_it(g_currentY, 0, "Mounting devices         ");
-    open_progress_form("Mounting devices",
-                       "I am now mounting all the drives.",
-                       "This should not take long.",
+    mvaddstr_and_log_it(g_currentY, 0, _("Mounting devices         "));
+    open_progress_form(_("Mounting devices"),
+                       _("I am now mounting all the drives."),
+                       _("This should not take long."),
                        "", mountlist->entries);
 
@@ -610 +610 @@
                     "Again with the /proc - why is this in your mountlist?");
         } else if (is_this_device_mounted(mountlist->el[lino].device)) {
-            sprintf(tmp, "%s is already mounted",
+            sprintf(tmp, _("%s is already mounted"),
                     mountlist->el[lino].device);
             log_to_screen(tmp);
@@ -639 +639 @@
         if (g_partition_table_locked_up > 0) {
             log_to_screen
-                ("fdisk's ictol() call to refresh its copy of the partition table causes the kernel to");
+                (_("fdisk's ioctl() call to refresh its copy of the partition table causes the kernel to"));
             log_to_screen
-                ("lock up the partition table. You might have to reboot and use Interactive Mode to");
+                (_("lock up the partition table. You might have to reboot and use Interactive Mode to"));
             log_to_screen
-                ("format and restore *without* partitioning first. Sorry for the inconvenience.");
-        }
-        sprintf(tmp, "Could not mount devices %s- shall I abort?",
+                (_("format and restore *without* partitioning first. Sorry for the inconvenience."));
+        }
+        sprintf(tmp, _("Could not mount devices %s- shall I abort?"),
                 these_failed);
         if (!ask_me_yes_or_no(tmp)) {
             retval = 0;
             log_to_screen
-                ("Continuing, although some devices failed to be mounted");
-            mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+                (_("Continuing, although some devices failed to be mounted"));
+            mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
         } else {
-            mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
+            mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
             log_to_screen
-                ("Unable to mount some or all of your partitions.");
+                (_("Unable to mount some or all of your partitions."));
         }
     } else {
-        log_to_screen("All partitions were mounted OK.");
-        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+        log_to_screen(_("All partitions were mounted OK."));
+        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     }
     run_program_and_log_output("df -P -m", 3);
@@ -1322 +1322 @@
     if (am_I_in_disaster_recovery_mode()
         &&
-        ask_me_yes_or_no("Do you want to retrieve the mountlist as well?"))
+        ask_me_yes_or_no(_("Do you want to retrieve the mountlist as well?")))
     {
 //      sprintf(command, "cp -f tmp/mountlist.txt /tmp");
@@ -1348 +1348 @@
 
     case 0:
-        log_to_screen("Pre-processing filelist");
+        log_to_screen(("Pre-processing filelist"));
         if (!does_file_exist(g_biggielist_txt)) {
             sprintf(command, "> %s", g_biggielist_txt);
@@ -1360 +1360 @@
 
     default:
-        open_evalcall_form("Pre-processing filelist");
+        open_evalcall_form(_("Pre-processing filelist"));
         while (!waitpid(pid, (int *) 0, WNOHANG)) {
             usleep(100000);
@@ -1373 +1373 @@
     unlink(g_filelist_full);
     if (g_text_mode) {
-        printf("Restore which directory? --> ");
+        printf(_("Restore which directory? --> "));
         fgets(tmp, sizeof(tmp), stdin);
         toggle_path_selection(filelist, tmp, TRUE);
@@ -1506 +1506 @@
     else {
         log_to_screen
-            ("Unable to determine type of boot loader. Defaulting to LILO.");
+            (_("Unable to determine type of boot loader. Defaulting to LILO."));
         res = run_lilo(offer_to_hack_scripts);
     }
@@ -1512 +1512 @@
     retval += res;
     if (res) {
-        log_to_screen("Your boot loader returned an error");
+        log_to_screen(_("Your boot loader returned an error"));
     } else {
-        log_to_screen("Your boot loader ran OK");
+        log_to_screen(_("Your boot loader ran OK"));
     }
     paranoid_free(device);
@@ -1595 +1595 @@
     }
     if (offer_to_run_stabgrub
-        && ask_me_yes_or_no("Did you change the mountlist?"))
+        && ask_me_yes_or_no(_("Did you change the mountlist?")))
         /* interactive mode */
     {
         mvaddstr_and_log_it(g_currentY,
                             0,
-                            "Modifying fstab and grub.conf, and running GRUB...                             ");
+                            _("Modifying fstab and grub.conf, and running GRUB...                             "));
         for (done = FALSE; !done;) {
-            popup_and_get_string("Boot device",
-                                 "Please confirm/enter the boot device. If in doubt, try /dev/hda",
+            popup_and_get_string(_("Boot device"),
+                                 _("Please confirm/enter the boot device. If in doubt, try /dev/hda"),
                                  boot_device, MAX_STR_LEN / 4);
             sprintf(command, "stabgrub-me %s", boot_device);
@@ -1609 +1609 @@
             if (res) {
                 popup_and_OK
-                    ("GRUB installation failed. Please install manually using 'grub-install' or similar command. You are now chroot()'ed to your restored system. Please type 'exit' when you are done.");
+                    (_("GRUB installation failed. Please install manually using 'grub-install' or similar command. You are now chroot()'ed to your restored system. Please type 'exit' when you are done."));
                 newtSuspend();
                 system("chroot " MNT_RESTORING);
                 newtResume();
-                popup_and_OK("Thank you.");
+                popup_and_OK(_("Thank you."));
             } else {
                 done = TRUE;
             }
-            popup_and_OK("You will now edit fstab and grub.conf");
+            popup_and_OK(_("You will now edit fstab and grub.conf"));
             if (!g_text_mode) {
                 newtSuspend();
@@ -1634 +1634 @@
         mvaddstr_and_log_it(g_currentY,
                             0,
-                            "Running GRUB...                                                 ");
+                            _("Running GRUB...                                                 "));
         iamhere(command);
         res = run_program_and_log_output(command, 1);
         if (res) {
             popup_and_OK
-                ("Because of bugs in GRUB's own installer, GRUB was not installed properly. Please install the boot loader manually now, using this chroot()'ed shell prompt. Type 'exit' when you have finished.");
+                (_("Because of bugs in GRUB's own installer, GRUB was not installed properly. Please install the boot loader manually now, using this chroot()'ed shell prompt. Type 'exit' when you have finished."));
             newtSuspend();
             system("chroot " MNT_RESTORING);
             newtResume();
-            popup_and_OK("Thank you.");
+            popup_and_OK(_("Thank you."));
         }
     }
     if (res) {
-        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
+        mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
         log_to_screen
-            ("GRUB ran w/error(s). See /tmp/mondo-restore.log for more info.");
+            (_("GRUB ran w/error(s). See /tmp/mondo-restore.log for more info."));
         log_msg(1, "Type:-");
         log_msg(1, "    mount-me");
@@ -1660 +1660 @@
                 "If you're really stuck, please e-mail the mailing list.");
     } else {
-        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     }
     paranoid_free(rootdev);
@@ -1698 +1698 @@
     strcpy(editor, find_my_editor());
     if (offer_to_run_stabelilo
-        && ask_me_yes_or_no("Did you change the mountlist?"))
+        && ask_me_yes_or_no(_("Did you change the mountlist?")))
 
         /* interactive mode */
@@ -1704 +1704 @@
         mvaddstr_and_log_it(g_currentY,
                             0,
-                            "Modifying fstab and elilo.conf...                             ");
+                            _("Modifying fstab and elilo.conf...                             "));
         sprintf(command, "stabelilo-me");
         res = run_program_and_log_output(command, 3);
         if (res) {
             popup_and_OK
-                ("You will now edit fstab and elilo.conf, to make sure they match your new mountlist.");
+                (_("You will now edit fstab and elilo.conf, to make sure they match your new mountlist."));
             for (done = FALSE; !done;) {
                 if (!g_text_mode) {
@@ -1723 +1723 @@
                 }
 //              newtCls();
-                if (ask_me_yes_or_no("Edit them again?")) {
+                if (ask_me_yes_or_no(_("Edit them again?"))) {
                     continue;
                 }
@@ -1729 +1729 @@
             }
         } else {
-            log_to_screen("elilo.conf and fstab were modified OK");
+            log_to_screen(_("elilo.conf and fstab were modified OK"));
         }
     } else
@@ -1773 +1773 @@
     strcpy(editor, find_my_editor());
     if (offer_to_run_stablilo
-        && ask_me_yes_or_no("Did you change the mountlist?"))
+        && ask_me_yes_or_no(_("Did you change the mountlist?")))
 
         /* interactive mode */
@@ -1779 +1779 @@
         mvaddstr_and_log_it(g_currentY,
                             0,
-                            "Modifying fstab and lilo.conf, and running LILO...                             ");
+                            _("Modifying fstab and lilo.conf, and running LILO...                             "));
         sprintf(command, "stablilo-me");
         res = run_program_and_log_output(command, 3);
         if (res) {
             popup_and_OK
-                ("You will now edit fstab and lilo.conf, to make sure they match your new mountlist.");
+                (_("You will now edit fstab and lilo.conf, to make sure they match your new mountlist."));
             for (done = FALSE; !done;) {
                 if (!g_text_mode) {
@@ -1797 +1797 @@
                 }
 //              newtCls();
-                if (ask_me_yes_or_no("Edit them again?")) {
+                if (ask_me_yes_or_no(_("Edit them again?"))) {
                     continue;
                 }
@@ -1811 +1811 @@
                     done =
                         ask_me_yes_or_no
-                        ("LILO failed. Re-edit system files?");
+                        (_("LILO failed. Re-edit system files?"));
                 } else {
                     done = TRUE;
@@ -1817 +1817 @@
             }
         } else {
-            log_to_screen("lilo.conf and fstab were modified OK");
+            log_to_screen(_("lilo.conf and fstab were modified OK"));
         }
     } else
@@ -1824 +1824 @@
         mvaddstr_and_log_it(g_currentY,
                             0,
-                            "Running LILO...                                                 ");
+                            _("Running LILO...                                                 "));
         res =
             run_program_and_log_output("chroot " MNT_RESTORING " lilo -L",
@@ -1834 +1834 @@
         }
         if (res) {
-            mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
+            mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
             log_to_screen
-                ("Failed to re-jig fstab and/or lilo. Edit/run manually, please.");
+                (_("Failed to re-jig fstab and/or lilo. Edit/run manually, please."));
         } else {
-            mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+            mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
         }
     }
@@ -1886 +1886 @@
 
     if (offer_to_hack_scripts
-        && ask_me_yes_or_no("Did you change the mountlist?"))
+        && ask_me_yes_or_no(_("Did you change the mountlist?")))
         /* interactive mode */
     {
         mvaddstr_and_log_it(g_currentY, 0,
-                            "Modifying fstab and restoring MBR...                           ");
+                            _("Modifying fstab and restoring MBR...                           "));
         for (done = FALSE; !done;) {
             if (!run_program_and_log_output("which vi", FALSE)) {
-                popup_and_OK("You will now edit fstab");
+                popup_and_OK(_("You will now edit fstab"));
                 if (!g_text_mode) {
                     newtSuspend();
@@ -1904 +1904 @@
 //              newtCls();
             }
-            popup_and_get_string("Boot device",
-                                 "Please confirm/enter the boot device. If in doubt, try /dev/hda",
+            popup_and_get_string(_("Boot device"),
+                                 _("Please confirm/enter the boot device. If in doubt, try /dev/hda"),
                                  boot_device, MAX_STR_LEN / 4);
             sprintf(command, "stabraw-me %s", boot_device);
             res = run_program_and_log_output(command, 3);
             if (res) {
-                done = ask_me_yes_or_no("Modifications failed. Re-try?");
+                done = ask_me_yes_or_no(_("Modifications failed. Re-try?"));
             } else {
                 done = TRUE;
@@ -1919 +1919 @@
     {
         mvaddstr_and_log_it(g_currentY, 0,
-                            "Restoring MBR...                                               ");
+                            _("Restoring MBR...                                               "));
         res = run_program_and_log_output(command, 3);
     }
     if (res) {
-        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
+        mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
         log_to_screen
-            ("MBR+fstab processed w/error(s). See /tmp/mondo-restore.log for more info.");
+            (_("MBR+fstab processed w/error(s). See /tmp/mondo-restore.log for more info."));
     } else {
-        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     }
     paranoid_free(command);
@@ -2067 +2067 @@
 {
     log_to_screen
-        ("Mondorestore is terminating in response to a signal from the OS");
+        (_("Mondorestore is terminating in response to a signal from the OS"));
     paranoid_MR_finish(254);
 }
@@ -2089 +2089 @@
         return;
     }
-    open_progress_form("CAUTION",
-                       "Be advised: I am about to ERASE your hard disk(s)!",
-                       "You may press Ctrl+Alt+Del to abort safely.",
+    open_progress_form(_("CAUTION"),
+                       _("Be advised: I am about to ERASE your hard disk(s)!"),
+                       _("You may press Ctrl+Alt+Del to abort safely."),
                        "", 20);
     for (i = 0; i < 20; i++) {
         g_current_progress = i;
-        sprintf(tmp, "You have %d seconds left to abort.", 20 - i);
+        sprintf(tmp, _("You have %d seconds left to abort."), 20 - i);
         update_progress_form(tmp);
         sleep(1);
@@ -2151 +2151 @@
 
     run_program_and_log_output("df -P -m", 3);
-    mvaddstr_and_log_it(g_currentY, 0, "Unmounting devices      ");
-    open_progress_form("Unmounting devices",
-                       "Unmounting all devices that were mounted,",
-                       "in preparation for the post-restoration reboot.",
+    mvaddstr_and_log_it(g_currentY, 0, _("Unmounting devices      "));
+    open_progress_form(_("Unmounting devices"),
+                       _("Unmounting all devices that were mounted,"),
+                       _("in preparation for the post-restoration reboot."),
                        "", mountlist->entries);
     chdir("/");
@@ -2187 +2187 @@
             continue;
         }
-        sprintf(tmp, "Unmounting device %s  ", mountlist->el[lino].device);
+        sprintf(tmp, _("Unmounting device %s  "), mountlist->el[lino].device);
 
         update_progress_form(tmp);
@@ -2206 +2206 @@
             res = run_program_and_log_output(command, 3);
         } else {
-            strcat(tmp, "...not mounted anyway :-) OK");
+            strcat(tmp, _("...not mounted anyway :-) OK"));
             res = 0;
         }
         g_current_progress++;
         if (res) {
-            strcat(tmp, "...Failed");
+            strcat(tmp, _("...Failed"));
             retval++;
             log_to_screen(tmp);
@@ -2220 +2220 @@
     close_progress_form();
     if (retval) {
-        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
+        mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
     } else {
-        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     }
     if (retval) {
-        log_to_screen("Unable to unmount some of your partitions.");
+        log_to_screen(_("Unable to unmount some of your partitions."));
     } else {
-        log_to_screen("All partitions were unmounted OK.");
+        log_to_screen(_("All partitions were unmounted OK."));
     }
     free(mountlist);
@@ -2311 +2311 @@
     malloc_string(tmp);
     log_msg(2, "gcffa --- starting");
-    log_to_screen("I'm thinking...");
+    log_to_screen(_("I'm thinking..."));
     sprintf(mountpt, "%s/mount.bootdisk", bkpinfo->tmpdir);
     device[0] = '\0';
@@ -2423 +2423 @@
 
             if (!does_file_exist("tmp/mondo-restore.cfg")) {
-                log_to_screen("Cannot find config info on tape/CD/floppy");
+                log_to_screen(_("Cannot find config info on tape/CD/floppy"));
                 return (1);
             }
@@ -2504 +2504 @@
         log_msg(1, "%s not found", cfg_file);
         log_to_screen
-            ("Oh dear. Unable to recover configuration file from boot disk");
+            (_("Oh dear. Unable to recover configuration file from boot disk"));
         return (1);
     }
 
-    log_to_screen("Recovered mondo-restore.cfg");
+    log_to_screen(_("Recovered mondo-restore.cfg"));
     if (!does_file_exist(MOUNTLIST_FNAME_STUB)) {
-        log_to_screen("...but not mountlist.txt - a pity, really...");
+        log_to_screen(_("...but not mountlist.txt - a pity, really..."));
     }
 /* start SAH */
@@ -2580 +2580 @@
     while (unfinished_mdstat_devices > 0) {
         if (read_mdstat(mdstat, mdstat_file)) {
-            log_to_screen("Sorry, cannot read %s", mdstat_file);
+            log_to_screen(_("Sorry, cannot read %s"), mdstat_file);
             return;
         }
@@ -2586 +2586 @@
             if (mdstat->el[i].progress < wait_for_percentage) {
                 unfinished_mdstat_devices++;
-                sprintf(screen_message, "Sync'ing /dev/md%d",
+                sprintf(screen_message, _("Sync'ing /dev/md%d"),
                         mdstat->el[i].md);
                 open_evalcall_form(screen_message);