Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/usr.sbin/sysinst Make sure all menus have a translatable exi...



details:   https://anonhg.NetBSD.org/src/rev/16901130e1db
branches:  trunk
changeset: 461141:16901130e1db
user:      martin <martin%NetBSD.org@localhost>
date:      Sat Nov 16 20:26:59 2019 +0000

description:
Make sure all menus have a translatable exit option (or none at all).

diffstat:

 usr.sbin/sysinst/configmenu.c |   4 ++--
 usr.sbin/sysinst/disks.c      |   9 ++++-----
 usr.sbin/sysinst/msg.mi.de    |   4 +++-
 usr.sbin/sysinst/msg.mi.en    |   5 +++--
 usr.sbin/sysinst/msg.mi.es    |   4 +++-
 usr.sbin/sysinst/msg.mi.fr    |   4 +++-
 usr.sbin/sysinst/msg.mi.pl    |   4 +++-
 usr.sbin/sysinst/net.c        |   4 ++--
 usr.sbin/sysinst/partman.c    |  21 ++++++++++++---------
 usr.sbin/sysinst/run.c        |   4 ++--
 usr.sbin/sysinst/util.c       |   5 +++--
 11 files changed, 40 insertions(+), 28 deletions(-)

diffs (252 lines):

diff -r 38db71570c6d -r 16901130e1db usr.sbin/sysinst/configmenu.c
--- a/usr.sbin/sysinst/configmenu.c     Sat Nov 16 19:23:56 2019 +0000
+++ b/usr.sbin/sysinst/configmenu.c     Sat Nov 16 20:26:59 2019 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: configmenu.c,v 1.10 2019/07/23 18:13:40 martin Exp $ */
+/* $NetBSD: configmenu.c,v 1.11 2019/11/16 20:26:59 martin Exp $ */
 
 /*-
  * Copyright (c) 2012 The NetBSD Foundation, Inc.
@@ -464,7 +464,7 @@
 
        menu_no = new_menu(NULL, me, opts, 0, -4, 0, 70,
                MC_SCROLL | MC_NOBOX | MC_DFLTEXIT,
-               configmenu_hdr, set_config, NULL, "XXX Help String",
+               configmenu_hdr, set_config, NULL, NULL,
                MSG_doneconfig);
 
        process_menu(menu_no, ce);
diff -r 38db71570c6d -r 16901130e1db usr.sbin/sysinst/disks.c
--- a/usr.sbin/sysinst/disks.c  Sat Nov 16 19:23:56 2019 +0000
+++ b/usr.sbin/sysinst/disks.c  Sat Nov 16 20:26:59 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: disks.c,v 1.56 2019/11/13 18:57:26 martin Exp $ */
+/*     $NetBSD: disks.c,v 1.57 2019/11/16 20:26:59 martin Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -852,7 +852,7 @@
                        menu_no = new_menu(MSG_Available_disks,
                                dsk_menu, i, -1,
                                 4, 0, 0, MC_SCROLL,
-                               NULL, NULL, NULL, NULL, NULL);
+                               NULL, NULL, NULL, NULL, MSG_exit_menu_generic);
                        if (menu_no == -1)
                                return -1;
                        msg_fmt_display(MSG_ask_disk, "%s", doingwhat);
@@ -2211,7 +2211,7 @@
            3, 3, 0, 60,
            MC_SUBMENU | MC_SCROLL | MC_NOCLEAR,
            NULL, display_single_part, NULL,
-           NULL, NULL);
+           NULL, MSG_exit_menu_generic);
        if (sel_menu != -1) {
                struct selected_partition *newsels;
                struct sel_menu_data data;
@@ -2410,8 +2410,7 @@
        /* loop with menu */
        update_sel_part_title(&data);
        m = new_menu(data.title, men, __arraycount(men), 3, 2, 0, 65, MC_SCROLL,
-           post_sel_part, fmt_sel_part_line, NULL, NULL,
-           "Source selection OK, proceed to target selection");
+           post_sel_part, fmt_sel_part_line, NULL, NULL, MSG_clone_src_done);
        process_menu(m, &data);
        free(data.title);
        if (res->num_sel == 0)
diff -r 38db71570c6d -r 16901130e1db usr.sbin/sysinst/msg.mi.de
--- a/usr.sbin/sysinst/msg.mi.de        Sat Nov 16 19:23:56 2019 +0000
+++ b/usr.sbin/sysinst/msg.mi.de        Sat Nov 16 20:26:59 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msg.mi.de,v 1.17 2019/11/12 16:33:14 martin Exp $      */
+/*     $NetBSD: msg.mi.de,v 1.18 2019/11/16 20:26:59 martin Exp $      */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -1498,3 +1498,5 @@
 message clone_target_hdr
 {Einfügen der duplizierten Partitionen vor:}
 message clone_target_disp              {duplizierte Partition(en)}
