From 818ef9aaf6d89d964a18ed66b9048c719d698e3f Mon Sep 17 00:00:00 2001
From: Philip Withnall <philip@tecnocode.co.uk>
Date: Sun, 22 Aug 2010 15:06:45 +0100
Subject: [PATCH] Miscellaneous string fixes

Mostly capitalisation fixes. Closes: bgo#528257
---
 gdk/gdk.c                                        | 4 ++--
 gtk/gtkbuilderparser.c                           | 2 +-
 gtk/gtkmountoperation-stub.c                     | 2 +-
 gtk/gtkmountoperation-x11.c                      | 2 +-
 gtk/gtkmountoperation.c                          | 2 +-
 gtk/gtktextbufferserialize.c                     | 2 +-
 modules/printbackends/cups/gtkprintbackendcups.c | 2 +-
 7 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/gdk/gdk.c b/gdk/gdk.c
index 110d662dc7..e602a80f02 100644
--- a/gdk/gdk.c
+++ b/gdk/gdk.c
@@ -161,10 +161,10 @@ static const GOptionEntry gdk_args[] = {
     /* Placeholder in --screen=SCREEN in --help output */      N_("SCREEN") },
 #ifdef G_ENABLE_DEBUG
   { "gdk-debug",    0, 0, G_OPTION_ARG_CALLBACK, gdk_arg_debug_cb,  
-    /* Description of --gdk-debug=FLAGS in --help output */    N_("Gdk debugging flags to set"),
+    /* Description of --gdk-debug=FLAGS in --help output */    N_("GDK debugging flags to set"),
     /* Placeholder in --gdk-debug=FLAGS in --help output */    N_("FLAGS") },
   { "gdk-no-debug", 0, 0, G_OPTION_ARG_CALLBACK, gdk_arg_no_debug_cb, 
-    /* Description of --gdk-no-debug=FLAGS in --help output */ N_("Gdk debugging flags to unset"), 
+    /* Description of --gdk-no-debug=FLAGS in --help output */ N_("GDK debugging flags to unset"),
     /* Placeholder in --gdk-no-debug=FLAGS in --help output */ N_("FLAGS") },
 #endif 
   { NULL }
diff --git a/gtk/gtkbuilderparser.c b/gtk/gtkbuilderparser.c
index b4f6855136..52a06df8ad 100644
--- a/gtk/gtkbuilderparser.c
+++ b/gtk/gtkbuilderparser.c
@@ -404,7 +404,7 @@ parse_object (GMarkupParseContext  *context,
     {
       g_set_error (error, GTK_BUILDER_ERROR,
                    GTK_BUILDER_ERROR_DUPLICATE_ID,
-                   _("Duplicate object id '%s' on line %d (previously on line %d)"),
+                   _("Duplicate object ID '%s' on line %d (previously on line %d)"),
                    object_id, line, line2);
       return;
     }
diff --git a/gtk/gtkmountoperation-stub.c b/gtk/gtkmountoperation-stub.c
index c7b8d1a9ed..27b09ae7f9 100644
--- a/gtk/gtkmountoperation-stub.c
+++ b/gtk/gtkmountoperation-stub.c
@@ -61,7 +61,7 @@ _gtk_mount_operation_kill_process (GPid      pid,
   g_set_error (error,
                G_IO_ERROR,
                G_IO_ERROR_NOT_SUPPORTED,
-               _("Cannot kill process with pid %d. Operation is not implemented."),
+               _("Cannot kill process with PID %d. Operation is not implemented."),
                pid);
   return FALSE;
 }
diff --git a/gtk/gtkmountoperation-x11.c b/gtk/gtkmountoperation-x11.c
index a20c8cf428..92914f6906 100644
--- a/gtk/gtkmountoperation-x11.c
+++ b/gtk/gtkmountoperation-x11.c
@@ -963,7 +963,7 @@ _gtk_mount_operation_kill_process (GPid      pid,
       g_set_error (error,
                    G_IO_ERROR,
                    g_io_error_from_errno (errsv),
-                   _("Cannot end process with pid %d: %s"),
+                   _("Cannot end process with PID %d: %s"),
                    pid,
                    g_strerror (errsv));
     }
diff --git a/gtk/gtkmountoperation.c b/gtk/gtkmountoperation.c
index d611631bb8..7837263446 100644
--- a/gtk/gtkmountoperation.c
+++ b/gtk/gtkmountoperation.c
@@ -878,7 +878,7 @@ add_pid_to_process_list_store (GtkMountOperation              *mount_operation,
                                     &pixbuf);
 
   if (name == NULL)
-    name = g_strdup_printf (_("Unknown Application (pid %d)"), pid);
+    name = g_strdup_printf (_("Unknown Application (PID %d)"), pid);
 
   if (command_line == NULL)
     command_line = g_strdup ("");
diff --git a/gtk/gtktextbufferserialize.c b/gtk/gtktextbufferserialize.c
index 1ddb9b0f81..0f22cdb7d0 100644
--- a/gtk/gtktextbufferserialize.c
+++ b/gtk/gtktextbufferserialize.c
@@ -843,7 +843,7 @@ check_id_or_name (GMarkupParseContext  *context,
 	    {
 	      set_error (error, context,
 			 G_MARKUP_ERROR, G_MARKUP_ERROR_PARSE,
-			 _("<%s> element has invalid id \"%s\""), attribute_values[i]);
+			 _("<%s> element has invalid ID \"%s\""), attribute_values[i]);
 	      return FALSE;
 	    }
 	}
diff --git a/modules/printbackends/cups/gtkprintbackendcups.c b/modules/printbackends/cups/gtkprintbackendcups.c
index 2a9b74ca80..6cb0926911 100644
--- a/modules/printbackends/cups/gtkprintbackendcups.c
+++ b/modules/printbackends/cups/gtkprintbackendcups.c
@@ -1683,7 +1683,7 @@ cups_request_printer_list_cb (GtkPrintBackendCups *cups_backend,
           N_("The door is open on printer '%s'."),
           N_("Printer '%s' is low on paper."),
           N_("Printer '%s' is out of paper."),
-          N_("Printer '%s' is currently off-line."),
+          N_("Printer '%s' is currently offline."),
           N_("There is a problem on printer '%s'.")
         };
       gboolean is_paused = FALSE;