Merge branch '3269-en-gb' into 'main'

gio: Change ‘unrecognised’ to ‘unrecognized’ in various user-visible places

See merge request GNOME/glib!3985

docs/reference/gio/gapplication.rst

@@ -177,7 +177,7 @@ Here is a simplified example, as may be installed in ``/usr/bin/fooview``::
        ;;
 
      -*)
-       echo "unrecognised commandline argument"
+       echo "unrecognized commandline argument"
        exit 1
        ;;
 

gio/gapplication-tool.c

@@ -470,7 +470,7 @@ main (int argc, char **argv)
   if (g_str_equal (argv[1], "list-actions"))
     return app_list_actions (argv + 2);
 
-  g_printerr (_("unrecognised command: %s\n\n"), argv[1]);
+  g_printerr (_("unrecognized command: %s\n\n"), argv[1]);
 
   return app_help (FALSE, NULL);
 }

gio/gapplication.c

@@ -709,8 +709,8 @@ add_packed_option (GApplication *application,
  * was to send all of the commandline arguments (options and all) to the
  * primary instance for handling.  #GApplication ignored them completely
  * on the local side.  Calling this function "opts in" to the new
- * behaviour, and in particular, means that unrecognised options will be
- * treated as errors.  Unrecognised options have never been ignored when
+ * behaviour, and in particular, means that unrecognized options will be
+ * treated as errors.  Unrecognized options have never been ignored when
  * %G_APPLICATION_HANDLES_COMMAND_LINE is unset.
  *
  * If #GApplication::handle-local-options needs to see the list of
@@ -851,7 +851,7 @@ g_application_add_main_option (GApplication *application,
  *
  * Calling this function will cause the options in the supplied option
  * group to be parsed, but it does not cause you to be "opted in" to the
- * new functionality whereby unrecognised options are rejected even if
+ * new functionality whereby unrecognized options are rejected even if
  * %G_APPLICATION_HANDLES_COMMAND_LINE was given.
  *
  * Since: 2.40

gio/gthreadedresolver.c

@@ -1073,7 +1073,7 @@ g_resolver_records_from_res_query (const gchar      *rrname,
           record = parse_res_txt (answer, p + rdlength, &p, &parsing_error);
           break;
         default:
-          g_debug ("Unrecognised DNS record type %u", rrtype);
+          g_debug ("Unrecognized DNS record type %u", rrtype);
           record = NULL;
           break;
         }

gio/tests/gio-du.c

@@ -112,7 +112,7 @@ main (int argc, char **argv)
         progress = report_progress;
       else
         {
-          g_printerr ("unrecognised flag %s\n", argv[i]);
+          g_printerr ("unrecognized flag %s\n", argv[i]);
         }
     }