diff --git a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
index 681b01cccd5a..ec5e978c35b2 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/java/StringResource_en_US.xml
@@ -9110,7 +9110,7 @@ Alternatively, you will want to download <strong>Incremental Channel Conte
- <strong>Monitoring</strong> type has been applied.<br/><strong>Note:</strong> Since you added the Monitoring system type we automatically assigned the Prometheus Exporters formula to the system. Please apply the <a href="/rhn/manager/systems/details/highstate?sid={0}">Highstate</a> in order to install and enable the Prometheus metrics exporters.<br/><strong>Note:</strong> Please make sure to open the <a href="/docs/{1}/installation-and-upgrade/ports.html#_external_client_ports" target="_blank">required network ports</a> for all installed exporters.
+ <strong>Monitor this Host</strong> type has been applied.<br/><strong>Note:</strong> Since you added the Monitoring system type we automatically assigned the Prometheus Exporters formula to the system. Please apply the <a href="/rhn/manager/systems/details/highstate?sid={0}">Highstate</a> in order to install and enable the Prometheus metrics exporters.<br/><strong>Note:</strong> Please make sure to open the <a href="/docs/{1}/installation-and-upgrade/ports.html#_external_client_ports" target="_blank">required network ports</a> for all installed exporters./rhn/systems/details/Overview.do
diff --git a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
index fe8952b4d9ab..4bd4202dce51 100644
--- a/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
+++ b/java/code/src/com/redhat/rhn/frontend/strings/jsp/StringResource_en_US.xml
@@ -25140,7 +25140,11 @@ given channel.
OS Image Build Host
+<<<<<<< HEAD
Monitored Host
+=======
+ Monitor this Host
+>>>>>>> 47f0b941c34 (re-wording 'Monitoring' to 'Monitor this Host' on the systems properties page)
Ansible Control Node
diff --git a/java/spacewalk-java.changes.carlo.Manager-4.3-fix-properties-tab b/java/spacewalk-java.changes.carlo.Manager-4.3-fix-properties-tab
new file mode 100644
index 000000000000..310535462d5d
--- /dev/null
+++ b/java/spacewalk-java.changes.carlo.Manager-4.3-fix-properties-tab
@@ -0,0 +1,2 @@
+- re-wording 'Monitoring' to 'Monitor this host' on the UI
+ systems properties page (bsc#1212161)