fixed messages for testservice, avoiding also duplicate message ids

2 files changed, 105 insertions, 311 deletions

diff --git a/tests/service/create_testservicemsg.pl b/tests/service/create_testservicemsg.pl
index 033cda8..5fc0fde 100755
--- a/tests/service/create_testservicemsg.pl
+++ b/tests/service/create_testservicemsg.pl
@@ -30,6 +30,9 @@ LanguageNames = (
 
 EOF
 
+# remember already mapped message ids
+my %message_ids = ();
+
 # read all gettext translations
 my $lang;
 my %gettext = ();
@@ -116,11 +119,11 @@ EOF
 
 undef $/;
 
-open CONTENT, "find . -name '*.c' -exec cat {} \\; |";
+open CONTENT, "find ../.. -name '*.c' -exec cat {} \\; |";
 my $code = <CONTENT>;
 close CONTENT;
 
-open CONTENT, "find . -name '*.c' -exec cat {} \\; | cpp -DENABLE_NLS=1 -I../../include/wolf |";
+open CONTENT, "find ../.. -name '*.c' -exec cat {} \\; | cpp -DENABLE_NLS=1 -I../../include/wolf |";
 my $expanded_code = <CONTENT>;
 close CONTENT;
 
@@ -169,6 +172,11 @@ AGAIN:
 			goto AGAIN;
 		}
 
+		if( defined( $message_ids{$messageid} ) ) {
+			next;
+		}
+		$message_ids{$messageid} = "";
+
 		print <<EOF;
 MessageId = $messageid_number
 Severity = $severity
diff --git a/tests/service/testservicemsg.mc b/tests/service/testservicemsg.mc
index 666a633..f632d6d 100644
--- a/tests/service/testservicemsg.mc
+++ b/tests/service/testservicemsg.mc
@@ -5,7 +5,7 @@
 ;// (see http://msdn.microsoft.com/en-us/library/ms776260.aspx)
 LanguageNames = (
 	English		= 0x0409	: MSG00409
-	German		= 0x0407	: MSG00407
+;	German		= 0x0407	: MSG00407
 )
 
 ;// Category names come first, the 'CategoryCount' registry entry
@@ -21,37 +21,34 @@ SymbolicName = WOLF_CATEGORY_LOGGER
 Language = English
 Logger
 .
-Language = German
-Logger
-.
+;Language = German
+;Logger
+;.
 
 MessageId = 0x2
 SymbolicName = WOLF_CATEGORY_DAEMON
 Language = English
 Daemon
 .
-Language = German
-Unix-Prozess
-.
+;Language = German
+;Unix-Prozess
+;.
 
 MessageId = 0x3
 SymbolicName = WOLF_CATEGORY_SERVICE
 Language = English
-Service
-.
-Language = German
-Dienst
+test service
+;Language = German
+;Service
 .
 
 MessageId = 0x4
 SymbolicName = WOLF_CATEGORY_TESTSERVICE
 Language = English
-Test Service
-.
-Language = German
-TestDienst
+test service
 .
 
