Module Name: src
Committed By: martin
Date: Sat Nov 3 18:30:00 UTC 2018
Modified Files:
src/usr.sbin/sysinst: main.c msg.mi.de msg.mi.en msg.mi.es msg.mi.fr
msg.mi.pl
Log Message:
Remove "usage" translations - they never could be displayed as we only select
the language later.
Extend usage display a bit and sync with reality.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 src/usr.sbin/sysinst/main.c \
src/usr.sbin/sysinst/msg.mi.fr
cvs rdiff -u -r1.8 -r1.9 src/usr.sbin/sysinst/msg.mi.de \
src/usr.sbin/sysinst/msg.mi.es
cvs rdiff -u -r1.12 -r1.13 src/usr.sbin/sysinst/msg.mi.en
cvs rdiff -u -r1.10 -r1.11 src/usr.sbin/sysinst/msg.mi.pl
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.sbin/sysinst/main.c
diff -u src/usr.sbin/sysinst/main.c:1.11 src/usr.sbin/sysinst/main.c:1.12
--- src/usr.sbin/sysinst/main.c:1.11 Sat Oct 6 18:45:37 2018
+++ src/usr.sbin/sysinst/main.c Sat Nov 3 18:30:00 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.11 2018/10/06 18:45:37 martin Exp $ */
+/* $NetBSD: main.c,v 1.12 2018/11/03 18:30:00 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -420,7 +420,22 @@ static void
usage(void)
{
- (void)fprintf(stderr, "%s", msg_string(MSG_usage));
+ (void)fprintf(stderr, "usage: sysinst [-D] [-f definition_file] "
+ "[-r release] [-C bg:fg]"
+#ifndef NO_PARTMAN
+ " [-p]"
+#endif
+ "\n"
+ "where:\n"
+ "\t-D\n\t\trun in debug mode\n"
+ "\t-f definition_file\n\t\toverride built-in defaults from file\n"
+ "\t-r release\n\t\toverride release name\n"
+ "\t-C bg:fg\n\t\tuse different color scheme\n"
+#ifndef NO_PARTMAN
+ "\t-p\n\t\tonly run the partition editor, no installation\n"
+#endif
+ );
+
exit(1);
}
Index: src/usr.sbin/sysinst/msg.mi.fr
diff -u src/usr.sbin/sysinst/msg.mi.fr:1.11 src/usr.sbin/sysinst/msg.mi.fr:1.12
--- src/usr.sbin/sysinst/msg.mi.fr:1.11 Tue Sep 11 08:05:18 2018
+++ src/usr.sbin/sysinst/msg.mi.fr Sat Nov 3 18:30:00 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.fr,v 1.11 2018/09/11 08:05:18 martin Exp $ */
+/* $NetBSD: msg.mi.fr,v 1.12 2018/11/03 18:30:00 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -34,10 +34,6 @@
/* MI Message catalog -- french, machine independent */
-message usage
-{utilisation: sysinst [-D] [-f fichier_de_d�finition] [-r version] [-C bg:fg]
-}
-
/*
* We can not use non ascii characters in this message - it is displayed
* before the locale is set up!
Index: src/usr.sbin/sysinst/msg.mi.de
diff -u src/usr.sbin/sysinst/msg.mi.de:1.8 src/usr.sbin/sysinst/msg.mi.de:1.9
--- src/usr.sbin/sysinst/msg.mi.de:1.8 Tue Sep 11 08:05:18 2018
+++ src/usr.sbin/sysinst/msg.mi.de Sat Nov 3 18:30:00 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.de,v 1.8 2018/09/11 08:05:18 martin Exp $ */
+/* $NetBSD: msg.mi.de,v 1.9 2018/11/03 18:30:00 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -34,10 +34,6 @@
/* MI Message catalog -- German, machine independent */
-message usage
-{Aufruf: sysinst [-D] [-f Definitionsdatei] [-r Version] [-C bg:fg]
-}
-
/*
* We can not use non ascii characters in this message - it is displayed
* before the locale is set up!
Index: src/usr.sbin/sysinst/msg.mi.es
diff -u src/usr.sbin/sysinst/msg.mi.es:1.8 src/usr.sbin/sysinst/msg.mi.es:1.9
--- src/usr.sbin/sysinst/msg.mi.es:1.8 Tue Sep 11 08:05:18 2018
+++ src/usr.sbin/sysinst/msg.mi.es Sat Nov 3 18:30:00 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.es,v 1.8 2018/09/11 08:05:18 martin Exp $ */
+/* $NetBSD: msg.mi.es,v 1.9 2018/11/03 18:30:00 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -34,10 +34,6 @@
/* MI Message catalog -- spanish, machine independent */
-message usage
-{uso: sysinst [-D] [-f fichero_definici�n] [-r versi�n] [-C bg:fg]
-}
-
/*
* We can not use non ascii characters in this message - it is displayed
* before the locale is set up!
Index: src/usr.sbin/sysinst/msg.mi.en
diff -u src/usr.sbin/sysinst/msg.mi.en:1.12 src/usr.sbin/sysinst/msg.mi.en:1.13
--- src/usr.sbin/sysinst/msg.mi.en:1.12 Tue Sep 11 08:05:18 2018
+++ src/usr.sbin/sysinst/msg.mi.en Sat Nov 3 18:30:00 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.en,v 1.12 2018/09/11 08:05:18 martin Exp $ */
+/* $NetBSD: msg.mi.en,v 1.13 2018/11/03 18:30:00 martin Exp $ */
/*
* Copyright 1997 Piermont Information Systems Inc.
@@ -34,10 +34,6 @@
/* MI Message catalog -- english, machine independent */
-message usage
-{usage: sysinst [-D] [-f definition_file] [-r release] [-C bg:fg]
-}
-
message sysinst_message_language
{Installation messages in English}
Index: src/usr.sbin/sysinst/msg.mi.pl
diff -u src/usr.sbin/sysinst/msg.mi.pl:1.10 src/usr.sbin/sysinst/msg.mi.pl:1.11
--- src/usr.sbin/sysinst/msg.mi.pl:1.10 Tue Sep 11 08:05:18 2018
+++ src/usr.sbin/sysinst/msg.mi.pl Sat Nov 3 18:30:00 2018
@@ -1,4 +1,4 @@
-/* $NetBSD: msg.mi.pl,v 1.10 2018/09/11 08:05:18 martin Exp $ */
+/* $NetBSD: msg.mi.pl,v 1.11 2018/11/03 18:30:00 martin Exp $ */
/* Based on english version: */
/* NetBSD: msg.mi.pl,v 1.36 2004/04/17 18:55:35 atatat Exp */
@@ -36,10 +36,6 @@
/* MI Message catalog -- polish, machine independent */
-message usage
-{uzycie: sysinst [-D] [-f plik_definicja] [-r wersja] [-C bg:fg]
-}
-
/*
* We can not use non ascii characters in this message - it is displayed
* before the locale is set up!
