Index: trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java	(revision 17674)
+++ trunk/src/org/openstreetmap/josm/tools/PlatformHookOsx.java	(revision 17676)
@@ -96,5 +96,5 @@
         } catch (ReflectiveOperationException | SecurityException | IllegalArgumentException ex) {
             // We'll just ignore this for now. The user will still be able to close JOSM by closing all its windows.
-            Logging.warn("Failed to register with OSX: " + ex);
+            Logging.warn("Failed to register with macOS: " + ex);
         }
         checkExpiredJava(callback);
@@ -158,5 +158,5 @@
                     Window.class, boolean.class).invoke(eawtFullScreenUtilities, window, Boolean.TRUE);
         } catch (ReflectiveOperationException | SecurityException | IllegalArgumentException e) {
-            Logging.warn("Failed to register with OSX: " + e);
+            Logging.warn("Failed to register with macOS: " + e);
         }
     }
@@ -171,5 +171,5 @@
     public Object invoke(Object proxy, Method method, Object[] args) throws Throwable {
         if (Logging.isDebugEnabled()) {
-            Logging.debug("OSX handler: {0} - {1}", method.getName(), Arrays.toString(args));
+            Logging.debug("macOS handler: {0} - {1}", method.getName(), Arrays.toString(args));
         }
         switch (method.getName()) {
@@ -205,5 +205,5 @@
             break;
         default:
-            Logging.warn("OSX unsupported method: "+method.getName());
+            Logging.warn("macOS unsupported method: "+method.getName());
         }
         return null;
Index: trunk/src/org/openstreetmap/josm/tools/Shortcut.java
===================================================================
--- trunk/src/org/openstreetmap/josm/tools/Shortcut.java	(revision 17674)
+++ trunk/src/org/openstreetmap/josm/tools/Shortcut.java	(revision 17676)
@@ -537,5 +537,5 @@
                 int newmodifier = findNewOsxModifier(requestedGroup);
                 if (!findShortcut(requestedKey, newmodifier).isPresent()) {
-                    Logging.info("Reassigning OSX shortcut '" + shortText + "' from Meta to Ctrl because of conflict with " + conflict);
+                    Logging.info("Reassigning macOS shortcut '" + shortText + "' from Meta to Ctrl because of conflict with " + conflict);
                     return reassignShortcut(shortText, longText, requestedKey, conflict, requestedGroup, requestedKey, newmodifier);
                 }