re-wording 'Monitoring' to 'Monitor this Host' on the systems propert…

…ies page
uyuni-project · Dec 5, 2024 · e9fb47c · e9fb47c
1 parent bae4b6d
commit e9fb47c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
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
@@ -9110,7 +9110,7 @@ Alternatively, you will want to download &lt;strong&gt;Incremental Channel Conte
         </context-group>
       </trans-unit>
       <trans-unit id="system.entitle.added.monitoring_entitled" xml:space="preserve">
-        <source>&lt;strong&gt;Monitoring&lt;/strong&gt; type has been applied.&lt;br/&gt;&lt;strong&gt;Note:&lt;/strong&gt; Since you added the Monitoring system type we automatically assigned the Prometheus Exporters formula to the system. Please apply the &lt;a href="/rhn/manager/systems/details/highstate?sid={0}"&gt;Highstate&lt;/a&gt; in order to install and enable the Prometheus metrics exporters.&lt;br/&gt;&lt;strong&gt;Note:&lt;/strong&gt; Please make sure to open the &lt;a href="/docs/{1}/installation-and-upgrade/ports.html#_external_client_ports" target="_blank">required network ports&lt;/a&gt; for all installed exporters.</source>
+        <source>&lt;strong&gt;Monitor this Host&lt;/strong&gt; type has been applied.&lt;br/&gt;&lt;strong&gt;Note:&lt;/strong&gt; Since you added the Monitoring system type we automatically assigned the Prometheus Exporters formula to the system. Please apply the &lt;a href="/rhn/manager/systems/details/highstate?sid={0}"&gt;Highstate&lt;/a&gt; in order to install and enable the Prometheus metrics exporters.&lt;br/&gt;&lt;strong&gt;Note:&lt;/strong&gt; Please make sure to open the &lt;a href="/docs/{1}/installation-and-upgrade/ports.html#_external_client_ports" target="_blank">required network ports&lt;/a&gt; for all installed exporters.</source>
         <context-group name="ctx">
           <context context-type="sourcefile">/rhn/systems/details/Overview.do</context>
         </context-group>

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
@@ -25140,7 +25140,11 @@ given channel.</source>
         <source>OS Image Build Host</source>
       </trans-unit>
       <trans-unit id="monitoring_entitled" xml:space="preserve">
+<<<<<<< HEAD
         <source>Monitored Host</source>
+=======
+        <source>Monitor this Host</source>
+>>>>>>> 47f0b941c34 (re-wording 'Monitoring' to 'Monitor this Host' on the systems properties page)
       </trans-unit>
       <trans-unit id="ansible_control_node" xml:space="preserve">
         <source>Ansible Control Node</source>

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
@@ -0,0 +1,2 @@
+- re-wording 'Monitoring' to 'Monitor this host' on the UI
+  systems properties page (bsc#1212161)
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		- re-wording 'Monitoring' to 'Monitor this host' on the UI
		systems properties page (bsc#1212161)
Check failure on line 2 in java/spacewalk-java.changes.carlo.Manager-4.3-fix-properties-tab View workflow job for this annotation GitHub Actions / Changelog tests `Wrong capitalization in file java/spacewalk-java.changes.carlo.Manager-4.3-fix-properties-tab#L1-2` Check failure on line 2 in java/spacewalk-java.changes.carlo.Manager-4.3-fix-properties-tab View workflow job for this annotation GitHub Actions / Changelog tests `bsc#1212161 is not mentioned in PR title or in commit messages in file java/spacewalk-java.changes.carlo.Manager-4.3-fix-properties-tab#L1-2` Check failure on line 2 in java/spacewalk-java.changes.carlo.Manager-4.3-fix-properties-tab View workflow job for this annotation GitHub Actions / Changelog tests `Wrong capitalization in file java/spacewalk-java.changes.carlo.Manager-4.3-fix-properties-tab#L1-2` Check failure on line 2 in java/spacewalk-java.changes.carlo.Manager-4.3-fix-properties-tab View workflow job for this annotation GitHub Actions / Changelog tests `bsc#1212161 is not mentioned in PR title or in commit messages in file java/spacewalk-java.changes.carlo.Manager-4.3-fix-properties-tab#L1-2` Check failure on line 2 in java/spacewalk-java.changes.carlo.Manager-4.3-fix-properties-tab View workflow job for this annotation GitHub Actions / Changelog tests `Wrong capitalization in file java/spacewalk-java.changes.carlo.Manager-4.3-fix-properties-tab#L1-2`