summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2019-01-13 14:12:39 +0000
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2019-01-13 14:12:39 +0000
commitf7ab04023806caf4ac46ccdb1fc0a9635ae6e56a (patch)
treef32c85a656c820dc16294f9b9b93893cb6edc3a4
parent418fc3cdacf9aebe505d9e187c1a30cbd7938761 (diff)
downloaddrakiso-f7ab04023806caf4ac46ccdb1fc0a9635ae6e56a.tar
drakiso-f7ab04023806caf4ac46ccdb1fc0a9635ae6e56a.tar.gz
drakiso-f7ab04023806caf4ac46ccdb1fc0a9635ae6e56a.tar.bz2
drakiso-f7ab04023806caf4ac46ccdb1fc0a9635ae6e56a.tar.xz
drakiso-f7ab04023806caf4ac46ccdb1fc0a9635ae6e56a.zip
bootloader: make it clear that non-free drivers are only for NVIDIA.
-rw-r--r--NEWS2
-rw-r--r--bootloader/po/af.po2
-rw-r--r--bootloader/po/bg.po2
-rw-r--r--bootloader/po/bootloader.pot2
-rw-r--r--bootloader/po/ca.po2
-rw-r--r--bootloader/po/cs.po2
-rw-r--r--bootloader/po/cy.po2
-rw-r--r--bootloader/po/da.po2
-rw-r--r--bootloader/po/de.po2
-rw-r--r--bootloader/po/el.po2
-rw-r--r--bootloader/po/eo.po2
-rw-r--r--bootloader/po/es.po2
-rw-r--r--bootloader/po/et.po2
-rw-r--r--bootloader/po/eu.po2
-rw-r--r--bootloader/po/fr.po2
-rw-r--r--bootloader/po/hi.po2
-rw-r--r--bootloader/po/hu.po2
-rw-r--r--bootloader/po/ja.po2
-rw-r--r--bootloader/po/nb.po2
-rw-r--r--bootloader/po/nl.po2
-rw-r--r--bootloader/po/pt.po2
-rw-r--r--bootloader/po/pt_BR.po2
-rw-r--r--bootloader/po/ru.po2
-rw-r--r--bootloader/po/sl.po2
-rw-r--r--bootloader/po/sq.po2
-rw-r--r--bootloader/po/sv.po2
-rw-r--r--bootloader/po/tr.po2
-rw-r--r--bootloader/po/uk.po2
-rw-r--r--bootloader/po/zh_CN.po2
-rw-r--r--bootloader/po/zh_TW.po2
-rw-r--r--examples/gui/config/build.cfg10
-rw-r--r--examples/xfce/config/build.cfg10
32 files changed, 41 insertions, 39 deletions
diff --git a/NEWS b/NEWS
index e62e74c..b83d49f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- bootloader: make it clear that non-free drivers are only for NVIDIA
+
1.8:
- fix linux16/linuxefi inclusion in bootloader images
diff --git a/bootloader/po/af.po b/bootloader/po/af.po
index ef1a665..2909e22 100644
--- a/bootloader/po/af.po
+++ b/bootloader/po/af.po
@@ -65,7 +65,7 @@ msgstr "Laai Mageia Live"
msgid "Install Mageia Live"
msgstr "Installeer Mageia Live"
-msgid " + use non-free video drivers (slower to boot)"
+msgid " + use non-free NVIDIA drivers (slower to boot)"
msgstr " + gebruik nievrye videoaandrywers (stadiger selflaai)"
msgid "Select an item with the arrow keys and press Enter to boot."
diff --git a/bootloader/po/bg.po b/bootloader/po/bg.po
index 573c0d3..baba7c6 100644
--- a/bootloader/po/bg.po
+++ b/bootloader/po/bg.po
@@ -64,7 +64,7 @@ msgstr "Зареждане на Mageia Live"
msgid "Install Mageia Live"
msgstr "Инсталиране на Mageia Live"
-msgid " + use non-free video drivers (slower to boot)"
+msgid " + use non-free NVIDIA drivers (slower to boot)"
msgstr ""
"+ използване на платени видео драйвъри (началното зареждане е по-бавно)"
diff --git a/bootloader/po/bootloader.pot b/bootloader/po/bootloader.pot
index 3d66ff9..565dd85 100644
--- a/bootloader/po/bootloader.pot
+++ b/bootloader/po/bootloader.pot
@@ -60,7 +60,7 @@ msgstr ""
msgid "Install Mageia Live"
msgstr ""
-msgid " + use non-free video drivers (slower to boot)"
+msgid " + use non-free NVIDIA drivers (slower to boot)"
msgstr ""
msgid "Select an item with the arrow keys and press Enter to boot."
diff --git a/bootloader/po/ca.po b/bootloader/po/ca.po
index 53afc21..97b2283 100644
--- a/bootloader/po/ca.po
+++ b/bootloader/po/ca.po
@@ -67,7 +67,7 @@ msgstr "Arrenca Mageia autònom"
msgid "Install Mageia Live"
msgstr "Instal·la Mageia autònom"
-msgid " + use non-free video drivers (slower to boot)"
+msgid " + use non-free NVIDIA drivers (slower to boot)"
msgstr " + utilitza controladors de vídeo no lliures (més lent)"
msgid "Select an item with the arrow keys and press Enter to boot."
diff --git a/bootloader/po/cs.po b/bootloader/po/cs.po
index eef26d4..6944ca8 100644
--- a/bootloader/po/cs.po
+++ b/bootloader/po/cs.po
@@ -66,7 +66,7 @@ msgstr "Zavést Mageia Live"
msgid "Install Mageia Live"
msgstr "Instalovat Mageia Live"
-msgid " + use non-free video drivers (slower to boot)"
+msgid " + use non-free NVIDIA drivers (slower to boot)"
msgstr " + použít nesvobodné ovladače grafické karty (pomalejší start)"
msgid "Select an item with the arrow keys and press Enter to boot."
diff --git a/bootloader/po/cy.po b/bootloader/po/cy.po
index 19f7f3f..dde0d4e 100644
--- a/bootloader/po/cy.po
+++ b/bootloader/po/cy.po
@@ -64,7 +64,7 @@ msgstr "Cychwyn Mageia Live"
msgid "Install Mageia Live"
msgstr "Gosod Mageia Live"
-msgid " + use non-free video drivers (slower to boot)"
+msgid " + use non-free NVIDIA drivers (slower to boot)"
msgstr "a defnyddio gyrrwyr fideo cyfyng (cychwyn yn arafach)"
msgid "Select an item with the arrow keys and press Enter to boot."
diff --git a/bootloader/po/da.po b/bootloader/po/da.po
index 1c66b71..5add44d 100644
--- a/bootloader/po/da.po
+++ b/bootloader/po/da.po
@@ -65,7 +65,7 @@ msgstr "Start Mageia Live"
msgid "Install Mageia Live"
msgstr "Installér Mageia Live"
-msgid " + use non-free video drivers (slower to boot)"
+msgid " + use non-free NVIDIA drivers (slower to boot)"
msgstr " + brug ikke-frie videodrivere (langsommere opstart)"
msgid "Select an item with the arrow keys and press Enter to boot."
diff --git a/bootloader/po/de.po b/bootloader/po/de.po
index 2935224..bcec8c9 100644
--- a/bootloader/po/de.po
+++ b/bootloader/po/de.po
@@ -65,7 +65,7 @@ msgstr "Mageia Live starten"
msgid "Install Mageia Live"
msgstr "Mageia Live installieren"
-msgid " + use non-free video drivers (slower to boot)"
+msgid " + use non-free NVIDIA drivers (slower to boot)"
msgstr "+ verwende unfreie Grafikkartentreiber (langsamerer Systemstart)"
msgid "Select an item with the arrow keys and press Enter to boot."
diff --git a/bootloader/po/el.po b/bootloader/po/el.po
index cd589d4..b704790 100644
--- a/bootloader/po/el.po
+++ b/bootloader/po/el.po
@@ -64,7 +64,7 @@ msgstr "Εκκίνηση της Mageia Live"
msgid "Install Mageia Live"
msgstr "Εγκατάσταση της Mageia Live"
-msgid " + use non-free video drivers (slower to boot)"
+msgid " + use non-free NVIDIA drivers (slower to boot)"
msgstr " + με ιδιόκτητους οδηγούς γραφικών (βραδύτερη εκκίνηση)"
msgid "Select an item with the arrow keys and press Enter to boot."
diff --git a/bootloader/po/eo.po b/bootloader/po/eo.po
index 2ed0547..a3ec0cf 100644
--- a/bootloader/po/eo.po
+++ b/bootloader/po/eo.po
@@ -64,7 +64,7 @@ msgstr "Ekkuro Mageia Live"
msgid "Install Mageia Live"
msgstr "Instali Mageia Live"
-msgid " + use non-free video drivers (slower to boot)"
+msgid " + use non-free NVIDIA drivers (slower to boot)"
msgstr "+ uzu senpagajn filmetilojn (pli malrapidaj por ekkapti)"
msgid "Select an item with the arrow keys and press Enter to boot."
diff --git a/bootloader/po/es.po b/bootloader/po/es.po
index ad1b447..963d168 100644
--- a/bootloader/po/es.po
+++ b/bootloader/po/es.po
@@ -66,7 +66,7 @@ msgstr "Iniciar Mageia Live (Caldero)"
msgid "Install Mageia Live"
msgstr "Instalar Mageia Live (Caldero)"
-msgid " + use non-free video drivers (slower to boot)"
+msgid " + use non-free NVIDIA drivers (slower to boot)"
msgstr "+ usar controladores de video propietarios (inicio más lento)"
msgid "Select an item with the arrow keys and press Enter to boot."
diff --git a/bootloader/po/et.po b/bootloader/po/et.po
index b635079..d73928d 100644
--- a/bootloader/po/et.po
+++ b/bootloader/po/et.po
@@ -64,7 +64,7 @@ msgstr "Mageia Live laadimine"
msgid "Install Mageia Live"
msgstr "Mageia Live paigaldamine"
-msgid " + use non-free video drivers (slower to boot)"
+msgid " + use non-free NVIDIA drivers (slower to boot)"
msgstr "+ mittevaba videodraiveri kasutamine (aeglasem käivitus)"
msgid "Select an item with the arrow keys and press Enter to boot."
diff --git a/bootloader/po/eu.po b/bootloader/po/eu.po
index 369ee91..ecbed11 100644
--- a/bootloader/po/eu.po
+++ b/bootloader/po/eu.po
@@ -64,7 +64,7 @@ msgstr "Abiatu Mageia Live"
msgid "Install Mageia Live"
msgstr "Instalatu Mageia Live"
-msgid " + use non-free video drivers (slower to boot)"
+msgid " + use non-free NVIDIA drivers (slower to boot)"
msgstr " + bideo-gidari ez-libreak erabiltzazu (motelago martxan hasieratu)"
msgid "Select an item with the arrow keys and press Enter to boot."
diff --git a/bootloader/po/fr.po b/bootloader/po/fr.po
index bdd7204..e273d04 100644
--- a/bootloader/po/fr.po
+++ b/bootloader/po/fr.po
@@ -65,7 +65,7 @@ msgstr "Amorcer Mageia Live"
msgid "Install Mageia Live"
msgstr "Installer Mageia Live"
-msgid " + use non-free video drivers (slower to boot)"
+msgid " + use non-free NVIDIA drivers (slower to boot)"
msgstr "+ avec pilote vidéo propriétaire (démarrage lent)"
msgid "Select an item with the arrow keys and press Enter to boot."
diff --git a/bootloader/po/hi.po b/bootloader/po/hi.po
index a6092ad..463f511 100644
--- a/bootloader/po/hi.po
+++ b/bootloader/po/hi.po
@@ -62,7 +62,7 @@ msgstr "मजिया लाइव बूट करें"
msgid "Install Mageia Live"
msgstr "मजिया लाइव इंस्टॉल करें"
-msgid " + use non-free video drivers (slower to boot)"
+msgid " + use non-free NVIDIA drivers (slower to boot)"
msgstr "+ अमुक्त वीडियो ड्राइवर उपयोग करें (इससे बूट प्रक्रिया धीमी होगी)"
msgid "Select an item with the arrow keys and press Enter to boot."
diff --git a/bootloader/po/hu.po b/bootloader/po/hu.po
index dcf45b8..9e49784 100644
--- a/bootloader/po/hu.po
+++ b/bootloader/po/hu.po
@@ -60,7 +60,7 @@ msgstr "Mageia Live indítása"
msgid "Install Mageia Live"
msgstr "Mageia Live telepítése"
-msgid " + use non-free video drivers (slower to boot)"
+msgid " + use non-free NVIDIA drivers (slower to boot)"
msgstr "+ használja a non-free videó illesztőprogramokat (lassabb indításhoz)"
msgid "Select an item with the arrow keys and press Enter to boot."
diff --git a/bootloader/po/ja.po b/bootloader/po/ja.po
index 41119f8..b46817b 100644
--- a/bootloader/po/ja.po
+++ b/bootloader/po/ja.po
@@ -63,7 +63,7 @@ msgstr "Mageia Live を起動"
msgid "Install Mageia Live"
msgstr "Mageia Live をインストール"
-msgid " + use non-free video drivers (slower to boot)"
+msgid " + use non-free NVIDIA drivers (slower to boot)"
msgstr " + 非フリーなビデオ ドライバ (起動がより遅くなります)"
msgid "Select an item with the arrow keys and press Enter to boot."
diff --git a/bootloader/po/nb.po b/bootloader/po/nb.po
index 066ef95..4b51e01 100644
--- a/bootloader/po/nb.po
+++ b/bootloader/po/nb.po
@@ -64,7 +64,7 @@ msgstr "Start Mageia Live"
msgid "Install Mageia Live"
msgstr "Installer Mageia Live"
-msgid " + use non-free video drivers (slower to boot)"
+msgid " + use non-free NVIDIA drivers (slower to boot)"
msgstr "+ bruk ikke frie video drivere (gir saktere oppstart)"
msgid "Select an item with the arrow keys and press Enter to boot."
diff --git a/bootloader/po/nl.po b/bootloader/po/nl.po
index 074120f..f1af883 100644
--- a/bootloader/po/nl.po
+++ b/bootloader/po/nl.po
@@ -64,7 +64,7 @@ msgstr "Start Mageia Live"
msgid "Install Mageia Live"
msgstr "Installeer Mageia Live"
-msgid " + use non-free video drivers (slower to boot)"
+msgid " + use non-free NVIDIA drivers (slower to boot)"
msgstr "+ gebruik niet-vrije videodrivers (start trager op)"
msgid "Select an item with the arrow keys and press Enter to boot."
diff --git a/bootloader/po/pt.po b/bootloader/po/pt.po
index 9890872..148386c 100644
--- a/bootloader/po/pt.po
+++ b/bootloader/po/pt.po
@@ -66,7 +66,7 @@ msgstr "Arranque Mageia Live"
msgid "Install Mageia Live"
msgstr "Instalar Mageia Live"
-msgid " + use non-free video drivers (slower to boot)"
+msgid " + use non-free NVIDIA drivers (slower to boot)"
msgstr " + usar controladores de vídeo não livres (mais lento ao arrancar)"
msgid "Select an item with the arrow keys and press Enter to boot."
diff --git a/bootloader/po/pt_BR.po b/bootloader/po/pt_BR.po
index d1994ec..1228b3b 100644
--- a/bootloader/po/pt_BR.po
+++ b/bootloader/po/pt_BR.po
@@ -67,7 +67,7 @@ msgstr "Iniciar Mageia Live"
msgid "Install Mageia Live"
msgstr "Instalar Mageia Live"
-msgid " + use non-free video drivers (slower to boot)"
+msgid " + use non-free NVIDIA drivers (slower to boot)"
msgstr "+ Usar drivers de vídeo não-livres (mais lento para inicializar)"
msgid "Select an item with the arrow keys and press Enter to boot."
diff --git a/bootloader/po/ru.po b/bootloader/po/ru.po
index 4ac8fc4..0cb967c 100644
--- a/bootloader/po/ru.po
+++ b/bootloader/po/ru.po
@@ -66,7 +66,7 @@ msgstr "Загрузка Mageia Live"
msgid "Install Mageia Live"
msgstr "Установка Mageia Live"
-msgid " + use non-free video drivers (slower to boot)"
+msgid " + use non-free NVIDIA drivers (slower to boot)"
msgstr "+ использовать несвободные видео драйвера (медленнее загрузка)"
msgid "Select an item with the arrow keys and press Enter to boot."
diff --git a/bootloader/po/sl.po b/bootloader/po/sl.po
index fd10eb7..2bfcfa8 100644
--- a/bootloader/po/sl.po
+++ b/bootloader/po/sl.po
@@ -65,7 +65,7 @@ msgstr "Zaženi Mageia Live"
msgid "Install Mageia Live"
msgstr "Namestitev Mageia Live"
-msgid " + use non-free video drivers (slower to boot)"
+msgid " + use non-free NVIDIA drivers (slower to boot)"
msgstr "+ uporaba lastniških grafičnih gonilnikov (počasen zagon)"
msgid "Select an item with the arrow keys and press Enter to boot."
diff --git a/bootloader/po/sq.po b/bootloader/po/sq.po
index 9df3367..0bbdbf8 100644
--- a/bootloader/po/sq.po
+++ b/bootloader/po/sq.po
@@ -64,7 +64,7 @@ msgstr "Ndez Mageia Direkt"
msgid "Install Mageia Live"
msgstr "Instalo Mageia Direkt"
-msgid " + use non-free video drivers (slower to boot)"
+msgid " + use non-free NVIDIA drivers (slower to boot)"
msgstr " + përdor drejtues videoje jo-falas (ngadalë në ndezje)"
msgid "Select an item with the arrow keys and press Enter to boot."
diff --git a/bootloader/po/sv.po b/bootloader/po/sv.po
index 077688d..7bf2d85 100644
--- a/bootloader/po/sv.po
+++ b/bootloader/po/sv.po
@@ -65,7 +65,7 @@ msgstr "Starta Mageia Live"
msgid "Install Mageia Live"
msgstr "Installera Mageia Live"
-msgid " + use non-free video drivers (slower to boot)"
+msgid " + use non-free NVIDIA drivers (slower to boot)"
msgstr "+ använd ej-fria grafikdrivrutiner (långsammare att starta)"
msgid "Select an item with the arrow keys and press Enter to boot."
diff --git a/bootloader/po/tr.po b/bootloader/po/tr.po
index 3985c63..4e3c388 100644
--- a/bootloader/po/tr.po
+++ b/bootloader/po/tr.po
@@ -64,7 +64,7 @@ msgstr "Canlı Mageia Sistemini Başlat"
msgid "Install Mageia Live"
msgstr "Canlı Mageia Sistemini Kur"
-msgid " + use non-free video drivers (slower to boot)"
+msgid " + use non-free NVIDIA drivers (slower to boot)"
msgstr "+ müseccel ekran kartı sürücülerini kullan (yavaş önyükleme)"
msgid "Select an item with the arrow keys and press Enter to boot."
diff --git a/bootloader/po/uk.po b/bootloader/po/uk.po
index aee3eaa..7089f92 100644
--- a/bootloader/po/uk.po
+++ b/bootloader/po/uk.po
@@ -63,7 +63,7 @@ msgstr "Завантажити Mageia Live"
msgid "Install Mageia Live"
msgstr "Встановити Mageia Live"
-msgid " + use non-free video drivers (slower to boot)"
+msgid " + use non-free NVIDIA drivers (slower to boot)"
msgstr " + закриті відеодрайвери (повільніше завантаження)"
msgid "Select an item with the arrow keys and press Enter to boot."
diff --git a/bootloader/po/zh_CN.po b/bootloader/po/zh_CN.po
index 3cd3f45..de8bd1a 100644
--- a/bootloader/po/zh_CN.po
+++ b/bootloader/po/zh_CN.po
@@ -65,7 +65,7 @@ msgstr "启动 Mageia Live"
msgid "Install Mageia Live"
msgstr "安装 Mageia Live"
-msgid " + use non-free video drivers (slower to boot)"
+msgid " + use non-free NVIDIA drivers (slower to boot)"
msgstr "+ 使用非自由图形驱动(引导速度稍慢)"
msgid "Select an item with the arrow keys and press Enter to boot."
diff --git a/bootloader/po/zh_TW.po b/bootloader/po/zh_TW.po
index 69c1a07..71e7017 100644
--- a/bootloader/po/zh_TW.po
+++ b/bootloader/po/zh_TW.po
@@ -60,7 +60,7 @@ msgstr "啟動 Mageia Live"
msgid "Install Mageia Live"
msgstr "安裝 Mageia Live"
-msgid " + use non-free video drivers (slower to boot)"
+msgid " + use non-free NVIDIA drivers (slower to boot)"
msgstr "使用專有顯示驅動 (開機較慢)"
msgid "Select an item with the arrow keys and press Enter to boot."
diff --git a/examples/gui/config/build.cfg b/examples/gui/config/build.cfg
index 8b3c999..a33cff3 100644
--- a/examples/gui/config/build.cfg
+++ b/examples/gui/config/build.cfg
@@ -181,11 +181,11 @@ my $config = {
bootloader_default => 0,
bootloader_timeout => 10,
bootloader_entries => [
- 'Boot Mageia Live' => { append => $default_append . ' xdriver=free' },
- ' + use non-free video drivers (slower to boot)' => { append => $default_append . ' nokmsboot' },
- 'Install Mageia Live' => { append => $default_append . ' xdriver=free install' },
- ' + use non-free video drivers (slower to boot)' => { append => $default_append . ' nokmsboot install' },
- 'Memory Test' => { command => 'linux16', image => '/boot/memtest', initrd => 'none' },
+ 'Boot Mageia Live' => { append => $default_append . ' xdriver=free' },
+ ' + use non-free NVIDIA drivers (slower to boot)' => { append => $default_append . ' nokmsboot' },
+ 'Install Mageia Live' => { append => $default_append . ' xdriver=free install' },
+ ' + use non-free NVIDIA drivers (slower to boot)' => { append => $default_append . ' nokmsboot install' },
+ 'Memory Test' => { command => 'linux16', image => '/boot/memtest', initrd => 'none' },
],
mbr_boot_img => '/usr/share/drakiso/bootloader/images/boot_hybrid.img',
eltorito_img => '/usr/share/drakiso/bootloader/images/eltorito.img',
diff --git a/examples/xfce/config/build.cfg b/examples/xfce/config/build.cfg
index 1a0e9fc..b8ddc75 100644
--- a/examples/xfce/config/build.cfg
+++ b/examples/xfce/config/build.cfg
@@ -230,11 +230,11 @@ my $config = {
bootloader_default => 0,
bootloader_timeout => 10,
bootloader_entries => [
- 'Boot Mageia Live' => { append => $default_append . ' xdriver=free' },
- ' + use non-free video drivers (slower to boot)' => { append => $default_append . ' nokmsboot' },
- 'Install Mageia Live' => { append => $default_append . ' xdriver=free install' },
- ' + use non-free video drivers (slower to boot)' => { append => $default_append . ' nokmsboot install' },
- 'Memory Test' => { command => 'linux16', image => '/boot/memtest', initrd => 'none' },
+ 'Boot Mageia Live' => { append => $default_append . ' xdriver=free' },
+ ' + use non-free NVIDIA drivers (slower to boot)' => { append => $default_append . ' nokmsboot' },
+ 'Install Mageia Live' => { append => $default_append . ' xdriver=free install' },
+ ' + use non-free NVIDIA drivers (slower to boot)' => { append => $default_append . ' nokmsboot install' },
+ 'Memory Test' => { command => 'linux16', image => '/boot/memtest', initrd => 'none' },
],
mbr_boot_img => '/usr/share/drakiso/bootloader/images/boot_hybrid.img',
eltorito_img => '/usr/share/drakiso/bootloader/images/eltorito.img',