Changeset 524 in MondoRescue for trunk/mondo

Timestamp:

May 5, 2006, 11:47:41 AM (18 years ago)

Author:

bcornec

Message:

merge -r 516:523 $SVN_M/branches/stable

Location:

trunk/mondo/mondo

Files:

• mondoarchive/mondo-cli.c (modified) (2 diffs)
• mondorestore/mondo-rstr-compare.c (modified) (10 diffs)

trunk/mondo/mondo/mondoarchive/mondo-cli.c

@@ -327 +327 @@
         strncpy(bkpinfo->include_paths + strlen(bkpinfo->include_paths),
                 flag_val['I'],
-                MAX_STR_LEN - strlen(bkpinfo->include_paths));
+                4*MAX_STR_LEN - strlen(bkpinfo->include_paths));
         log_msg(1, "include_paths is now '%s'", bkpinfo->include_paths);
         if (bkpinfo->include_paths[0] == '-') {
@@ -561 +561 @@
         strncpy(bkpinfo->exclude_paths + strlen(bkpinfo->exclude_paths),
                 flag_val['E'],
-                MAX_STR_LEN - strlen(bkpinfo->exclude_paths));
+                4*MAX_STR_LEN - strlen(bkpinfo->exclude_paths));
     }
     if (flag_set['e']) {

trunk/mondo/mondo/mondorestore/mondo-rstr-compare.c

@@ -254 +254 @@
     }
     mvaddstr_and_log_it(g_currentY, 0,
-                        "Comparing large files                                                  ");
+                        _("Comparing large files                                                  "));
     open_progress_form(_("Comparing large files"),
                        _("I am now comparing the large files"),
@@ -270 +270 @@
     return (0);
     if (retval) {
-        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
-    } else {
-        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+        mvaddstr_and_log_it(g_currentY++, 74, _("Errors."));
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     }
     return (retval);
@@ -430 +430 @@
 
     assert(bkpinfo != NULL);
-    mvaddstr_and_log_it(g_currentY, 0, "Comparing archives");
+    mvaddstr_and_log_it(g_currentY, 0, _("Comparing archives"));
     read_cfg_var(g_mondo_cfg_file, "last-filelist-number", tmp);
 
@@ -490 +490 @@
     close_progress_form();
     if (retval) {
-        mvaddstr_and_log_it(g_currentY++, 74, "Errors.");
-    } else {
-        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+        mvaddstr_and_log_it(g_currentY++, 74, _("Errors."));
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     }
     paranoid_free(tarball_fname);
@@ -609 +609 @@
     read_cfg_file_into_bkpinfo(g_mondo_cfg_file, bkpinfo);
     g_current_media_number = 1;
-    mvaddstr_and_log_it(1, 30, "Comparing Automatically");
+    mvaddstr_and_log_it(1, 30, _("Comparing Automatically"));
     iamhere("Pre-MAD");
     retval = mount_all_devices(mountlist, FALSE);
@@ -628 +628 @@
         mvaddstr_and_log_it(g_currentY++,
                             0,
-                            "Warning - differences found during the compare phase");
+                            _("Warning - differences found during the compare phase"));
     }
 
@@ -635 +635 @@
     if (count_lines_in_file("/tmp/changed.txt") > 0) {
         mvaddstr_and_log_it(g_currentY++, 0,
-                            "Differences found while files were being compared.");
+                            _("Differences found while files were being compared."));
         streamline_changes_file("/tmp/changed.files", "/tmp/changed.txt");
         if (count_lines_in_file("/tmp/changed.files") <= 0) {
             mvaddstr_and_log_it(g_currentY++, 0,
-                                "...but they were logfiles and temporary files. Your archives are fine.");
+                                _("...but they were logfiles and temporary files. Your archives are fine."));
             log_to_screen
                 (_("The differences were logfiles and temporary files. Your archives are fine."));
@@ -696 +696 @@
     run_program_and_log_output(command, FALSE);
     mvaddstr_and_log_it(g_currentY,
-                        0, "Verifying archives against filesystem");
+                        0, _("Verifying archives against filesystem"));
 
     if (bkpinfo->disaster_recovery
@@ -719 +719 @@
     }
 
-    mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+    mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     paranoid_free(dir);
     paranoid_free(command);
@@ -756 +756 @@
     run_program_and_log_output(command, FALSE);
     mvaddstr_and_log_it(g_currentY,
-                        0, "Verifying archives against filesystem");
+                        0, _("Verifying archives against filesystem"));
     res = verify_tape_backups(bkpinfo);
     chdir(dir);
     if (res) {
-        mvaddstr_and_log_it(g_currentY++, 74, "Failed.");
-    } else {
-        mvaddstr_and_log_it(g_currentY++, 74, "Done.");
+        mvaddstr_and_log_it(g_currentY++, 74, _("Failed."));
+    } else {
+        mvaddstr_and_log_it(g_currentY++, 74, _("Done."));
     }
     paranoid_free(dir);