From 9824ebabc3443abe6f0d18fdf30ddfb2cc046a00 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Sat, 17 Aug 2013 11:37:04 +0000 Subject: [PATCH] linux-image.postinst: Remove debconf warning about missing firmware At this point, Debian users should know that they may need to install firmware from non-free. People using e.g. the r8169 driver may quite reasonably choose not to install the associated firmware, either because the driver doesn't actually request it for their chip or because the driver can still work without it. One thing we lose by doing this is a reminder that a firmware package might also need to be upgraded, as a driver requires a newer version of the firmware that has a different name. As an alternative, we could compare the firmware file lists for old and new modules and only warn about newly listed files that are missing. However, that would also result in incorrect warnings for e.g. r8169 users, as that driver may request a different file for each of the many chips it supports. svn path=/dists/trunk/linux/; revision=20511 --- debian/changelog | 3 + debian/templates/image.plain.postinst.in | 92 ----------------------- debian/templates/image.plain.templates.in | 16 ---- debian/templates/po/ca.po | 34 --------- debian/templates/po/cs.po | 34 +-------- debian/templates/po/da.po | 34 +-------- debian/templates/po/de.po | 35 +-------- debian/templates/po/es.po | 35 +-------- debian/templates/po/et.po | 32 -------- debian/templates/po/fr.po | 35 +-------- debian/templates/po/it.po | 32 -------- debian/templates/po/ja.po | 32 -------- debian/templates/po/nl.po | 35 +-------- debian/templates/po/pl.po | 35 +-------- debian/templates/po/pt.po | 34 +-------- debian/templates/po/pt_BR.po | 33 -------- debian/templates/po/ru.po | 34 +-------- debian/templates/po/sk.po | 34 +-------- debian/templates/po/sv.po | 34 +-------- debian/templates/po/templates.pot | 27 +------ debian/templates/po/tr.po | 34 +-------- debian/templates/po/vi.po | 33 -------- 22 files changed, 16 insertions(+), 731 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8dc1698c6..4b5d394ef 100644 --- a/debian/changelog +++ b/debian/changelog @@ -18,6 +18,9 @@ linux (3.11~rc5-1~exp1) UNRELEASED; urgency=low in gencontrol.py - linux-image.postinst: Remove debconf warning about ramdisk variable in /etc/kernel-img.conf + - linux-image.postinst: Remove debconf warning about missing firmware; + this should now be redundant and it annoys users that don't need the + files (Closes: #612822) -- Ben Hutchings Sun, 11 Aug 2013 19:34:47 +0200 diff --git a/debian/templates/image.plain.postinst.in b/debian/templates/image.plain.postinst.in index 792429d3c..020421324 100755 --- a/debian/templates/image.plain.postinst.in +++ b/debian/templates/image.plain.postinst.in @@ -522,98 +522,6 @@ sub do_modules { } } } - - # If we are installing (not upgrading) a package for a newer - # upstream version than that of the running kernel, check whether - # the user might be missing necessary firmware, perhaps because - # it has now been removed from the kernel. - # - # We base this check on the modules used in the running kernel and - # the corresponding (by name) modules in the new kernel. This is - # not entirely accurate because: - # 1. A device may now be handled by a module with a different name, - # leading us to miss the dependency - # 2. A device may be handled by a module that needs firmware only - # for some other device, leading us to claim a dependency wrongly - - if (!defined($ARGV[1]) || $ARGV[1] eq '') { - sub version_code { - my $version = shift; - $version =~ s/^2\.(\d+)\.(\d+).*/2*65536 + $1*256 + $2/e - or $version =~ s/^(\d+)\.(\d+).*/$1*65536 + $2*256/e - or $version = 0; - return $version; - } - (undef, undef, my $running_version) = POSIX::uname(); - - if (version_code($version) > version_code($running_version)) { - my $missing = ''; - my %module_paths; - open(DEP, "<$modules_base/$version/modules.dep") or return; - while () { - if (m|(.*/([^/]*)\.ko):|) { - my ($path, $module) = ($1, $2); - $module =~ s/-/_/g; - $module_paths{$module} = $path; - } - } - close(DEP); - open(MODULES, ') { - s/ .*//s; - my $module = $_; - my $module_path = $module_paths{$module}; - if (defined($module_path)) { - my $first = 1; - if ($module_path !~ m|^/|) { - $module_path = "$modules_base/$version/$module_path"; - } - open(MODINFO, "modinfo -F firmware '$module_path' |"); - while () { - chomp; - my $firmware = $_; - unless (-e "/lib/firmware/$firmware" || - -e "/lib/firmware/$version/$firmware") { - if ($first) { - $missing .= "\\n" if $missing ne ''; - $missing .= "$module: "; - $first = 0; - } else { - $missing .= ', '; - } - $missing .= $firmware; - } - } - close(MODINFO); - } - } - close(MODULES); - - if ($missing ne '') { - my ($ret, $seen); - my $text = "${package_name}/postinst/missing-firmware-${version}"; - - ($ret, $seen) = subst($text, 'runningversion', $running_version); - die "Error setting debconf substitutions in $text: $seen" if $ret; - - ($ret, $seen) = subst($text, 'version', $version); - die "Error setting debconf substitutions in $text: $seen" if $ret; - - ($ret, $seen) = subst($text, 'missing', $missing); - die "Error setting debconf substitutions in $text: $seen" if $ret; - - ($ret, $seen) = input('high', $text); - if ($ret && $ret != 30) { - die "Error setting debconf question $text: $seen"; - } - - ($ret, $seen) = go(); - if ($ret && $ret != 30) { - die "Error asking debconf question $text: $seen"; - } - } - } - } } # We may not have any modules installed diff --git a/debian/templates/image.plain.templates.in b/debian/templates/image.plain.templates.in index feaaf2a1a..7d5271f86 100644 --- a/debian/templates/image.plain.templates.in +++ b/debian/templates/image.plain.templates.in @@ -36,19 +36,3 @@ _Description: Abort kernel removal? . It is highly recommended to abort the kernel removal unless you are prepared to fix the system after removal. - -Template: linux-image-@abiname@@localversion@/postinst/missing-firmware-@abiname@@localversion@ -Type: note -#flag:translate!:3 -_Description: Required firmware files may be missing - This system is currently running Linux ${runningversion} and you are - installing Linux ${version}. In the new version some of the drivers - used on this system may require additional firmware files: - . - ${missing} - . - Most firmware files are not included in the system because they do - not conform to the Debian Free Software Guidelines. You may need to - reconfigure the package manager to include the contrib and non-free - sections of the package archive before you can install these - firmware files. diff --git a/debian/templates/po/ca.po b/debian/templates/po/ca.po index 575f03050..bd22be83d 100644 --- a/debian/templates/po/ca.po +++ b/debian/templates/po/ca.po @@ -95,37 +95,3 @@ msgid "" msgstr "" "És molt recomanable que avorteu la supressió del nucli si no esteu preparat " "per a reparar el sistema després de la supressió." - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "Required firmware files may be missing" -msgstr "És possible que manquen fitxers de microprogramari requerits" - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "" -"This system is currently running Linux ${runningversion} and you are " -"installing Linux ${version}. In the new version some of the drivers used on " -"this system may require additional firmware files:" -msgstr "" -"Actualment, el sistema està executant el Linux ${runningversion} i esteu " -"instaŀlant el Linux ${version}. A la nova versió, és possible que alguns " -"dels dispositius emprats en el sistema requereixen fitxers de " -"microprogramari addicionals:" - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "" -"Most firmware files are not included in the system because they do not " -"conform to the Debian Free Software Guidelines. You may need to reconfigure " -"the package manager to include the contrib and non-free sections of the " -"package archive before you can install these firmware files." -msgstr "" -"La major part dels fitxers de microprogramari no estan inclosos al sistema " -"perquè no compleixen els principis del programari lliure de Debian. És " -"possible que necessiteu reconfigurar el gestor de paquets per a incloure les " -"seccions «contrib» i «non-free» de l'arxiu de paquets abans de poder " -"instaŀlar aquests fitxers de microprogramari." diff --git a/debian/templates/po/cs.po b/debian/templates/po/cs.po index 2c1ea0c5f..e3979832b 100644 --- a/debian/templates/po/cs.po +++ b/debian/templates/po/cs.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: linux 3.2.21-3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:38+0200\n" +"POT-Creation-Date: 2013-08-10 00:43+0200\n" "PO-Revision-Date: 2012-06-30 13:02+0200\n" "Last-Translator: Michal Simunek \n" "Language-Team: Czech \n" @@ -90,35 +90,3 @@ msgid "" msgstr "" "Je silně doporučeno přerušit odstraňování jádra, pokud nejste připraveni " "opravovat systém po jeho odstranění." - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "Required firmware files may be missing" -msgstr "Mohou chybět potřebné soubory s firmwarem" - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "" -"This system is currently running Linux ${runningversion} and you are " -"installing Linux ${version}. In the new version some of the drivers used on " -"this system may require additional firmware files:" -msgstr "" -"Systém nyní běží na Linuxu ${runningversion} a vy instalujete Linux " -"${version}. V nové verzi mohou některé ovladače používané v tomto systému, " -"vyžadovat dodatečné soubory s firmwarem:" - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "" -"Most firmware files are not included in the system because they do not " -"conform to the Debian Free Software Guidelines. You may need to reconfigure " -"the package manager to include the contrib and non-free sections of the " -"package archive before you can install these firmware files." -msgstr "" -"Většina souborů s firmwarem není zahrnuta v systému, protože nejsou v " -"souladu se Zásadami svobodného softwaru Debianu. Než budete moci tyto " -"soubory s firmwarem nainstalovat, budete možná muset nastavit správce " -"balíčků, aby zahrnoval archiv sekce balíčků non-free." diff --git a/debian/templates/po/da.po b/debian/templates/po/da.po index 14a2dfda6..95a050549 100644 --- a/debian/templates/po/da.po +++ b/debian/templates/po/da.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: linux\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:38+0200\n" +"POT-Creation-Date: 2013-08-10 00:43+0200\n" "PO-Revision-Date: 2011-07-03 05:26+0100\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" @@ -93,35 +93,3 @@ msgid "" msgstr "" "Det anbefales stærkt, at afbryde kernefjernelsen med mindre du er forberedt " "på at rette systemet op efter fjernelsen." - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "Required firmware files may be missing" -msgstr "Krævet firmwarefiler mangler måske" - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "" -"This system is currently running Linux ${runningversion} and you are " -"installing Linux ${version}. In the new version some of the drivers used on " -"this system may require additional firmware files:" -msgstr "" -"Dette system kører aktuelt Linux ${runningversion}, og du installerer Linux " -"${version}. I den nye version kræver nogle af driverne på dette system måske " -"yderligere firmwarefiler:" - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "" -"Most firmware files are not included in the system because they do not " -"conform to the Debian Free Software Guidelines. You may need to reconfigure " -"the package manager to include the contrib and non-free sections of the " -"package archive before you can install these firmware files." -msgstr "" -"De fleste firmwarefiler er ikke inkluderet i Debiansystemet, da de ikke " -"overholder Debian Free Softwares retningslinjer. Du skal måske rekonfigurere " -"pakkehåndteringen for at inkludere contrib og det ikke frie afsnit af " -"Debianarkivet, før du kan installere disse firmwarefiler." diff --git a/debian/templates/po/de.po b/debian/templates/po/de.po index f8214c19d..db8e1e1ef 100644 --- a/debian/templates/po/de.po +++ b/debian/templates/po/de.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: linux-2.6 3.0.0-3\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:38+0200\n" +"POT-Creation-Date: 2013-08-10 00:43+0200\n" "PO-Revision-Date: 2011-09-13 20:41+0200\n" "Last-Translator: Holger Wansing \n" "Language-Team: Debian German \n" @@ -96,36 +96,3 @@ msgstr "" "Es wird dringend empfohlen, das Entfernen des Kernels abzubrechen, " "ausgenommen Sie sind darauf vorbereitet, das System nach der Entfernung " "wieder instandzusetzen." - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "Required firmware files may be missing" -msgstr "Benötigte Firmware-Dateien möglicherweise nicht vorhanden" - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "" -"This system is currently running Linux ${runningversion} and you are " -"installing Linux ${version}. In the new version some of the drivers used on " -"this system may require additional firmware files:" -msgstr "" -"Auf diesem System läuft derzeit Linux ${runningversion} und Sie installieren " -"gerade Linux ${version}. In der neuen Version könnten einige Treiber, die " -"auf diesem System verwendet werden, zusätzliche Firmware-Dateien benötigen:" - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "" -"Most firmware files are not included in the system because they do not " -"conform to the Debian Free Software Guidelines. You may need to reconfigure " -"the package manager to include the contrib and non-free sections of the " -"package archive before you can install these firmware files." -msgstr "" -"Die meisten Firmware-Dateien sind nicht im System enthalten, da sie nicht " -"mit den Debian-Richtlinien für Freie Software (DFSG) konform sind. Sie " -"müssen unter Umständen den Paketmanager neu konfigurieren, so dass die " -"contrib- und non-free-Sektionen des Paketarchivs ebenfalls enthalten sind, " -"bevor Sie diese Firmware-Dateien installieren können." diff --git a/debian/templates/po/es.po b/debian/templates/po/es.po index 25f164670..a860b65da 100644 --- a/debian/templates/po/es.po +++ b/debian/templates/po/es.po @@ -30,7 +30,7 @@ msgid "" msgstr "" "Project-Id-Version: linux-2.6 2.6.32+5\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:38+0200\n" +"POT-Creation-Date: 2013-08-10 00:43+0200\n" "PO-Revision-Date: 2011-07-16 17:59+0200\n" "Last-Translator: Omar Campagne \n" "Language-Team: Debian l10n Spanish \n" @@ -125,36 +125,3 @@ msgid "" msgstr "" "Se recomienda encarecidamente cancelar la eliminación del núcleo, a menos " "que esté preparado para arreglar el sistema después de la eliminación." - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "Required firmware files may be missing" -msgstr "Puede que los ficheros de firmware requeridos no estén disponibles" - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "" -"This system is currently running Linux ${runningversion} and you are " -"installing Linux ${version}. In the new version some of the drivers used on " -"this system may require additional firmware files:" -msgstr "" -"Este sistema ejecuta actualmente la versión ${runningversion} de Linux, y se " -"está instalando la versión ${version}. Puede que los controladores incluidos " -"en la nueva versión requieran ficheros de firmware adicionales:" - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "" -"Most firmware files are not included in the system because they do not " -"conform to the Debian Free Software Guidelines. You may need to reconfigure " -"the package manager to include the contrib and non-free sections of the " -"package archive before you can install these firmware files." -msgstr "" -"La mayoría de ficheros de firmware no se incluyen en el sistema porque no " -"cumplen las normas de software libre de Debian («Debian Free Software " -"Guidelines»). Puede que tenga que reconfigurar el gestor de paquetes para " -"incluir las secciones «contrib» y «non-free» del archivo de Debian antes de " -"instalar estos ficheros de firmware." diff --git a/debian/templates/po/et.po b/debian/templates/po/et.po index 98f74bdda..809d4308d 100644 --- a/debian/templates/po/et.po +++ b/debian/templates/po/et.po @@ -96,35 +96,3 @@ msgid "" msgstr "" "On äärmiselt soovituslik katkestada tuuma eemaldamine, kui sa just pole " "valmistunud süsteemi ise parandama." - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "Required firmware files may be missing" -msgstr "Vajalikud püsivara failid võivad olla puudu" - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "" -"This system is currently running Linux ${runningversion} and you are " -"installing Linux ${version}. In the new version some of the drivers used on " -"this system may require additional firmware files:" -msgstr "" -"See süsteem kasutab praegu Linuxi versiooni ${runningversion} ja sina " -"paigaldad versiooni ${version}. Uues versionis võivad mõned ajurid vajada " -"lisaks püsivara faile:" - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "" -"Most firmware files are not included in the system because they do not " -"conform to the Debian Free Software Guidelines. You may need to reconfigure " -"the package manager to include the contrib and non-free sections of the " -"package archive before you can install these firmware files." -msgstr "" -"Enamik püsivara faile ei ole kaasatud süsteemi, sest nad ei vasta Debian " -"vaba tarkvara juhtnööridele (Debian Free Software Guidelines). Võimalik, et " -"pead enne oma pakimajandajat ümber seadistama, et kaasata varamutesse ka " -"contrib ja non-free harud, kui saad need püsivara failid paigaldada." diff --git a/debian/templates/po/fr.po b/debian/templates/po/fr.po index c118c9400..8e4e9c213 100644 --- a/debian/templates/po/fr.po +++ b/debian/templates/po/fr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: linux-2.6 2.6.39-1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:38+0200\n" +"POT-Creation-Date: 2013-08-10 00:43+0200\n" "PO-Revision-Date: 2011-05-22 08:48-0400\n" "Last-Translator: David Prévot \n" "Language-Team: French \n" @@ -97,36 +97,3 @@ msgid "" msgstr "" "Il est fortement recommandé d'interrompre la suppression du noyau à moins " "d'être ensuite prêt à réparer le système." - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "Required firmware files may be missing" -msgstr "Microprogrammes (« firmwares ») probablement manquants" - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "" -"This system is currently running Linux ${runningversion} and you are " -"installing Linux ${version}. In the new version some of the drivers used on " -"this system may require additional firmware files:" -msgstr "" -"Ce système utilise actuellement Linux ${runningversion}, et Linux ${version} " -"va être installé. Dans la nouvelle version, certains pilotes utilisés par ce " -"système peuvent avoir besoin des microprogrammes additionnels :" - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "" -"Most firmware files are not included in the system because they do not " -"conform to the Debian Free Software Guidelines. You may need to reconfigure " -"the package manager to include the contrib and non-free sections of the " -"package archive before you can install these firmware files." -msgstr "" -"La plupart des microprogrammes ne sont pas intégrés car ils ne sont pas " -"conformes aux principes du logiciel libre selon Debian. Il est probablement " -"nécessaire de modifier la configuration du gestionnaire de paquets et " -"d'ajouter les sections « contrib » (contributions) et « non-free » (non " -"libre) de l'archive avant de pouvoir installer ces fichiers." diff --git a/debian/templates/po/it.po b/debian/templates/po/it.po index 282865001..7ffc9166b 100644 --- a/debian/templates/po/it.po +++ b/debian/templates/po/it.po @@ -95,35 +95,3 @@ msgid "" msgstr "" "Si consiglia vivamente di interrompere la rimozione del kernel a meno che " "non si sia preparati a riparare il sistema in seguito." - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "Required firmware files may be missing" -msgstr "Alcuni firmware richiesti potrebbero non essere presenti" - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "" -"This system is currently running Linux ${runningversion} and you are " -"installing Linux ${version}. In the new version some of the drivers used on " -"this system may require additional firmware files:" -msgstr "" -"Su questo sistema è attualmente in esecuzione Linux ${runningversion} e si " -"sta installando Linux ${version}. Nella nuova versione alcuni dei driver " -"utilizzati su questo sistema potrebbero richiedere firmware aggiuntivi:" - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "" -"Most firmware files are not included in the system because they do not " -"conform to the Debian Free Software Guidelines. You may need to reconfigure " -"the package manager to include the contrib and non-free sections of the " -"package archive before you can install these firmware files." -msgstr "" -"La maggior parte dei firmware non sono inclusi nel sistema in quanto non " -"conformi alle Linee Guida Debian per il Software Libero. Potrebbe essere " -"necessario riconfigurare il gestore dei pacchetti ed includere le sezioni " -"contrib e non-free per poterli installare." diff --git a/debian/templates/po/ja.po b/debian/templates/po/ja.po index 489b536df..18396c233 100644 --- a/debian/templates/po/ja.po +++ b/debian/templates/po/ja.po @@ -96,35 +96,3 @@ msgid "" msgstr "" "削除後でもシステムに問題がないような準備を済ませるまで、カーネルの削除を中止" "することを強くお勧めします。" - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "Required firmware files may be missing" -msgstr "必要なファームウェアファイルがなくなっている可能性があります" - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "" -"This system is currently running Linux ${runningversion} and you are " -"installing Linux ${version}. In the new version some of the drivers used on " -"this system may require additional firmware files:" -msgstr "" -"このシステムは現在 Linux ${runningversion} を実行しており、Linux ${version} " -"をインストールしようとしています。新しいバージョンでは、このシステムで使われ" -"るドライバのいくつかは追加のファームウェアファイルを必要とするかもしれません:" - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "" -"Most firmware files are not included in the system because they do not " -"conform to the Debian Free Software Guidelines. You may need to reconfigure " -"the package manager to include the contrib and non-free sections of the " -"package archive before you can install these firmware files." -msgstr "" -"ほとんどのファームウェアファイルは、Debian フリーソフトウェアガイドラインに合" -"致しないため、システムに含まれていません。これらのファームウェアファイルをイ" -"ンストール可能にするために、パッケージアーカイブの contrib および non-free セ" -"クションを含むようパッケージマネージャを再設定する必要があるかもしれません。" diff --git a/debian/templates/po/nl.po b/debian/templates/po/nl.po index 0b69c7566..535362605 100644 --- a/debian/templates/po/nl.po +++ b/debian/templates/po/nl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: linux\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:38+0200\n" +"POT-Creation-Date: 2013-08-10 00:43+0200\n" "PO-Revision-Date: 2012-02-04 12:27+0100\n" "Last-Translator: willem kuyn \n" "Language-Team: Debian-Dutch \n" @@ -95,36 +95,3 @@ msgstr "" "Het wordt ten sterkste aanbevolen om het verwijderen van de kernel af te " "breken tenzij u bent voorbereid om het systeem te repareren na het " "verwijderen." - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "Required firmware files may be missing" -msgstr "De vereiste firmware-bestanden kunnen ontbreken" - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "" -"This system is currently running Linux ${runningversion} and you are " -"installing Linux ${version}. In the new version some of the drivers used on " -"this system may require additional firmware files:" -msgstr "" -"Het systeem draait op dit moment Linux ${runningversion} en u installeert " -"Linux ${version}. In de nieuwe versie kunnen enkele stuurprogramma's van het " -"systeem aparte firmware-bestanden nodig hebben." - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "" -"Most firmware files are not included in the system because they do not " -"conform to the Debian Free Software Guidelines. You may need to reconfigure " -"the package manager to include the contrib and non-free sections of the " -"package archive before you can install these firmware files." -msgstr "" -"Veel firmware-bestanden zijn niet in het systeem opgenomen omdat zij niet " -"voldoen aan de Debian Richtlijnen voor Vrije Software (DFSG). Mogelijk moet " -"u de configuratie van de pakketbeheerprogramma aanpassen en de contrib en " -"non-free secties van het pakketarchief toevoegen voordat u deze firmware " -"bestanden kunt installeren. " diff --git a/debian/templates/po/pl.po b/debian/templates/po/pl.po index 9b1501cf2..9fffc4094 100644 --- a/debian/templates/po/pl.po +++ b/debian/templates/po/pl.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:38+0200\n" +"POT-Creation-Date: 2013-08-10 00:43+0200\n" "PO-Revision-Date: 2012-02-05 18:38+0100\n" "Last-Translator: Michał Kułach \n" "Language-Team: Polish \n" @@ -98,36 +98,3 @@ msgid "" msgstr "" "Jest wysoce zalecane, aby przerwać usuwanie jądra, chyba że użytkownik jest " "przygotowany do naprawy systemu po usunięciu." - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "Required firmware files may be missing" -msgstr "Wymagane pliki firmware mogą być niedostępne" - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "" -"This system is currently running Linux ${runningversion} and you are " -"installing Linux ${version}. In the new version some of the drivers used on " -"this system may require additional firmware files:" -msgstr "" -"System działa obecnie na jądrze Linux ${runningversion}, a instalowany jest " -"Linux ${version}. W nowej wersji niektóre ze sterowników używanych przez " -"system, mogą wymagać dodatkowych plików firmware:" - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "" -"Most firmware files are not included in the system because they do not " -"conform to the Debian Free Software Guidelines. You may need to reconfigure " -"the package manager to include the contrib and non-free sections of the " -"package archive before you can install these firmware files." -msgstr "" -"Większość plików firmware nie jest dołączonych do systemu, ponieważ nie " -"spełniają Wytycznych Debiana dotyczących Wolnego Oprogramowania. Może zajść " -"potrzeba ponownej konfiguracji menedżera pakietów, aby dołączyć sekcje " -"contrib i non-free archiwum pakietów, przed możliwością zainstalowania " -"potrzebnych plików firmware." diff --git a/debian/templates/po/pt.po b/debian/templates/po/pt.po index 2426f38d9..b6b667f8d 100644 --- a/debian/templates/po/pt.po +++ b/debian/templates/po/pt.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: linux 2.6.39.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:38+0200\n" +"POT-Creation-Date: 2013-08-10 00:43+0200\n" "PO-Revision-Date: 2011-05-22 23:53+0100\n" "Last-Translator: Américo Monteiro \n" "Language-Team: Portuguese \n" @@ -96,35 +96,3 @@ msgid "" msgstr "" "É altamente recomendado abortar a remoção do kernel a menos que esteja " "preparado para corrigir o sistema após a remoção." - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "Required firmware files may be missing" -msgstr "Podem estar em falta ficheiros de firmware necessários" - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "" -"This system is currently running Linux ${runningversion} and you are " -"installing Linux ${version}. In the new version some of the drivers used on " -"this system may require additional firmware files:" -msgstr "" -"Este sistema está actualmente a correr Linux ${runningversion} e você está a " -"instalar Linux ${version}. Na nova versão algumas das drivers usadas neste " -"sistema podem necessitar dos ficheiros de firmware adicionais:" - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "" -"Most firmware files are not included in the system because they do not " -"conform to the Debian Free Software Guidelines. You may need to reconfigure " -"the package manager to include the contrib and non-free sections of the " -"package archive before you can install these firmware files." -msgstr "" -"A maioria dos ficheiros de firmware não estão incluídos no sistema porque " -"não respeitam as Guidelines da Debian Free Software. Você pode precisar de " -"reconfigurar o gestor de pacotes para incluir as secções contrib e non-free " -"do arquivo de pacotes antes de poder instalar estes ficheiros de firmware." diff --git a/debian/templates/po/pt_BR.po b/debian/templates/po/pt_BR.po index dd6b540f7..13eec1df5 100644 --- a/debian/templates/po/pt_BR.po +++ b/debian/templates/po/pt_BR.po @@ -98,36 +98,3 @@ msgid "" msgstr "" "É altamente recomendável cancelar a remoção do kernel, a menos que você " "esteja preparado para consertar o sistema após a remoção." - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "Required firmware files may be missing" -msgstr "Arquivos de firmware necessários podem estar faltando" - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "" -"This system is currently running Linux ${runningversion} and you are " -"installing Linux ${version}. In the new version some of the drivers used on " -"this system may require additional firmware files:" -msgstr "" -"Este sistema atualmente está executando o Linux ${runningversion} e você " -"está instalando o Linux ${version}. Na nova versão alguns dos drivers usados " -"neste sistema podem precisar de arquivos de firmware adicionais:" - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "" -"Most firmware files are not included in the system because they do not " -"conform to the Debian Free Software Guidelines. You may need to reconfigure " -"the package manager to include the contrib and non-free sections of the " -"package archive before you can install these firmware files." -msgstr "" -"A maioria dos arquivos de firmware não estão incluídos no sistema porque não " -"estão em conformidade com a Definição Debian de Software Livre (\"Debian " -"Free Software Guidelines\"). Você poderá precisar reconfigurar o gerenciador " -"de pacotes para incluir as seções contrib e non-free do repositório de " -"pacotes antes de poder instalar estes arquivos de firmware." diff --git a/debian/templates/po/ru.po b/debian/templates/po/ru.po index d702d3453..23a021bae 100644 --- a/debian/templates/po/ru.po +++ b/debian/templates/po/ru.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: linux-2.6 3.1.6-1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:38+0200\n" +"POT-Creation-Date: 2013-08-10 00:43+0200\n" "PO-Revision-Date: 2011-12-30 18:35+0400\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" @@ -94,35 +94,3 @@ msgid "" msgstr "" "Настоятельно рекомендуется прервать удаление ядра, если вы не готовы чинить " "систему после его удаления." - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "Required firmware files may be missing" -msgstr "Могут отсутствовать необходимые файлы микропрограмм" - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "" -"This system is currently running Linux ${runningversion} and you are " -"installing Linux ${version}. In the new version some of the drivers used on " -"this system may require additional firmware files:" -msgstr "" -"В этой системе сейчас работает ядро Linux ${runningversion} и производится " -"установка Linux ${version}. В новой версии некоторым драйверам, используемым " -"в данной системе, могут потребоваться дополнительные файлы микропрограмм:" - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "" -"Most firmware files are not included in the system because they do not " -"conform to the Debian Free Software Guidelines. You may need to reconfigure " -"the package manager to include the contrib and non-free sections of the " -"package archive before you can install these firmware files." -msgstr "" -"Большинства файлов микропрограмм нет в дистрибутиве, так как они не " -"удовлетворяют критериям свободного ПО Debian. Для установки этих файлов из " -"архива вам может потребоваться перенастроить менеджер пакетов, чтобы " -"включить разделы contrib и non-free." diff --git a/debian/templates/po/sk.po b/debian/templates/po/sk.po index 05d2925b8..bb1f73e57 100644 --- a/debian/templates/po/sk.po +++ b/debian/templates/po/sk.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: linux-2.6 2.6.32-29\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:38+0200\n" +"POT-Creation-Date: 2013-08-10 00:43+0200\n" "PO-Revision-Date: 2011-07-10 09:19+0200\n" "Last-Translator: Slavko \n" "Language-Team: Slovak \n" @@ -93,35 +93,3 @@ msgid "" msgstr "" "Dôrazne odporúčame prerušiť odstraňovanie jadra, ak nie ste pripravený na " "opravu systému po jeho odstránení." - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "Required firmware files may be missing" -msgstr "Vyžadované súbory s firmware môžu chýbať" - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "" -"This system is currently running Linux ${runningversion} and you are " -"installing Linux ${version}. In the new version some of the drivers used on " -"this system may require additional firmware files:" -msgstr "" -"Tento systém práve používa Linux ${runningversion} a vy inštalujete Linux " -"${version}. V novej verzii môžu niektoré ovládače používané týmto systémom " -"vyžadovať dodatočné súbory s firmware:" - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "" -"Most firmware files are not included in the system because they do not " -"conform to the Debian Free Software Guidelines. You may need to reconfigure " -"the package manager to include the contrib and non-free sections of the " -"package archive before you can install these firmware files." -msgstr "" -"Väčšina súborov s firmware nie je v systéme zahrnutá, pretože nie sú v " -"súlade so Zásadami slobodného softvéru Debianu. Pred inštaláciou týchto " -"súborov s firmware, budete možno musieť nastaviť správcu balíkov tak, aby " -"zahŕňal sekcie archívu balíkov contrib a non-free." diff --git a/debian/templates/po/sv.po b/debian/templates/po/sv.po index 98084f9ec..b81103a50 100644 --- a/debian/templates/po/sv.po +++ b/debian/templates/po/sv.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: linux\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:38+0200\n" +"POT-Creation-Date: 2013-08-10 00:43+0200\n" "PO-Revision-Date: 2011-06-02 14:52+0100\n" "Last-Translator: Martin Bagge / brother \n" "Language-Team: Swedish \n" @@ -95,35 +95,3 @@ msgid "" msgstr "" "Det rekomenderas starkt att du avbryter raderingen av kärnan om du inte är " "beredd på att laga systemet efter raderingen." - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "Required firmware files may be missing" -msgstr "Firmware-filer som krävs kan saknas" - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "" -"This system is currently running Linux ${runningversion} and you are " -"installing Linux ${version}. In the new version some of the drivers used on " -"this system may require additional firmware files:" -msgstr "" -"Detta system kör Linux ${runningversion} och du installerar Linux " -"${version}. I den nya versionen kan vissa drivrutiner behöva ytterligare " -"firmware-filer:" - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "" -"Most firmware files are not included in the system because they do not " -"conform to the Debian Free Software Guidelines. You may need to reconfigure " -"the package manager to include the contrib and non-free sections of the " -"package archive before you can install these firmware files." -msgstr "" -"På grund av bestämmelserna i Debian Free Software Guidelines kan de flesta " -"firmware-filer inte inkluderas i systemet. Du kan behöva anpassa " -"pakethanteraren för att inkludera sektionerna \"contrib\" och \"non-free\" i " -"paketarkivet innan du kan installera dessa filer." diff --git a/debian/templates/po/templates.pot b/debian/templates/po/templates.pot index 33bb80d1f..45a604592 100644 --- a/debian/templates/po/templates.pot +++ b/debian/templates/po/templates.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:38+0200\n" +"POT-Creation-Date: 2013-08-10 00:43+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -79,28 +79,3 @@ msgid "" "It is highly recommended to abort the kernel removal unless you are prepared " "to fix the system after removal." msgstr "" - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "Required firmware files may be missing" -msgstr "" - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "" -"This system is currently running Linux ${runningversion} and you are " -"installing Linux ${version}. In the new version some of the drivers used on " -"this system may require additional firmware files:" -msgstr "" - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "" -"Most firmware files are not included in the system because they do not " -"conform to the Debian Free Software Guidelines. You may need to reconfigure " -"the package manager to include the contrib and non-free sections of the " -"package archive before you can install these firmware files." -msgstr "" diff --git a/debian/templates/po/tr.po b/debian/templates/po/tr.po index c923cbf41..e3e3f41f7 100644 --- a/debian/templates/po/tr.po +++ b/debian/templates/po/tr.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: linux-2.6 3.2.4-1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2013-08-10 00:38+0200\n" +"POT-Creation-Date: 2013-08-10 00:43+0200\n" "PO-Revision-Date: 2012-02-12 22:36+0200\n" "Last-Translator: Mert Dirik \n" "Language-Team: Debian L10n Turkish \n" @@ -94,35 +94,3 @@ msgid "" msgstr "" "Kaldırma işlemi sonrasında sistemi düzeltmeye hazır olmadığınız takdirde " "kaldırma işleminden vazgeçmeniz şiddetle tavsiye edilir." - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "Required firmware files may be missing" -msgstr "Gerekli aygıt yazılımları eksik" - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "" -"This system is currently running Linux ${runningversion} and you are " -"installing Linux ${version}. In the new version some of the drivers used on " -"this system may require additional firmware files:" -msgstr "" -"Bu sistem şu anda Linux ${runningversion} kullanıyor ve siz Linux ${version} " -"sürümünü kurmak üzeresiniz. Yeni sürümde bu sistemde kullanmakta olduğunuz " -"bazı sürücüler ek aygıt yazılımları (firmware) gerektirebilir:" - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "" -"Most firmware files are not included in the system because they do not " -"conform to the Debian Free Software Guidelines. You may need to reconfigure " -"the package manager to include the contrib and non-free sections of the " -"package archive before you can install these firmware files." -msgstr "" -"Çoğu aygıt yazılımı Debian Özgür Yazılım Yönergeleri'ne uymadığı için " -"sisteme dahil edilmez. Bu aygıt yazılımlarını kurabilmek için öncelikle " -"paket yöneticisini paket arşivinin contrib ve non-free kısımlarını " -"kullanacak şekilde ayarlamanız gerekir." diff --git a/debian/templates/po/vi.po b/debian/templates/po/vi.po index b3b3bfa58..6c130e167 100644 --- a/debian/templates/po/vi.po +++ b/debian/templates/po/vi.po @@ -92,36 +92,3 @@ msgid "" msgstr "" "Rất khuyên bạn hủy bỏ tiến trình gỡ bỏ hạt nhân, nếu bạn không sẵn sàng sửa " "chữa hệ thống sau khi gỡ bỏ." - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "Required firmware files may be missing" -msgstr "Có thể thiếu một số tập tin phần vững cần thiết" - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "" -"This system is currently running Linux ${runningversion} and you are " -"installing Linux ${version}. In the new version some of the drivers used on " -"this system may require additional firmware files:" -msgstr "" -"Hệ thống này hiện thời chạy Linux ${runningversion} còn bạn đang cài đặt " -"Linux ${version}. Trong phiên bản mới, một số trình điều khiển dùng trên hệ " -"thống này có thể yêu cầu tập tin phần vững bổ sung:" - -#. Type: note -#. Description -#: ../image.plain.templates.in:4001 -msgid "" -"Most firmware files are not included in the system because they do not " -"conform to the Debian Free Software Guidelines. You may need to reconfigure " -"the package manager to include the contrib and non-free sections of the " -"package archive before you can install these firmware files." -msgstr "" -"Phần lớn các tập tin phần vững không phải có sẵn trong hệ thống do không làm " -"cho hợp với Nguyên tắc Chỉ đạo Phần mềm Tự do Debian. Có thể là bạn cần phải " -"cấu hình lại trình quản lý gói phần mềm để bao gồm phần đóng góp (contrib) " -"và phần khác tự do (non-free) của kho lưu gói trước khi có khả năng cài đặt " -"tập tin phần vững như vậy."