Changeset 541 in MondoRescue for branches/stable/mondo/mondo/common/libmondo-files.c

Timestamp:

May 13, 2006, 8:47:23 PM (18 years ago)

Author:

bcornec

Message:

Stable is reverted to r436 (2.0.7) to put it in line with 2.0.8 and start from there over

File:

• branches/stable/mondo/mondo/common/libmondo-files.c (modified) (8 diffs)

branches/stable/mondo/mondo/common/libmondo-files.c

@@ -88 +88 @@
 #include "libmondo-files.h"
 
+#include "lib-common-externs.h"
+
 #include "libmondo-tools-EXT.h"
-#include "newt-specific-EXT.h"
+#include "libmondo-gui-EXT.h"
 #include "libmondo-devices-EXT.h"
 #include "libmondo-fork-EXT.h"
@@ -360 +362 @@
     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
@@ -573 +575 @@
 
     if (!does_file_exist(filename)) {
-        sprintf(tmp, "Trying to get last line of nonexistent file (%s)",
+        sprintf(tmp, "Tring to get last line of nonexistent file (%s)",
                 filename);
         log_it(tmp);
@@ -662 +664 @@
         log_OS_error("Unable to openout cksumlist");
         paranoid_fclose(fin);
-        log_to_screen(_("Can't open checksum list"));
+        log_to_screen("Can't open checksum list");
         return (1);
     }
@@ -687 +689 @@
                     time_taken * 100 / (long) (percentage) - time_taken;
                 sprintf(tmp,
-                        _("%02d%% done   %02d:%02d taken   %02d:%02d remaining  %-37s"),
+                        "%02d%% done   %02d:%02d taken   %02d:%02d remaining  %-37s\r",
                         percentage, (int) (time_taken / 60),
                         (int) (time_taken % 60),
@@ -1027 +1029 @@
     sprintf(command, "which %s > /dev/null 2> /dev/null", fname);
     sprintf(errorstr,
-            _("Please install '%s'. I cannot find it on your system."),
+            "Please install '%s'. I cannot find it on your system.",
             fname);
     if (system(command)) {
         log_to_screen(errorstr);
         log_to_screen
-            (_("There may be hyperlink at http://www.mondorescue.com which"));
-        log_to_screen(_("will take you to the relevant (missing) package."));
+            ("There may be hyperlink at http://www.mondorescue.com which");
+        log_to_screen("will take you to the relevant (missing) package.");
         return (1);
     } else {
@@ -1148 +1150 @@
         fatal_error("Failed to copy Mondo's stuff to scratchdir");
     }
-
-    /* i18n */
-    sprintf(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);
 
     sprintf(tmp, "%s/payload.tgz", g_mondo_home);
@@ -1387 +1384 @@
     if (scratchLL <= 1) {
         sprintf(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 if (scratchLL > 4) {
         sprintf(tmp,
-                _("Your backup will occupy one meeeeellion media! (maybe %s)"),
+                "Your backup will occupy one meeeeellion media! (maybe %s)",
                 number_to_text((int) (scratchLL + 1)));
     } else {
-        sprintf(tmp, _("Your backup will occupy approximately %s media."),
+        sprintf(tmp, "Your backup will occupy approximately %s media.",
                 number_to_text((int) (scratchLL + 1)));
     }