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

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