Changeset 507 in MondoRescue for trunk/mondo/mondo/mondoarchive/main.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/mondoarchive/main.c (modified) (16 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);
     }