[gnome-disk-utility] String review, part II

[Matthias Clasen <matthiasc src gnome org>]

commit 4326dfe058755b6794efb8e7d5969da44aa11d50
Author: Matthias Clasen <mclasen redhat com>
Date:   Mon Jul 27 14:02:43 2009 -0400

    String review, part II
    
    Change instances of 'cancelled' to 'canceled' in translated strings.

 src/format-tool/gdu-format-tool.c   |    2 +-
 src/palimpsest/gdu-section-health.c |    4 ++--
 src/palimpsest/gdu-shell.c          |    2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/src/format-tool/gdu-format-tool.c b/src/format-tool/gdu-format-tool.c
index 19722f9..3aa1a73 100644
--- a/src/format-tool/gdu-format-tool.c
+++ b/src/format-tool/gdu-format-tool.c
@@ -158,7 +158,7 @@ on_progress_dialog_response (GtkDialog *dialog,
 {
         FormatData *data = user_data;
 
-        data->error = g_error_new (G_IO_ERROR, G_IO_ERROR_CANCELLED, _("Operation was cancelled"));
+        data->error = g_error_new (G_IO_ERROR, G_IO_ERROR_CANCELLED, _("Operation was canceled"));
         g_main_loop_quit (data->loop);
 }
 
diff --git a/src/palimpsest/gdu-section-health.c b/src/palimpsest/gdu-section-health.c
index ad4fc0c..e7528a9 100644
--- a/src/palimpsest/gdu-section-health.c
+++ b/src/palimpsest/gdu-section-health.c
@@ -285,10 +285,10 @@ smart_data_set (GduSectionHealth *section)
                 s = g_strdup (C_("ATA SMART test result", "Completed OK"));
                 break;
         case GDU_ATA_SMART_SELF_TEST_EXECUTION_STATUS_ABORTED:
-                s = g_strdup (C_("ATA SMART test result", "Cancelled"));
+                s = g_strdup (C_("ATA SMART test result", "Canceled"));
                 break;
         case GDU_ATA_SMART_SELF_TEST_EXECUTION_STATUS_INTERRUPTED:
-                s = g_strdup (C_("ATA SMART test result", "Cancelled (with hard or soft reset)"));
+                s = g_strdup (C_("ATA SMART test result", "Canceled (with hard or soft reset)"));
                 break;
         case GDU_ATA_SMART_SELF_TEST_EXECUTION_STATUS_FATAL:
                 s = g_strdup (C_("ATA SMART test result", "Not completed (a fatal error might have occured)"));
diff --git a/src/palimpsest/gdu-shell.c b/src/palimpsest/gdu-shell.c
index 2c782b4..9e8b231 100644
--- a/src/palimpsest/gdu-shell.c
+++ b/src/palimpsest/gdu-shell.c
@@ -1751,7 +1751,7 @@ gdu_shell_raise_error (GduShell       *shell,
                 error_msg = _("The device is busy.");
                 break;
         case GDU_ERROR_CANCELLED:
-                error_msg = _("The operation was cancelled.");
+                error_msg = _("The operation was canceled.");
                 break;
         case GDU_ERROR_INHIBITED:
                 error_msg = _("The daemon is being inhibited.");