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

Timestamp:

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

Author:

bcornec

Message:

merge -r489:506 $SVN_M/branches/stable

File:

• trunk/mondo/mondo/common/libmondo-filelist.c (modified) (12 diffs)

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);