Changeset 507 in MondoRescue for trunk/mondo/mondo/mondoarchive

Timestamp:

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

Author:

bcornec

Message:

merge -r489:506 $SVN_M/branches/stable

Location:

trunk/mondo/mondo/mondoarchive

Files:

• main.c (modified) (16 diffs)
• mondo-cli.c (modified) (29 diffs)

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