tdf#147997: MySQL/MariaDB for dialog for direct connection

Expand a bit rebranding to JDBC part and other locations

Change-Id: Ia48972996b3eb3be0341d7d93a0ba1dc69fe0057
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/131632
Tested-by: Jenkins
Reviewed-by: Julien Nabet <serval2412@yahoo.fr>

5 files changed, 13 insertions, 13 deletions

diff --git a/dbaccess/inc/strings.hrc b/dbaccess/inc/strings.hrc
index ed910c8df1af..ea57f4ebd240 100644
--- a/dbaccess/inc/strings.hrc
+++ b/dbaccess/inc/strings.hrc
@@ -332,7 +332,7 @@
 #define STR_CALC_PATH_OR_FILE                       NC_("STR_CALC_PATH_OR_FILE", "Path to the spreadsheet document")
 #define STR_NAME_OF_ODBC_DATASOURCE                 NC_("STR_NAME_OF_ODBC_DATASOURCE", "Name of the ODBC data source on your system")
 #define STR_WRITER_PATH_OR_FILE                     NC_("STR_WRITER_PATH_OR_FILE", "Path to the Writer document")
-#define STR_MYSQL_DATABASE_NAME                     NC_("STR_MYSQL_DATABASE_NAME", "Name of the MySQL database")
+#define STR_MYSQL_DATABASE_NAME                     NC_("STR_MYSQL_DATABASE_NAME", "Name of the MySQL/MariaDB database")
 #define STR_ORACLE_DATABASE_NAME                    NC_("STR_ORACLE_DATABASE_NAME", "Name of the Oracle database")
 #define STR_MSACCESS_MDB_FILE                       NC_("STR_MSACCESS_MDB_FILE", "Microsoft Access database file")
 #define STR_NO_ADDITIONAL_SETTINGS                  NC_("STR_NO_ADDITIONAL_SETTINGS", "No more settings are necessary. To verify that the connection is working, click the '%test' button.")
@@ -365,16 +365,16 @@
 #define STR_PAGETITLE_ADO                           NC_("STR_PAGETITLE_ADO", "Set up ADO connection" )
 #define STR_PAGETITLE_JDBC                          NC_("STR_PAGETITLE_JDBC", "Set up JDBC connection" )
 #define STR_PAGETITLE_ORACLE                        NC_("STR_PAGETITLE_ORACLE", "Set up Oracle database connection" )
-#define STR_PAGETITLE_MYSQL                         NC_("STR_PAGETITLE_MYSQL", "Set up MySQL connection" )
+#define STR_PAGETITLE_MYSQL                         NC_("STR_PAGETITLE_MYSQL", "Set up MySQL/MariaDB connection" )
 #define STR_PAGETITLE_ODBC                          NC_("STR_PAGETITLE_ODBC", "Set up ODBC connection" )
 #define STR_PAGETITLE_DOCUMENT_OR_SPREADSHEET       NC_("STR_PAGETITLE_DOCUMENT_OR_SPREADSHEET", "Set up Writer Document or Spreadsheet connection" )
 #define STR_PAGETITLE_AUTHENTIFICATION              NC_("STR_PAGETITLE_AUTHENTIFICATION", "Set up user authentication" )
-#define STR_PAGETITLE_MYSQL_NATIVE                  NC_("STR_PAGETITLE_MYSQL_NATIVE", "Set up MySQL server data")
+#define STR_PAGETITLE_MYSQL_NATIVE                  NC_("STR_PAGETITLE_MYSQL_NATIVE", "Set up MySQL/MariaDB server data")
 #define STR_PAGETITLE_FINAL                         NC_("STR_PAGETITLE_FINAL", "Save and proceed" )
 #define STR_DATABASEDEFAULTNAME                     NC_("STR_DATABASEDEFAULTNAME", "New Database" )
-#define STR_MYSQLJDBC_HEADERTEXT                    NC_("STR_MYSQLJDBC_HEADERTEXT", "Set up connection to a MySQL database using JDBC" )
-#define STR_MYSQLJDBC_HELPTEXT                      NC_("STR_MYSQLJDBC_HELPTEXT", "Please enter the required information to connect to a MySQL database using JDBC. Note that a JDBC driver class must be installed on your system and registered with %PRODUCTNAME.\nPlease contact your system administrator if you are unsure about the following settings.")
-#define STR_MYSQL_DRIVERCLASSTEXT                   NC_("STR_MYSQL_DRIVERCLASSTEXT", "MySQL JDBC d~river class:")
+#define STR_MYSQLJDBC_HEADERTEXT                    NC_("STR_MYSQLJDBC_HEADERTEXT", "Set up connection to a MySQL/MariaDB database using JDBC" )
+#define STR_MYSQLJDBC_HELPTEXT                      NC_("STR_MYSQLJDBC_HELPTEXT", "Please enter the required information to connect to a MySQL/MariaDB database using JDBC. Note that a JDBC driver class must be installed on your system and registered with %PRODUCTNAME.\nPlease contact your system administrator if you are unsure about the following settings.")
+#define STR_MYSQL_DRIVERCLASSTEXT                   NC_("STR_MYSQL_DRIVERCLASSTEXT", "MySQL/MariaDB JDBC d~river class:")
 #define STR_MYSQL_DEFAULT                           NC_("STR_MYSQL_DEFAULT", "Default: 3306")
 #define STR_DBASE_HEADERTEXT                        NC_("STR_DBASE_HEADERTEXT", "Set up a connection to dBASE files" )
 #define STR_DBASE_HELPTEXT                          NC_("STR_DBASE_HELPTEXT", "Select the folder where the dBASE files are stored." )
