* Add a "Free software only" boot option (mapping to

apt-setup/restricted=false apt-setup/multiverse=false).

debian/changelog

@@ -1,3 +1,10 @@
+gfxboot-theme-ubuntu (0.5.12) UNRELEASED; urgency=low
+
+  * Add a "Free software only" boot option (mapping to
+    apt-setup/restricted=false apt-setup/multiverse=false).
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Sun, 23 Mar 2008 09:56:47 +0000
+
 gfxboot-theme-ubuntu (0.5.11) hardy; urgency=low
 
   * Backport 'split' memory corruption fix from SuSE.

dia_fulloptions.inc

@@ -11,6 +11,7 @@
 /.fulloptions.acpi_off 1 def
 /.fulloptions.noapic 2 def
 /.fulloptions.nolapic 3 def
+/.fulloptions.free 4 def
 
 % These strings are intentionally not translatable.
 /txt_acpi_off "acpi=off" def
@@ -39,6 +40,7 @@
   xmenu .xm_list [
     is_live not { /txt_expert_mode } if
     /txt_acpi_off /txt_noapic /txt_nolapic
+    /txt_option_free
   ] put
 
   xmenu .xm_title /txt_other_options put
@@ -70,6 +72,7 @@
       over .fulloptions.acpi_off eq { pop "acpi=off" } if
       over .fulloptions.noapic eq { pop "noapic" } if
       over .fulloptions.nolapic eq { pop "nolapic" } if
