catalog: update job begin/done messages

These texts have been slightly misleading previously, as they talked
about units, not jobs, but are actually generated for jobs, not units.
This difference matters as units can change state without a job
requesting that.

Also, the message be02cf6855d2428ba40df7e9d022f03d was particularly
wrong, as it claimed the unit failed, while it actually is the start job
that failed, which is a major difference, as jobs can fail without the
unit actually being placed in a failed state. Let's move this message a
bit up, closed to 39f53479d3a045ac8e11786248231fbf (i.e. the message
seen when a start job finished successfully).

diff --git a/catalog/systemd.catalog.in b/catalog/systemd.catalog.in
index 49a45890f6e8b8445f4262c8f19e1551828d274e..2136c93d02dc85484da75678c7c7b7dba8a07738 100644 (file)
--- a/catalog/systemd.catalog.in
+++ b/catalog/systemd.catalog.in
@@ -189,59 +189,67 @@ System shutdown has been initiated. The shutdown has now begun and
 all system services are terminated and all file systems unmounted.
 
 -- 7d4958e842da4a758f6c1cdc7b36dcc5
-Subject: Unit @UNIT@ has begun start-up
+Subject: A start job for unit @UNIT@ has begun execution
 Defined-By: systemd
 Support: %SUPPORT_URL%
 
-Unit @UNIT@ has begun starting up.
+A start job for unit @UNIT@ has begun execution.
+
+The job identifier is @JOB_ID@.
 
 -- 39f53479d3a045ac8e11786248231fbf
-Subject: Unit @UNIT@ has finished start-up
+Subject: A start job for unit @UNIT@ has finished successfully
 Defined-By: systemd
 Support: %SUPPORT_URL%
 
-Unit @UNIT@ has finished starting up.
+A start job for unit @UNIT@ has finished successfully.
 
-The start-up result is @JOB_RESULT@.
+The job identifier is @JOB_ID@.
 
--- de5b426a63be47a7b6ac3eaac82e2f6f
-Subject: Unit @UNIT@ has begun shutting down
+-- be02cf6855d2428ba40df7e9d022f03d
+Subject: A start job for unit @UNIT@ has failed
 Defined-By: systemd
 Support: %SUPPORT_URL%
 
-Unit @UNIT@ has begun shutting down.
+A start job for unit @UNIT@ has finished with a failure.
 
--- 9d1aaa27d60140bd96365438aad20286
-Subject: Unit @UNIT@ has finished shutting down
+The job identifier is @JOB_ID@ and the job result is @JOB_RESULT@.
+
+-- de5b426a63be47a7b6ac3eaac82e2f6f
+Subject: A stop job for unit @UNIT@ has begun execution
 Defined-By: systemd
 Support: %SUPPORT_URL%
 
-Unit @UNIT@ has finished shutting down.
+A stop job for unit @UNIT@ has begun execution.
 
--- be02cf6855d2428ba40df7e9d022f03d
-Subject: Unit @UNIT@ has failed
+The job identifier is @JOB_ID@.
+
+-- 9d1aaa27d60140bd96365438aad20286
+Subject: A stop job for unit @UNIT@ has finished
 Defined-By: systemd
 Support: %SUPPORT_URL%
 
-Unit @UNIT@ has failed.
+A stop job for unit @UNIT@ has finished.
 
-The result is @JOB_RESULT@.
+The job identifier is @JOB_ID@ and the job result is @JOB_RESULT@.
 
 -- d34d037fff1847e6ae669a370e694725
-Subject: Unit @UNIT@ has begun reloading its configuration
+Subject: A reload job for unit @UNIT@ has begun execution
 Defined-By: systemd
 Support: %SUPPORT_URL%
 
-Unit @UNIT@ has begun reloading its configuration
+A reload job for unit @UNIT@ has begun execution.
+
+The job identifier is @JOB_ID@.
 
 -- 7b05ebc668384222baa8881179cfda54
-Subject: Unit @UNIT@ has finished reloading its configuration
+Subject: A reload job for unit @UNIT@ has finished
 Defined-By: systemd
 Support: %SUPPORT_URL%
 
-Unit @UNIT@ has finished reloading its configuration
+A reload job for unit @UNIT@ has finished.
 
-The result is @JOB_RESULT@.
+The job identifier is @JOB_ID@ and the job result is @JOB_RESULT@.
 
 -- 641257651c1b4ec9a8624d7a40a9e1e7
 Subject: Process @EXECUTABLE@ could not be executed