diff options
| author | Bartosz Kosiorek <gang65@poczta.onet.pl> | 2018-11-27 11:40:49 +0100 |
|---|---|---|
| committer | Bartosz Kosiorek <gang65@poczta.onet.pl> | 2018-11-29 14:08:26 +0100 |
| commit | 9c0d40fbc7d01ff46b78b798361bf3a19cc18bdc (patch) | |
| tree | a2afd07ced2da313c5cdc6183bb1ea7e832d9a7e /include | |
| parent | a55d15e27f4290b9aaf5597161b2b3c5200d3f85 (diff) | |
Rename Mac OS X to official name macOS in comments and documentation
Change-Id: I651b7f202fa52ff5f5357a11aa72c43eb7dc7f95
Reviewed-on: https://gerrit.libreoffice.org/64102
Tested-by: Jenkins
Reviewed-by: Bartosz Kosiorek <gang65@poczta.onet.pl>
Diffstat (limited to 'include')
| -rw-r--r-- | include/sal/log-areas.dox | 4 | ||||
| -rw-r--r-- | include/svtools/strings.hrc | 2 | ||||
| -rw-r--r-- | include/vcl/svapp.hxx | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/include/sal/log-areas.dox b/include/sal/log-areas.dox index c2ff84627248..1468680d065e 100644 --- a/include/sal/log-areas.dox +++ b/include/sal/log-areas.dox @@ -456,9 +456,9 @@ certain functionality. @li @c vcl @li @c vcl.a11y @li @c vcl.app -@li @c vcl.cg - CoreGraphics calls on OS X and iOS +@li @c vcl.cg - CoreGraphics calls on macOS and iOS @li @c vcl.control -@li @c vcl.ct - CoreText-using code for OS X and iOS +@li @c vcl.ct - CoreText-using code for macOS and iOS @li @c vcl.debugevent @li @c vcl.emf - EMF/EMF+ processing @li @c vcl.eventtesting diff --git a/include/svtools/strings.hrc b/include/svtools/strings.hrc index 84987002c7fb..efd5ece4efa8 100644 --- a/include/svtools/strings.hrc +++ b/include/svtools/strings.hrc @@ -283,7 +283,7 @@ #define STR_WARNING_JAVANOTFOUND NC_("STR_WARNING_JAVANOTFOUND", "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. Please install a JRE and restart %PRODUCTNAME.") #define STR_WARNING_JAVANOTFOUND_WIN NC_("STR_WARNING_JAVANOTFOUND_WIN", "%PRODUCTNAME requires a %BITNESS-bit Java runtime environment (JRE) to perform this task. Please install a JRE and restart %PRODUCTNAME.") -#define STR_WARNING_JAVANOTFOUND_MAC NC_("STR_WARNING_JAVANOTFOUND_MAC", "%PRODUCTNAME requires Oracle's Java Development Kit (JDK) on Mac OS X 10.10 or greater to perform this task. Please install them and restart %PRODUCTNAME.") +#define STR_WARNING_JAVANOTFOUND_MAC NC_("STR_WARNING_JAVANOTFOUND_MAC", "%PRODUCTNAME requires Oracle's Java Development Kit (JDK) on macOS 10.10 or greater to perform this task. Please install them and restart %PRODUCTNAME.") #define STR_WARNING_INVALIDJAVASETTINGS_MAC NC_("STR_WARNING_INVALIDJAVASETTINGS_MAC", "The %PRODUCTNAME configuration has been changed. Under %PRODUCTNAME - Preferences - %PRODUCTNAME - Advanced, select the Java runtime environment you want to have used by %PRODUCTNAME.") #define STR_WARNING_INVALIDJAVASETTINGS NC_("STR_WARNING_INVALIDJAVASETTINGS", "The %PRODUCTNAME configuration has been changed. Under Tools - Options - %PRODUCTNAME - Advanced, select the Java runtime environment you want to have used by %PRODUCTNAME.") #define STR_ERROR_JVMCREATIONFAILED_MAC NC_("STR_ERROR_JVMCREATIONFAILED_MAC", "%PRODUCTNAME requires a Java runtime environment (JRE) to perform this task. The selected JRE is defective. Please select another version or install a new JRE and select it under %PRODUCTNAME - Preferences - %PRODUCTNAME - Advanced.") diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx index 3a43ee2c7386..9032ebc7f299 100644 --- a/include/vcl/svapp.hxx +++ b/include/vcl/svapp.hxx @@ -1025,7 +1025,7 @@ public: /** @name Accelerators and Mnemonics - Accelerators allow a user to hold down Ctrl+key (or CMD+key on OS X) + Accelerators allow a user to hold down Ctrl+key (or CMD+key on macOS) combination to gain quick access to functionality. Mnemonics are underline letters in things like menus and dialog boxes |