9 files changed, 15 insertions, 15 deletions
diff --git a/Documentation/user-manual.txt b/Documentation/user-manual.txt
index 7d6e467ca..6f73e7a55 100644
--- a/Documentation/user-manual.txt
+++ b/Documentation/user-manual.txt
@@ -216,7 +216,7 @@ These dives can be imported from:
 This is usually the approach for dives without a dive computer. The basic record
 of information within _Subsurface_ is a dive. The most important information
 in a simple dive logbook usually includes dive type, date, time, duration,
-depth, the names of your dive buddy and the dive master or dive guide, and
+depth, the names of your dive buddy and the divemaster or dive guide, and
 some remarks about the dive. _Subsurface_ can store much more
 information for each dive.  To add a dive to a dive log, select _Log
 ->  Add Dive_ from the Main Menu. The program then shows three panels
@@ -758,7 +758,7 @@ rebreather) and pSCR (Passive semi-closed rebreather).
 
 *Divemaster*: The name of the divemaster or dive guide should be
 entered in this field
-which offers auto selection based on the list of dive masters in
+which offers auto selection based on the list of divemasters in
 the current logbook.
 
 *Buddy*: In this field, enter the name(s) of the buddy or buddies
@@ -2788,7 +2788,7 @@ _Edit_. This brings up the possibility to _Undo_ or _Redo_ an action.
 === Filtering the dive list
 
 The dives in the *Dive List* panel can be filtered, selecting only some
-of the dives based on their attributes, e.g. dive tags, dive site, dive master, buddy or protective
+of the dives based on their attributes, e.g. dive tags, dive site, divemaster, buddy or protective
 clothing. For instance, filtering lets you list the deep dives at a particular
 dive site, or otherwise the cave dives with a particular buddy.
 
@@ -4674,7 +4674,7 @@ Only a subset of the dive data is exported:
 |location| (*string*) location of the dive
 |duration| (*string*) duration of the dive
 |depth| (*string*) depth of the dive
-|divemaster| (*string*) dive master for the dive
+|divemaster| (*string*) divemaster for the dive
 |buddy| (*string*) buddy for the dive
 |airTemp| (*string*) air temperature of the dive
 |waterTemp| (*string*) water temperature of the dive
diff --git a/Documentation/user-manual_es.txt b/Documentation/user-manual_es.txt
index d11697113..5e61fc5f6 100644
--- a/Documentation/user-manual_es.txt
+++ b/Documentation/user-manual_es.txt
@@ -234,7 +234,7 @@ Este es habitualmente el caso para inmersiones sin ordenador de buceo. La unidad
 básica de información en _Subsurface_ es una inmersión. La información más
 importante en un diario de inmersiones incluye, habitualmente, el tipo de
 inmersión, fecha, hora, duración, profundidad, los nombres de los compañeros de
-buceo o el dive master o el guía, y algunas anotaciones acerca de la inmersión.
+buceo o el divemaster o el guía, y algunas anotaciones acerca de la inmersión.
 _Subsurface_ puede conservar mucha más información por cada inmersión. Para
 añadir una inmersión a un registro de buceo, selecciona _Registro → Añadir
 Inmersión_ en el menú principal. El programa muestra entonces tres paneles para
diff --git a/Documentation/user-manual_fr.txt b/Documentation/user-manual_fr.txt
index b14aa13fc..12d5bba5c 100644
--- a/Documentation/user-manual_fr.txt
+++ b/Documentation/user-manual_fr.txt
@@ -244,7 +244,7 @@ obtenues. Ces plongées peuvent être importées à partir de :
 This is usually the approach for dives without a dive computer. The basic
 record of information within _Subsurface_ is a dive. The most important
 information in a simple dive logbook usually includes dive type, date, time,
-duration, depth, the names of your dive buddy and the dive master or dive
+duration, depth, the names of your dive buddy and the divemaster or dive
 guide, and some remarks about the dive. _Subsurface_ can store much more
 information for each dive.  To add a dive to a dive log, select _Log -> Add
 Dive_ from the Main Menu. The program then shows three panels on which to
@@ -775,7 +775,7 @@ rebreather) and pSCR (Passive semi-closed rebreather).
 
 *Divemaster*: The name of the divemaster or dive guide should be
 entered in this field
-which offers auto selection based on the list of dive masters in
+which offers auto selection based on the list of divemasters in
 the current logbook.
 
 *Buddy*: In this field, enter the name(s) of the buddy or buddies
