From e596e8e66b014161116c207daa8d42cff849bfd2 Mon Sep 17 00:00:00 2001 From: Jeremy Kerr Date: Thu, 24 Jul 2014 15:13:24 +0800 Subject: ui/ncurses: Move menu initialisation to cui code We'll want to re-initialise the petitboot main menu (when the language is changed), which we can't do if the items are populated entirely from the main() function. This change moves the menu initilisation to the cui code, we we can re-init when necessary. Signed-off-by: Jeremy Kerr --- po/POTFILES.in | 2 +- po/en.po | 38 +++++++++++++++++++------------------- 2 files changed, 20 insertions(+), 20 deletions(-) (limited to 'po') diff --git a/po/POTFILES.in b/po/POTFILES.in index ba9f977..7754f8b 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -7,7 +7,7 @@ ui/ncurses/nc-helpscreen.c ui/ncurses/nc-menu.c ui/ncurses/nc-sysinfo.c ui/ncurses/nc-textscreen.c -ui/ncurses/generic-main-help.c +ui/ncurses/nc-cui-help.c ui/ncurses/nc-boot-editor-help.c ui/ncurses/nc-config-help.c ui/ncurses/nc-sysinfo-help.c diff --git a/po/en.po b/po/en.po index 6df54eb..d55b155 100644 --- a/po/en.po +++ b/po/en.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: petitboot 20140623-g89bd2ed2-dirty\n" "Report-Msgid-Bugs-To: Geoff Levand \n" -"POT-Creation-Date: 2014-07-28 13:45+0800\n" +"POT-Creation-Date: 2014-07-28 13:48+0800\n" "PO-Revision-Date: 2014-06-24 13:56+0800\n" "Last-Translator: Jeremy Kerr \n" "Language-Team: English\n" @@ -166,6 +166,24 @@ msgstr "SAFE MODE: select '%s' to continue" msgid "Rescan devices" msgstr "Rescan devices" +msgid "Enter=accept, e=edit, n=new, x=exit, h=help" +msgstr "Enter=accept, e=edit, n=new, x=exit, h=help" + +msgid "Welcome to Petitboot" +msgstr "Welcome to Petitboot" + +msgid "System information" +msgstr "System information" + +msgid "System configuration" +msgstr "System configuration" + +msgid "Exit to shell" +msgstr "Exit to shell" + +msgid "main menu" +msgstr "main menu" + #, c-format msgid "%s: alloc cui failed.\n" msgstr "%s: alloc cui failed.\n" @@ -390,21 +408,3 @@ msgstr "" msgid "Usage" msgstr "Usage" - -msgid "Enter=accept, e=edit, n=new, x=exit, h=help" -msgstr "Enter=accept, e=edit, n=new, x=exit, h=help" - -msgid "Welcome to Petitboot" -msgstr "Welcome to Petitboot" - -msgid "System information" -msgstr "System information" - -msgid "System configuration" -msgstr "System configuration" - -msgid "Exit to shell" -msgstr "Exit to shell" - -msgid "main menu" -msgstr "main menu" -- cgit v1.2.1