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

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