+
 ;// event log severity levels (severity bits)
 SeverityNames = ( 
 	Success		= 0x0	: STATUS_SEVERITY_SUCCESS
@@ -79,9 +76,6 @@ SymbolicName = WOLF_MSG_DAEMON_CANT_CLOSE_FD
 Language = English
 Error while closing file descriptor %1: %2
 .
-Language = German
-Datei Deskriptor %1 kann nicht geschlossen werden: %2
-.
 MessageId = 2061
 Severity = Error
 Facility = Application
@@ -89,9 +83,6 @@ SymbolicName = WOLF_MSG_DAEMON_RETRIEVING_MAXNOFFDS_FAILED
 Language = English
 Unable to retrieve maximal number of files: %1
 .
-Language = German
-Kann die maximale Anzahl Datei Deskriptoren nicht berechnen: %1
-.
 MessageId = 2062
 Severity = Informational
 Facility = Application
@@ -99,9 +90,6 @@ SymbolicName = WOLF_MSG_DAEMON_CLOSING_ALL_FDS
 Language = English
 Closing all filedescriptors up to %ld
 .
-Language = German
-Schliesse alle Datei Deskriptoren bis zur Nummer %ld
-.
 MessageId = 2063
 Severity = Error
 Facility = Application
@@ -109,9 +97,6 @@ SymbolicName = WOLF_MSG_DAEMON_CANT_OPEN_FD_AS_DEV_NULL
 Language = English
 Unable to open fd %1 as /dev/null: %2
 .
-Language = German
-Kann den Datei Deskriptor %1 nicht als /dev/null öffnen: %2
-.
 MessageId = 2064
 Severity = Error
 Facility = Application
@@ -119,9 +104,6 @@ SymbolicName = WOLF_MSG_DAEMON_FD_NUMBERS_WRONG
 Language = English
 Something is wrong with the file descriptors (expecting %1, got %2)!
 .
-Language = German
-Fehler bei Datei Deskriptoren des Prozesses (erwarte %1 und nicht %2)!
-.
 MessageId = 2065
 Severity = Error
 Facility = Application
@@ -129,9 +111,6 @@ SymbolicName = WOLF_MSG_DAEMON_PIPE_ATOMIC_WRITE_FAILED
 Language = English
 Error in atomar write to fd %1: %2
 .
-Language = German
-Fehler bei atomaren Schreiben in Datei Deskriptor %1: %2
-.
 MessageId = 2066
 Severity = Error
 Facility = Application
@@ -139,9 +118,6 @@ SymbolicName = WOLF_MSG_DAEMON_PIPE_ATOMIC_WRITE_WRONG_OCTETS
 Language = English
 Unexpected number of octets %zd in atomar write to fd %1 (expected %zd)
 .
-Language = German
-Unerwartete Anzahl Bytes %zd bei atomaren Schreiben in Datei Deskriptor %1 (erwarte %zd)
-.
 MessageId = 2067
 Severity = Error
 Facility = Application
@@ -149,9 +125,6 @@ SymbolicName = WOLF_MSG_DAEMON_PIPE_ATOMIC_READ_FAILED
 Language = English
 Error in atmoar read from fd %1: %2
 .
-Language = German
-Fehler bei atomaren Lesen von Datei Deskriptor %1: %2
-.
 MessageId = 2068
 Severity = Error
 Facility = Application
@@ -159,9 +132,6 @@ SymbolicName = WOLF_MSG_DAEMON_PIPE_ATOMIC_READ_WRONG_OCTETS
 Language = English
 Unexpected number of octets %zd in atomar read from fd %1 (expected %zd)
 .
-Language = German
-Unerwartete Anzahl Bytes %zd bei atomaren Lesen von Datei Deskriptor %1 (erwarte %zd)
-.
 MessageId = 2069
 Severity = Error
 Facility = Application
@@ -169,9 +139,6 @@ SymbolicName = WOLF_MSG_DAEMON_ALREADY_RUNNING
 Language = English
 Already running as daemon!
 .
-Language = German
-Laufe bereits als Unix-Daemon!
-.
 MessageId = 2070
 Severity = Error
 Facility = Application
@@ -179,9 +146,6 @@ SymbolicName = WOLF_MSG_DAEMON_CANT_START_AS_NON_ROOT
 Language = English
 Unable to start daemon as not root user!
 .
-Language = German
-Kann einen Unix-Daemon nur als Root-Benutzer starten!
-.
 MessageId = 2071
 Severity = Error
 Facility = Application
@@ -189,9 +153,6 @@ SymbolicName = WOLF_MSG_DAEMON_CANT_CREATE_EXIT_CODE_PIPE
 Language = English
 Unable to create exit code pipe: %1
 .
-Language = German
-Kann keine Terminierungs-Pipe erstellen: %1
-.
 MessageId = 2072
 Severity = Informational
 Facility = Application
@@ -199,9 +160,6 @@ SymbolicName = WOLF_MSG_DAEMON_EXIT_CODE_PIPE_CREATED
 Language = English
 Created exit code pipe (%1,%2)
 .
-Language = German
-Terminierungs-Pipe erstellt (%1,%2)
-.
 MessageId = 2073
 Severity = Error
 Facility = Application
@@ -209,9 +167,6 @@ SymbolicName = WOLF_MSG_DAEMON_FIRST_FORK_FAILED
 Language = English
 Unable to fork the first time: %1
 .
-Language = German
-Erstes Forken fehlgeschlagen: %1
-.
 MessageId = 2074
 Severity = Informational
 Facility = Application
@@ -219,9 +174,6 @@ SymbolicName = WOLF_MSG_DAEMON_FIRST_FORK_REACHED
 Language = English
 First fork reached
 .
-Language = German
-Erstes Forken erfolgreich
-.
 MessageId = 2075
 Severity = Informational
 Facility = Application
@@ -229,9 +181,6 @@ SymbolicName = WOLF_MSG_DAEMON_PARENT_AFTER_FIRST_FORK
 Language = English
 Parent after first fork: child is %1
 .
-Language = German
-Im Vaterprozess nach dem ersten Forken, das Kind hat PID %1
-.
 MessageId = 2076
 Severity = Error
 Facility = Application
@@ -239,9 +188,6 @@ SymbolicName = WOLF_MSG_DAEMON_CANT_CREATE_PARENT_PIPE
 Language = English
 Unable to create parent pipe: %1
 .
-Language = German
-Kann keine Vater-Pipe erstellen: %1
-.
 MessageId = 2077
 Severity = Informational
 Facility = Application
@@ -249,9 +195,6 @@ SymbolicName = WOLF_MSG_DAEMON_PARENT_PIPE_CREATED
 Language = English
 Created parent pipe (%1,%2)
 .
-Language = German
-Vater-Pipe erstellt (%1,%2)
-.
 MessageId = 2107
 Severity = Error
 Facility = Application
@@ -259,9 +202,6 @@ SymbolicName = WOLF_MSG_DAEMON_CANT_SET_NEW_PROCESS_GROUP_PARENT
 Language = English
 Starting new process group session for the parent of the daemon failed: %1
 .
-Language = German
-Das Starten einer neuen Prozessgruppensiztung im Vaterprozess ist fehlgeschlagen: %1
-.
 MessageId = 2079
 Severity = Error
 Facility = Application
@@ -269,9 +209,6 @@ SymbolicName = WOLF_MSG_DAEMON_SECOND_FORK_FAILED
 Language = English
 Unable to fork the second time: %1
 .
-Language = German
-Zweites Forken fehlgeschlagen: %1
-.
 MessageId = 2080
 Severity = Informational
 Facility = Application
@@ -279,9 +216,6 @@ SymbolicName = WOLF_MSG_DAEMON_SECOND_FORK_REACHED
 Language = English
 Second fork reached
 .
-Language = German
-Zweites Forken erfolgreich
-.
 MessageId = 2081
 Severity = Informational
 Facility = Application
@@ -289,9 +223,6 @@ SymbolicName = WOLF_MSG_DAEMON_PARENT_AFTER_SECOND_FORK
 Language = English
 Parent after second fork: child (and daemon) is %1
 .
-Language = German
-Im Vaterprozess nach dem zweiten Forken, das Kind (Unix-Daemon) hat PID %1
-.
 MessageId = 2078
 Severity = Error
 Facility = Application
@@ -299,9 +230,6 @@ SymbolicName = WOLF_MSG_DAEMON_CANT_SET_NEW_PROCESS_GROUP
 Language = English
 Starting new process group for daemon session failed: %1
 .
-Language = German
-Das Starten einer neuen Prozessgruppensiztung im Daemon ist fehlgeschlagen: %1
-.
 MessageId = 2082
 Severity = Error
 Facility = Application
@@ -309,9 +237,6 @@ SymbolicName = WOLF_MSG_DAEMON_CANT_CHANGE_ROOT_DIR
 Language = English
 Changing to root diretory failed: %1
 .
-Language = German
-Wechseln ins Stammverzeichnis ist fehlgeschlagen: %1
-.
 MessageId = 2083
 Severity = Informational
 Facility = Application
@@ -319,9 +244,6 @@ SymbolicName = WOLF_MSG_DAEMON_CHANGED_ROOT_DIR
 Language = English
 Changed to root directory /
 .
-Language = German
-Ins Stammverzeichnis / gewechselt
-.
 MessageId = 2084
 Severity = Informational
 Facility = Application
@@ -329,9 +251,6 @@ SymbolicName = WOLF_MSG_DAEMON_SWITCHED_UMASK
 Language = English
 Switched umask from %04o to %04o
 .
-Language = German
-Rechtemaske gewechselt von %04o zu %04o
-.
 MessageId = 2085
 Severity = Error
 Facility = Application
@@ -339,9 +258,6 @@ SymbolicName = WOLF_MSG_DAEMON_DAEMON_ALREADY_RUNNING_WITH_PID
 Language = English
 Another daemon is already running with pid '%1', can't start!
 .
-Language = German
-Ein anderer Unix-Daemon laeuft bereits mit PID '%1', kann nicht starten!
-.
 MessageId = 2086
 Severity = Informational
 Facility = Application
@@ -349,9 +265,6 @@ SymbolicName = WOLF_MSG_DAEMON_SWITCHED_UMASK_FINAL
 Language = English
 Switched umask from %04o to %04o
 .
-Language = German
-Rechtemaske gewechselt von %04o zu %04o
-.
 MessageId = 2087
 Severity = Error
 Facility = Application
@@ -359,9 +272,6 @@ SymbolicName = WOLF_MSG_DAEMON_GROUP_NOT_FOUND
 Language = English
 No group '%1' found
 .
-Language = German
-Es existiert keine Gruppe '%1'
-.
 MessageId = 2088
 Severity = Error
 Facility = Application
@@ -369,9 +279,6 @@ SymbolicName = WOLF_MSG_DAEMON_GETGRNAM_FAILED
 Language = English
 Unable to retrieve group information for group '%1': %2
 .
-Language = German
-Kann keine Information zu Gruppe '%1' bekommen: %2
-.
 MessageId = 2089
 Severity = Error
 Facility = Application
@@ -379,9 +286,6 @@ SymbolicName = WOLF_MSG_DAEMON_USER_NOT_FOUND
 Language = English
 No user '%1' found
 .
-Language = German
-Es existiert kein Benutzer '%1'
-.
 MessageId = 2090
 Severity = Error
 Facility = Application
@@ -389,9 +293,6 @@ SymbolicName = WOLF_MSG_DAEMON_GETPWNAM_FAILED
 Language = English
 Unable to retrieve user information for user '%1': %2
 .
-Language = German
-Kann keine Information zu Benutzer '%1' bekommen: %2
-.
 MessageId = 2091
 Severity = Error
 Facility = Application
@@ -399,9 +300,6 @@ SymbolicName = WOLF_MSG_DAEMON_SETTING_UNPRIVILEGED_GROUP_FAILED
 Language = English
 Setting unprivileged group failed: %1
 .
-Language = German
-Setzen der unprivilegierten Gruppe ist fehlgeschlagen: %1
-.
 MessageId = 2092
 Severity = Error
 Facility = Application
@@ -409,9 +307,6 @@ SymbolicName = WOLF_MSG_DAEMON_SETTING_UNPRIVILEGED_USER_FAILED
 Language = English
 Setting unprivileged user failed: %1
 .
-Language = German
-Setzen des unprivilegierten Benutzers ist fehlgeschlagen: %1
-.
 MessageId = 2093
 Severity = Informational
 Facility = Application
@@ -419,9 +314,6 @@ SymbolicName = WOLF_MSG_DAEMON_SWITCHED_USER
 Language = English
 Switched to user '%1' (%2) and group '%3' (%4)
 .
-Language = German
-Der Unix-Daemon laueft nun unter Benutzer '%1' (%2) und Gruppe '%3' (%4)
-.
 MessageId = 2094
 Severity = Informational
 Facility = Application
@@ -429,9 +321,6 @@ SymbolicName = WOLF_MSG_DAEMON_EXIT_CALLED
 Language = English
 daemon_exit called int state %1 (error %2)
 .
-Language = German
-daemon_exit wurde aufgerufen im Zustand %1 (Fehler %2)
-.
 MessageId = 2095
 Severity = Informational
 Facility = Application
@@ -439,9 +328,6 @@ SymbolicName = WOLF_MSG_DAEMON_WAITING_FOR_EXIT_CODE_ON_PIPE
 Language = English
 Waiting on exit_code pipe for exit code
 .
-Language = German
-Warte auf einen Exitcode von der Terminierungs-Pipe
-.
 MessageId = 2096
 Severity = Informational
 Facility = Application
@@ -449,9 +335,6 @@ SymbolicName = WOLF_MSG_DAEMON_TERMINATING_GRAND_PARENT
 Language = English
 Terminating grand-parent of daemon with code %1 (PID: %lu)
 .
-Language = German
-Beende Vater des Vaters des Unix-Daemons mit Kode %1 (PID: %lu)
-.
 MessageId = 2097
 Severity = Informational
 Facility = Application
@@ -459,9 +342,6 @@ SymbolicName = WOLF_MSG_DAEMON_WAITING_FOR_TERMINATION
 Language = English
 Waiting on parent pipe for termination signal
 .
-Language = German
-Warte auf Terminierung von der Vater-Pipe
-.
 MessageId = 2098
 Severity = Informational
 Facility = Application
@@ -469,9 +349,6 @@ SymbolicName = WOLF_MSG_DAEMON_PARENT_GOT_TERMINATION
 Language = English
 Parent got termination (pidfile lock: %1, run: %2, fd: %3).. cleaning up now (PID: %lu)
 .
-Language = German
-Vater bekam ein Terminierungssignal (Lockdatei ist gelockt: %1, run: %2, Deskriptor: %3)..raeume jetzt auf (PID: %lu)
-.
 MessageId = 2099
 Severity = Informational
 Facility = Application
@@ -479,9 +356,6 @@ SymbolicName = WOLF_MSG_DAEMON_TERMINATING_PARENT
 Language = English
 Terminating parent of daemon (PID %lu)
 .
-Language = German
-Beende Vaterprozess des Unix-Daemons (PID %lu)
-.
 MessageId = 2100
 Severity = Informational
 Facility = Application
@@ -489,9 +363,6 @@ SymbolicName = WOLF_MSG_DAEMON_TERMINATING_DAEMON_OK
 Language = English
 Terminating daemon (PID: %lu)
 .
-Language = German
-Beende den Unix-Daemon (PID: %lu)
-.
 MessageId = 2101
 Severity = Informational
 Facility = Application
@@ -499,9 +370,6 @@ SymbolicName = WOLF_MSG_DAEMON_TERMINATING_DAEMON_ERROR
 Language = English
 Terminating daemon (PID: %lu) with error
 .
-Language = German
-Beende den Unix-Daemon (PID: %lu) mit einem Fehler
-.
 MessageId = 2102
 Severity = Error
 Facility = Application
@@ -509,9 +377,6 @@ SymbolicName = WOLF_MSG_DAEMON_CANT_CREATE_SIGNAL_PIPE
 Language = English
 Unable to create signal pipe: %1
 .
-Language = German
-Kann keine Signal-Pipe erstellen: %1
-.
 MessageId = 2103
 Severity = Informational
 Facility = Application
@@ -519,9 +384,6 @@ SymbolicName = WOLF_MSG_DAEMON_SIGNAL_PIPE_CREATED
 Language = English
 Created signal pipe (%1,%2)
 .
-Language = German
-Signal-Pipe erstellt (%1,%2)
-.
 MessageId = 2104
 Severity = Error
 Facility = Application
@@ -529,9 +391,6 @@ SymbolicName = WOLF_MSG_DAEMON_SELECT_FAILED_WAITING_FOR_SIGNAL
 Language = English
 Error in select when waiting for signal from pipe: %1
 .
-Language = German
-Fehler beim Warten auf ein Signal von der Signal-Pipe: %1
-.
 MessageId = 2105
 Severity = Error
 Facility = Application
@@ -539,9 +398,6 @@ SymbolicName = WOLF_MSG_DAEMON_CANT_READ_SIGNAL_FROM_PIPE
 Language = English
 Error while reading a signal from the pipe: %1
 .
-Language = German
-Fehler beim Lesen des konkreten Signals von der Signal-Pipe: %1
-.
 MessageId = 2106
 Severity = Error
 Facility = Application
@@ -549,9 +405,6 @@ SymbolicName = WOLF_MSG_DAEMON_NON_ATOMIC_READ_ON_SIGNAL_PIPE
 Language = English
 Unexpected error in read: result is %1
 .
-Language = German
-Unerwarteter Fehler beim Lesen, Resultat ist %1
-.
 MessageId = 2020
 Severity = Informational
 Facility = Application
@@ -559,9 +412,6 @@ SymbolicName = WOLF_MSG_DAEMON_NO_PIDFILE
 Language = English
 No pidfile '%1' found, daemon is not running
 .
-Language = German
-Die Lockdatei '%1' wurde nicht gefunden, der Unix-Daemon laeuft nicht
-.
 MessageId = 2021
 Severity = Error
 Facility = Application
@@ -569,9 +419,6 @@ SymbolicName = WOLF_MSG_DAEMON_CANT_OPEN_PIDFILE_FOR_READING
 Language = English
 Unable to open pidfile '%1' for reading: %2
 .
-Language = German
-Kann keine Lockdatei '%1' zum Lesen oeffnen: %2
-.
 MessageId = 2023
 Severity = Informational
 Facility = Application
@@ -579,9 +426,6 @@ SymbolicName = WOLF_MSG_DAEMON_ANOTHER_IS_RUNNING
 Language = English
 Another process locks the pidfile, daemon already running
 .
-Language = German
-Ein anderer Prozess lockt die Lockdatei, der Daemon laeuft schon
-.
 MessageId = 2024
 Severity = Error
 Facility = Application
@@ -589,9 +433,6 @@ SymbolicName = WOLF_MSG_DAEMON_CANT_LOCK_PIDFILE
 Language = English
 Unable to lock pidfile '%1': %2
 .
-Language = German
-Kann die Lockdatei '%1' nicht locken: %2
-.
 MessageId = 2025
 Severity = Error
 Facility = Application
@@ -599,9 +440,6 @@ SymbolicName = WOLF_MSG_DAEMON_CANT_READ_PID_FROM_PIDFILE
 Language = English
 Unable to read pid from pidfile '%1': %2
 .
-Language = German
-Kann die Prozessnummer nicht aus der Lockdatei '%1' lesen: %2
-.
 MessageId = 2026
 Severity = Error
 Facility = Application
@@ -609,9 +447,6 @@ SymbolicName = WOLF_MSG_DAEMON_PIDFILE_WITH_ILLEGAL_DATA
 Language = English
 pidfile '%1' contains invalid data, can't read PID from it!
 .
-Language = German
-Die Lockdatei '%1' enthaelt ungueltige Daten, keine Prozessnummer!
-.
 MessageId = 2027
 Severity = Informational
 Facility = Application
@@ -619,9 +454,6 @@ SymbolicName = WOLF_MSG_DAEMON_FOUND_PID_IN_PIDFILE
 Language = English
 Found PID '%lu' in pidfile
 .
-Language = German
-Prozessnummer '%lu' in Lockdatei gefunden
-.
 MessageId = 2028
 Severity = Error
 Facility = Application
@@ -629,9 +461,6 @@ SymbolicName = WOLF_MSG_DAEMON_FOUND_PID_BUT_NO_PROCESS_RUNNING
 Language = English
 Found PID '%lu' in pidfile '%1', but no such process is running. Check and manually delete the pidfile!
 .
-Language = German
-Habe eine Prozessnummer '%lu' in Lockdatei '%1' gefunden, aber es laeuft kein Prozess mit dieser Nummer. Bitte manuell ueberpruefen und die Lockdatei von Hand loeschen!
-.
 MessageId = 2029
 Severity = Error
 Facility = Application
@@ -639,9 +468,6 @@ SymbolicName = WOLF_MSG_DAEMON_PROCESS_ALIVE_CHECK_FAILED
 Language = English
 Can't check if process with PID '%lu' is alive: %1
 .
-Language = German
-Kann nicht uberpruefen, of der Prozess mit Prozessnummer '%lu' immer noch laeuft: %1
-.
 MessageId = 2030
 Severity = Informational
 Facility = Application
@@ -649,9 +475,6 @@ SymbolicName = WOLF_MSG_DAEMON_ALREADY_RUNNING_WITH_PID
 Language = English
 A process with PID '%lu' is already running
 .
-Language = German
-Ein Prozess mit Prozessnummer '%lu' laeuft bereits
-.
 MessageId = 2022
 Severity = Error
 Facility = Application
@@ -659,9 +482,6 @@ SymbolicName = WOLF_MSG_DAEMON_CANT_OPEN_PIDFILE_FOR_WRITTING
 Language = English
 Unable to open pidfile '%1' for writing: %2
 .
-Language = German
-Kann keine Lockdatei '%1' zum Schreiben oeffnen: %2
-.
 MessageId = 2031
 Severity = Error
 Facility = Application
@@ -669,9 +489,6 @@ SymbolicName = WOLF_MSG_DAEMON_PIDFILE_IN_USE
 Language = English
 Unable to lock pidfile '%1' after creation, daemon started in parallel?
 .
-Language = German
-Kann die Lockdatei '%1' nicht locken direkt nach deren Erstellung. Wurde der Unix-Daemon etwa mehrfach parallel gestartet?
-.
 MessageId = 2032
 Severity = Error
 Facility = Application
@@ -679,9 +496,6 @@ SymbolicName = WOLF_MSG_DAEMON_CANT_LOCK_PIDFILE_AFTER_CREATION
 Language = English
 Unable to lock pidfile '%1' after creation: %2
 .
-Language = German
-Kann die Lockdatei '%1' nicht locken nach deren Erstellung: %2
-.
 MessageId = 2033
 Severity = Error
 Facility = Application
@@ -689,9 +503,6 @@ SymbolicName = WOLF_MSG_DAEMON_CANT_TRUNCATE_PIDFILE
 Language = English
 Unable to truncate the pidfile '%1' before writing to it
 .
-Language = German
-Kann den Inhalt der Lockdatei '%1' nicht loeschen
-.
 MessageId = 2034
 Severity = Error
 Facility = Application
@@ -699,9 +510,6 @@ SymbolicName = WOLF_MSG_DAEMON_CANT_WRITE_PID_INTO_PIDFILE
 Language = English
 Unable to write PID into the pidfile '%1': %2
 .
-Language = German
-Kann keine Prozessnummer in die Lockdatei '%1' schreiben: %2
-.
 MessageId = 2035
 Severity = Error
 Facility = Application
@@ -709,9 +517,6 @@ SymbolicName = WOLF_MSG_DAEMON_ATOMIC_PIDFILE_WRITE_FAILED
 Language = English
 Non-atomic write failed when storing the PID into the pidfile '%1'
 .
-Language = German
-Nicht-atomares Schreiben ist fehlgeschlagen beim Schreiben der Prozessnummer in die Lockdatei '%1'
-.
 MessageId = 2036
 Severity = Informational
 Facility = Application
@@ -719,9 +524,6 @@ SymbolicName = WOLF_MSG_DAEMON_STORED_PIDFILE
 Language = English
 Stored '%lu' into the pidfile '%1' and locked it
 .
-Language = German
-Die Prozessnummer '%lu' wurde in die Lockdatei '%1' geschrieben, die Datei wurde gelockt
-.
 MessageId = 2037
 Severity = Informational
 Facility = Application
@@ -729,9 +531,6 @@ SymbolicName = WOLF_MSG_DAEMON_RELEASING_PIDFILE
 Language = English
 Releasing (unlocking/closing) pidfile '%1' (fd: %2, locked: %3)
 .
-Language = German
-Lockdatei '%1' wieder freigeben (entlocken/schliessen), (Dateideskriptor: %2, gelockt: %3)
-.
 MessageId = 2038
 Severity = Error
 Facility = Application
@@ -739,9 +538,6 @@ SymbolicName = WOLF_MSG_DAEMON_CANT_UNLOCK_PIDFILE
 Language = English
 Unable to unlock the pidfile '%1': %2
 .
-Language = German
-Kann die Lockdatei '%1' nicht entriegeln: %2
-.
 MessageId = 2039
 Severity = Error
 Facility = Application
@@ -749,9 +545,6 @@ SymbolicName = WOLF_MSG_DAEMON_CANT_CLOSE_PIDFILE
 Language = English
 Unable to close the pidfile '%1': %2
 .
-Language = German
-Kann die Lockdatei '%1' nicht schliessen: %2
-.
 MessageId = 2040
 Severity = Informational
 Facility = Application
@@ -759,9 +552,6 @@ SymbolicName = WOLF_MSG_DAEMON_REMOVING_PIDFILE
 Language = English
 Removing pidfile '%1' (fd: %2, locked: %3, running: %4)
 .
-Language = German
-Entferne die Lockdatei '%1' (dateideskriptor: %2, gelockt: %3, laeuft: %4)
-.
 MessageId = 2041
 Severity = Error
 Facility = Application
@@ -769,9 +559,6 @@ SymbolicName = WOLF_MSG_DAEMON_CANT_REMOVE_PIDFILE
 Language = English
 Unable to remove the pidfile '%1': %2
 .
-Language = German
-Kann die Lockdatei '%1' nicht entfernen: %2
-.
 MessageId = 2001
 Severity = Error
 Facility = Application
@@ -779,9 +566,6 @@ SymbolicName = WOLF_MSG_DAEMON_CANT_INSTALL_IGNORE_SIGNAL
 Language = English
 Can't ignore signal handler for signal '%1' (%2): %3
 .
-Language = German
-Kann das Signal '%1' (%2) nicht ignorieren: %3
-.
 MessageId = 2002
 Severity = Informational
 Facility = Application
@@ -789,9 +573,6 @@ SymbolicName = WOLF_MSG_DAEMON_IGNORE_SIGNAL
 Language = English
 Ignoring signal handler for signal '%1' (%2)
 .
-Language = German
-Ignoriere Signal '%'s (%1)
-.
 MessageId = 2003
 Severity = Error
 Facility = Application
@@ -799,9 +580,6 @@ SymbolicName = WOLF_MSG_DAEMON_CANT_INSTALL_CRITICAL_SIGNAL
 Language = English
 Can't install empty signal handler for signal '%1' (%2): %3
 .
-Language = German
-Kann keine leere Signalbehandlungsfunktion fuer Signal '%1' (%2) installieren: %3
-.
 MessageId = 2004
 Severity = Informational
 Facility = Application
@@ -809,9 +587,6 @@ SymbolicName = WOLF_MSG_DAEMON_CRITICAL_SIGNAL
 Language = English
 Installed empty signal handler for signal '%1' (%2)
 .
-Language = German
-Leeren Signalbehandlungsfunktion installiert fuer Signal '%1' (%2)
-.
 MessageId = 2005
 Severity = Error
 Facility = Application
@@ -819,9 +594,6 @@ SymbolicName = WOLF_MSG_DAEMON_GOT_SIGNAL
 Language = English
 Got signal '%1' (%2)
 .
-Language = German
-Signal '%1' (%2) ist aufgetreten
-.
 MessageId = 2006
 Severity = Error
 Facility = Application
@@ -829,9 +601,6 @@ SymbolicName = WOLF_MSG_DAEMON_CANT_INSTALL_FUNC_SIGNAL
 Language = English
 Can't install signal handler for signal '%1' (%2): %3
 .
-Language = German
-Kann keine Signalbehandlungsfunktion fuer Signal '%1' (%2) installieren: %3
-.
 MessageId = 2007
 Severity = Informational
 Facility = Application
@@ -839,9 +608,6 @@ SymbolicName = WOLF_MSG_DAEMON_FUNC_SIGNAL
 Language = English
 Installed signal handler for signal '%1' (%2)
 .
-Language = German
-Signalbehandlungsfunktion installiert fuer Signal '%1' (%2)
-.
 MessageId = 3001
 Severity = Informational
 Facility = Application
@@ -849,9 +615,6 @@ SymbolicName = WOLF_MSG_SERVICE_INSTALLING_SERVICE
 Language = English
 Installing service '%1'
 .
-Language = German
-Installiere Dienst '%1'
-.
 MessageId = 3002
 Severity = Error
 Facility = Application
@@ -859,9 +622,6 @@ SymbolicName = WOLF_MSG_SERVICE_CANT_OPEN_SCM_FOR_INSTALL
 Language = English
 Unable to open the service control manager to register service '%1': %2 (%3)
 .
-Language = German
-Kann das Dienstkontrollprogramm nicht oeffenen um den '%1' Dienst zu registrieren: %2 (%3)
-.
 MessageId = 3003
 Severity = Error
 Facility = Application
@@ -869,9 +629,6 @@ SymbolicName = WOLF_MSG_SERVICE_CANT_GET_PATH_OF_BINARY
 Language = English
 Unable to get full path of the binary of service '%1': %2 (%3)
 .
-Language = German
-Der volle Pfadnamen des Dienstes '%1' kann nicht bestimmt werden: %2 (%3)
-.
 MessageId = 3004
 Severity = Error
 Facility = Application
@@ -879,9 +636,6 @@ SymbolicName = WOLF_MSG_SERVICE_CANT_CREATE_SERVICE
 Language = English
 Unable to create service '%1': %2 (%3)
 .
-Language = German
-Kann den '%1' Dienst nicht erstellen: %2 (%3)
-.
 MessageId = 3005
 Severity = Informational
 Facility = Application
@@ -889,9 +643,6 @@ SymbolicName = WOLF_MSG_SERVICE_SERVICE_INSTALLED
 Language = English
 Service '%1' installed successfully
 .
-Language = German
-Der '%1' Dienst wurde erfolgreich installiert
-.
 MessageId = 3006
 Severity = Informational
 Facility = Application
@@ -899,9 +650,6 @@ SymbolicName = WOLF_MSG_SERVICE_UNINSTALLING_SERVICE
 Language = English
 Unistalling service '%1'
 .
-Language = German
-Deinstalliere den '%1' Dienst
-.
 MessageId = 3007
 Severity = Error
 Facility = Application
@@ -909,9 +657,6 @@ SymbolicName = WOLF_MSG_SERVICE_CANT_OPEN_SCM_FOR_UNINSTALL
 Language = English
 Unable to open the service control manager to uninstall '%1': %2 (%3)
 .
-Language = German
-Kann das Dienstkontrollprogramm nicht oeffnen um den '%1' Dienst zu deregistrieren: %2 (%3)
-.
 MessageId = 3008
 Severity = Error
 Facility = Application
@@ -919,9 +664,6 @@ SymbolicName = WOLF_MSG_SERVICE_CANT_OPEN_SERVICE
 Language = English
 Unable to open service '%1': %2 (%3)
 .
-Language = German
-Kann den '%1' Dienst nicht oeffnen: %2 (%3)
-.
 MessageId = 3009
 Severity = Error
 Facility = Application
@@ -929,9 +671,6 @@ SymbolicName = WOLF_MSG_SERVICE_CANT_DELETE_SERVICE
 Language = English
 Unable to uninstall service '%1': %2 (%3)
 .
-Language = German
-Kann den '%1' Dienst nicht deinstallieren: %2 (%3)
-.
 MessageId = 3010
 Severity = Informational
 Facility = Application
@@ -939,9 +678,6 @@ SymbolicName = WOLF_MSG_SERVICE_SERVICE_UNINSTALLED
 Language = English
 Service '%1' uninstalled successfully
 .
-Language = German
-Der '%1' Dienst wurde erfolgreich deinstalliert
-.
 MessageId = 3011
 Severity = Informational
 Facility = Application
@@ -949,9 +685,6 @@ SymbolicName = WOLF_MSG_SERVICE_REPORT_STATUS
 Language = English
 reporting status with new state '%1' (%2) (currently in state '%3' (%4))
 .
-Language = German
-neuer Dienststatus '%1' (%2) (alter Status '%3' (%4))
-.
 MessageId = 3012
 Severity = Error
 Facility = Application
@@ -959,9 +692,6 @@ SymbolicName = WOLF_MSG_SERVICE_CANT_REPORT_STATUS
 Language = English
 Unable to report state '%1' (%2) of service '%3' to SCM '%4 (%5)
 .
-Language = German
-Dienststatus '%1' (%2) fuer den '%3' Dienst kann nicht an das Kontrollprogramm gesandt werden: %4 (%5)
-.
 MessageId = 3013
 Severity = Informational
 Facility = Application
@@ -969,9 +699,6 @@ SymbolicName = WOLF_MSG_SERVICE_HANDLING_EVENT
 Language = English
 service handler received status change '%1' (%2)
 .
-Language = German
-Die Callbackfunktion des Dienstes bekommt Kontrollsignal '%1' (%2)
-.
 MessageId = 3014
 Severity = Error
 Facility = Application
@@ -979,9 +706,6 @@ SymbolicName = WOLF_MSG_SERVICE_CANT_REGISTER_SERVICE_CTRL_HANDLER
 Language = English
 Unable to register service control handler function for service '%1': %2 (%3)
 .
-Language = German
-Kann die Callbackfunktion fuer den '%1' Dienst nicht registrieren: %2 (%3)
-.
 MessageId = 3015
 Severity = Error
 Facility = Application
@@ -989,46 +713,108 @@ SymbolicName = WOLF_MSG_SERVICE_CANT_CREATE_STOP_EVENT
 Language = English
 Unable to create the stop event for service '%1': %2 (%3)
 .
-Language = German
-Kann kein Stop-Ereignis generieren fuer den '%1' Dienst: %2 (%3)
-.
 MessageId = 3016
+Severity = Error
+Facility = Application
+SymbolicName = WOLF_MSG_SERVICE_WAIT_FOR_OBJECT_FAILED
+Language = English
+Waiting for events in the service '%1' failed: %2 (%3)
+.
+MessageId = 3019
 Severity = Informational
 Facility = Application
-SymbolicName = WOLF_MSG_SERVICE_STARTED_SERVICE
+SymbolicName = WOLF_MSG_SERVICE_CONSOLE_CTRL_RECEIVED
 Language = English
-Started %1 service
+Got a console control event '%1' (%2)
 .
-Language = German
-Der %1 Dienst wurde gestartet
+MessageId = 3018
+Severity = Error
+Facility = Application
+SymbolicName = WOLF_MSG_SERVICE_CANT_REGISTER_CONSOLE_CTRL_HANDLER
+Language = English
+Unable to register the console control handler for foreground service '%1': %2 (%3)
 .
 MessageId = 3017
 Severity = Error
 Facility = Application
-SymbolicName = WOLF_MSG_SERVICE_WAIT_FOR_OBJECT_FAILED
+SymbolicName = WOLF_MSG_SERVICE_CANT_DISPATCH_SERVICE
+Language = English
+Unable to dispatch service '%1': %2 (%3)
+.
+MessageId = 2501
+Severity = Informational
+Facility = Application
+SymbolicName = WOLF_MSG_DAEMON_TESTING_CONFIGURATION
+Language = English
+Testing configuraton read from '%1'
+.
+MessageId = 2502
+Severity = Informational
+Facility = Application
+SymbolicName = WOLF_MSG_DAEMON_STARTED_DAEMON
 Language = English
-Waiting for the stop event for service '%1' failed: %2 (%3)
+Started %1 daemon
 .
-Language = German
-Warten auf das Stopp-Ereignis fuer den '%1' Dienst ist fehlgeschlagen: %2 (%3)
+MessageId = 2503
+Severity = Error
+Facility = Application
+SymbolicName = WOLF_MSG_DAEMON_SUSPENDING_ON_SIGNAL_ERROR
+Language = English
+Suspending on UNIX signal resulted in an error %1!
 .
-MessageId = 3018
+MessageId = 2504
 Severity = Informational
 Facility = Application
-SymbolicName = WOLF_MSG_SERVICE_STOPPED_SERVICE
+SymbolicName = WOLF_MSG_DAEMON_REREADING_CONFIGURATION
 Language = English
-Stopped %1 service
+Rereading configuration
 .
-Language = German
-%1 Dienst gestoppt
+MessageId = 2505
+Severity = Informational
+Facility = Application
+SymbolicName = WOLF_MSG_DAEMON_GOT_TERMINATION_SIGNAL
+Language = English
+Got termination signal, shutting down the daemon
 .
-MessageId = 3019
+MessageId = 2506
 Severity = Error
 Facility = Application
-SymbolicName = WOLF_MSG_SERVICE_CANT_DISPATCH_SERVICE
+SymbolicName = WOLF_MSG_DAEMON_UNEXPECED_SIGNAL
 Language = English
-Unable to dispatch service '%1': %2 (%3)
+Unexpected signal '%1' (%2)
+.
+MessageId = 2507
+Severity = Informational
+Facility = Application
+SymbolicName = WOLF_MSG_DAEMON_STOPPED_DAEMON
+Language = English
+Stopped %1 daemon
+.
+MessageId = 4001
+Severity = Informational
+Facility = Application
+SymbolicName = WOLF_MSG_TESTSERVICE_STARTED_SERVICE
+Language = English
+Started %1 service
 .
-Language = German
-Kann den Thread fuer den '%1' Dienst nicht starten: %2 (%3)
+MessageId = 4002
+Severity = Error
+Facility = Application
+SymbolicName = WOLF_MSG_TESTSERVICE_SUSPENDING_ON_EVENT_ERROR
+Language = English
+Suspending on a service event resulted in an error %1!
+.
+MessageId = 4003
+Severity = Informational
+Facility = Application
+SymbolicName = WOLF_MSG_TESTSERVICE_GOT_TERMINATION_EVENT
+Language = English
+Got termination event, shutting down the daemon
+.
+MessageId = 4004
+Severity = Informational
+Facility = Application
+SymbolicName = WOLF_MSG_TESTSERVICE_STOPPED_SERVICE
+Language = English
+Stopped %1 service
 .