+message clone_src_done
+{Quellselektion OK, weiter mit der Zielauswahl}
diff -r 38db71570c6d -r 16901130e1db usr.sbin/sysinst/msg.mi.en
--- a/usr.sbin/sysinst/msg.mi.en        Sat Nov 16 19:23:56 2019 +0000
+++ b/usr.sbin/sysinst/msg.mi.en        Sat Nov 16 20:26:59 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msg.mi.en,v 1.24 2019/11/12 16:33:14 martin Exp $      */
+/*     $NetBSD: msg.mi.en,v 1.25 2019/11/16 20:26:59 martin Exp $      */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -1438,4 +1438,5 @@
 message clone_target_hdr
 {Insert cloned partitions before:}
 message clone_target_disp              {cloned partition(s)}
-
+message clone_src_done
+{Source selection OK, proceed to target selection}
diff -r 38db71570c6d -r 16901130e1db usr.sbin/sysinst/msg.mi.es
--- a/usr.sbin/sysinst/msg.mi.es        Sat Nov 16 19:23:56 2019 +0000
+++ b/usr.sbin/sysinst/msg.mi.es        Sat Nov 16 20:26:59 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msg.mi.es,v 1.18 2019/11/12 16:33:14 martin Exp $      */
+/*     $NetBSD: msg.mi.es,v 1.19 2019/11/16 20:26:59 martin Exp $      */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -1486,4 +1486,6 @@
 message clone_target_hdr
 {Insert cloned partitions before:}
 message clone_target_disp              {cloned partition(s)}
+message clone_src_done
+{Source selection OK, proceed to target selection}
 
diff -r 38db71570c6d -r 16901130e1db usr.sbin/sysinst/msg.mi.fr
--- a/usr.sbin/sysinst/msg.mi.fr        Sat Nov 16 19:23:56 2019 +0000
+++ b/usr.sbin/sysinst/msg.mi.fr        Sat Nov 16 20:26:59 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msg.mi.fr,v 1.22 2019/11/12 16:33:14 martin Exp $      */
+/*     $NetBSD: msg.mi.fr,v 1.23 2019/11/16 20:26:59 martin Exp $      */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -1530,4 +1530,6 @@
 message clone_target_hdr
 {Insert cloned partitions before:}
 message clone_target_disp              {cloned partition(s)}
+message clone_src_done
+{Source selection OK, proceed to target selection}
 
diff -r 38db71570c6d -r 16901130e1db usr.sbin/sysinst/msg.mi.pl
--- a/usr.sbin/sysinst/msg.mi.pl        Sat Nov 16 19:23:56 2019 +0000
+++ b/usr.sbin/sysinst/msg.mi.pl        Sat Nov 16 20:26:59 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: msg.mi.pl,v 1.25 2019/11/12 16:33:14 martin Exp $      */
+/*     $NetBSD: msg.mi.pl,v 1.26 2019/11/16 20:26:59 martin Exp $      */
 /*     Based on english version: */
 /*     NetBSD: msg.mi.pl,v 1.36 2004/04/17 18:55:35 atatat Exp       */
 
@@ -1425,4 +1425,6 @@
 message clone_target_hdr
 {Insert cloned partitions before:}
 message clone_target_disp              {cloned partition(s)}
+message clone_src_done
+{Source selection OK, proceed to target selection}
 
diff -r 38db71570c6d -r 16901130e1db usr.sbin/sysinst/net.c
--- a/usr.sbin/sysinst/net.c    Sat Nov 16 19:23:56 2019 +0000
+++ b/usr.sbin/sysinst/net.c    Sat Nov 16 20:26:59 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: net.c,v 1.33 2019/07/23 12:37:23 martin Exp $  */
+/*     $NetBSD: net.c,v 1.34 2019/11/16 20:26:59 martin Exp $  */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -524,7 +524,7 @@
        menu_no = new_menu(MSG_netdevs,
                net_menu, num_devs, -1, 4, 0, 0,
                MC_SCROLL,
-               NULL, NULL, NULL, NULL, NULL);
+               NULL, NULL, NULL, NULL, MSG_cancel);
 again:
        selected_net = -1;
        msg_display(MSG_asknetdev);
