X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=catalog%2Fsystemd.catalog;h=5dcbd4620a3cde684884bb9d602d34682868a04e;hp=337413935c05175f59949f8ce7a3120b2c5f0543;hb=01ec23582dc0523831059fc05bedde16efd06576;hpb=5d6a86d7a034a1fb3d6e3f1b58e2c13739270894;ds=inline

diff --git a/catalog/systemd.catalog b/catalog/systemd.catalog
index 337413935..5dcbd4620 100644
--- a/catalog/systemd.catalog
+++ b/catalog/systemd.catalog
@@ -1,4 +1,4 @@
-b#  This file is part of systemd.
+#  This file is part of systemd.
 #
 #  Copyright 2012 Lennart Poettering
 #
@@ -20,6 +20,8 @@ b#  This file is part of systemd.
 # The catalog format is documented on
 # http://www.freedesktop.org/wiki/Software/systemd/catalog
 
+# For an explanation why we do all this, see https://xkcd.com/1024/
+
 -- f77379a8490b408bbe5f6940505a777b
 Subject: The Journal has been started
 Defined-By: systemd
@@ -125,7 +127,7 @@ Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
 Documentation: http://www.freedesktop.org/wiki/Software/systemd/multiseat
 Documentation: http://www.freedesktop.org/wiki/Software/systemd/catalog/@MESSAGE_ID@
 
-A seat @SEAT_ID@ has been removed and is no longer avilable.
+A seat @SEAT_ID@ has been removed and is no longer available.
 
 -- c7a787079b354eaaa9e77b371893cd27
 Subject: Time change
@@ -133,7 +135,7 @@ Defined-By: systemd
 Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
 Documentation: http://www.freedesktop.org/wiki/Software/systemd/catalog/@MESSAGE_ID@
 
-The system clock has been changed to @REALTIME@ usec after January 1st, 1970.
+The system clock has been changed to @REALTIME@ microseconds after January 1st, 1970.
 
 -- c7a787079b354eaaa9e77b371893cd27 de
 Subject: Zeitänderung
@@ -141,7 +143,7 @@ Defined-By: systemd
 Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
 Documentation: http://www.freedesktop.org/wiki/Software/systemd/catalog/@MESSAGE_ID@
 
-Die System-Zeit wurde geändert auf @REALTIME@ usec after January 1st, 1970.
+Die System-Zeit wurde geändert auf @REALTIME@ Mikrosekunden nach dem 1. Januar 1970.
 
 -- 45f82f4aef7a4bbf942ce861d1f20990
 Subject: Time zone change to @TIMEZONE@
@@ -161,11 +163,11 @@ All system services necessary queued for starting at boot have been
 successfully started. Note that this does not mean that the machine is
 now idle as services might still be busy with completing start-up.
 
-Kernel start-up required @KERNEL_USEC@ usec.
+Kernel start-up required @KERNEL_USEC@ microseconds.
 
-Initial RAM disk start-up required @INITRD_USEC@ usec.
+Initial RAM disk start-up required @INITRD_USEC@ microseconds.
 
-Userspace start-up required @KERNEL_USEC@ usec.
+Userspace start-up required @USERSPACE_USEC@ microseconds.
 
 -- 6bbd95ee977941e497c48be27c254128
 Subject: System sleep state @SLEEP@ entered
@@ -262,10 +264,10 @@ Documentation: http://www.freedesktop.org/wiki/Software/systemd/catalog/@MESSAGE
 
 The process @EXECUTABLE@ could not be executed and failed.
 
-The error number for while executing this process is @ERRNO@.
+The error number returned while executing this process is @ERRNO@.
 
 -- 0027229ca0644181a76c4e92458afa2e
-Subject: One or messages could not be forwarded to syslog
+Subject: One or more messages could not be forwarded to syslog
 Defined-By: systemd
 Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
 Documentation: http://www.freedesktop.org/wiki/Software/systemd/catalog/@MESSAGE_ID@
@@ -274,3 +276,16 @@ One or more messages could not be forwarded to the syslog service
 running side-by-side with journald. This usually indicates that the
 syslog implementation has not been able to keep up with the speed of
 messages queued.
+
+-- 1dee0369c7fc4736b7099b38ecb46ee7
+Subject: Mount point is not empty
+Defined-By: systemd
+Support: http://lists.freedesktop.org/mailman/listinfo/systemd-devel
+Documentation: http://www.freedesktop.org/wiki/Software/systemd/catalog/@MESSAGE_ID@
+
+The directory @WHERE@ is specified as the mount point (second field in
+/etc/fstab or Where= field in systemd unit file) and is not empty.
+This does not interfere with mounting, but the pre-exisiting files in
+this directory become inaccessible. To see those over-mounted files,
+please manually mount the underlying file system to a secondary
+location.