+      over .fulloptions.free eq { pop "apt-setup/restricted=false apt-setup/multiverse=false" } if
       dup {
 	% append new option string
 	dup length fulloptions.option length add 1 add string

po/ar.po

@@ -369,3 +369,8 @@ msgstr "ﺓﺮﻛﺍﺫ^ﻝﺍ ﺺﺤﻓ"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "ﻝﻭ^ﻷﺍ ﺐﻠﺼﻟﺍ ﺹﺮﻘﻟﺍ ﻦﻣ ﻊﻠﻗﺃ"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/be.po

@@ -371,3 +371,8 @@ msgstr "Тэст памяці"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "^Загрузіцца з жорсткага дыска"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/bg.po

@@ -384,3 +384,8 @@ msgstr "^Теста на паметта"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "^Зареждане от първия твърд диск"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/bn.po

@@ -384,3 +384,8 @@ msgstr "^মেমরী পরীক্ষা"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "প্রথম হার্ড ডিস্ক থেকে ^বুট করো"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/bootloader.pot

@@ -338,3 +338,8 @@ msgstr ""
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr ""
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/bs.po

@@ -371,3 +371,8 @@ msgstr ""
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr ""
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/ca.po

@@ -372,3 +372,8 @@ msgstr "Comprovació de la ^memòria"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "^Arrenca des del primer disc dur"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/cs.po

@@ -373,3 +373,8 @@ msgstr "Otestovat pa^měť"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "^Zavést systém z prvního pevného disku"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/da.po

@@ -382,3 +382,8 @@ msgstr "^Hukommelsestest"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "^Start op fra første harddisk"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/de.po

@@ -386,3 +386,8 @@ msgstr "RA^M-Speichertest durchführen"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "Von der ersten ^Festplatte starten"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/el.po

@@ -384,3 +384,8 @@ msgstr "Έλεγ^χος μνήμης"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "Ε^κκίνηση από τον πρώτο σκληρό δίσκο"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/eo.po

@@ -385,3 +385,8 @@ msgstr "^Memortesto"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "Komencu de la unua durdisko"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/es.po

@@ -375,3 +375,8 @@ msgstr "Test de ^memoria"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "^Arrancar desde el primer disco duro"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/et.po

@@ -371,3 +371,8 @@ msgstr "^Mälutest"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "Tee alglaa^dimine esimeselt kõvakettalt"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/eu.po

@@ -371,3 +371,8 @@ msgstr "^Memoria testa"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "^Lehen disko gogorretik abiarazi"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/fi.po

@@ -372,3 +372,8 @@ msgstr "^Muistin tarkistus"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "Käynnistä ^ensimmäiseltä kiintolevyltä"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/fr.po

@@ -378,3 +378,8 @@ msgstr "Tester la ^mémoire"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "^Démarrer à partir du premier disque dur"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/gl.po

@@ -370,3 +370,8 @@ msgstr "Probar a ^memoria"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "^Iniciar desde o primeiro disco duro"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/he.po

@@ -370,3 +370,8 @@ msgstr "בדוק את הזיכרון"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "^אתחול מהדיסק הקשיח הראשון"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/hi.po

@@ -367,3 +367,8 @@ msgstr ""
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr ""
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/hr.po

@@ -385,3 +385,8 @@ msgstr "Test ^memorije"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "^Podigni s prvog čvrstog diska"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/hu.po

@@ -375,3 +375,8 @@ msgstr "^Memóriateszt"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "^Rendszerindítás az első merevlemezről"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/id.po

@@ -385,3 +385,8 @@ msgstr "Uji ^memori"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "^Boot dari hard disk pertama"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/it.po

@@ -392,3 +392,8 @@ msgstr "Test della ^memoria"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "^Boot dal primo disco rigido"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/ja.po

@@ -383,3 +383,8 @@ msgstr "メモリテスト"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "一番目のハードディスクから起動"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/ka.po

@@ -387,3 +387,8 @@ msgstr "^მეხსიერების ტესტი"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "პირველი ^მყარი დისკიდან ჩატვირთვა"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/ko.po

@@ -388,3 +388,8 @@ msgstr "메모리 테스트 (^M)"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "첫 번째 하드 디스크로 부팅하기 (^B)"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/ku.po

@@ -377,3 +377,8 @@ msgstr "^Testa bîrê"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "Ji hard disk a yekemîn ^boot bike"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/lt.po

@@ -384,3 +384,8 @@ msgstr "^Operatyviosios atminties (RAM) tikrinimas"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "Į^kelti iš pirmojo standaus disko"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/lv.po

@@ -369,3 +369,8 @@ msgstr "Pārbaudīt operatīvo at^miņu"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "Ielādē^t sistēmu no pirmā diska"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/mk.po

@@ -387,3 +387,8 @@ msgstr "^Мемориски тест"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "^Подигни од првиот тврд диск"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/ml.po

@@ -358,3 +358,8 @@ msgstr ""
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr ""
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/nb.po

@@ -384,3 +384,8 @@ msgstr "^Minnetest"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "^Oppstart fra første harddisk"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/nl.po

@@ -374,3 +374,8 @@ msgstr "^Geheugentest"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "Start ^op vanaf de eerste harde schijf"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/nn.po

@@ -368,3 +368,8 @@ msgstr ""
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr ""
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/pl.po

@@ -369,3 +369,8 @@ msgstr "^Test pamięci"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "^Uruchomienie systemu z pierwszego dysku twardego"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/pt.po

@@ -373,3 +373,8 @@ msgstr "Testar memória"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "Iniciar do ^primeiro disco rígido"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/pt_BR.po

@@ -370,3 +370,8 @@ msgstr "Teste de ^memória"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "Inicializar pelo ^primeiro disco rígido"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/ro.po

@@ -373,3 +373,8 @@ msgstr "Test ^memorie"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "[^B]Porneşte de pe primul hard disc"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/ru.po

@@ -372,3 +372,8 @@ msgstr "Проверить ^память"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "^Загрузиться с первого жёсткого диска"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/sk.po

@@ -375,3 +375,8 @@ msgstr "^Test pamäte"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "Štart systému z prvého ^disku"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/sl.po

@@ -384,3 +384,8 @@ msgstr "Preveri delovni po^mnilnik"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "^Zaženi s prvega trdega diska"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/sq.po

@@ -378,3 +378,8 @@ msgstr "^Testimi i memorjes"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "^Boot nga disku i parë i ngurtë."
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/sv.po

@@ -372,3 +372,8 @@ msgstr "Kontrollera ^minne"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "^Starta upp från första hårddisken"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/ta.po

@@ -382,3 +382,8 @@ msgstr "^நினைவக சோதனை"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "முதல் வன் தட்டிலிருந்து ^பூட் செய்"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/th.po

@@ -385,3 +385,8 @@ msgstr "^ทดสอบหน่วยความจำ"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "บูตจาก^ฮาร์ดดิสก์ตัวแรก"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/tl.po

@@ -358,3 +358,8 @@ msgstr ""
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr ""
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/tr.po

@@ -393,3 +393,8 @@ msgstr "^Bellek testi"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "Birinci sabit diskten ^aç"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/uk.po

@@ -384,3 +384,8 @@ msgstr "Тест пам'яті"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "Завантажитись з першого жорсткого диску"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/vi.po

@@ -385,3 +385,8 @@ msgstr "Kiểm tra bộ ^nhớ"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "K^hởi động từ ổ cứng đầu tiên"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/zh_CN.po

@@ -369,3 +369,8 @@ msgstr "内存测试 (^M)"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "从第一块硬盘启动 (^B)"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""

po/zh_TW.po

@@ -384,3 +384,8 @@ msgstr "記憶體測試(^M)"
 #. txt_menuitem_hd
 msgid "^Boot from first hard disk"
 msgstr "從第一個硬碟開機(^B)"
+
+#. Boot option.
+#. txt_option_free
+msgid "Free software only"
+msgstr ""