diff options
64 files changed, 134 insertions, 129 deletions
diff --git a/build/arch-options/hurd b/build/arch-options/hurd index 48a4c7323..fc6f977fd 100644 --- a/build/arch-options/hurd +++ b/build/arch-options/hurd @@ -4,3 +4,5 @@ archspec="$archspec;hurd-any" arch_kernel="Hurd" arch_parttype="Linux" +kernelversion="1.3.99" +kernelpackage="gnumach" diff --git a/build/arch-options/kfreebsd b/build/arch-options/kfreebsd index b4796d976..c3cc4c813 100644 --- a/build/arch-options/kfreebsd +++ b/build/arch-options/kfreebsd @@ -4,3 +4,5 @@ archspec="$archspec;kfreebsd-any" arch_kernel="kFreeBSD" arch_parttype="FreeBSD" +kernelversion="8" +kernelpackage="kfreebsd-image" diff --git a/build/arch-options/linux b/build/arch-options/linux index 93904f7af..024a9f2f4 100644 --- a/build/arch-options/linux +++ b/build/arch-options/linux @@ -4,3 +4,5 @@ archspec="$archspec;linux-any" arch_kernel="Linux" arch_parttype="Linux" +kernelversion="2.6.32" +kernelpackage="linux-image" diff --git a/build/buildone.sh b/build/buildone.sh index 23fd16543..0193a4508 100755 --- a/build/buildone.sh +++ b/build/buildone.sh @@ -87,7 +87,8 @@ create_profiled () { echo "<!ENTITY arch-listname \"${arch_listname}\">" >> $dynamic echo "<!ENTITY arch-porturl \"${arch_porturl}\">" >> $dynamic echo "<!ENTITY arch-parttype \"${arch_parttype}\">" >> $dynamic - echo "<!ENTITY altkernelversion \"${altkernelversion}\">" >> $dynamic + echo "<!ENTITY kernelversion \"${kernelversion}\">" >> $dynamic + echo "<!ENTITY kernelpackage \"${kernelpackage}\">" >> $dynamic echo "<!ENTITY smp-config-section \"${smp_config_section}\">" >> $dynamic echo "<!ENTITY smp-config-option \"${smp_config_option}\">" >> $dynamic echo "<!ENTITY minimum-memory \"${minimum_memory}¬ation-megabytes;\">" >> $dynamic diff --git a/build/entities/common.ent b/build/entities/common.ent index 4836e06b5..9cefbbe9b 100644 --- a/build/entities/common.ent +++ b/build/entities/common.ent @@ -19,8 +19,6 @@ <!ENTITY arch-title "<phrase arch='any-amd64'>AMD64</phrase><phrase arch='arm'>ARM</phrase><phrase arch='hppa'>PA-RISC</phrase><phrase arch='any-i386'>Intel x86</phrase><phrase arch='ia64'>IA-64</phrase><phrase arch='mips'>Mips</phrase><phrase arch='mipsel'>Mipsel</phrase><phrase arch='powerpc'>PowerPC</phrase><phrase arch='sparc'>SPARC</phrase><phrase arch='s390'>S/390</phrase>"> -<!ENTITY kernelversion "2.6.32"> - <!-- general things from installer --> <!ENTITY enterkey "<keycap>Enter</keycap>"> <!ENTITY escapekey "<keycap>Esc</keycap>"> diff --git a/ca/appendix/chroot-install.xml b/ca/appendix/chroot-install.xml index 3049268ab..30b83be14 100644 --- a/ca/appendix/chroot-install.xml +++ b/ca/appendix/chroot-install.xml @@ -506,7 +506,7 @@ una carregador d'arrencada. Identifiqueu si hi ha algun nucli pre-empaquetat amb: <informalexample><screen> -# apt-cache search linux-image +# apt-cache search &kernelpackage; </screen></informalexample> </para><para> @@ -555,7 +555,7 @@ Aleshores instal·leu el paquet del nucli que trieu fent ús del nom del paquet. <informalexample><screen> -# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</replaceable> +# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</replaceable> </screen></informalexample> Si no creeu un fitxer <filename>/etc/kernel-img.conf</filename> abans diff --git a/ca/appendix/preseed.xml b/ca/appendix/preseed.xml index 4985005eb..93bba5fd5 100644 --- a/ca/appendix/preseed.xml +++ b/ca/appendix/preseed.xml @@ -1240,7 +1240,7 @@ instal·lació del nucli. # El (meta) paquet de la imatge del nucli a instal·lar; es pot utilitzar # "none" si no es vol instal·lar cap nucli. -#d-i base-installer/kernel/image string linux-image-2.6-486 +#d-i base-installer/kernel/image string &kernelpackage;-2.6-486 </screen></informalexample> </sect2> diff --git a/ca/post-install/kernel-baking.xml b/ca/post-install/kernel-baking.xml index c6cadcd96..1403c2f78 100644 --- a/ca/post-install/kernel-baking.xml +++ b/ca/post-install/kernel-baking.xml @@ -146,7 +146,7 @@ dependrà de la potència de l'ordinador. Un cop finalitzada la compilació, podeu instal·lar el nucli personalitzat com qualsevol altre paquet. Heu d'executar, com a superusuari, <userinput>dpkg -i -../linux-image-&kernelversion;-<replaceable>subarquitectura</replaceable>_custom.1.0_&architecture;.deb</userinput>. +../&kernelpackage;-&kernelversion;-<replaceable>subarquitectura</replaceable>_custom.1.0_&architecture;.deb</userinput>. La part <replaceable>subarquitectura</replaceable> és una subarquitectura opcional <phrase arch="i386"> com per exemple <quote>686</quote>, </phrase> diff --git a/cs/appendix/chroot-install.xml b/cs/appendix/chroot-install.xml index fae3039f4..0098c8f14 100644 --- a/cs/appendix/chroot-install.xml +++ b/cs/appendix/chroot-install.xml @@ -498,7 +498,7 @@ nainstalovat jádro (a možná zavaděč). Následujícím příkazem zjistíte dostupná připravená jádra: <informalexample><screen> -<prompt>#</prompt> <userinput>apt-cache search linux-image</userinput> +<prompt>#</prompt> <userinput>apt-cache search &kernelpackage;</userinput> </screen></informalexample> </para><para> @@ -530,7 +530,7 @@ na míru vašemu systému. Poté nainstalujte balík vybraným jádrem. <informalexample><screen> -<prompt>#</prompt> <userinput>aptitude install linux-image-<replaceable>&kernelversion;-arch-atd</replaceable></userinput> +<prompt>#</prompt> <userinput>aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-atd</replaceable></userinput> </screen></informalexample> Jestliže jste před instalací jádra nevytvořili soubor diff --git a/cs/appendix/preseed.xml b/cs/appendix/preseed.xml index 45ee89dba..57e344d38 100644 --- a/cs/appendix/preseed.xml +++ b/cs/appendix/preseed.xml @@ -1252,7 +1252,7 @@ týkají instalace jádra. # (Meta) balík jádra, který se má nainstalovat; nechcete-li instalovat # žádné jádro, zadejte "none". -#d-i base-installer/kernel/image string linux-image-2.6-486 +#d-i base-installer/kernel/image string &kernelpackage;-2.6-486 </screen></informalexample> </sect2> diff --git a/cs/post-install/kernel-baking.xml b/cs/post-install/kernel-baking.xml index ccc49806c..19b85ae8b 100644 --- a/cs/post-install/kernel-baking.xml +++ b/cs/post-install/kernel-baking.xml @@ -137,7 +137,7 @@ vašeho počítače. Až kompilace skončí, jádro nainstalujete jako každý jiný balík. Jako root napište <userinput>dpkg -i -../linux-image-&kernelversion;-<replaceable>podarchitektura</replaceable>_jadro.1.0_&architecture;.deb</userinput>. +../&kernelpackage;-&kernelversion;-<replaceable>podarchitektura</replaceable>_jadro.1.0_&architecture;.deb</userinput>. <replaceable>podarchitektura</replaceable> je volitelné upřesnění architektury, <phrase arch="x86"> např. <quote>686</quote>, </phrase> které jste zadali při konfiguraci diff --git a/de/appendix/chroot-install.xml b/de/appendix/chroot-install.xml index b007340a9..7fec9d2e7 100644 --- a/de/appendix/chroot-install.xml +++ b/de/appendix/chroot-install.xml @@ -522,7 +522,7 @@ einen &arch-kernel;-Kernel und einen Bootloader. Sie finden verfügbare, bereits fertig paketierte Kernel mit dem Befehl <informalexample><screen> -# apt-cache search linux-image +# apt-cache search &kernelpackage; </screen></informalexample> </para><para> @@ -554,7 +554,7 @@ zu überprüfen, ob die eingetragenen Werte für Ihr System passend sind. Um einen Kernel Ihrer Wahl zu installieren, benutzen Sie seinen Paketnamen: <informalexample><screen> -# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</replaceable> +# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</replaceable> </screen></informalexample> Wenn Sie die Datei <filename>/etc/kernel-img.conf</filename> vor der diff --git a/de/appendix/preseed.xml b/de/appendix/preseed.xml index 08343a850..37d022935 100644 --- a/de/appendix/preseed.xml +++ b/de/appendix/preseed.xml @@ -1298,7 +1298,7 @@ Installation des Kernels. # Das Kernel-Image-(Meta-)Paket, das installiert werden soll; "none" kann # genutzt werden, wenn kein Kernel installiert werden soll. -#d-i base-installer/kernel/image string linux-image-2.6-486 +#d-i base-installer/kernel/image string &kernelpackage;-2.6-486 </screen></informalexample> </sect2> diff --git a/de/post-install/kernel-baking.xml b/de/post-install/kernel-baking.xml index a8339910a..8f994dd1e 100644 --- a/de/post-install/kernel-baking.xml +++ b/de/post-install/kernel-baking.xml @@ -153,7 +153,7 @@ abhängig von der Leistungsfähigkeit Ihres Rechners. Sobald die Kompilierung beendet ist, können Sie Ihren eigenen Kernel wie jedes andere Paket installieren. Tippen Sie als root ein: <userinput>dpkg -i -../linux-image-&kernelversion;-<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</userinput>. +../&kernelpackage;-&kernelversion;-<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</userinput>. Der Teil <replaceable>subarchitecture</replaceable> im Dateinamen ist eine optionale Bezeichnung für die Unterarchitektur, <phrase arch="i386"> wie z.B. <quote>686</quote>, </phrase> diff --git a/en/appendix/chroot-install.xml b/en/appendix/chroot-install.xml index c74a27583..8e7f47ca2 100644 --- a/en/appendix/chroot-install.xml +++ b/en/appendix/chroot-install.xml @@ -496,7 +496,7 @@ If you intend to boot this system, you probably want a &arch-kernel; kernel and a boot loader. Identify available pre-packaged kernels with: <informalexample><screen> -# apt-cache search linux-image +# apt-cache search &kernelpackage; </screen></informalexample> </para><para> @@ -528,7 +528,7 @@ that the values are appropriate for your system. Then install the kernel package of your choice using its package name. <informalexample><screen> -# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</replaceable> +# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</replaceable> </screen></informalexample> If you did not create a <filename>/etc/kernel-img.conf</filename> before diff --git a/en/appendix/preseed.xml b/en/appendix/preseed.xml index 6fc558bf4..c46522a74 100644 --- a/en/appendix/preseed.xml +++ b/en/appendix/preseed.xml @@ -1210,7 +1210,7 @@ installation. The only questions asked concern the installation of the kernel. # The kernel image (meta) package to be installed; "none" can be used if no # kernel is to be installed. -#d-i base-installer/kernel/image string linux-image-2.6-486 +#d-i base-installer/kernel/image string &kernelpackage;-2.6-486 </screen></informalexample> </sect2> diff --git a/en/post-install/kernel-baking.xml b/en/post-install/kernel-baking.xml index d3fad6c5d..07e3b3010 100644 --- a/en/post-install/kernel-baking.xml +++ b/en/post-install/kernel-baking.xml @@ -141,7 +141,7 @@ the power of your machine. Once the compilation is complete, you can install your custom kernel like any package. As root, do <userinput>dpkg -i -../linux-image-&kernelversion;-<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</userinput>. +../&kernelpackage;-&kernelversion;-<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</userinput>. The <replaceable>subarchitecture</replaceable> part is an optional sub-architecture, <phrase arch="i386"> such as <quote>686</quote>, </phrase> diff --git a/es/appendix/chroot-install.xml b/es/appendix/chroot-install.xml index 1fcc1134f..3a757c343 100644 --- a/es/appendix/chroot-install.xml +++ b/es/appendix/chroot-install.xml @@ -529,7 +529,7 @@ y un gestor de arranque. Identifique los núcleos previamente empaquetados disponibles con: <informalexample><screen> -# apt-cache search linux-image +# apt-cache search &kernelpackage; </screen></informalexample> Luego instale su elección usando el nombre del paquete. @@ -566,7 +566,7 @@ Después instale el paquete del núcleo que elija utilizando el nombre del paquete. <informalexample><screen> -# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</replaceable> +# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</replaceable> </screen></informalexample> Se le harán algunas preguntas referidas a diff --git a/es/appendix/preseed.xml b/es/appendix/preseed.xml index 04fbe92ad..a51e478d4 100644 --- a/es/appendix/preseed.xml +++ b/es/appendix/preseed.xml @@ -1169,7 +1169,7 @@ refiere al ncleo. # El (meta) paquete de la imagen del ncleo que se vaya a instalar; # puede usar "none" si no se ba a instalar ncleo. -#d-i base-installer/kernel/image string linux-image-2.6-486 +#d-i base-installer/kernel/image string &kernelpackage;-2.6-486 </screen></informalexample> </sect2> diff --git a/es/post-install/kernel-baking.xml b/es/post-install/kernel-baking.xml index 4b643a07c..70822eb08 100644 --- a/es/post-install/kernel-baking.xml +++ b/es/post-install/kernel-baking.xml @@ -157,7 +157,7 @@ tiempo, dependiendo de la potencia de su mquina. Una vez finalizada la compilacin, puede instalar su ncleo personalizado como cualquier paquete. Como superusuario, ejecute <userinput>dpkg -i -../linux-image-&kernelversion;-<replaceable>subarchitectura</replaceable>_custom.1.0_&architecture;.deb</userinput>. +../&kernelpackage;-&kernelversion;-<replaceable>subarchitectura</replaceable>_custom.1.0_&architecture;.deb</userinput>. La parte <replaceable>subarquitectura</replaceable> es una subarquitectura opcional, <phrase arch="i386"> como <quote>i586</quote>, </phrase> dependiendo de las opciones diff --git a/fr/appendix/chroot-install.xml b/fr/appendix/chroot-install.xml index 01fd680f8..9f61097ee 100644 --- a/fr/appendix/chroot-install.xml +++ b/fr/appendix/chroot-install.xml @@ -495,7 +495,7 @@ besoin d'un noyau &arch-kernel; ainsi que d'un programme d'amorçage. Identifiez les paquets contenant des noyaux avec : <informalexample><screen> -# apt-cache search linux-image +# apt-cache search &kernelpackage; </screen></informalexample> </para> @@ -529,7 +529,7 @@ que les valeurs correspondent bien à votre système. Installez alors le noyau de votre choix en utilisant son nom : <informalexample><screen> -# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</replaceable> +# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</replaceable> </screen></informalexample> Si vous n'avez pas créé de fichier <filename>/etc/kernel-img.conf</filename> diff --git a/fr/appendix/preseed.xml b/fr/appendix/preseed.xml index d7a59bc65..29477c124 100644 --- a/fr/appendix/preseed.xml +++ b/fr/appendix/preseed.xml @@ -1185,7 +1185,7 @@ Les seules questions posées concernent l'installation du noyau. # Version du noyau à installer (nom du paquet). Utilisez <emphasis>none</emphasis> si vous ne voulez pas # installer de noyau. -#d-i base-installer/kernel/image string linux-image-2.6-486 +#d-i base-installer/kernel/image string &kernelpackage;-2.6-486 </screen></informalexample> </sect2> diff --git a/fr/post-install/kernel-baking.xml b/fr/post-install/kernel-baking.xml index 663d62070..6b414b156 100644 --- a/fr/post-install/kernel-baking.xml +++ b/fr/post-install/kernel-baking.xml @@ -148,7 +148,7 @@ Une fois la compilation terminée, vous pouvez installer votre noyau personnalisé comme n'importe quel autre paquet. En tant que superutilisateur, exécutez la commande <userinput>dpkg -i -../linux-image-&kernelversion;-<replaceable>sous-architecture</replaceable>_custom.1.0_&architecture;.deb</userinput>. +../&kernelpackage;-&kernelversion;-<replaceable>sous-architecture</replaceable>_custom.1.0_&architecture;.deb</userinput>. La partie <replaceable>sous-architecture</replaceable> est une sous-architecture optionnelle, <phrase arch="x86"> telle que <quote>686</quote>, </phrase> diff --git a/it/appendix/chroot-install.xml b/it/appendix/chroot-install.xml index 0ed3fd535..818481ea8 100644 --- a/it/appendix/chroot-install.xml +++ b/it/appendix/chroot-install.xml @@ -799,7 +799,7 @@ Nel caso si intenda avviare il nuovo sistema, servono un kernel &arch-kernel; e un boot loader. I kernel pacchettizzati disponibili si trovano con: <informalexample><screen> -# apt-cache search linux-image +# apt-cache search &kernelpackage; </screen></informalexample> </para><para> @@ -850,7 +850,7 @@ Si può quindi installare il pacchetto con il kernel prescelto usando il nome del pacchetto. <informalexample><screen> -# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</replaceable> +# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</replaceable> </screen></informalexample> <!-- diff --git a/it/appendix/preseed.xml b/it/appendix/preseed.xml index 76cf85325..f7310147a 100644 --- a/it/appendix/preseed.xml +++ b/it/appendix/preseed.xml @@ -2138,7 +2138,7 @@ kernel. # kernel is to be installed. --># Il (meta)pacchetto con l'immagine del kernel da installare; per non # installare un kernel inserire "none". -#d-i base-installer/kernel/image string linux-image-2.6-486 +#d-i base-installer/kernel/image string &kernelpackage;-2.6-486 </screen></informalexample> </sect2> diff --git a/it/post-install/kernel-baking.xml b/it/post-install/kernel-baking.xml index a0d8ed620..ab161f784 100644 --- a/it/post-install/kernel-baking.xml +++ b/it/post-install/kernel-baking.xml @@ -278,7 +278,7 @@ in base alla potenza della macchina. Once the compilation is complete, you can install your custom kernel like any package. As root, do <userinput>dpkg -i -../linux-image-&kernelversion;-<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</userinput>. +../&kernelpackage;-&kernelversion;-<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</userinput>. The <replaceable>subarchitecture</replaceable> part is an optional sub-architecture, <phrase arch="i386"> such as <quote>686</quote>, </phrase> @@ -297,7 +297,7 @@ you'll need to install that package as well. Finita la compilazione è possibile installare il proprio kernel personalizzato come qualsiasi altro pacchetto. Da root eseguire <userinput>dpkg -i -../linux-image-&kernelversion;-<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</userinput>. +../&kernelpackage;-&kernelversion;-<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</userinput>. La parte <replaceable>sottoarchitettura</replaceable> è opzionale e indica la sottoarchitettura, <phrase arch="i386"> per esempio <quote>686</quote>, </phrase> diff --git a/nl/appendix/chroot-install.xml b/nl/appendix/chroot-install.xml index a9e15f81e..2e85248ef 100644 --- a/nl/appendix/chroot-install.xml +++ b/nl/appendix/chroot-install.xml @@ -496,7 +496,7 @@ If you intend to boot this system, you probably want a &arch-kernel; kernel and a boot loader. Identify available pre-packaged kernels with: <informalexample><screen> -# apt-cache search linux-image +# apt-cache search &kernelpackage; </screen></informalexample> </para><para> @@ -528,7 +528,7 @@ that the values are appropriate for your system. Then install the kernel package of your choice using its package name. <informalexample><screen> -# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</replaceable> +# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</replaceable> </screen></informalexample> If you did not create a <filename>/etc/kernel-img.conf</filename> before diff --git a/nl/appendix/preseed.xml b/nl/appendix/preseed.xml index 400785c7a..afa5227d3 100644 --- a/nl/appendix/preseed.xml +++ b/nl/appendix/preseed.xml @@ -1210,7 +1210,7 @@ installation. The only questions asked concern the installation of the kernel. # The kernel image (meta) package to be installed; "none" can be used if no # kernel is to be installed. -#d-i base-installer/kernel/image string linux-image-2.6-486 +#d-i base-installer/kernel/image string &kernelpackage;-2.6-486 </screen></informalexample> </sect2> diff --git a/nl/post-install/kernel-baking.xml b/nl/post-install/kernel-baking.xml index 9377eca5d..23b1e7e71 100644 --- a/nl/post-install/kernel-baking.xml +++ b/nl/post-install/kernel-baking.xml @@ -141,7 +141,7 @@ the power of your machine. Once the compilation is complete, you can install your custom kernel like any package. As root, do <userinput>dpkg -i -../linux-image-&kernelversion;-<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</userinput>. +../&kernelpackage;-&kernelversion;-<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</userinput>. The <replaceable>subarchitecture</replaceable> part is an optional sub-architecture, <phrase arch="i386"> such as <quote>686</quote>, </phrase> diff --git a/po/el/post-install.po b/po/el/post-install.po index 45c629911..b0f5ed0ef 100644 --- a/po/el/post-install.po +++ b/po/el/post-install.po @@ -1062,7 +1062,7 @@ msgstr "" #, no-c-format msgid "" "Once the compilation is complete, you can install your custom kernel like " -"any package. As root, do <userinput>dpkg -i ../linux-image-&kernelversion;-" +"any package. As root, do <userinput>dpkg -i ../&kernelpackage;-&kernelversion;-" "<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</" "userinput>. The <replaceable>subarchitecture</replaceable> part is an " "optional sub-architecture, <phrase arch=\"i386\"> such as <quote>686</" @@ -1077,7 +1077,7 @@ msgid "" msgstr "" "Όταν η μεταγλώττιση έχει ολοκληρωθεί, μπορείτε να εγκαταστήσετε τον " "προσαρμοσμένο από σας πυρήνα όπως ένα οποιοδήποτε πακέτο.Σαν χρήστης root " -"τρέξτε <userinput>dpkg -i ../linux-image-&kernelversion;-" +"τρέξτε <userinput>dpkg -i ../&kernelpackage;-&kernelversion;-" "<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</" "userinput>. Το κομμάτι <replaceable>subarchitecture</replaceable> είναι μια " "προαιρετική υπο-αρχιτεκτονική <phrase arch=\"i386\"> όπως η <quote>686</" diff --git a/po/el/preseed.po b/po/el/preseed.po index 1e87ae0eb..9a6d34d4f 100644 --- a/po/el/preseed.po +++ b/po/el/preseed.po @@ -2318,7 +2318,7 @@ msgid "" "# The kernel image (meta) package to be installed; \"none\" can be used if " "no\n" "# kernel is to be installed.\n" -"#d-i base-installer/kernel/image string linux-image-2.6-486" +"#d-i base-installer/kernel/image string &kernelpackage;-2.6-486" msgstr "" "# Ρυθμίστε το APT ώστε να μην εγκαθιστά εξ ορισμού συνιστώμενα πακέτα. Η " "χρήση αυτής της\n" @@ -2334,7 +2334,7 @@ msgstr "" "# Το (μετα) πακέτο της εικόνας του πυρήνα που θα εγκατασταθεί; μπορεί να " "χρησιμοποιηθεί το \"none\" αν δεν πρόκειται να εγκατασταθεί # κάποιος " "πυρήνας.\n" -"#d-i base-installer/kernel/image string linux-image-2.6-486" +"#d-i base-installer/kernel/image string &kernelpackage;-2.6-486" #. Tag: title #: preseed.xml:956 diff --git a/po/el/random-bits.po b/po/el/random-bits.po index 92b69e453..244ed78d3 100644 --- a/po/el/random-bits.po +++ b/po/el/random-bits.po @@ -1638,8 +1638,8 @@ msgstr "" #. Tag: screen #: random-bits.xml:733 #, no-c-format -msgid "# apt-cache search linux-image" -msgstr "# apt-cache search linux-image " +msgid "# apt-cache search &kernelpackage;" +msgstr "# apt-cache search &kernelpackage; " #. Tag: para #: random-bits.xml:735 @@ -1696,7 +1696,7 @@ msgstr "" msgid "" "Then install the kernel package of your choice using its package name. " "<informalexample><screen>\n" -"# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</" +"# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</" "replaceable>\n" "</screen></informalexample> If you did not create a <filename>/etc/kernel-" "img.conf</filename> before installing a pre-packaged kernel, you may be " @@ -1704,7 +1704,7 @@ msgid "" msgstr "" "Στη συνέχεια εγκαταστήστε το πακέτο πυρήνα της επιλογής σας χρησιμοποιώντας " "το όνομα του πακέτου.<informalexample><screen>\n" -"# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</" +"# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</" "replaceable>\n" "</screen></informalexample>. Αν δεν δημιουργήσατε ένα αρχείο <filename>/etc/" "kernel-img.conf</filename> πριν την εγκατάσταση ενός ήδη πακεταρισμένου " diff --git a/po/fi/post-install.po b/po/fi/post-install.po index c2ba9ccdf..0bdea8436 100644 --- a/po/fi/post-install.po +++ b/po/fi/post-install.po @@ -1009,7 +1009,7 @@ msgstr "" #, no-c-format msgid "" "Once the compilation is complete, you can install your custom kernel like " -"any package. As root, do <userinput>dpkg -i ../linux-image-&kernelversion;-" +"any package. As root, do <userinput>dpkg -i ../&kernelpackage;-&kernelversion;-" "<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</" "userinput>. The <replaceable>subarchitecture</replaceable> part is an " "optional sub-architecture, <phrase arch=\"i386\"> such as <quote>686</" @@ -1023,7 +1023,7 @@ msgid "" "created a modules package, you'll need to install that package as well." msgstr "" " Kun käännös on valmis, oma ydin voidaan asentaa kuten mikä tahansa paketti. " -"Pääkäyttäjänä komennetaan <userinput>dpkg -i ../linux-image-&kernelversion;-" +"Pääkäyttäjänä komennetaan <userinput>dpkg -i ../&kernelpackage;-&kernelversion;-" "<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</" "userinput>. Kohta <replaceable>subarchitecture</replaceable> on valinnainen " "arkkitehtuurin muunnos, <phrase arch=\"i386\"> kuten <quote>686</quote>, </" diff --git a/po/fi/preseed.po b/po/fi/preseed.po index 6e93f9c49..f70210220 100644 --- a/po/fi/preseed.po +++ b/po/fi/preseed.po @@ -2171,7 +2171,7 @@ msgid "" "# The kernel image (meta) package to be installed; \"none\" can be used if " "no\n" "# kernel is to be installed.\n" -"#d-i base-installer/kernel/image string linux-image-2.6-486" +"#d-i base-installer/kernel/image string &kernelpackage;-2.6-486" msgstr "" "# APT:n asetetaan olemaan asentamatta suositeltuja paketteja oletusarvona. \n" "# Tämän valitsimen käyttö voi johtaa epätäydelliseen järjestelmään ja \n" @@ -2182,7 +2182,7 @@ msgstr "" "#d-i base-installer/kernel/linux/initramfs-generators string yaird\n" "# Asennettava ydinkuvan sisältävä (meta)paketti. Valitse \"none\", jos\n" "# mitään ydintä ei haluta asentaa.\n" -"#d-i base-installer/kernel/image string linux-image-2.6-486" +"#d-i base-installer/kernel/image string &kernelpackage;-2.6-486" #. Tag: title #: preseed.xml:956 diff --git a/po/fi/random-bits.po b/po/fi/random-bits.po index 901acce04..9aaa2c665 100644 --- a/po/fi/random-bits.po +++ b/po/fi/random-bits.po @@ -1595,8 +1595,8 @@ msgstr "" #. Tag: screen #: random-bits.xml:733 #, no-c-format -msgid "# apt-cache search linux-image" -msgstr "# apt-cache search linux-image" +msgid "# apt-cache search &kernelpackage;" +msgstr "# apt-cache search &kernelpackage;" #. Tag: para #: random-bits.xml:735 @@ -1652,7 +1652,7 @@ msgstr "" msgid "" "Then install the kernel package of your choice using its package name. " "<informalexample><screen>\n" -"# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</" +"# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</" "replaceable>\n" "</screen></informalexample> If you did not create a <filename>/etc/kernel-" "img.conf</filename> before installing a pre-packaged kernel, you may be " @@ -1660,7 +1660,7 @@ msgid "" msgstr "" "Asenna sitten haluamasi ydinpaketti käyttämällä paketin nimeä. " "<informalexample><screen>\n" -"# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</" +"# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</" "replaceable>\n" "</screen></informalexample> Jos et luonut tiedostoa <filename>/etc/kernel-" "img.conf</filename> ennen valmiiksi paketoidun ytimen asentamista, saatetaan " diff --git a/po/hu/post-install.po b/po/hu/post-install.po index 344d11385..08693d5d2 100644 --- a/po/hu/post-install.po +++ b/po/hu/post-install.po @@ -987,7 +987,7 @@ msgstr "" #, no-c-format msgid "" "Once the compilation is complete, you can install your custom kernel like " -"any package. As root, do <userinput>dpkg -i ../linux-image-&kernelversion;-" +"any package. As root, do <userinput>dpkg -i ../&kernelpackage;-&kernelversion;-" "<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</" "userinput>. The <replaceable>subarchitecture</replaceable> part is an " "optional sub-architecture, <phrase arch=\"i386\"> such as <quote>686</" @@ -1002,7 +1002,7 @@ msgid "" msgstr "" "A fordítás végeztével más csomaghoz hasonlóan telepítheted az egyedi " "kernelt. Rendszergazdaként add ki ezt a parancsot: <userinput>dpkg -i ../" -"linux-image-&kernelversion;-<replaceable>alarchitektúra</" +"&kernelpackage;-&kernelversion;-<replaceable>alarchitektúra</" "replaceable>_egyedi.1.0_&architecture;.deb</userinput>. Az " "<replaceable>alarchitektúra</replaceable> rész egy lehetséges al-" "architektúra, <phrase arch=\"i386\"> például <quote>686</quote>, </phrase> a " diff --git a/po/hu/preseed.po b/po/hu/preseed.po index 480e5b46f..a7d74ca6a 100644 --- a/po/hu/preseed.po +++ b/po/hu/preseed.po @@ -2193,7 +2193,7 @@ msgid "" "# The kernel image (meta) package to be installed; \"none\" can be used if " "no\n" "# kernel is to be installed.\n" -"#d-i base-installer/kernel/image string linux-image-2.6-486" +"#d-i base-installer/kernel/image string &kernelpackage;-2.6-486" msgstr "" "# A 2.6 kernel számára használt initramfs előállító választása.\n" "#d-i base-installer/kernel/linux/initramfs-generators string yaird" diff --git a/po/hu/random-bits.po b/po/hu/random-bits.po index 13e39c4c6..cca2cf2a9 100644 --- a/po/hu/random-bits.po +++ b/po/hu/random-bits.po @@ -1632,8 +1632,8 @@ msgstr "" #. Tag: screen #: random-bits.xml:733 #, no-c-format -msgid "# apt-cache search linux-image" -msgstr "# apt-cache search linux-image" +msgid "# apt-cache search &kernelpackage;" +msgstr "# apt-cache search &kernelpackage;" #. Tag: para #: random-bits.xml:735 @@ -1688,14 +1688,14 @@ msgstr "" msgid "" "Then install the kernel package of your choice using its package name. " "<informalexample><screen>\n" -"# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</" +"# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</" "replaceable>\n" "</screen></informalexample> If you did not create a <filename>/etc/kernel-" "img.conf</filename> before installing a pre-packaged kernel, you may be " "asked some questions during its installation that refer to it." msgstr "" "Majd telepítsd a választott kernel csomagot. <informalexample><screen>\n" -"# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</" +"# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</" "replaceable>\n" "</screen></informalexample> Ha nem hozol létre <filename>/etc/kernel-img." "conf</filename> fájlt egy elő-csomagolt kernel telepítése előtt, pár erre " diff --git a/po/ja/post-install.po b/po/ja/post-install.po index 8d20a0e17..5b9ea15f8 100644 --- a/po/ja/post-install.po +++ b/po/ja/post-install.po @@ -999,7 +999,7 @@ msgstr "" #, no-c-format msgid "" "Once the compilation is complete, you can install your custom kernel like " -"any package. As root, do <userinput>dpkg -i ../linux-image-&kernelversion;-" +"any package. As root, do <userinput>dpkg -i ../&kernelpackage;-&kernelversion;-" "<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</" "userinput>. The <replaceable>subarchitecture</replaceable> part is an " "optional sub-architecture, <phrase arch=\"i386\"> such as <quote>686</" @@ -1013,7 +1013,7 @@ msgid "" "created a modules package, you'll need to install that package as well." msgstr "" "一旦コンパイルが完了すれば、他のパッケージと同じように、そのカスタムカーネル" -"をインストールできます。root アカウントで <userinput>dpkg -i ../linux-image-" +"をインストールできます。root アカウントで <userinput>dpkg -i ../&kernelpackage;-" "&kernelversion;-<replaceable>subarchitecture</" "replaceable>_custom.1.0_&architecture;.deb</userinput> を実行してください。" "<replaceable>subarchitecture</replaceable> は、カーネルのオプションで設定され" diff --git a/po/ja/preseed.po b/po/ja/preseed.po index f727a07d7..9fd457930 100644 --- a/po/ja/preseed.po +++ b/po/ja/preseed.po @@ -2148,7 +2148,7 @@ msgid "" "# The kernel image (meta) package to be installed; \"none\" can be used if " "no\n" "# kernel is to be installed.\n" -"#d-i base-installer/kernel/image string linux-image-2.6-486" +"#d-i base-installer/kernel/image string &kernelpackage;-2.6-486" msgstr "" "# Configure APT to not install recommended packages by default. Use of this\n" "# option can result in an incomplete system and should only be used by very\n" @@ -2162,7 +2162,7 @@ msgstr "" "# The kernel image (meta) package to be installed; \"none\" can be used if " "no\n" "# kernel is to be installed.\n" -"#d-i base-installer/kernel/image string linux-image-2.6-486" +"#d-i base-installer/kernel/image string &kernelpackage;-2.6-486" #. Tag: title #: preseed.xml:956 diff --git a/po/ja/random-bits.po b/po/ja/random-bits.po index a19e7d44c..a3bb0dd40 100644 --- a/po/ja/random-bits.po +++ b/po/ja/random-bits.po @@ -1583,8 +1583,8 @@ msgstr "" #. Tag: screen #: random-bits.xml:733 #, no-c-format -msgid "# apt-cache search linux-image" -msgstr "# apt-cache search linux-image" +msgid "# apt-cache search &kernelpackage;" +msgstr "# apt-cache search &kernelpackage;" #. Tag: para #: random-bits.xml:735 @@ -1639,7 +1639,7 @@ msgstr "" msgid "" "Then install the kernel package of your choice using its package name. " "<informalexample><screen>\n" -"# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</" +"# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</" "replaceable>\n" "</screen></informalexample> If you did not create a <filename>/etc/kernel-" "img.conf</filename> before installing a pre-packaged kernel, you may be " @@ -1647,7 +1647,7 @@ msgid "" msgstr "" "それから、選んだパッケージ名のカーネルパッケージをインストールしてください。" "<informalexample><screen>\n" -"# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</" +"# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</" "replaceable>\n" "</screen></informalexample> パッケージ化済みカーネルをインストールする前に " "<filename>/etc/kernel-img.conf</filename> を作成しない場合、インストール時に" diff --git a/po/ko/post-install.po b/po/ko/post-install.po index b05a33a46..3958b28f2 100644 --- a/po/ko/post-install.po +++ b/po/ko/post-install.po @@ -976,7 +976,7 @@ msgstr "" #, no-c-format msgid "" "Once the compilation is complete, you can install your custom kernel like " -"any package. As root, do <userinput>dpkg -i ../linux-image-&kernelversion;-" +"any package. As root, do <userinput>dpkg -i ../&kernelpackage;-&kernelversion;-" "<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</" "userinput>. The <replaceable>subarchitecture</replaceable> part is an " "optional sub-architecture, <phrase arch=\"i386\"> such as <quote>686</" @@ -990,7 +990,7 @@ msgid "" "created a modules package, you'll need to install that package as well." msgstr "" "일단 컴파일이 끝나면 다른 패키지와 같은 방법으로 직접 만든 커널을 설치할 수 " -"있습니다. 루트 권한으로 <userinput>dpkg -i ../linux-image-&kernelversion;-" +"있습니다. 루트 권한으로 <userinput>dpkg -i ../&kernelpackage;-&kernelversion;-" "<replaceable>서브아키텍처</replaceable>_custom.1.0_&architecture;.deb</" "userinput> 명령을 실행하십시오. <replaceable>서브아키텍처</replaceable> 부분" "은 커널 옵션에 따라 달라지는 <phrase arch=\"i386\"><quote>686과 같은</" diff --git a/po/ko/preseed.po b/po/ko/preseed.po index 62d0fd49e..04e4b6435 100644 --- a/po/ko/preseed.po +++ b/po/ko/preseed.po @@ -2217,7 +2217,7 @@ msgstr "" #| "# The kernel image (meta) package to be installed; \"none\" can be used " #| "if no\n" #| "# kernel is to be installed.\n" -#| "#d-i base-installer/kernel/image string linux-image-2.6-486" +#| "#d-i base-installer/kernel/image string &kernelpackage;-2.6-486" msgid "" "# Configure APT to not install recommended packages by default. Use of this\n" "# option can result in an incomplete system and should only be used by very\n" @@ -2231,7 +2231,7 @@ msgid "" "# The kernel image (meta) package to be installed; \"none\" can be used if " "no\n" "# kernel is to be installed.\n" -"#d-i base-installer/kernel/image string linux-image-2.6-486" +"#d-i base-installer/kernel/image string &kernelpackage;-2.6-486" msgstr "" "# 2.6 커널의 initrd를 만드는 initramfs를 선택합니다\n" "#d-i base-installer/kernel/linux/initramfs-generators string yaird\n" @@ -2239,7 +2239,7 @@ msgstr "" "# 설치할 커널 이미지 (메타) 패키지입니다. \"none\"을 사용하면 커널을 설치하" "지\n" "# 않습니다.\n" -"#d-i base-installer/kernel/image string linux-image-2.6-486" +"#d-i base-installer/kernel/image string &kernelpackage;-2.6-486" #. Tag: title #: preseed.xml:956 diff --git a/po/ko/random-bits.po b/po/ko/random-bits.po index 0fc4d1bfd..2466920a3 100644 --- a/po/ko/random-bits.po +++ b/po/ko/random-bits.po @@ -1631,8 +1631,8 @@ msgstr "" #. Tag: screen #: random-bits.xml:733 #, no-c-format -msgid "# apt-cache search linux-image" -msgstr "# apt-cache search linux-image" +msgid "# apt-cache search &kernelpackage;" +msgstr "# apt-cache search &kernelpackage;" #. Tag: para #: random-bits.xml:735 @@ -1686,7 +1686,7 @@ msgstr "" msgid "" "Then install the kernel package of your choice using its package name. " "<informalexample><screen>\n" -"# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</" +"# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</" "replaceable>\n" "</screen></informalexample> If you did not create a <filename>/etc/kernel-" "img.conf</filename> before installing a pre-packaged kernel, you may be " @@ -1694,7 +1694,7 @@ msgid "" msgstr "" "그리고 설치하려는 커널 패키지를 패키지 이름을 이용해 설치하십시오. " "<informalexample><screen>\n" -"# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</" +"# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</" "replaceable>\n" "</screen></informalexample> 패키지로 만든 커널을 설치하기 전에 <filename>/" "etc/kernel-img.conf</filename> 파일을 만들어 두지 않았다면, 설치하면서 몇 가" diff --git a/po/pt/post-install.po b/po/pt/post-install.po index 87880865f..00c58d233 100644 --- a/po/pt/post-install.po +++ b/po/pt/post-install.po @@ -1022,7 +1022,7 @@ msgstr "" #, no-c-format msgid "" "Once the compilation is complete, you can install your custom kernel like " -"any package. As root, do <userinput>dpkg -i ../linux-image-&kernelversion;-" +"any package. As root, do <userinput>dpkg -i ../&kernelpackage;-&kernelversion;-" "<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</" "userinput>. The <replaceable>subarchitecture</replaceable> part is an " "optional sub-architecture, <phrase arch=\"i386\"> such as <quote>686</" @@ -1037,7 +1037,7 @@ msgid "" msgstr "" "Quando a compilação estiver completa, poderá instalar o seu kernel " "personalizado como qualquer outro pacote. Como root, faça <userinput>dpkg -" -"i ../linux-image-&kernelversion;-<replaceable>subarchitecture</" +"i ../&kernelpackage;-&kernelversion;-<replaceable>subarchitecture</" "replaceable>_custom.1.0_&architecture;.deb</userinput>. A parte " "<replaceable>subarchitecture</replaceable> é uma sub-arquitectura opcional, " "<phrase arch=\"i386\"> tal como <quote>686</quote>, </phrase> dependendo das " diff --git a/po/pt/preseed.po b/po/pt/preseed.po index 21914515a..cbe472905 100644 --- a/po/pt/preseed.po +++ b/po/pt/preseed.po @@ -2232,7 +2232,7 @@ msgid "" "# The kernel image (meta) package to be installed; \"none\" can be used if " "no\n" "# kernel is to be installed.\n" -"#d-i base-installer/kernel/image string linux-image-2.6-486" +"#d-i base-installer/kernel/image string &kernelpackage;-2.6-486" msgstr "" "# Configure o APT para não instalar, por omissão, pacotes recomendados. A\n" "# utilização desta opção pode resultar num sistema incompleto e deve apenas\n" @@ -2245,7 +2245,7 @@ msgstr "" "\n" "# O (meta) pacote de imagem do kernel a ser instalado; pode ser utilizado\n" "# \"none\" para não instalar nenhum kernel.\n" -"#d-i base-installer/kernel/image string linux-image-2.6-486" +"#d-i base-installer/kernel/image string &kernelpackage;-2.6-486" #. Tag: title #: preseed.xml:956 diff --git a/po/pt/random-bits.po b/po/pt/random-bits.po index 4b1d23405..f771d752b 100644 --- a/po/pt/random-bits.po +++ b/po/pt/random-bits.po @@ -1596,8 +1596,8 @@ msgstr "" #. Tag: screen #: random-bits.xml:733 #, no-c-format -msgid "# apt-cache search linux-image" -msgstr "# apt-cache search linux-image" +msgid "# apt-cache search &kernelpackage;" +msgstr "# apt-cache search &kernelpackage;" #. Tag: para #: random-bits.xml:735 @@ -1653,7 +1653,7 @@ msgstr "" msgid "" "Then install the kernel package of your choice using its package name. " "<informalexample><screen>\n" -"# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</" +"# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</" "replaceable>\n" "</screen></informalexample> If you did not create a <filename>/etc/kernel-" "img.conf</filename> before installing a pre-packaged kernel, you may be " @@ -1661,7 +1661,7 @@ msgid "" msgstr "" "Depois instale o pacote do kernel á sua escolha utilizando o seu nome de " "pacote. <informalexample><screen>\n" -"# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</" +"# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</" "replaceable>\n" "</screen></informalexample> Se não criar um <filename>/etc/kernel-img.conf</" "filename> antes de instalar um kernel pré-empacotado, poder-lhe-ão ser " @@ -2845,10 +2845,10 @@ msgstr "" #~ msgstr "<entry>71</entry>" #~ msgid "" -#~ "# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</" +#~ "# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</" #~ "replaceable>" #~ msgstr "" -#~ "# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</" +#~ "# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</" #~ "replaceable>" #~ msgid "" diff --git a/po/ru/post-install.po b/po/ru/post-install.po index 7c9aa3542..3db497bb3 100644 --- a/po/ru/post-install.po +++ b/po/ru/post-install.po @@ -1012,7 +1012,7 @@ msgstr "" #, no-c-format msgid "" "Once the compilation is complete, you can install your custom kernel like " -"any package. As root, do <userinput>dpkg -i ../linux-image-&kernelversion;-" +"any package. As root, do <userinput>dpkg -i ../&kernelpackage;-&kernelversion;-" "<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</" "userinput>. The <replaceable>subarchitecture</replaceable> part is an " "optional sub-architecture, <phrase arch=\"i386\"> such as <quote>686</" @@ -1026,7 +1026,7 @@ msgid "" "created a modules package, you'll need to install that package as well." msgstr "" "После завершения сборки вы можете установить собранное ядро как обычный " -"пакет. От суперпользователя выполните <userinput>dpkg -i ../linux-image-" +"пакет. От суперпользователя выполните <userinput>dpkg -i ../&kernelpackage;-" "&kernelversion;-<replaceable>субархитектура</" "replaceable>_custom.1.0_&architecture;.deb</userinput>. Часть " "<replaceable>субархитектура</replaceable> — это необязательная " diff --git a/po/ru/preseed.po b/po/ru/preseed.po index 24db99d49..a012afee6 100644 --- a/po/ru/preseed.po +++ b/po/ru/preseed.po @@ -2204,7 +2204,7 @@ msgid "" "# The kernel image (meta) package to be installed; \"none\" can be used if " "no\n" "# kernel is to be installed.\n" -"#d-i base-installer/kernel/image string linux-image-2.6-486" +"#d-i base-installer/kernel/image string &kernelpackage;-2.6-486" msgstr "" "# Настроить APT для отмены автоматической установки рекомендуемых пакетов.\n" "# Использование данного параметра может привести к установке неполноценной\n" @@ -2218,7 +2218,7 @@ msgstr "" "\n" "# Устанавливаемый пакет (мета) с образом ядра; можно указать \"none\",\n" "# если ядро устанавливать не нужно.\n" -"#d-i base-installer/kernel/image string linux-image-2.6-486" +"#d-i base-installer/kernel/image string &kernelpackage;-2.6-486" #. Tag: title #: preseed.xml:956 diff --git a/po/ru/random-bits.po b/po/ru/random-bits.po index 4b0d5b0b8..7ae771651 100644 --- a/po/ru/random-bits.po +++ b/po/ru/random-bits.po @@ -1607,8 +1607,8 @@ msgstr "" #. Tag: screen #: random-bits.xml:733 #, no-c-format -msgid "# apt-cache search linux-image" -msgstr "# apt-cache search linux-image" +msgid "# apt-cache search &kernelpackage;" +msgstr "# apt-cache search &kernelpackage;" #. Tag: para #: random-bits.xml:735 @@ -1664,7 +1664,7 @@ msgstr "" msgid "" "Then install the kernel package of your choice using its package name. " "<informalexample><screen>\n" -"# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</" +"# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</" "replaceable>\n" "</screen></informalexample> If you did not create a <filename>/etc/kernel-" "img.conf</filename> before installing a pre-packaged kernel, you may be " @@ -1672,7 +1672,7 @@ msgid "" msgstr "" "Затем установите пакет с ядром, которое вы выбрали. " "<informalexample><screen>\n" -"# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</" +"# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</" "replaceable>\n" "</screen></informalexample> Если вы не создали <filename>/etc/kernel-img." "conf</filename> перед установкой ядра из пакета, то вам могут быть заданы " diff --git a/po/sv/post-install.po b/po/sv/post-install.po index 22f25f655..f5f6e325e 100644 --- a/po/sv/post-install.po +++ b/po/sv/post-install.po @@ -1010,7 +1010,7 @@ msgstr "" #, no-c-format msgid "" "Once the compilation is complete, you can install your custom kernel like " -"any package. As root, do <userinput>dpkg -i ../linux-image-&kernelversion;-" +"any package. As root, do <userinput>dpkg -i ../&kernelpackage;-&kernelversion;-" "<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</" "userinput>. The <replaceable>subarchitecture</replaceable> part is an " "optional sub-architecture, <phrase arch=\"i386\"> such as <quote>686</" @@ -1024,7 +1024,7 @@ msgid "" "created a modules package, you'll need to install that package as well." msgstr "" "När kompileringen är färdig kan du installera din anpassade kärna som ett " -"vanligt paket. Kör, som root, <userinput>dpkg -i ../linux-image-" +"vanligt paket. Kör, som root, <userinput>dpkg -i ../&kernelpackage;-" "&kernelversion;-<replaceable>underarkitektur</" "replaceable>_anpassad.1.0_&architecture;.deb</userinput>. " "<replaceable>Underarkitekturens</replaceable> del är en valfri " diff --git a/po/sv/preseed.po b/po/sv/preseed.po index c2737660c..70d886a7b 100644 --- a/po/sv/preseed.po +++ b/po/sv/preseed.po @@ -2331,7 +2331,7 @@ msgid "" "# The kernel image (meta) package to be installed; \"none\" can be used if " "no\n" "# kernel is to be installed.\n" -"#d-i base-installer/kernel/image string linux-image-2.6-486" +"#d-i base-installer/kernel/image string &kernelpackage;-2.6-486" msgstr "" "# Konfigurera APT till att inte installera rekommenderade paket som " "standard.\n" @@ -2347,7 +2347,7 @@ msgstr "" "# Kärnavbildningspaketet (meta) att installera; \"none\" kan användas om " "ingen\n" "# kärna ska installeras.\n" -"#d-i base-installer/kernel/image string linux-image-2.6-486" +"#d-i base-installer/kernel/image string &kernelpackage;-2.6-486" #. Tag: title #: preseed.xml:956 diff --git a/po/sv/random-bits.po b/po/sv/random-bits.po index f90cf7ef6..f744f4c59 100644 --- a/po/sv/random-bits.po +++ b/po/sv/random-bits.po @@ -1217,8 +1217,8 @@ msgstr "Om du tänker starta upp det här systemet, vill du antagligen ha en &ar #. Tag: screen #: random-bits.xml:733 #, no-c-format -msgid "# apt-cache search linux-image" -msgstr "# apt-cache search linux-image" +msgid "# apt-cache search &kernelpackage;" +msgstr "# apt-cache search &kernelpackage;" #. Tag: para #: random-bits.xml:735 @@ -1259,11 +1259,11 @@ msgstr "För detaljed information om den här filen och de olika inställningarn #, no-c-format msgid "" "Then install the kernel package of your choice using its package name. <informalexample><screen>\n" -"# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</replaceable>\n" +"# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</replaceable>\n" "</screen></informalexample> If you did not create a <filename>/etc/kernel-img.conf</filename> before installing a pre-packaged kernel, you may be asked some questions during its installation that refer to it." msgstr "" "Installera sedan önskat kärnpaket med hjälp av dess paketnamn.<informalexample><screen>\n" -"# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</replaceable>\n" +"# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</replaceable>\n" "</screen></informalexample> Om du inte skapade en <filename>/etc/kernel-img.conf</filename> innan en förpaketerad kärna installerades, kan du få ett antal frågor under dess installation som refererar till den." #. Tag: title @@ -1992,10 +1992,10 @@ msgstr "För att växla till en annan konsoll behöver du även använda <keycap #~ msgid "<entry>71</entry>" #~ msgstr "<entry>71</entry>" #~ msgid "" -#~ "# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</" +#~ "# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</" #~ "replaceable>" #~ msgstr "" -#~ "# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</" +#~ "# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</" #~ "replaceable>" #~ msgid "" #~ "Now you've got a real Debian system, though rather lean, on disk. " diff --git a/po/vi/post-install.po b/po/vi/post-install.po index 4e2b3af7b..6f3d56fbc 100644 --- a/po/vi/post-install.po +++ b/po/vi/post-install.po @@ -1010,7 +1010,7 @@ msgstr "" #, no-c-format msgid "" "Once the compilation is complete, you can install your custom kernel like " -"any package. As root, do <userinput>dpkg -i ../linux-image-&kernelversion;-" +"any package. As root, do <userinput>dpkg -i ../&kernelpackage;-&kernelversion;-" "<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</" "userinput>. The <replaceable>subarchitecture</replaceable> part is an " "optional sub-architecture, <phrase arch=\"i386\"> such as <quote>686</" @@ -1025,7 +1025,7 @@ msgid "" msgstr "" "Một khi biên dịch xong, bạn có khả năng cài đặt hạt nhân riêng giống như bất " "cứ gói phần mềm nào. Như là người chủ, hãy chạy lệnh <userinput>dpkg -i ../" -"linux-image-&kernelversion;-<replaceable>kiến trúc phụ</" +"&kernelpackage;-&kernelversion;-<replaceable>kiến trúc phụ</" "replaceable>_custom.1.0_&architecture;.deb</userinput>. Phần " "<replaceable>kiến trúc phụ</replaceable> là một kiến trúc phụ tùy chọn, " "<phrase arch=\"i386\"> v.d. <quote>686</quote>, </phrase> phụ thuộc vào " diff --git a/po/vi/preseed.po b/po/vi/preseed.po index ff5074bb2..21d197588 100644 --- a/po/vi/preseed.po +++ b/po/vi/preseed.po @@ -2211,7 +2211,7 @@ msgid "" "# The kernel image (meta) package to be installed; \"none\" can be used if " "no\n" "# kernel is to be installed.\n" -"#d-i base-installer/kernel/image string linux-image-2.6-486" +"#d-i base-installer/kernel/image string &kernelpackage;-2.6-486" msgstr "" "# Cấu hình APT để không cài đặt các gói khuyến khích theo mặc định.\n" "# Sử dụng tuỳ chọn này cũng có thể gây ra một hệ thống không hoàn toàn:\n" @@ -2223,7 +2223,7 @@ msgstr "" "\n" "# (Siêu) gói ảnh hạt nhân cần cài đặt (có thể lập thành « none »\n" "# nếu không cài đặt hạt nhân.\n" -"#d-i base-installer/kernel/image string linux-image-2.6-486" +"#d-i base-installer/kernel/image string &kernelpackage;-2.6-486" #. Tag: title #: preseed.xml:956 diff --git a/po/vi/random-bits.po b/po/vi/random-bits.po index 2e5edd9b2..ab2d4ed6b 100644 --- a/po/vi/random-bits.po +++ b/po/vi/random-bits.po @@ -1602,8 +1602,8 @@ msgstr "" #: random-bits.xml:733 #, no-c-format #. Tag: screen -msgid "# apt-cache search linux-image" -msgstr "# apt-cache search linux-image" +msgid "# apt-cache search &kernelpackage;" +msgstr "# apt-cache search &kernelpackage;" #: random-bits.xml:735 #, no-c-format @@ -1664,7 +1664,7 @@ msgstr "" msgid "" "Then install the kernel package of your choice using its package name. " "<informalexample><screen>\n" -"# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</" +"# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</" "replaceable>\n" "</screen></informalexample> If you did not create a <filename>/etc/kernel-" "img.conf</filename> before installing a pre-packaged kernel, you may be " @@ -1672,11 +1672,11 @@ msgid "" msgstr "" "Sau đó, hãy cài đặt gói hạt nhân đã muốn, dùng tên gói cua nó." "<informalexample><screen>\n" -"# aptitude install linux-image-<replaceable>&kernelversion;-kiến_trúc-v.v.</" +"# aptitude install &kernelpackage;-<replaceable>&kernelversion;-kiến_trúc-v.v.</" "replaceable>\n" "</screen></informalexample>\n" "[install\tcài đặt\n" -"linux-image\tảnh linux]\n" +"&kernelpackage;\tảnh linux]\n" "Nếu bạn chưa tạo tập tin cấu hình <filename>/etc/kernel-img.conf</filename> " "trước khi cài đặt hạt nhân đã đóng gói sẵn, bạn có thể được hỏi một số câu " "về nó trong tiến trình cài đặt." diff --git a/po/zh_CN/post-install.po b/po/zh_CN/post-install.po index 67a058fcf..f207d7b0f 100644 --- a/po/zh_CN/post-install.po +++ b/po/zh_CN/post-install.po @@ -922,7 +922,7 @@ msgstr "" #, no-c-format msgid "" "Once the compilation is complete, you can install your custom kernel like " -"any package. As root, do <userinput>dpkg -i ../linux-image-&kernelversion;-" +"any package. As root, do <userinput>dpkg -i ../&kernelpackage;-&kernelversion;-" "<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</" "userinput>. The <replaceable>subarchitecture</replaceable> part is an " "optional sub-architecture, <phrase arch=\"i386\"> such as <quote>686</" @@ -936,7 +936,7 @@ msgid "" "created a modules package, you'll need to install that package as well." msgstr "" "一旦编译完成，您就可以像安装其它软件包一样安装定制的内核。以 root 身份，执行 " -"<userinput>dpkg -i ../linux-image-&kernelversion;-" +"<userinput>dpkg -i ../&kernelpackage;-&kernelversion;-" "<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</" "userinput>。其中 <replaceable>subarchitecture</replaceable> 部分是一个可选的" "子结构，<phrase arch=\"i386\">例如 <quote>686</quote>，</phrase>这取决于您所" diff --git a/po/zh_CN/preseed.po b/po/zh_CN/preseed.po index cd3e4806b..8fea5d871 100644 --- a/po/zh_CN/preseed.po +++ b/po/zh_CN/preseed.po @@ -2040,7 +2040,7 @@ msgid "" "# The kernel image (meta) package to be installed; \"none\" can be used if " "no\n" "# kernel is to be installed.\n" -"#d-i base-installer/kernel/image string linux-image-2.6-486" +"#d-i base-installer/kernel/image string &kernelpackage;-2.6-486" msgstr "" "# Configure APT to not install recommended packages by default. Use of this\n" "# option can result in an incomplete system and should only be used by very\n" @@ -2054,7 +2054,7 @@ msgstr "" "# The kernel image (meta) package to be installed; \"none\" can be used if " "no\n" "# kernel is to be installed.\n" -"#d-i base-installer/kernel/image string linux-image-2.6-486" +"#d-i base-installer/kernel/image string &kernelpackage;-2.6-486" #. Tag: title #: preseed.xml:956 diff --git a/po/zh_CN/random-bits.po b/po/zh_CN/random-bits.po index b0d264e7e..44ea98156 100644 --- a/po/zh_CN/random-bits.po +++ b/po/zh_CN/random-bits.po @@ -1531,8 +1531,8 @@ msgstr "" #. Tag: screen #: random-bits.xml:733 #, no-c-format -msgid "# apt-cache search linux-image" -msgstr "# apt-cache search linux-image" +msgid "# apt-cache search &kernelpackage;" +msgstr "# apt-cache search &kernelpackage;" #. Tag: para #: random-bits.xml:735 @@ -1585,14 +1585,14 @@ msgstr "" msgid "" "Then install the kernel package of your choice using its package name. " "<informalexample><screen>\n" -"# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</" +"# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</" "replaceable>\n" "</screen></informalexample> If you did not create a <filename>/etc/kernel-" "img.conf</filename> before installing a pre-packaged kernel, you may be " "asked some questions during its installation that refer to it." msgstr "" "然后使用所选择的内核软件包名来安装。<informalexample><screen>\n" -"# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</" +"# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</" "replaceable>\n" "</screen></informalexample> 假如您在安装预编译内核包之前没有创建 <filename>/" "etc/kernel-img.conf</filename> 文件，安装时会被问到相关的问题。" diff --git a/po/zh_TW/post-install.po b/po/zh_TW/post-install.po index 058240a05..a39b478d7 100644 --- a/po/zh_TW/post-install.po +++ b/po/zh_TW/post-install.po @@ -836,7 +836,7 @@ msgstr "" #, fuzzy, no-c-format msgid "" "Once the compilation is complete, you can install your custom kernel like " -"any package. As root, do <userinput>dpkg -i ../linux-image-&kernelversion;-" +"any package. As root, do <userinput>dpkg -i ../&kernelpackage;-&kernelversion;-" "<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</" "userinput>. The <replaceable>subarchitecture</replaceable> part is an " "optional sub-architecture, <phrase arch=\"i386\"> such as <quote>686</" diff --git a/po/zh_TW/random-bits.po b/po/zh_TW/random-bits.po index 6ede29af2..cdabc8acc 100644 --- a/po/zh_TW/random-bits.po +++ b/po/zh_TW/random-bits.po @@ -1454,7 +1454,7 @@ msgstr "" #. Tag: screen #: random-bits.xml:733 #, no-c-format -msgid "# apt-cache search linux-image" +msgid "# apt-cache search &kernelpackage;" msgstr "" #. Tag: para @@ -1496,7 +1496,7 @@ msgstr "" msgid "" "Then install the kernel package of your choice using its package name. " "<informalexample><screen>\n" -"# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</" +"# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</" "replaceable>\n" "</screen></informalexample> If you did not create a <filename>/etc/kernel-" "img.conf</filename> before installing a pre-packaged kernel, you may be " @@ -2358,7 +2358,7 @@ msgstr "" #, fuzzy #~ msgid "" -#~ "# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</" +#~ "# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</" #~ "replaceable>" #~ msgstr "" #~ "# apt-get install kernel-image-<replaceable>2.X.X-arch-etc</replaceable>" diff --git a/pt_BR/appendix/chroot-install.xml b/pt_BR/appendix/chroot-install.xml index 69f985648..fd222f419 100644 --- a/pt_BR/appendix/chroot-install.xml +++ b/pt_BR/appendix/chroot-install.xml @@ -514,7 +514,7 @@ do &arch-kernel; e um gerenciador de inicialização. Identifique os kernels pré-empacotados com: <informalexample><screen> -# apt-cache search linux-image +# apt-cache search &kernelpackage; </screen></informalexample> </para><para> @@ -546,7 +546,7 @@ quais os valores apropriados para o seu sistema. Então, instale o pacote do kernel de sua escolhe usando o nome do pacote. <informalexample><screen> -# aptitude install linux-image-<replaceable>&kernelversion;-arch-etc</replaceable> +# aptitude install &kernelpackage;-<replaceable>&kernelversion;-arch-etc</replaceable> </screen></informalexample> Se você não criou um <filename>/etc/kernel-img.conf</filename> antes da diff --git a/pt_BR/appendix/preseed.xml b/pt_BR/appendix/preseed.xml index c6e2d42df..5095e1e1a 100644 --- a/pt_BR/appendix/preseed.xml +++ b/pt_BR/appendix/preseed.xml @@ -1130,7 +1130,7 @@ instalação. As únicas questões feitas referem-se à instalação do kernel. # The kernel image (meta) package to be installed; "none" can be used if no # kernel is to be installed. -#d-i base-installer/kernel/image string linux-image-2.6-486 +#d-i base-installer/kernel/image string &kernelpackage;-2.6-486 </screen></informalexample> </sect2> diff --git a/pt_BR/post-install/kernel-baking.xml b/pt_BR/post-install/kernel-baking.xml index f169f39f1..f595a1e64 100644 --- a/pt_BR/post-install/kernel-baking.xml +++ b/pt_BR/post-install/kernel-baking.xml @@ -151,7 +151,7 @@ poderá levar um tempo, dependendo do poder de processamento da sua máquina. Assim que a compilação estiver concluída, você poderá instalar o kernel personalizado como qualquer pacote. Como root, execute o comando <userinput>dpkg -i -../linux-image-&kernelversion;-<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</userinput>. +../&kernelpackage;-&kernelversion;-<replaceable>subarchitecture</replaceable>_custom.1.0_&architecture;.deb</userinput>. A parte <replaceable>sub-arquitetura</replaceable> é uma sub-arquitetura opcional, <phrase arch="i386"> tal como <quote>686</quote>, </phrase> |