diff --git a/dbaccess/source/ui/dlg/generalpage.cxx b/dbaccess/source/ui/dlg/generalpage.cxx
index e3bacdefbc73..5809b7bd7088 100644
--- a/dbaccess/source/ui/dlg/generalpage.cxx
+++ b/dbaccess/source/ui/dlg/generalpage.cxx
@@ -564,7 +564,7 @@ namespace dbaui
         case ::dbaccess::DST_MYSQL_JDBC:
         case ::dbaccess::DST_MYSQL_ODBC:
         case ::dbaccess::DST_MYSQL_NATIVE:
-            _inout_rDisplayName = "MySQL";
+            _inout_rDisplayName = "MySQL/MariaDB";
             break;
         default:
             break;
diff --git a/dbaccess/uiconfig/ui/dbwizmysqlintropage.ui b/dbaccess/uiconfig/ui/dbwizmysqlintropage.ui
index b2646d31b7be..890f6a12829b 100644
--- a/dbaccess/uiconfig/ui/dbwizmysqlintropage.ui
+++ b/dbaccess/uiconfig/ui/dbwizmysqlintropage.ui
@@ -125,7 +125,7 @@ Please contact your system administrator if you are unsure about the following s
           <object class="GtkLabel" id="header">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes" context="dbwizmysqlintropage|header">Set Up a Connection to a MySQL Database</property>
+            <property name="label" translatable="yes" context="dbwizmysqlintropage|header">Set Up a Connection to a MySQL/MariaDB Database</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/dbaccess/uiconfig/ui/dbwizmysqlnativepage.ui b/dbaccess/uiconfig/ui/dbwizmysqlnativepage.ui
index f426fa7b7418..b2537b2fda46 100644
--- a/dbaccess/uiconfig/ui/dbwizmysqlnativepage.ui
+++ b/dbaccess/uiconfig/ui/dbwizmysqlnativepage.ui
@@ -32,7 +32,7 @@
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="halign">start</property>
-                <property name="label" translatable="yes" context="dbwizmysqlnativepage|helptext">Please enter the required information to connect to a MySQL database.</property>
+                <property name="label" translatable="yes" context="dbwizmysqlnativepage|helptext">Please enter the required information to connect to a MySQL/MariaDB database.</property>
                 <property name="wrap">True</property>
                 <property name="width_chars">72</property>
                 <property name="max_width_chars">72</property>
@@ -67,7 +67,7 @@
           <object class="GtkLabel" id="header">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="label" translatable="yes" context="dbwizmysqlnativepage|header">Set Up a Connection to a MySQL Database</property>
+            <property name="label" translatable="yes" context="dbwizmysqlnativepage|header">Set Up a Connection to a MySQL/MariaDB Database</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
diff --git a/dbaccess/uiconfig/ui/specialjdbcconnectionpage.ui b/dbaccess/uiconfig/ui/specialjdbcconnectionpage.ui
index 9255f6709f4d..0605fb00b18c 100644
--- a/dbaccess/uiconfig/ui/specialjdbcconnectionpage.ui
+++ b/dbaccess/uiconfig/ui/specialjdbcconnectionpage.ui
@@ -21,7 +21,7 @@
         <property name="can_focus">False</property>
         <property name="halign">start</property>
         <property name="margin_bottom">6</property>
-        <property name="label" translatable="yes" context="specialjdbcconnectionpage|header">Set up connection to a MySQL database using JDBC</property>
+        <property name="label" translatable="yes" context="specialjdbcconnectionpage|header">Set up connection to a MySQL/MariaDB database using JDBC</property>
         <attributes>
           <attribute name="weight" value="bold"/>
         </attributes>
@@ -36,7 +36,7 @@
       <object class="GtkLabel" id="helpLabel">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
-        <property name="label" translatable="yes" context="specialjdbcconnectionpage|helpLabel">Please enter the required information to connect to a MySQL database using JDBC. Note that a JDBC driver class must be installed on your system and registered with %PRODUCTNAME. Please contact your system administrator if you are unsure about the following settings. </property>
+        <property name="label" translatable="yes" context="specialjdbcconnectionpage|helpLabel">Please enter the required information to connect to a MySQL/MariaDB database using JDBC. Note that a JDBC driver class must be installed on your system and registered with %PRODUCTNAME. Please contact your system administrator if you are unsure about the following settings. </property>
         <property name="wrap">True</property>
         <property name="width_chars">72</property>
         <property name="max_width_chars">72</property>
@@ -185,7 +185,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="halign">start</property>
-            <property name="label" translatable="yes" context="specialjdbcconnectionpage|jdbcDriverLabel">MySQL JDBC d_river class:</property>
+            <property name="label" translatable="yes" context="specialjdbcconnectionpage|jdbcDriverLabel">MySQL/MariaDB JDBC d_river class:</property>
             <property name="use_underline">True</property>
             <property name="mnemonic_widget">jdbcDriverEntry</property>
           </object>