From 7046981c72309cd7015183010bdf54fc9a314346 Mon Sep 17 00:00:00 2001 From: Colin Watson Date: Mon, 12 Dec 2005 07:20:15 +0000 Subject: [PATCH] restore "Other Options" panel item, so that people can edit boot options --- boot.config | 1 + dia_options.inc | 50 +++++++++++++++++++++++++++++++++++++++++++++++ install.config | 1 + panel.inc | 4 +++- po/bg.po | 5 +++++ po/bootloader.pot | 5 +++++ po/cs.po | 5 +++++ po/da.po | 5 +++++ po/de.po | 5 +++++ po/el.po | 5 +++++ po/es.po | 5 +++++ po/fi.po | 5 +++++ po/fr.po | 5 +++++ po/hu.po | 5 +++++ po/it.po | 5 +++++ po/ja.po | 5 +++++ po/lt.po | 5 +++++ po/nb.po | 5 +++++ po/nl.po | 5 +++++ po/pl.po | 5 +++++ po/pt.po | 5 +++++ po/pt_BR.po | 5 +++++ po/ro.po | 5 +++++ po/ru.po | 5 +++++ po/sk.po | 5 +++++ po/sl.po | 5 +++++ po/sr.po | 5 +++++ po/sv.po | 5 +++++ po/uk.po | 5 +++++ po/zh_CN.po | 5 +++++ po/zh_TW.po | 5 +++++ 31 files changed, 190 insertions(+), 1 deletion(-) create mode 100644 dia_options.inc diff --git a/boot.config b/boot.config index e9e1523..56373d5 100644 --- a/boot.config +++ b/boot.config @@ -18,6 +18,7 @@ %% include dia_profile.inc %% include dia_install.inc %% include dia_bits.inc +%% include dia_options.inc %% include panel.inc %% include keytables.inc %% include locale.inc diff --git a/dia_options.inc b/dia_options.inc new file mode 100644 index 0000000..f2f5ce2 --- /dev/null +++ b/dia_options.inc @@ -0,0 +1,50 @@ +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% +% Panel 'more options' entry. +% +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% Show help window. +% +% ( ) => ( ) +% +/panel.options { + boot.show not { + /boot.show true def + boot.setup + + boot.window .color.fg get setcolor + boot.window .ed.font get setfont + + boot.ed 3 get + boot.ed over edit.init + "" ne { boot.ed ' ' edit.input } if + } if + + /window.action actRedraw def +} def + + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% Return width of options entry. +% +% ( ) => ( width ) +% +/panel.options.width { + txt_other_options strsize pop +} def + + +% - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - +% Redraw panel entry. +% +% ( panel ) => ( ) +% +/panel.options.update { + panel.text.moveto + + txt_other_options show +} def + + diff --git a/install.config b/install.config index 2344d7a..68981b4 100644 --- a/install.config +++ b/install.config @@ -18,6 +18,7 @@ %% include dia_profile.inc %% include dia_install.inc %% include dia_bits.inc +%% include dia_options.inc %% include panel.inc %% include keytables.inc %% include locale.inc diff --git a/panel.inc b/panel.inc index cc52158..8fe59c1 100644 --- a/panel.inc +++ b/panel.inc @@ -42,11 +42,13 @@ livecd { [ keyF2 0 "F2" /panel.video /panel.video.width /panel.video.update /video.init ] + [ keyF3 0 "F3" /panel.options /panel.options.width /panel.options.update .undef ] } { [ keyF2 0 "F2" /panel.lang /panel.lang.width /panel.lang.update /lang.init ] - [ keyF3 0 "F3" /panel.video /panel.video.width /panel.video.update /video.init ] + [ keyF3 0 "F3" /panel.options /panel.options.width /panel.options.update .undef ] + [ keyF4 0 "F4" /panel.video /panel.video.width /panel.video.update /video.init ] 32+64bit_source { 64bit { diff --git a/po/bg.po b/po/bg.po index ea1dc55..0513e5f 100644 --- a/po/bg.po +++ b/po/bg.po @@ -221,6 +221,11 @@ msgstr "Инсталиране от HTTP" msgid "Domain\n" msgstr "Домейн\n" +# button label for other/more options +#. txt_other_options +msgid "Other Options" +msgstr "Други параметри" + # label for language selection #. txt_language msgid "Language" diff --git a/po/bootloader.pot b/po/bootloader.pot index ee36566..a63a5d0 100644 --- a/po/bootloader.pot +++ b/po/bootloader.pot @@ -187,6 +187,11 @@ msgstr "" msgid "Domain\n" msgstr "" +# button label for other/more options +#. txt_other_options +msgid "Other Options" +msgstr "" + # label for language selection #. txt_language msgid "Language" diff --git a/po/cs.po b/po/cs.po index 55fc8fa..3422161 100644 --- a/po/cs.po +++ b/po/cs.po @@ -220,6 +220,11 @@ msgstr "HTTP instalace" msgid "Domain\n" msgstr "Doména\n" +# button label for other/more options +#. txt_other_options +msgid "Other Options" +msgstr "Další volby" + # label for language selection #. txt_language msgid "Language" diff --git a/po/da.po b/po/da.po index 7c1fce4..8a1e95b 100644 --- a/po/da.po +++ b/po/da.po @@ -200,6 +200,11 @@ msgstr "HTTP installation" msgid "Domain\n" msgstr "Domæne\n" +# button label for other/more options +#. txt_other_options +msgid "Other Options" +msgstr "Andre indstillinger" + # label for language selection #. txt_language msgid "Language" diff --git a/po/de.po b/po/de.po index a7c33a1..5065e99 100644 --- a/po/de.po +++ b/po/de.po @@ -218,6 +218,11 @@ msgstr "HTTP-Installation" msgid "Domain\n" msgstr "Domain\n" +# button label for other/more options +#. txt_other_options +msgid "Other Options" +msgstr "Weitere Optionen" + # label for language selection #. txt_language msgid "Language" diff --git a/po/el.po b/po/el.po index 9b04633..6067a3e 100644 --- a/po/el.po +++ b/po/el.po @@ -219,6 +219,11 @@ msgstr "Εγκατάσταση HTTP" msgid "Domain\n" msgstr "Περιοχή\n" +# button label for other/more options +#. txt_other_options +msgid "Other Options" +msgstr "Άλλες Επιλογές" + # label for language selection #. txt_language msgid "Language" diff --git a/po/es.po b/po/es.po index 2afaf22..3572d98 100644 --- a/po/es.po +++ b/po/es.po @@ -219,6 +219,11 @@ msgstr "Instalación HTTP" msgid "Domain\n" msgstr "Dominio\n" +# button label for other/more options +#. txt_other_options +msgid "Other Options" +msgstr "Otras opciones" + # label for language selection #. txt_language msgid "Language" diff --git a/po/fi.po b/po/fi.po index 9e8c1f7..791d86b 100644 --- a/po/fi.po +++ b/po/fi.po @@ -200,6 +200,11 @@ msgstr "HTTP-asennus" msgid "Domain\n" msgstr "Toimialue\n" +# button label for other/more options +#. txt_other_options +msgid "Other Options" +msgstr "Muut valinnat" + # label for language selection #. txt_language msgid "Language" diff --git a/po/fr.po b/po/fr.po index 150e8d0..ffa6c43 100644 --- a/po/fr.po +++ b/po/fr.po @@ -223,6 +223,11 @@ msgstr "Installation HTTP" msgid "Domain\n" msgstr "Domaine\n" +# button label for other/more options +#. txt_other_options +msgid "Other Options" +msgstr "Autres options" + # label for language selection #. txt_language msgid "Language" diff --git a/po/hu.po b/po/hu.po index 051f3ab..a70f476 100644 --- a/po/hu.po +++ b/po/hu.po @@ -221,6 +221,11 @@ msgstr "HTTP telepítés" msgid "Domain\n" msgstr "Tartomány\n" +# button label for other/more options +#. txt_other_options +msgid "Other Options" +msgstr "Egyéb beállítások" + # label for language selection #. txt_language msgid "Language" diff --git a/po/it.po b/po/it.po index 27583d7..79a27af 100644 --- a/po/it.po +++ b/po/it.po @@ -218,6 +218,11 @@ msgstr "Installazione HTTP" msgid "Domain\n" msgstr "Domino\n" +# button label for other/more options +#. txt_other_options +msgid "Other Options" +msgstr "Altre opzioni" + # label for language selection #. txt_language msgid "Language" diff --git a/po/ja.po b/po/ja.po index 7155705..1cecadf 100644 --- a/po/ja.po +++ b/po/ja.po @@ -213,6 +213,11 @@ msgstr "HTTPインストール" msgid "Domain\n" msgstr "ドメイン\n" +# button label for other/more options +#. txt_other_options +msgid "Other Options" +msgstr "その他のオプション" + # label for language selection #. txt_language msgid "Language" diff --git a/po/lt.po b/po/lt.po index ab28aac..c9de3a6 100644 --- a/po/lt.po +++ b/po/lt.po @@ -215,6 +215,11 @@ msgstr "Diegimas per HTTP" msgid "Domain\n" msgstr "Domenas\n" +# button label for other/more options +#. txt_other_options +msgid "Other Options" +msgstr "Kiti parametrai" + # label for language selection #. txt_language msgid "Language" diff --git a/po/nb.po b/po/nb.po index f4d3865..4f7bb1b 100644 --- a/po/nb.po +++ b/po/nb.po @@ -217,6 +217,11 @@ msgstr "HTTP-installasjon" msgid "Domain\n" msgstr "Domene\n" +# button label for other/more options +#. txt_other_options +msgid "Other Options" +msgstr "Andre valg" + # label for language selection #. txt_language msgid "Language" diff --git a/po/nl.po b/po/nl.po index e8127f8..8d974eb 100644 --- a/po/nl.po +++ b/po/nl.po @@ -221,6 +221,11 @@ msgstr "HTTP-installatie" msgid "Domain\n" msgstr "Domein\n" +# button label for other/more options +#. txt_other_options +msgid "Other Options" +msgstr "Andere opties" + # label for language selection #. txt_language msgid "Language" diff --git a/po/pl.po b/po/pl.po index ff6c0f2..c49e007 100644 --- a/po/pl.po +++ b/po/pl.po @@ -211,6 +211,11 @@ msgstr "Instalacja HTTP" msgid "Domain\n" msgstr "Domena\n" +# button label for other/more options +#. txt_other_options +msgid "Other Options" +msgstr "Inne opcje" + # label for language selection #. txt_language msgid "Language" diff --git a/po/pt.po b/po/pt.po index 2005c45..f834147 100644 --- a/po/pt.po +++ b/po/pt.po @@ -200,6 +200,11 @@ msgstr "Instalação HTTP" msgid "Domain\n" msgstr "Domínio\n" +# button label for other/more options +#. txt_other_options +msgid "Other Options" +msgstr "Outras Opções" + # label for language selection #. txt_language msgid "Language" diff --git a/po/pt_BR.po b/po/pt_BR.po index d4905ff..448a602 100644 --- a/po/pt_BR.po +++ b/po/pt_BR.po @@ -214,6 +214,11 @@ msgstr "Instalação por HTTP" msgid "Domain\n" msgstr "Domínio\n" +# button label for other/more options +#. txt_other_options +msgid "Other Options" +msgstr "Outras Opções" + # label for language selection #. txt_language msgid "Language" diff --git a/po/ro.po b/po/ro.po index c0906d5..0783cb7 100644 --- a/po/ro.po +++ b/po/ro.po @@ -221,6 +221,11 @@ msgstr "Instalare prin HTTP" msgid "Domain\n" msgstr "" +# button label for other/more options +#. txt_other_options +msgid "Other Options" +msgstr "" + # label for language selection #. txt_language msgid "Language" diff --git a/po/ru.po b/po/ru.po index c7436db..483097e 100644 --- a/po/ru.po +++ b/po/ru.po @@ -223,6 +223,11 @@ msgstr "Установка по HTTP" msgid "Domain\n" msgstr "" +# button label for other/more options +#. txt_other_options +msgid "Other Options" +msgstr "" + # label for language selection #. txt_language msgid "Language" diff --git a/po/sk.po b/po/sk.po index 4ac68bf..7f5c76c 100644 --- a/po/sk.po +++ b/po/sk.po @@ -225,6 +225,11 @@ msgstr "HTTP Inštalácia" msgid "Domain\n" msgstr "Doména\n" +# button label for other/more options +#. txt_other_options +msgid "Other Options" +msgstr "" + # label for language selection #. txt_language msgid "Language" diff --git a/po/sl.po b/po/sl.po index 765358f..f3fd40c 100644 --- a/po/sl.po +++ b/po/sl.po @@ -221,6 +221,11 @@ msgstr "Namestitev preko HTTP" msgid "Domain\n" msgstr "Domena\n" +# button label for other/more options +#. txt_other_options +msgid "Other Options" +msgstr "Ostale možnosti" + # label for language selection #. txt_language msgid "Language" diff --git a/po/sr.po b/po/sr.po index 8f7a607..749299d 100755 --- a/po/sr.po +++ b/po/sr.po @@ -197,6 +197,11 @@ msgstr "HTTP инсталација" msgid "Domain\n" msgstr "Домен\n" +# button label for other/more options +#. txt_other_options +msgid "Other Options" +msgstr "Остале опције" + # label for language selection #. txt_language msgid "Language" diff --git a/po/sv.po b/po/sv.po index 367641a..d40ada3 100644 --- a/po/sv.po +++ b/po/sv.po @@ -218,6 +218,11 @@ msgstr "HTTP-installation" msgid "Domain\n" msgstr "Domän\n" +# button label for other/more options +#. txt_other_options +msgid "Other Options" +msgstr "Fler alternativ" + # label for language selection #. txt_language msgid "Language" diff --git a/po/uk.po b/po/uk.po index 880c91f..c5ffc70 100644 --- a/po/uk.po +++ b/po/uk.po @@ -223,6 +223,11 @@ msgstr "Встановлення через HTTP" msgid "Domain\n" msgstr "Домен\n" +# button label for other/more options +#. txt_other_options +msgid "Other Options" +msgstr "" + # label for language selection #. txt_language msgid "Language" diff --git a/po/zh_CN.po b/po/zh_CN.po index cbf937e..8b3b392 100644 --- a/po/zh_CN.po +++ b/po/zh_CN.po @@ -214,6 +214,11 @@ msgstr "HTTP 安装" msgid "Domain\n" msgstr "域\n" +# button label for other/more options +#. txt_other_options +msgid "Other Options" +msgstr "其他选项" + # label for language selection #. txt_language msgid "Language" diff --git a/po/zh_TW.po b/po/zh_TW.po index cc9adfd..27ce9a2 100644 --- a/po/zh_TW.po +++ b/po/zh_TW.po @@ -214,6 +214,11 @@ msgstr "HTTP 安裝" msgid "Domain\n" msgstr "領域\n" +# button label for other/more options +#. txt_other_options +msgid "Other Options" +msgstr "其他選項" + # label for language selection #. txt_language msgid "Language"