A bunch of "{Mac} OS X" -> "macOS" changes.

Avoid anachronisms, however; there was no "macOS 10.0" or even "OS X
10.0", for example.  It was "Mac OS X" until 10.8 (although 10.7 was
sometimes called "OS X" and sometimes called "Mac OS X"), and it was "OS
X" from 10.8 to 10.11.

Change-Id: Ie4a848997dcc6c45c2245c1fb84ec526032375c3
Reviewed-on: https://code.wireshark.org/review/20933
Reviewed-by: Guy Harris <guy@alum.mit.edu>

7 files changed, 12 insertions, 12 deletions

diff --git a/ui/gtk/file_dlg.c b/ui/gtk/file_dlg.c
index 72acf6029b..47e8938302 100644
--- a/ui/gtk/file_dlg.c
+++ b/ui/gtk/file_dlg.c
@@ -292,7 +292,7 @@ file_target_unwritable_ui(GtkWidget *chooser_w, char *cf_name)
      ioctls (FS_IOC_GETFLAGS/FS_IOC_SETFLAGS in newer kernels,
      EXT2_IOC_GETFLAGS/EXT2_IOC_SETFLAGS in older kernels - non-ext2
      file systems that support those ioctls use the same values as ext2
-     does), appears to be more like the *BSD/OS X "system immutable"
+     does), appears to be more like the *BSD/macOS "system immutable"
      flag, as it can be set only by the superuser or by processes with
      CAP_LINUX_IMMUTABLE, so it sounds as if it's not intended for
      arbitrary users to set or clear. */
@@ -314,8 +314,8 @@ file_target_unwritable_ui(GtkWidget *chooser_w, char *cf_name)
                                         GTK_MESSAGE_QUESTION,
                                         GTK_BUTTONS_NONE,
 #ifdef __APPLE__
-    /* Stuff in the OS X UI calls files with the "user immutable" bit
-       "locked"; pre-OS X Mac software might have had that notion and
+    /* Stuff in the macOS UI calls files with the "user immutable" bit
+       "locked"; the classic Mac OS might have had that notion and
        called it "locked". */
                                         "The file \"%s\" is locked.",
 #else /* __APPLE__ */
diff --git a/ui/gtk/main.c b/ui/gtk/main.c
index c8b030b2fc..b7002f5660 100644
--- a/ui/gtk/main.c
+++ b/ui/gtk/main.c
@@ -3195,7 +3195,7 @@ create_main_window (gint pl_size, gint tv_size, gint bv_size, e_prefs *prefs_p
     menubar = main_menu_new(&accel);
 
 #if defined(HAVE_IGE_MAC_INTEGRATION) || defined (HAVE_GTKOSXAPPLICATION)
-    /* Mac OS X native menus are created and displayed by main_menu_new() */
+    /* macOS native menus are created and displayed by main_menu_new() */
     if(!prefs_p->gui_macosx_style) {
 #endif
     gtk_window_add_accel_group(GTK_WINDOW(top_level), accel);
diff --git a/ui/gtk/main_menubar.c b/ui/gtk/main_menubar.c
index a9b981b3ca..8669743135 100644
--- a/ui/gtk/main_menubar.c
+++ b/ui/gtk/main_menubar.c
@@ -2501,7 +2501,7 @@ main_menu_new(GtkAccelGroup ** table)
     }
 
     /* The quit item in the application menu shows up whenever ige mac
-     * integration is enabled, even if the OS X UI style in Wireshark isn't
+     * integration is enabled, even if the macOS UI style in Wireshark isn't
      * turned on. */
     quit_item = gtk_menu_item_new_with_label("Quit");
     g_signal_connect(quit_item, "activate", G_CALLBACK(file_quit_cmd_cb), NULL);
diff --git a/ui/gtk/prefs_gui.c b/ui/gtk/prefs_gui.c
index 4438444835..176f55dbfd 100644
--- a/ui/gtk/prefs_gui.c
+++ b/ui/gtk/prefs_gui.c
@@ -205,8 +205,8 @@ gui_prefs_show(void)
 
 #if defined(HAVE_IGE_MAC_INTEGRATION) || defined(HAVE_GTKOSXAPPLICATION)
 	macosx_style_cb = create_preference_check_button(main_grid, pos++,
-	    "OS X style",
-	    "Create an OS X look and feel. Checking this box will move the "
+	    "macOS style",
+	    "Create a macOS look and feel. Checking this box will move the "
 	    "menu bar to the top of the screen instead of the top of the Wireshark window. "
 	    "Requires a restart of Wireshark to take effect.",
 	    prefs.gui_macosx_style);
diff --git a/ui/gtk/rlc_lte_graph.c b/ui/gtk/rlc_lte_graph.c
index 7bc23c7f04..ec729937bf 100644
--- a/ui/gtk/rlc_lte_graph.c
+++ b/ui/gtk/rlc_lte_graph.c
@@ -323,7 +323,7 @@ static int rint(double );     /* compiler template for Windows */
 static struct irect zoomrect;
 
 
-/* XXX - what about OS X? */
+/* XXX - what about macOS? */
 static char helptext[] =
     "Here's what you can do:\n"
     "\n"
diff --git a/ui/gtk/tcp_graph.c b/ui/gtk/tcp_graph.c
index 0a68b6353f..266e0968ed 100644
--- a/ui/gtk/tcp_graph.c
+++ b/ui/gtk/tcp_graph.c
@@ -480,7 +480,7 @@ static struct irect zoomrect;
 
 /* #define ORIGINAL_WIN32_BUTTONS 1 */
 
-/* XXX - what about OS X? */
+/* XXX - what about macOS? */
 /* XXX: Needs work to ensire that the columns line up properly in both Gtk2 & Gtk3  */
 /*      What is the proper way to do this ??                                        */
 static char helptext[] =
diff --git a/ui/gtk/webbrowser.c b/ui/gtk/webbrowser.c
index 36e94debf5..467a7333f1 100644
--- a/ui/gtk/webbrowser.c
+++ b/ui/gtk/webbrowser.c
@@ -72,12 +72,12 @@
  * (Its Windows openURL uses ShellExecute() on non-mailto URLs (it
  * does more exotic stuff for mailto: URLs).
  *
- * Its OS X stuff uses the openURL method of an NSWorkspace (which
+ * Its macOS stuff uses the openURL method of an NSWorkspace (which
  * probably ends up in Launch Services....).)
  *
  * GTK+ has gtk_show_uri(), but that ultimately uses gvfs on UN*X,
  * so it's not appropriate for non-GNOME UN*Xes (including, but not
- * limited to, OS X), and ultimately appears to be a stubbed-out
+ * limited to, macOS), and ultimately appears to be a stubbed-out
  * routine in GLib 2.36.0, so it's not very useful for a cross-
  * platform applicatio n.
  *
@@ -125,7 +125,7 @@
 /* if WIN32_LEAN_AND_MEAN is defined, shellapi.h is needed too */
 #include <shellapi.h>
 #elif defined (HAVE_OS_X_FRAMEWORKS)
-/* Mac OS X - use Launch Services to start a browser */
+/* macOS - use Launch Services to start a browser */
 #include <CoreFoundation/CoreFoundation.h>
 #include <ApplicationServices/ApplicationServices.h>
 #else