Increase length of set description to 40 characters so recent additions fit. Ok: martin@ Fixes PR install/58188 "sysinst fails to display status of base32 set"diff -r1.47 -r1.48 src/usr.sbin/sysinst/msg.mi.de
(hannken)
--- src/usr.sbin/sysinst/msg.mi.de 2024/04/22 14:41:26 1.47
+++ src/usr.sbin/sysinst/msg.mi.de 2024/04/25 11:25:08 1.48
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: msg.mi.de,v 1.47 2024/04/22 14:41:26 nia Exp $ */ | 1 | /* $NetBSD: msg.mi.de,v 1.48 2024/04/25 11:25:08 hannken Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Copyright 1997 Piermont Information Systems Inc. | 4 | * Copyright 1997 Piermont Information Systems Inc. | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * Written by Philip A. Nelson for Piermont Information Systems Inc. | 7 | * Written by Philip A. Nelson for Piermont Information Systems Inc. | |
8 | * | 8 | * | |
9 | * Redistribution and use in source and binary forms, with or without | 9 | * Redistribution and use in source and binary forms, with or without | |
10 | * modification, are permitted provided that the following conditions | 10 | * modification, are permitted provided that the following conditions | |
11 | * are met: | 11 | * are met: | |
12 | * 1. Redistributions of source code must retain the above copyright | 12 | * 1. Redistributions of source code must retain the above copyright | |
13 | * notice, this list of conditions and the following disclaimer. | 13 | * notice, this list of conditions and the following disclaimer. | |
14 | * 2. Redistributions in binary form must reproduce the above copyright | 14 | * 2. Redistributions in binary form must reproduce the above copyright | |
@@ -865,28 +865,28 @@ abbrechen. | @@ -865,28 +865,28 @@ abbrechen. | |||
865 | } | 865 | } | |
866 | .endif | 866 | .endif | |
867 | 867 | |||
868 | message mntnetconfig | 868 | message mntnetconfig | |
869 | {Möchten Sie die aktuellen Netzwerkeinstellungen für den allgemeinen | 869 | {Möchten Sie die aktuellen Netzwerkeinstellungen für den allgemeinen | |
870 | Gebrauch in /etc speichern?} | 870 | Gebrauch in /etc speichern?} | |
871 | 871 | |||
872 | message cur_distsets | 872 | message cur_distsets | |
873 | {Die folgenden Distributionspakete werden verwendet: | 873 | {Die folgenden Distributionspakete werden verwendet: | |
874 | 874 | |||
875 | } | 875 | } | |
876 | 876 | |||
877 | message cur_distsets_header | 877 | message cur_distsets_header | |
878 | { Distributionspaket Ausgewählt | 878 | { Distributionspaket Ausgewählt | |
879 | ------------------------ ---------- | 879 | ---------------------------------- ---------- | |
880 | } | 880 | } | |
881 | 881 | |||
882 | message set_base | 882 | message set_base | |
883 | {Basispaket} | 883 | {Basispaket} | |
884 | 884 | |||
885 | message set_base32 | 885 | message set_base32 | |
886 | {Basispaket f?r 32-Bit-Kompatibilit?t} | 886 | {Basispaket f?r 32-Bit-Kompatibilit?t} | |
887 | 887 | |||
888 | message set_base64 | 888 | message set_base64 | |
889 | {Basispaket f?r 64-Bit-Kompatibilit?t} | 889 | {Basispaket f?r 64-Bit-Kompatibilit?t} | |
890 | 890 | |||
891 | message set_system | 891 | message set_system | |
892 | {Systemkonfiguration (/etc)} | 892 | {Systemkonfiguration (/etc)} |
--- src/usr.sbin/sysinst/msg.mi.en 2024/04/22 14:41:26 1.50
+++ src/usr.sbin/sysinst/msg.mi.en 2024/04/25 11:25:08 1.51
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: msg.mi.en,v 1.50 2024/04/22 14:41:26 nia Exp $ */ | 1 | /* $NetBSD: msg.mi.en,v 1.51 2024/04/25 11:25:08 hannken Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Copyright 1997 Piermont Information Systems Inc. | 4 | * Copyright 1997 Piermont Information Systems Inc. | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * Written by Philip A. Nelson for Piermont Information Systems Inc. | 7 | * Written by Philip A. Nelson for Piermont Information Systems Inc. | |
8 | * | 8 | * | |
9 | * Redistribution and use in source and binary forms, with or without | 9 | * Redistribution and use in source and binary forms, with or without | |
10 | * modification, are permitted provided that the following conditions | 10 | * modification, are permitted provided that the following conditions | |
11 | * are met: | 11 | * are met: | |
12 | * 1. Redistributions of source code must retain the above copyright | 12 | * 1. Redistributions of source code must retain the above copyright | |
13 | * notice, this list of conditions and the following disclaimer. | 13 | * notice, this list of conditions and the following disclaimer. | |
14 | * 2. Redistributions in binary form must reproduce the above copyright | 14 | * 2. Redistributions in binary form must reproduce the above copyright | |
@@ -799,28 +799,28 @@ If the set has no more disks, select "Se | @@ -799,28 +799,28 @@ If the set has no more disks, select "Se | |||
799 | Select "Abort fetch" to return to the install media selection menu. | 799 | Select "Abort fetch" to return to the install media selection menu. | |
800 | } | 800 | } | |
801 | 801 | |||
802 | message mntnetconfig | 802 | message mntnetconfig | |
803 | {Is the network information you entered accurate for this machine | 803 | {Is the network information you entered accurate for this machine | |
804 | in regular operation and do you want it installed in /etc? } | 804 | in regular operation and do you want it installed in /etc? } | |
805 | 805 | |||
806 | message cur_distsets | 806 | message cur_distsets | |
807 | {The following is the list of distribution sets that will be used. | 807 | {The following is the list of distribution sets that will be used. | |
808 | 808 | |||
809 | } | 809 | } | |
810 | 810 | |||
811 | message cur_distsets_header | 811 | message cur_distsets_header | |
812 | { Distribution set Selected | 812 | { Distribution set Selected | |
813 | ------------------------ -------- | 813 | ---------------------------------- -------- | |
814 | } | 814 | } | |
815 | 815 | |||
816 | message set_base | 816 | message set_base | |
817 | {Base} | 817 | {Base} | |
818 | 818 | |||
819 | message set_base32 | 819 | message set_base32 | |
820 | {Base 32-bit compatibility libraries} | 820 | {Base 32-bit compatibility libraries} | |
821 | 821 | |||
822 | message set_base64 | 822 | message set_base64 | |
823 | {Base 64-bit compatibility libraries} | 823 | {Base 64-bit compatibility libraries} | |
824 | 824 | |||
825 | message set_system | 825 | message set_system | |
826 | {Configuration files (/etc)} | 826 | {Configuration files (/etc)} |
--- src/usr.sbin/sysinst/msg.mi.es 2024/04/22 14:41:26 1.42
+++ src/usr.sbin/sysinst/msg.mi.es 2024/04/25 11:25:08 1.43
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: msg.mi.es,v 1.42 2024/04/22 14:41:26 nia Exp $ */ | 1 | /* $NetBSD: msg.mi.es,v 1.43 2024/04/25 11:25:08 hannken Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Copyright 1997 Piermont Information Systems Inc. | 4 | * Copyright 1997 Piermont Information Systems Inc. | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * Written by Philip A. Nelson for Piermont Information Systems Inc. | 7 | * Written by Philip A. Nelson for Piermont Information Systems Inc. | |
8 | * | 8 | * | |
9 | * Redistribution and use in source and binary forms, with or without | 9 | * Redistribution and use in source and binary forms, with or without | |
10 | * modification, are permitted provided that the following conditions | 10 | * modification, are permitted provided that the following conditions | |
11 | * are met: | 11 | * are met: | |
12 | * 1. Redistributions of source code must retain the above copyright | 12 | * 1. Redistributions of source code must retain the above copyright | |
13 | * notice, this list of conditions and the following disclaimer. | 13 | * notice, this list of conditions and the following disclaimer. | |
14 | * 2. Redistributions in binary form must reproduce the above copyright | 14 | * 2. Redistributions in binary form must reproduce the above copyright | |
@@ -824,28 +824,28 @@ para instalarlo. Seleccione "Abortar lec | @@ -824,28 +824,28 @@ para instalarlo. Seleccione "Abortar lec | |||
824 | de selección de medios de instalación. | 824 | de selección de medios de instalación. | |
825 | } | 825 | } | |
826 | 826 | |||
827 | message mntnetconfig | 827 | message mntnetconfig | |
828 | {La información de red que ha introducido, ¿es la adecuada para el | 828 | {La información de red que ha introducido, ¿es la adecuada para el | |
829 | funcionamiento normal de esta máquina y desea instalarla en /etc? } | 829 | funcionamiento normal de esta máquina y desea instalarla en /etc? } | |
830 | 830 | |||
831 | message cur_distsets | 831 | message cur_distsets | |
832 | {Ésta es la lista de conjuntos de distribución que se usará. | 832 | {Ésta es la lista de conjuntos de distribución que se usará. | |
833 | 833 | |||
834 | } | 834 | } | |
835 | 835 | |||
836 | message cur_distsets_header | 836 | message cur_distsets_header | |
837 | { Conjunto de distribución Selecc. | 837 | { Conjunto de distribución Selecc. | |
838 | ------------------------ -------- | 838 | ---------------------------------- -------- | |
839 | } | 839 | } | |
840 | 840 | |||
841 | message set_base | 841 | message set_base | |
842 | {Base} | 842 | {Base} | |
843 | 843 | |||
844 | message set_base32 | 844 | message set_base32 | |
845 | {Base de compatibilidad de 32 bits} | 845 | {Base de compatibilidad de 32 bits} | |
846 | 846 | |||
847 | message set_base64 | 847 | message set_base64 | |
848 | {Base de compatibilidad de 64 bits} | 848 | {Base de compatibilidad de 64 bits} | |
849 | 849 | |||
850 | message set_system | 850 | message set_system | |
851 | {Sistema (/etc)} | 851 | {Sistema (/etc)} |
--- src/usr.sbin/sysinst/msg.mi.pl 2024/04/22 14:41:26 1.48
+++ src/usr.sbin/sysinst/msg.mi.pl 2024/04/25 11:25:08 1.49
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: msg.mi.pl,v 1.48 2024/04/22 14:41:26 nia Exp $ */ | 1 | /* $NetBSD: msg.mi.pl,v 1.49 2024/04/25 11:25:08 hannken Exp $ */ | |
2 | /* Based on english version: */ | 2 | /* Based on english version: */ | |
3 | /* NetBSD: msg.mi.pl,v 1.36 2004/04/17 18:55:35 atatat Exp */ | 3 | /* NetBSD: msg.mi.pl,v 1.36 2004/04/17 18:55:35 atatat Exp */ | |
4 | 4 | |||
5 | /* | 5 | /* | |
6 | * Copyright 1997 Piermont Information Systems Inc. | 6 | * Copyright 1997 Piermont Information Systems Inc. | |
7 | * All rights reserved. | 7 | * All rights reserved. | |
8 | * | 8 | * | |
9 | * Written by Philip A. Nelson for Piermont Information Systems Inc. | 9 | * Written by Philip A. Nelson for Piermont Information Systems Inc. | |
10 | * | 10 | * | |
11 | * Redistribution and use in source and binary forms, with or without | 11 | * Redistribution and use in source and binary forms, with or without | |
12 | * modification, are permitted provided that the following conditions | 12 | * modification, are permitted provided that the following conditions | |
13 | * are met: | 13 | * are met: | |
14 | * 1. Redistributions of source code must retain the above copyright | 14 | * 1. Redistributions of source code must retain the above copyright | |
@@ -796,28 +796,28 @@ aby rozpoczac proces jego instalacji. Wy | @@ -796,28 +796,28 @@ aby rozpoczac proces jego instalacji. Wy | |||
796 | zeby wybrac inne zrodlo oprogramowania. | 796 | zeby wybrac inne zrodlo oprogramowania. | |
797 | } | 797 | } | |
798 | 798 | |||
799 | message mntnetconfig | 799 | message mntnetconfig | |
800 | {Czy informacje o sieci, ktore podales sa prawidlowe dla tej maszyny | 800 | {Czy informacje o sieci, ktore podales sa prawidlowe dla tej maszyny | |
801 | w reguralnej pracy i czy chcesz aby je zapisac w /etc? } | 801 | w reguralnej pracy i czy chcesz aby je zapisac w /etc? } | |
802 | 802 | |||
803 | message cur_distsets | 803 | message cur_distsets | |
804 | {Ponizej jest lista pakietow dystrybucyjnych, ktore zostana uzyte. | 804 | {Ponizej jest lista pakietow dystrybucyjnych, ktore zostana uzyte. | |
805 | 805 | |||
806 | } | 806 | } | |
807 | 807 | |||
808 | message cur_distsets_header | 808 | message cur_distsets_header | |
809 | {Pakiet dystrybucyjny Uzyc? | 809 | {Pakiet dystrybucyjny Uzyc? | |
810 | --------------------------------- ----- | 810 | ------------------------------------------- ----- | |
811 | } | 811 | } | |
812 | 812 | |||
813 | message set_base | 813 | message set_base | |
814 | {Base} | 814 | {Base} | |
815 | 815 | |||
816 | message set_base32 | 816 | message set_base32 | |
817 | {Baza dla kompatybilno?ci 32-bitowej} | 817 | {Baza dla kompatybilno?ci 32-bitowej} | |
818 | 818 | |||
819 | message set_base64 | 819 | message set_base64 | |
820 | {Baza dla kompatybilno?ci 32-bitowej} | 820 | {Baza dla kompatybilno?ci 32-bitowej} | |
821 | 821 | |||
822 | message set_system | 822 | message set_system | |
823 | {System (/etc)} | 823 | {System (/etc)} |
--- src/usr.sbin/sysinst/util.c 2024/04/22 14:41:26 1.76
+++ src/usr.sbin/sysinst/util.c 2024/04/25 11:25:08 1.77
@@ -1,14 +1,14 @@ | @@ -1,14 +1,14 @@ | |||
1 | /* $NetBSD: util.c,v 1.76 2024/04/22 14:41:26 nia Exp $ */ | 1 | /* $NetBSD: util.c,v 1.77 2024/04/25 11:25:08 hannken Exp $ */ | |
2 | 2 | |||
3 | /* | 3 | /* | |
4 | * Copyright 1997 Piermont Information Systems Inc. | 4 | * Copyright 1997 Piermont Information Systems Inc. | |
5 | * All rights reserved. | 5 | * All rights reserved. | |
6 | * | 6 | * | |
7 | * Written by Philip A. Nelson for Piermont Information Systems Inc. | 7 | * Written by Philip A. Nelson for Piermont Information Systems Inc. | |
8 | * | 8 | * | |
9 | * Redistribution and use in source and binary forms, with or without | 9 | * Redistribution and use in source and binary forms, with or without | |
10 | * modification, are permitted provided that the following conditions | 10 | * modification, are permitted provided that the following conditions | |
11 | * are met: | 11 | * are met: | |
12 | * 1. Redistributions of source code must retain the above copyright | 12 | * 1. Redistributions of source code must retain the above copyright | |
13 | * notice, this list of conditions and the following disclaimer. | 13 | * notice, this list of conditions and the following disclaimer. | |
14 | * 2. Redistributions in binary form must reproduce the above copyright | 14 | * 2. Redistributions in binary form must reproduce the above copyright | |
@@ -236,27 +236,27 @@ init_set_status(int flags) | @@ -236,27 +236,27 @@ init_set_status(int flags) | |||
236 | /* Lookup some strings we need lots of times */ | 236 | /* Lookup some strings we need lots of times */ | |
237 | msg_yes = msg_string(MSG_Yes); | 237 | msg_yes = msg_string(MSG_Yes); | |
238 | msg_no = msg_string(MSG_No); | 238 | msg_no = msg_string(MSG_No); | |
239 | msg_all = msg_string(MSG_All); | 239 | msg_all = msg_string(MSG_All); | |
240 | msg_some = msg_string(MSG_Some); | 240 | msg_some = msg_string(MSG_Some); | |
241 | msg_none = msg_string(MSG_None); | 241 | msg_none = msg_string(MSG_None); | |
242 | 242 | |||
243 | /* Find longest and use it to determine width of selection menu */ | 243 | /* Find longest and use it to determine width of selection menu */ | |
244 | len = strlen(msg_no); longest = msg_no; | 244 | len = strlen(msg_no); longest = msg_no; | |
245 | i = strlen(msg_yes); if (i > len) {len = i; longest = msg_yes; } | 245 | i = strlen(msg_yes); if (i > len) {len = i; longest = msg_yes; } | |
246 | i = strlen(msg_all); if (i > len) {len = i; longest = msg_all; } | 246 | i = strlen(msg_all); if (i > len) {len = i; longest = msg_all; } | |
247 | i = strlen(msg_some); if (i > len) {len = i; longest = msg_some; } | 247 | i = strlen(msg_some); if (i > len) {len = i; longest = msg_some; } | |
248 | i = strlen(msg_none); if (i > len) {len = i; longest = msg_none; } | 248 | i = strlen(msg_none); if (i > len) {len = i; longest = msg_none; } | |
249 | select_menu_width = snprintf(NULL, 0, "%-30s %s", "", longest); | 249 | select_menu_width = snprintf(NULL, 0, "%-40s %s", "", longest); | |
250 | 250 | |||
251 | /* Give the md code a chance to choose the right kernel, etc. */ | 251 | /* Give the md code a chance to choose the right kernel, etc. */ | |
252 | md_init_set_status(flags); | 252 | md_init_set_status(flags); | |
253 | } | 253 | } | |
254 | 254 | |||
255 | int | 255 | int | |
256 | dir_exists_p(const char *path) | 256 | dir_exists_p(const char *path) | |
257 | { | 257 | { | |
258 | 258 | |||
259 | return file_mode_match(path, S_IFDIR); | 259 | return file_mode_match(path, S_IFDIR); | |
260 | } | 260 | } | |
261 | 261 | |||
262 | int | 262 | int | |
@@ -860,27 +860,27 @@ set_label(menudesc *menu, int opt, void | @@ -860,27 +860,27 @@ set_label(menudesc *menu, int opt, void | |||
860 | break; | 860 | break; | |
861 | } | 861 | } | |
862 | selected = msg_all; | 862 | selected = msg_all; | |
863 | } else { | 863 | } else { | |
864 | if (selected == msg_all) { | 864 | if (selected == msg_all) { | |
865 | selected = msg_some; | 865 | selected = msg_some; | |
866 | break; | 866 | break; | |
867 | } | 867 | } | |
868 | selected = msg_none; | 868 | selected = msg_none; | |
869 | } | 869 | } | |
870 | } | 870 | } | |
871 | } | 871 | } | |
872 | 872 | |||
873 | wprintw(menu->mw, "%-30s %s", msg_string(desc), selected); | 873 | wprintw(menu->mw, "%-40s %s", msg_string(desc), selected); | |
874 | } | 874 | } | |
875 | 875 | |||
876 | static int set_sublist(menudesc *menu, void *arg); | 876 | static int set_sublist(menudesc *menu, void *arg); | |
877 | 877 | |||
878 | static int | 878 | static int | |
879 | initialise_set_menu(distinfo *dist, menu_ent *me, distinfo **de, int all_none) | 879 | initialise_set_menu(distinfo *dist, menu_ent *me, distinfo **de, int all_none) | |
880 | { | 880 | { | |
881 | int set; | 881 | int set; | |
882 | int sets; | 882 | int sets; | |
883 | int nested; | 883 | int nested; | |
884 | 884 | |||
885 | for (sets = 0; ; dist++) { | 885 | for (sets = 0; ; dist++) { | |
886 | set = dist->set; | 886 | set = dist->set; |