fixed messages and script for testservice

3 files changed, 21 insertions, 77 deletions

diff --git a/tests/service/create_testservicemsg.pl b/tests/service/create_testservicemsg.pl
index 72d7b1b..5600f04 100755
--- a/tests/service/create_testservicemsg.pl
+++ b/tests/service/create_testservicemsg.pl
@@ -123,11 +123,11 @@ EOF
 
 undef $/;
 
-open CONTENT, "find ../.. -name '*.c' -exec cat {} \\; |";
+open CONTENT, "find ../../src . -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 ../../src . -name '*.c' -exec cat {} \\; | cpp -DENABLE_NLS=1 -I../../include/wolf |";
 my $expanded_code = <CONTENT>;
 close CONTENT;
 
@@ -199,6 +199,10 @@ $formatstr_win
 EOF
 			} else {
 				my $msg = $gettext{"${lang}_${formatstr_c}"};
+				if( !defined( $msg ) ) {
+					print STDERR "No translation for language '${lang}' found for message $messageid_number\n";
+					exit 1;
+				}
 				
 				# map C snprintf format to positional format
 				my $pos = 1;
diff --git a/tests/service/po/de.po b/tests/service/po/de.po
index dad9f26..245e79d 100644
--- a/tests/service/po/de.po
+++ b/tests/service/po/de.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: testservice 0.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-28 13:24+0100\n"
+"POT-Creation-Date: 2009-04-01 20:31+0200\n"
 "PO-Revision-Date: 2009-03-28 13:20+0100\n"
 "Last-Translator: Andreas Baumann <abaumann@yahoo.com>\n"
 "Language-Team: German\n"
@@ -26,8 +26,8 @@ msgstr "%s Dienst gestartet"
 msgid "Suspending on a service event resulted in an error %d!"
 msgstr "Fehler beim Warten auf ein Ereignis im Dienst, Code %d!"
 
-#: testservice.c:51
 #
+#: testservice.c:51
 msgid "Got termination event, shutting down the service"
 msgstr "Beendingungssignal empfangen, beende den Dienst"
 
diff --git a/tests/service/testservicemsg.mc b/tests/service/testservicemsg.mc
index fa97144..14fba53 100644
--- a/tests/service/testservicemsg.mc
+++ b/tests/service/testservicemsg.mc
@@ -1043,77 +1043,7 @@ Unable to dispatch service '%1': %2 (%3)
 Language = German
 Kann den Thread fuer den '%1' Dienst nicht starten: %2 (%3)
 .
-MessageId = 2501
-Severity = Informational
-Facility = Application
-SymbolicName = WOLF_MSG_DAEMON_TESTING_CONFIGURATION
-Language = English
-Testing configuraton read from '%1'
-.
-Language = German
-
-.
-MessageId = 2502
-Severity = Informational
-Facility = Application
-SymbolicName = WOLF_MSG_DAEMON_STARTED_DAEMON
-Language = English
-Started %1 daemon
-.
-Language = German
-
-.
-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!
-.
-Language = German
-
-.
-MessageId = 2504
-Severity = Informational
-Facility = Application
-SymbolicName = WOLF_MSG_DAEMON_REREADING_CONFIGURATION
-Language = English
-Rereading configuration
-.
-Language = German
-
-.
-MessageId = 2505
-Severity = Informational
-Facility = Application
-SymbolicName = WOLF_MSG_DAEMON_GOT_TERMINATION_SIGNAL
-Language = English
-Got termination signal, shutting down the daemon
-.
-Language = German
-
-.
-MessageId = 2506
-Severity = Error
-Facility = Application
-SymbolicName = WOLF_MSG_DAEMON_UNEXPECED_SIGNAL
-Language = English
-Unexpected signal '%1' (%2)
-.
-Language = German
-
-.
-MessageId = 2507
-Severity = Informational
-Facility = Application
-SymbolicName = WOLF_MSG_DAEMON_STOPPED_DAEMON
-Language = English
-Stopped %1 daemon
-.
-Language = German
-
-.
-MessageId = 4002
+MessageId = 4001
 Severity = Informational
 Facility = Application
 SymbolicName = WOLF_MSG_TESTSERVICE_STARTED_SERVICE
@@ -1123,7 +1053,7 @@ Started %1 service
 Language = German
 %1 Dienst gestartet
 .
-MessageId = 4003
+MessageId = 4002
 Severity = Error
 Facility = Application
 SymbolicName = WOLF_MSG_TESTSERVICE_SUSPENDING_ON_EVENT_ERROR
@@ -1133,7 +1063,7 @@ Suspending on a service event resulted in an error %1!
 Language = German
 Fehler beim Warten auf ein Ereignis im Dienst, Code %1!
 .
-MessageId = 4004
+MessageId = 4003
 Severity = Informational
 Facility = Application
 SymbolicName = WOLF_MSG_TESTSERVICE_GOT_TERMINATION_EVENT
@@ -1143,3 +1073,13 @@ Got termination event, shutting down the service
 Language = German
 Beendingungssignal empfangen, beende den Dienst
 .
+MessageId = 4004
+Severity = Informational
+Facility = Application
+SymbolicName = WOLF_MSG_TESTSERVICE_STOPPED_SERVICE
+Language = English
+Stopped %1 service
+.
+Language = German
+%1 Dienst gestoppt
+.