diff -r 38db71570c6d -r 16901130e1db usr.sbin/sysinst/partman.c
--- a/usr.sbin/sysinst/partman.c        Sat Nov 16 19:23:56 2019 +0000
+++ b/usr.sbin/sysinst/partman.c        Sat Nov 16 20:26:59 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: partman.c,v 1.43 2019/10/06 00:05:10 mrg Exp $ */
+/*     $NetBSD: partman.c,v 1.44 2019/11/16 20:26:59 martin Exp $ */
 
 /*
  * Copyright 2012 Eugene Lozovoy
@@ -387,8 +387,9 @@
                }
 
        menu_no = new_menu(MSG_avdisks,
-               menu_entries, num_devs, -1, -1, (num_devs+1<3)?3:num_devs+1, 13,
-               MC_SCROLL | MC_NOCLEAR, NULL, NULL, NULL, NULL, NULL);
+               menu_entries, num_devs, -1, -1,
+               (num_devs+1<3)?3:num_devs+1, 13,
+               MC_SCROLL | MC_NOCLEAR, NULL, NULL, NULL, NULL, MSG_cancel);
        if (menu_no == -1)
                return (struct part_entry) { .retvalue = -1, };
        process_menu(menu_no, &dev_num);
@@ -589,7 +590,7 @@
                menu_disk_adddel = new_menu(NULL, menuent_disk_adddel, 
                        __arraycount(menuent_disk_adddel),
                        -1, -1, 0, 10, MC_NOCLEAR, NULL, NULL, NULL, NULL,
-                       NULL);
+                       MSG_cancel);
        }
        
        switch (m->cursel) {
@@ -762,8 +763,9 @@
        }
 
        menu_no = new_menu(MSG_raid_disks,
-               menu_entries, num_devs, -1, -1, (num_devs+1<3)?3:num_devs+1, 13,
-               MC_SCROLL | MC_NOCLEAR, NULL, NULL, NULL, NULL, NULL);
+               menu_entries, num_devs, -1, -1,
+               (num_devs+1<3)?3:num_devs+1, 13,
+               MC_SCROLL | MC_NOCLEAR, NULL, NULL, NULL, NULL, MSG_cancel);
        if (menu_no == -1)
                return -1;
        process_menu(menu_no, &retvalue);
@@ -1493,8 +1495,9 @@
        }
 
        menu_no = new_menu(MSG_lvm_disks,
-               menu_entries, num_devs, -1, -1, (num_devs+1<3)?3:num_devs+1, 13,
-               MC_SCROLL | MC_NOCLEAR, NULL, NULL, NULL, NULL, NULL);
+               menu_entries, num_devs, -1, -1,
+               (num_devs+1<3)?3:num_devs+1, 13,
+               MC_SCROLL | MC_NOCLEAR, NULL, NULL, NULL, NULL, MSG_cancel);
        if (menu_no == -1)
                return -1;
        process_menu(menu_no, &retvalue);
@@ -1607,7 +1610,7 @@
                menu_disk_adddel = new_menu(NULL, menuent_disk_adddel,
                        __arraycount(menuent_disk_adddel),
                        -1, -1, 0, 10, MC_NOCLEAR, NULL, NULL, NULL, NULL,
-                       NULL);
+                       MSG_cancel);
        }
 
        switch (m->cursel) {
diff -r 38db71570c6d -r 16901130e1db usr.sbin/sysinst/run.c
--- a/usr.sbin/sysinst/run.c    Sat Nov 16 19:23:56 2019 +0000
+++ b/usr.sbin/sysinst/run.c    Sat Nov 16 20:26:59 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: run.c,v 1.12 2019/06/22 20:46:07 christos Exp $        */
+/*     $NetBSD: run.c,v 1.13 2019/11/16 20:26:59 martin Exp $  */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -99,7 +99,7 @@
 
        menu_no = new_menu(MSG_Logging_functions, logmenu, 2, -1, 12,
                0, 20, MC_SCROLL, NULL, log_menu_label, NULL,
-               MSG_Pick_an_option, NULL);
+               MSG_Pick_an_option, MSG_exit_menu_generic);
 
        if (menu_no < 0) {
                (void)fprintf(stderr, "Dynamic menu creation failed.\n");
diff -r 38db71570c6d -r 16901130e1db usr.sbin/sysinst/util.c
--- a/usr.sbin/sysinst/util.c   Sat Nov 16 19:23:56 2019 +0000
+++ b/usr.sbin/sysinst/util.c   Sat Nov 16 20:26:59 2019 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: util.c,v 1.38 2019/11/14 13:58:22 martin Exp $ */
+/*     $NetBSD: util.c,v 1.39 2019/11/16 20:26:59 martin Exp $ */
 
 /*
  * Copyright 1997 Piermont Information Systems Inc.
@@ -1467,7 +1467,8 @@
        menu_no = new_menu(NULL, NULL, 14, 23, 9,
                           12, 32, MC_ALWAYS_SCROLL | MC_NOSHORTCUT,
                           tzm_set_names, NULL, NULL,
-                          "\nPlease consult the install documents.", NULL);
+                          "\nPlease consult the install documents.",
+                          MSG_exit_menu_generic);
        if (menu_no < 0)
                goto done;      /* error - skip timezone setting */
 



Home | Main Index | Thread Index | Old Index