connectivity/registry/macab/org/openoffice/Office/DataAccess/Drivers.xcu |
2 +-
extensions/uiconfig/sabpilot/ui/selecttypepage.ui |
2 +-
vcl/osx/salinst.cxx |
2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
New commits:
commit 957d4254d6ab13bfa5df01b728d3396f11c82e9a
Author: Andras Timar <andras.ti...@collabora.com>
AuthorDate: Mon Sep 18 22:40:18 2023 +0200
Commit: Andras Timar <andras.ti...@collabora.com>
CommitDate: Tue Sep 19 07:13:24 2023 +0200
The name is macOS since 2016
Change-Id: I9f2011e1f9619652b4ed417f135451d8ccfe90bc
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/157033
Tested-by: Jenkins
Reviewed-by: Andras Timar <andras.ti...@collabora.com>
diff --git
a/connectivity/registry/macab/org/openoffice/Office/DataAccess/Drivers.xcu
b/connectivity/registry/macab/org/openoffice/Office/DataAccess/Drivers.xcu
index 3d9d3121de6e..027b6482535f 100644
--- a/connectivity/registry/macab/org/openoffice/Office/DataAccess/Drivers.xcu
+++ b/connectivity/registry/macab/org/openoffice/Office/DataAccess/Drivers.xcu
@@ -23,7 +23,7 @@
<value>com.sun.star.comp.sdbc.macab.Driver</value>
</prop>
<prop oor:name="DriverTypeDisplayName" oor:type="xs:string">
- <value xml:lang="en-US">Mac OS X Address Book</value>
+ <value xml:lang="en-US">macOS Address Book</value>
</prop>
<node oor:name="Properties">
<node oor:name="EscapeDateTime" oor:op="replace">
diff --git a/extensions/uiconfig/sabpilot/ui/selecttypepage.ui
b/extensions/uiconfig/sabpilot/ui/selecttypepage.ui
index d7493388cfc4..5627482afac8 100644
--- a/extensions/uiconfig/sabpilot/ui/selecttypepage.ui
+++ b/extensions/uiconfig/sabpilot/ui/selecttypepage.ui
@@ -139,7 +139,7 @@ This wizard helps you create the data source.</property>
</child>
<child>
<object class="GtkRadioButton" id="macosx">
- <property name="label" translatable="yes"
context="selecttypepage|macosx">Mac OS X address book</property>
+ <property name="label" translatable="yes"
context="selecttypepage|macosx">macOS address book</property>
<property name="visible">True</property>
<property name="can-focus">True</property>
<property name="receives-default">False</property>
diff --git a/vcl/osx/salinst.cxx b/vcl/osx/salinst.cxx
index 8177c2c8309f..bf1b11a94ba5 100644
--- a/vcl/osx/salinst.cxx
+++ b/vcl/osx/salinst.cxx
@@ -975,7 +975,7 @@ OUString AquaSalInstance::getOSVersion()
if ( sysVersionDict )
versionString = [ sysVersionDict valueForKey: @"ProductVersion" ];
- OUString aVersion = "Mac OS X ";
+ OUString aVersion = "macOS ";
if ( versionString )
aVersion += OUString::fromUtf8( [ versionString UTF8String ] );
else