@@ -2934,7 +2934,7 @@ brings up the possibility to _Undo_ or _Redo_ an action.
 === Filtering the dive list
 
 The dives in the *Dive List* panel can be filtered, selecting only some of
-the dives based on their attributes, e.g. dive tags, dive site, dive master,
+the dives based on their attributes, e.g. dive tags, dive site, divemaster,
 buddy or protective clothing. For instance, filtering lets you list the deep
 dives at a particular dive site, or otherwise the cave dives with a
 particular buddy.
@@ -4980,7 +4980,7 @@ Only a subset of the dive data is exported:
 |location| (*string*) location of the dive
 |duration| (*string*) duration of the dive
 |depth| (*string*) depth of the dive
-|divemaster| (*string*) dive master for the dive
+|divemaster| (*string*) divemaster for the dive
 |buddy| (*string*) buddy for the dive
 |airTemp| (*string*) air temperature of the dive
 |waterTemp| (*string*) water temperature of the dive
diff --git a/appdata/subsurface.appdata.xml b/appdata/subsurface.appdata.xml
index 3209797ae..848fa3b1a 100644
--- a/appdata/subsurface.appdata.xml
+++ b/appdata/subsurface.appdata.xml
@@ -9,7 +9,7 @@
   <p>
    Subsurface is an opensource diving logbook that runs on Linux, Windows and Mac.
    With this program, users can keep track of their dives by logging dive locations (with GPS coordinates),
-   weights and exposure protection used, dive masters and dive buddies, etc.
+   weights and exposure protection used, divemasters and dive buddies, etc.
    Subsurface also enables the users to rate their dives and provide additional dive notes.
   </p>
   <p>
diff --git a/mobile-widgets/qml/DiveDetailsEdit.qml b/mobile-widgets/qml/DiveDetailsEdit.qml
index 6ab2978f0..b4584185d 100644
--- a/mobile-widgets/qml/DiveDetailsEdit.qml
+++ b/mobile-widgets/qml/DiveDetailsEdit.qml
@@ -188,7 +188,7 @@ Item {
 
 			Kirigami.Label {
 				Layout.alignment: Qt.AlignRight
-				text: qsTr("Dive Master:")
+				text: qsTr("Divemaster:")
 			}
 			ComboBox {
 				id: divemasterBox
diff --git a/mobile-widgets/qml/DiveDetailsView.qml b/mobile-widgets/qml/DiveDetailsView.qml
index fda0db9d0..c43b8a313 100644
--- a/mobile-widgets/qml/DiveDetailsView.qml
+++ b/mobile-widgets/qml/DiveDetailsView.qml
@@ -195,7 +195,7 @@ Item {
 		}
 
 		Kirigami.Label {
-			text: qsTr("Dive Master:")
+			text: qsTr("Divemaster:")
 			opacity: 0.6
 			width: detailsView.col1Width
 			Layout.alignment: Qt.AlignRight
diff --git a/printing_templates/Flowlayout.html b/printing_templates/Flowlayout.html
index 21691c22b..eaa7289f8 100644
--- a/printing_templates/Flowlayout.html
+++ b/printing_templates/Flowlayout.html
@@ -179,7 +179,7 @@
 							</tr>
 							<tr>
 								<td class="fieldTitle">
-									<h1> Dive Master </h1>
+									<h1> Divemaster </h1>
 								</td>
 								<td class="fieldData">
 									<p> {{ dive.divemaster }} </p>
diff --git a/printing_templates/One Dive.html b/printing_templates/One Dive.html
index 3884ecaba..8cfc12799 100644
--- a/printing_templates/One Dive.html
+++ b/printing_templates/One Dive.html
@@ -192,7 +192,7 @@
 							</tr>
 							<tr>
 								<td class="fieldTitle">
-									<h1> Dive Master </h1>
+									<h1> Divemaster </h1>
 								</td>
 								<td class="fieldData">
 									<p> {{ dive.divemaster }} </p>
diff --git a/printing_templates/Two Dives.html b/printing_templates/Two Dives.html
index 5d2e1f618..e82781758 100644
--- a/printing_templates/Two Dives.html
+++ b/printing_templates/Two Dives.html
@@ -201,7 +201,7 @@
 							</tr>
 							<tr>
 								<td class="fieldTitle">
-									<h1> Dive Master </h1>
+									<h1> Divemaster </h1>
 								</td>
 								<td class="fieldData">
 									<p> {{ dive.divemaster }} </p>