[kernel] r16729 - in dists/trunk/linux-2.6/debian: . bin po
Ben Hutchings
benh at alioth.debian.org
Wed Dec 22 03:46:53 UTC 2010
Author: benh
Date: Wed Dec 22 03:46:48 2010
New Revision: 16729
Log:
Merge changes from sid branch
Added:
dists/trunk/linux-2.6/debian/po/ca.po
dists/trunk/linux-2.6/debian/po/it.po
dists/trunk/linux-2.6/debian/po/pt_BR.po
Modified:
dists/trunk/linux-2.6/debian/README.Debian
dists/trunk/linux-2.6/debian/bin/test-patches
dists/trunk/linux-2.6/debian/changelog
dists/trunk/linux-2.6/debian/linux-base.postinst
dists/trunk/linux-2.6/debian/po/da.po
dists/trunk/linux-2.6/debian/po/es.po
dists/trunk/linux-2.6/debian/po/ja.po
dists/trunk/linux-2.6/debian/po/vi.po
Modified: dists/trunk/linux-2.6/debian/README.Debian
==============================================================================
--- dists/trunk/linux-2.6/debian/README.Debian Wed Dec 22 02:13:49 2010 (r16728)
+++ dists/trunk/linux-2.6/debian/README.Debian Wed Dec 22 03:46:48 2010 (r16729)
@@ -24,8 +24,16 @@
or EXPERIMENTAL are of very low priority, and should not be enabled in
customized builds for a security-sensitive environment.
-Building specific binary packages
----------------------------------
+Building custom kernel binary packages
+--------------------------------------
+We recommend using the 'make deb-pkg' target provided by the upstream
+kernel source.
+
+Alternately, you may use the 'make-kpkg' command provided by the
+'kernel-package' package.
+
+Rebuilding official binary packages
+-----------------------------------
You can build specific kernel binary packages using the targets in
debian/rules.gen, which have names of the form:
binary-arch_<architecture>_<featureset>_<flavour>
Modified: dists/trunk/linux-2.6/debian/bin/test-patches
==============================================================================
--- dists/trunk/linux-2.6/debian/bin/test-patches Wed Dec 22 02:13:49 2010 (r16728)
+++ dists/trunk/linux-2.6/debian/bin/test-patches Wed Dec 22 03:46:48 2010 (r16729)
@@ -54,7 +54,13 @@
version="$version"a~test
dch -v "$version" --distribution UNRELEASED "Testing patches $*"
fi
-debversion="${version##*-}"
+
+restrictfeature=
+series="${version##*-}"
+if [ "$featureset" != none ]; then
+ restrictfeature=" featureset=$featureset"
+ series="${series}-extra"
+fi
# Copy all patches into a new directory
rm -rf debian/patches/test/
@@ -62,9 +68,9 @@
cp -t debian/patches/test/ "$@"
# Generate patch series for the new version
->debian/patches/series/"$debversion"
+>debian/patches/series/"$series"
for patch in "$@"; do
- echo "+ test/$(basename "$patch")" >>debian/patches/series/"$debversion"
+ echo "+ test/$(basename "$patch")${restrictfeature}" >>debian/patches/series/"$series"
done
# Regenerate control and included rules
Modified: dists/trunk/linux-2.6/debian/changelog
==============================================================================
--- dists/trunk/linux-2.6/debian/changelog Wed Dec 22 02:13:49 2010 (r16728)
+++ dists/trunk/linux-2.6/debian/changelog Wed Dec 22 03:46:48 2010 (r16729)
@@ -9,6 +9,19 @@
* [powerpc,x86] Enable PATA_PCMCIA (Closes: #606324)
* Disable BLK_DEV_IDECS
* [alpha] Use libata-based drivers for most PATA controllers
+ * [powerpc] linux-base: Run ybin after updating yaboot.conf
+ (Closes: #607284)
+ * Update debconf template translations:
+ - Add Catalan (Jordi Mallach)
+ - Update Danish (Joe Hansen)
+ - Update Spanish (Omar Campagne, Javier Fernández-Sanguino)
+ - Add Italian (Luca Bruno)
+ - Update Japanese (Nobuhiro Iwamatsu)
+ - Add Brazilian Portugese (Flamarion Jorge)
+ - Update Vietnamese (Clytie Siddall)
+ * debian/bin/test-patches: Restrict patches to featureset when building
+ with a featureset (thanks to Tim Small)
+ * Recommend use of 'make deb-pkg' to build custom kernel packages
-- Ben Hutchings <ben at decadent.org.uk> Sat, 11 Dec 2010 21:21:10 +0000
Modified: dists/trunk/linux-2.6/debian/linux-base.postinst
==============================================================================
--- dists/trunk/linux-2.6/debian/linux-base.postinst Wed Dec 22 02:13:49 2010 (r16728)
+++ dists/trunk/linux-2.6/debian/linux-base.postinst Wed Dec 22 03:46:48 2010 (r16729)
@@ -533,6 +533,12 @@
system('silo');
}
+### Yaboot
+
+sub yaboot_post {
+ system('ybin');
+}
+
### ELILO
sub elilo_update {
@@ -954,6 +960,7 @@
path => '/etc/yaboot.conf',
list => \&lilo_list,
update => \&lilo_update,
+ post_update => \&yaboot_post,
is_boot_loader => 1},
{packages => 'elilo',
path => '/etc/elilo.conf',
@@ -1620,8 +1627,8 @@
my $do_bootloader;
if (my $conf = new FileHandle('/etc/kernel-img.conf', 'r')) {
while (<$conf>) {
- $do_bootloader = 0 if /do_bootloader\s*=\s*(no|false|0)\s*$/i;
- $do_bootloader = 1 if /do_bootloader\s*=\s*(yes|true|1)\s*$/i;
+ $do_bootloader = 0 if /^\s*do_bootloader\s*=\s*(no|false|0)\s*$/i;
+ $do_bootloader = 1 if /^\s*do_bootloader\s*=\s*(yes|true|1)\s*$/i;
}
$conf->close();
}
Added: dists/trunk/linux-2.6/debian/po/ca.po
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/po/ca.po Wed Dec 22 03:46:48 2010 (r16729)
@@ -0,0 +1,250 @@
+# Catalan translation of linux-2.6 debconf templates.
+# Copyright © 2010 Software in the Public Interest, Inc.
+# This file is distributed under the same license as linux-2.6's packaging.
+# Jordi Mallach <jordi at debian.org>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: linux-2.6 2.6.32-24\n"
+"Report-Msgid-Bugs-To: linux-2.6 at packages.debian.org\n"
+"POT-Creation-Date: 2010-07-16 15:55+0100\n"
+"PO-Revision-Date: 2010-10-25 00:24+0200\n"
+"Last-Translator: Jordi Mallach <jordi at debian.org>\n"
+"Language-Team: Catalan <debian-l10n-catalan at lists.debian.org>\n"
+"Language: ca\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#. Type: boolean
+#. Description
+#: ../linux-base.templates:2001
+msgid "Update disk device IDs in system configuration?"
+msgstr "Voleu actualitzar els ID dels dispositius de discs a la configuració?"
+
+#. Type: boolean
+#. Description
+#: ../linux-base.templates:2001
+msgid ""
+"The new Linux kernel version provides different drivers for some PATA (IDE) "
+"controllers. The names of some hard disk, CD-ROM, and tape devices may "
+"change."
+msgstr "La versió nova del nucli Linux proporciona diferents controladors per a alguns dispositius PATA (IDE). Els noms d'alguns discs durs, CD-ROM i dispositius de cinta poden canviar."
+
+#. Type: boolean
+#. Description
+#: ../linux-base.templates:2001
+msgid ""
+"It is now recommended to identify disk devices in configuration files by "
+"label or UUID (unique identifier) rather than by device name, which will "
+"work with both old and new kernel versions."
+msgstr "És recomanable que identifiqueu els dispositius de disc als fitxers de configuració per etiqueta o UUID (identificador únic) en lloc de pel seu nom de dispositiu, perquè així funcionaran amb les versions de nucli antiga i nova."
+
+#. Type: boolean
+#. Description
+#: ../linux-base.templates:2001
+msgid ""
+"If you choose to not update the system configuration automatically, you must "
+"update device IDs yourself before the next system reboot or the system may "
+"become unbootable."
+msgstr "Si trieu no actualitzar la configuració del sistema automàticament, heu d'actualitzar els ID dels dispositius manualment abans del pròxim reinici del sistema, o el sistema pot deixar d'arrencar."
+
+#. Type: boolean
+#. Description
+#. Type: boolean
+#. Description
+#: ../linux-base.templates:3001 ../linux-base.templates:4001
+msgid "Apply configuration changes to disk device IDs?"
+msgstr "Voleu aplicar els canvis de configuració als ID de dispositius de disc?"
+
+#. Type: boolean
+#. Description
+#: ../linux-base.templates:3001
+msgid "These devices will be assigned UUIDs or labels:"
+msgstr "S'assignaran UUID o etiquetes a aquests dispositius:"
+
+#. Type: boolean
+#. Description
+#. Type: boolean
+#. Description
+#: ../linux-base.templates:3001 ../linux-base.templates:4001
+msgid "These configuration files will be updated:"
+msgstr "S'actualitzaran aquests fitxers de configuració:"
+
+#. Type: boolean
+#. Description
+#. Type: boolean
+#. Description
+#: ../linux-base.templates:3001 ../linux-base.templates:4001
+msgid "The device IDs will be changed as follows:"
+msgstr "Els ID dels dispositius canviaran de la manera següent:"
+
+#. Type: error
+#. Description
+#: ../linux-base.templates:5001
+msgid "Configuration files still contain deprecated device names"
+msgstr "Alguns fitxers de configuració encara contenen noms desaconsellats"
+
+#. Type: error
+#. Description
+#: ../linux-base.templates:5001
+msgid ""
+"The following configuration files still use some device names that may "
+"change when using the new kernel:"
+msgstr "Els fitxers de configuració següents encara empren alguns noms de dispositiu que poden canviar quan s'empre el nucli nou:"
+
+#. Type: error
+#. Description
+#: ../linux-base.templates:6001
+msgid "Boot loader configuration check needed"
+msgstr "Es requereix una comprovació de la configuració del carregador"
+
+#. Type: error
+#. Description
+#: ../linux-base.templates:6001
+msgid ""
+"The boot loader configuration for this system was not recognized. These "
+"settings in the configuration may need to be updated:"
+msgstr "No s'ha reconegut la configuració del carregador d'aquest sistema. És possible que calga actualitzar aquests paràmetres de la configuració:"
+
+#. Type: error
+#. Description
+#: ../linux-base.templates:6001
+msgid ""
+" * The root device ID passed as a kernel parameter;\n"
+" * The boot device ID used to install and update the boot loader."
+msgstr ""
+" * L'ID del dispositiu arrel que es passa com a paràmetre del nucli,\n"
+" * L'ID del dispositiu d'arrencada emprat per a instaŀlar i actualitzar el carregador."
+
+#. Type: error
+#. Description
+#: ../linux-base.templates:6001
+msgid ""
+"You should generally identify these devices by UUID or label. However, on "
+"MIPS systems the root device must be identified by name."
+msgstr "En general, hauríeu d'identificar aquests dispositius per UUID o etiqueta. Als sistemes MIPS, però, el dispositiu arrel s'ha d'identificar pel seu nom."
+
+#. Type: error
+#. Description
+#: ../linux-base.templates:8001
+msgid "Boot loader may need to be upgraded"
+msgstr "És possible que calga actualitzar el carregador"
+
+#. Type: error
+#. Description
+#: ../linux-base.templates:8001
+msgid "Kernel packages no longer update a default boot loader."
+msgstr "Els paquets del nucli ja no actualitzen el carregador per defecte."
+
+#. Type: error
+#. Description
+#: ../linux-base.templates:8001 ../templates/temp.image.plain/templates:5001
+msgid ""
+"If the boot loader needs to be updated whenever a new kernel is installed, "
+"the boot loader package should install a script in /etc/kernel/postinst.d. "
+"Alternately, you can specify the command to update the boot loader by "
+"setting the 'postinst_hook' variable in /etc/kernel-img.conf."
+msgstr "Si s'ha d'actualitzar el carregador cada vegada que s'instaŀla un nou nucli, el paquet del carregador hauria d'instaŀlar un script en /etc/kernel/postinst.d. Alternativament, podeu especificar l'ordre per a actualitzar el carregador establint la variable «postinst_hook» en /etc/kernel-img.conf."
+
+#. Type: boolean
+#. Description
+#: ../templates/temp.image.plain/templates:2001
+msgid "Abort installation after depmod error?"
+msgstr "Voleu avortar la instaŀlació degut a un error de depmod?"
+
+#. Type: boolean
+#. Description
+#: ../templates/temp.image.plain/templates:2001
+msgid ""
+"The 'depmod' command exited with the exit code ${exit_value} "
+"(${SIGNAL}${CORE})."
+msgstr "L'ordre «depmod» ha sortit amb el codi d'error ${exit_value} (${SIGNAL}${CORE})."
+
+#. Type: boolean
+#. Description
+#: ../templates/temp.image.plain/templates:2001
+msgid ""
+"Since this image uses initrd, the ${modules_base}/=V/modules.dep file will "
+"not be deleted, even though it may be invalid."
+msgstr "Com aquesta imatge empra un initrd, no es suprimirà el fitxer ${modules_base}/=V/modules.dep, tot i que potser és invàlid."
+
+#. Type: boolean
+#. Description
+#: ../templates/temp.image.plain/templates:2001
+msgid ""
+"You should abort the installation and fix the errors in depmod, or "
+"regenerate the initrd image with a known good modules.dep file. If you don't "
+"abort the installation, there is a danger that the system will fail to boot."
+msgstr "Hauríeu d'avortar la instaŀlació i corregir els errors de depmod, o regenerar la imatge initrd amb un fitxer modules.dep que siga correcte amb certesa. Si no avorteu la instaŀlació, hi ha el perill que l'arrencada del sistema falle."
+
+#. Type: boolean
+#. Description
+#: ../templates/temp.image.plain/templates:3001
+msgid "Abort kernel removal?"
+msgstr "Voleu avortar la supressió del nucli?"
+
+#. Type: boolean
+#. Description
+#: ../templates/temp.image.plain/templates:3001
+msgid ""
+"You are running a kernel (version ${running}) and attempting to remove the "
+"same version."
+msgstr "Esteu executant un nucli (versió ${running}) i esteu intentant suprimir la mateixa versió."
+
+#. Type: boolean
+#. Description
+#: ../templates/temp.image.plain/templates:3001
+msgid ""
+"This can make the system unbootable as it will remove /boot/vmlinuz-"
+"${running} and all modules under the directory /lib/modules/${running}. This "
+"can only be fixed with a copy of the kernel image and the corresponding "
+"modules."
+msgstr "Això pot fer que el sistema no arrenque perquè suprimirà /boot/vmlinuz-${running} i tots els mòduls sota el directori /lib/modules/${running}. Això només es pot corregir amb una còpia de la imatge del nucli i els mòduls corresponents."
+
+#. Type: boolean
+#. Description
+#: ../templates/temp.image.plain/templates:3001
+msgid ""
+"It is highly recommended to abort the kernel removal unless you are prepared "
+"to fix the system after removal."
+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
+#: ../templates/temp.image.plain/templates:4001
+msgid "Required firmware files may be missing"
+msgstr "És possible que manquen fitxers de microprogramari requerits"
+
+#. Type: note
+#. Description
+#: ../templates/temp.image.plain/templates: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
+#: ../templates/temp.image.plain/templates: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."
+
+#. Type: error
+#. Description
+#: ../templates/temp.image.plain/templates:5001
+msgid "Boot loader configuration must be updated"
+msgstr "S'ha d'actualitzar la configuració del carregador"
+
+#. Type: error
+#. Description
+#: ../templates/temp.image.plain/templates:5001
+msgid ""
+"Kernel packages no longer update a default boot loader. You should remove "
+"'do_bootloader = yes' from /etc/kernel-img.conf."
+msgstr "Els paquets del nucli ja no actualitzen el carregador per defecte. Hauríeu de suprimir la línia «do_bootloader = yes» del fitxer /etc/kernel-img.conf."
Modified: dists/trunk/linux-2.6/debian/po/da.po
==============================================================================
--- dists/trunk/linux-2.6/debian/po/da.po Wed Dec 22 02:13:49 2010 (r16728)
+++ dists/trunk/linux-2.6/debian/po/da.po Wed Dec 22 03:46:48 2010 (r16729)
@@ -7,8 +7,8 @@
msgstr ""
"Project-Id-Version: linux-2.6\n"
"Report-Msgid-Bugs-To: linux-2.6 at packages.debian.org\n"
-"POT-Creation-Date: 2010-07-16 15:55+0100\n"
-"PO-Revision-Date: 2010-06-18 05:26+0100\n"
+"POT-Creation-Date: 2010-10-01 10:30+0200\n"
+"PO-Revision-Date: 2010-10-07 05:26+0100\n"
"Last-Translator: Joe Hansen <joedalton2 at yahoo.dk>\n"
"Language-Team: Danish <debian-l10n-danish at lists.debian.org> \n"
"Language: da\n"
@@ -129,7 +129,7 @@
msgstr ""
" * Rootenheds-id'et passeret som en kerneparameter;\n"
" * Rootenheds-id'et brugt til at installere og opdatere opstartsindlæseren "
-"(boot loader)"
+"(boot loader)."
#. Type: error
#. Description
@@ -145,13 +145,13 @@
#. Description
#: ../linux-base.templates:8001
msgid "Boot loader may need to be upgraded"
-msgstr ""
+msgstr "Opstartsindlæseren (boot loader) skal måske opgraderes"
#. Type: error
#. Description
#: ../linux-base.templates:8001
msgid "Kernel packages no longer update a default boot loader."
-msgstr ""
+msgstr "Kernepakker opdaterer ikke længere en opstartsindlæser som standard."
#. Type: error
#. Description
@@ -162,6 +162,11 @@
"Alternately, you can specify the command to update the boot loader by "
"setting the 'postinst_hook' variable in /etc/kernel-img.conf."
msgstr ""
+"Hvis opstartsindlæseren (boot loader) skal opdateres, når en ny kerne er "
+"installeret, bør opstartsindlæserens pakke installere et skript i "
+"/etc/kernel/postinst.d. Alternativt kan du angive kommandoen til opdatering "
+"af opstartsindlæseren ved at angive variablen 'postinst_hook' i "
+"/etc/kernel-img.conf."
#. Type: boolean
#. Description
@@ -275,10 +280,8 @@
#. Type: error
#. Description
#: ../templates/temp.image.plain/templates:5001
-#, fuzzy
-#| msgid "Boot loader configuration check needed"
msgid "Boot loader configuration must be updated"
-msgstr "Behov for tjek af opstartsindlæseren (boot loader)"
+msgstr "Konfiguration af opstartsindlæseren (boot loader) skal opdateres"
#. Type: error
#. Description
@@ -287,3 +290,5 @@
"Kernel packages no longer update a default boot loader. You should remove "
"'do_bootloader = yes' from /etc/kernel-img.conf."
msgstr ""
+"Kernepakker opdaterer ikke længere en standardopstartsindlæser (boot loader). "
+"Du bør fjerne 'do_bootloader = yes' fra /etc/kernel-img.conf."
Modified: dists/trunk/linux-2.6/debian/po/es.po
==============================================================================
--- dists/trunk/linux-2.6/debian/po/es.po Wed Dec 22 02:13:49 2010 (r16728)
+++ dists/trunk/linux-2.6/debian/po/es.po Wed Dec 22 03:46:48 2010 (r16729)
@@ -4,8 +4,9 @@
# Changes:
# - Initial translation
# Omar Campagne <ocampagne at gmail.com> 2010
-# - Updates
-# TRANSLATOR
+#
+# - Review and update
+# Javier Fernandez-Sanguino, December 2010
#
# Traductores, si no conocen el formato PO, merece la pena leer la
# documentación de gettext, especialmente las secciones dedicadas a este
@@ -28,17 +29,21 @@
msgid ""
msgstr ""
"Project-Id-Version: linux-2.6 2.6.32+5\n"
-"Report-Msgid-Bugs-To: linux-2.6 at packages.debian.org\n"
-"POT-Creation-Date: 2010-07-16 15:55+0100\n"
-"PO-Revision-Date: 2010-06-06 19:04+0200\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-12-11 10:35+0100\n"
+"PO-Revision-Date: 2010-12-15 04:08+0100\n"
"Last-Translator: Omar Campagne <ocampagne at gmail.com>\n"
"Language-Team: Debian l10n Spanish <debian-l10n-spanish at lists.debian.org>\n"
-"Language: es\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: es\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"X-Generator: Virtaal 0.6.1\n"
+"X-POFile-SpellExtra: initrd postinsthook conf lib contrib yes IDE depmod\n"
+"X-POFile-SpellExtra: runningversion img script boot Free exitvalue version\n"
+"X-POFile-SpellExtra: Debian CORE free running dobootloader UUID dep SIGNAL\n"
+"X-POFile-SpellExtra: Guidelines modulesbase vmlinuz postinst\n"
#. Type: boolean
#. Description
@@ -149,7 +154,7 @@
"settings in the configuration may need to be updated:"
msgstr ""
"No se reconoció la configuración del gestor de arranque en este sistema. "
-"Puede que se tengan que actualizar estas opciones de configuración."
+"Puede que se tengan que actualizar estas opciones de configuración:"
#. Type: error
#. Description
@@ -158,10 +163,10 @@
" * The root device ID passed as a kernel parameter;\n"
" * The boot device ID used to install and update the boot loader."
msgstr ""
-" * El identificador del dispositivo raíz introducido como un parámetro del\n"
-" núcleo\n"
-" * El identificador del dispositivo de arranque usado para instalar y\n"
-" actualizar el gestor de arranque."
+" * El identificador del dispositivo raíz introducido como un parámetro del "
+"núcleo\n"
+" * El identificador del dispositivo de arranque usado para instalar y "
+"actualizar el gestor de arranque."
#. Type: error
#. Description
@@ -178,13 +183,13 @@
#. Description
#: ../linux-base.templates:8001
msgid "Boot loader may need to be upgraded"
-msgstr ""
+msgstr "Puede ser necesario actualizar el gestor de arranque"
#. Type: error
#. Description
#: ../linux-base.templates:8001
msgid "Kernel packages no longer update a default boot loader."
-msgstr ""
+msgstr "Los paquetes del núcleo ya no actualizan el gestor de arranque por omisión."
#. Type: error
#. Description
@@ -195,12 +200,17 @@
"Alternately, you can specify the command to update the boot loader by "
"setting the 'postinst_hook' variable in /etc/kernel-img.conf."
msgstr ""
+"El paquete del gestor de arranque debería instalar un script en "
+"«/etc/kernel/postinst.d» si tiene que actualizarse cada vez que se instala "
+"un nuevo núcleo. También puede especificar la orden a ejecutar para "
+"actualizar el gestor de arranque configurando la variable «postinst_hook» "
+"en el fichero de configuración «/etc/kernel-img.conf»."
#. Type: boolean
#. Description
#: ../templates/temp.image.plain/templates:2001
msgid "Abort installation after depmod error?"
-msgstr "¿Desea interrumpir la instalación después de un fallo de depmod?"
+msgstr "¿Desea interrumpir la instalación cuando se produzca un fallo de depmod?"
#. Type: boolean
#. Description
@@ -292,7 +302,7 @@
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."
+"en la nueva versión requieran ficheros de firmware adicionales:"
#. Type: note
#. Description
@@ -312,10 +322,8 @@
#. Type: error
#. Description
#: ../templates/temp.image.plain/templates:5001
-#, fuzzy
-#| msgid "Boot loader configuration check needed"
msgid "Boot loader configuration must be updated"
-msgstr "Se necesita comprobar la configuración del gestor de arranque"
+msgstr "Debe actualizarse la configuración del gestor de arranque"
#. Type: error
#. Description
@@ -324,3 +332,6 @@
"Kernel packages no longer update a default boot loader. You should remove "
"'do_bootloader = yes' from /etc/kernel-img.conf."
msgstr ""
+"Los paquetes del núcleo ya no actualizan el gestor de arranque por omisión. "
+"Debe eliminar la línea «do_bootloader = yes» del archivo de configuración "
+"«/etc/kernel-img.conf»."
Added: dists/trunk/linux-2.6/debian/po/it.po
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/po/it.po Wed Dec 22 03:46:48 2010 (r16729)
@@ -0,0 +1,301 @@
+# This file is distributed under the same license as the linux-2.6 package.
+# Collaboratively translated during an online sprint, thanks to all contributors!
+# Luca Bruno <lucab at debian.org>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: linux-2.6 2.6.32-27\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-11-01 10:31+0100\n"
+"PO-Revision-Date: 2010-11-09 18:24+0100\n"
+"Last-Translator: Luca Bruno <lucab at debian.org>\n"
+"Language-Team: Italian <tp at lists.linux.it>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#. Type: boolean
+#. Description
+#: ../linux-base.templates:2001
+msgid "Update disk device IDs in system configuration?"
+msgstr "Aggiornare gli ID dei dischi nella configurazione di sistema?"
+
+#. Type: boolean
+#. Description
+#: ../linux-base.templates:2001
+msgid ""
+"The new Linux kernel version provides different drivers for some PATA (IDE) "
+"controllers. The names of some hard disk, CD-ROM, and tape devices may "
+"change."
+msgstr ""
+"La nuova versione del kernel Linux fornisce diversi driver per alcuni "
+"controller PATA (IDE). I nomi di alcuni dischi fissi, CD-ROM e dispositivi a "
+"nastro potrebbero cambiare."
+
+#. Type: boolean
+#. Description
+#: ../linux-base.templates:2001
+msgid ""
+"It is now recommended to identify disk devices in configuration files by "
+"label or UUID (unique identifier) rather than by device name, which will "
+"work with both old and new kernel versions."
+msgstr ""
+"Per identificare i dischi nei file di configurazione, è consigliabile "
+"utilizzare delle etichette o degli UUID (identificatori univoci) piuttosto "
+"che i nomi dei dispositivi, poiché tale metodo funziona sia con nuove che "
+"con vecchie versioni di kernel."
+
+#. Type: boolean
+#. Description
+#: ../linux-base.templates:2001
+msgid ""
+"If you choose to not update the system configuration automatically, you must "
+"update device IDs yourself before the next system reboot or the system may "
+"become unbootable."
+msgstr ""
+"Se si sceglie di non aggiornare automaticamente la configurazione di sistema "
+"occorre aggiornare manualmente gli ID dei dispositivi prima del prossimo "
+"riavvio, altrimenti il sistema potrebbe diventare non avviabile."
+
+#. Type: boolean
+#. Description
+#. Type: boolean
+#. Description
+#: ../linux-base.templates:3001 ../linux-base.templates:4001
+msgid "Apply configuration changes to disk device IDs?"
+msgstr "Applicare le modifiche alla configurazione degli ID dei dischi?"
+
+#. Type: boolean
+#. Description
+#: ../linux-base.templates:3001
+msgid "These devices will be assigned UUIDs or labels:"
+msgstr "I seguenti dispositivi verranno identificati tramite UUID o etichette:"
+
+#. Type: boolean
+#. Description
+#. Type: boolean
+#. Description
+#: ../linux-base.templates:3001 ../linux-base.templates:4001
+msgid "These configuration files will be updated:"
+msgstr "I seguenti file di configurazione verranno aggiornati:"
+
+#. Type: boolean
+#. Description
+#. Type: boolean
+#. Description
+#: ../linux-base.templates:3001 ../linux-base.templates:4001
+msgid "The device IDs will be changed as follows:"
+msgstr "Gli ID dei dispositivi verranno cambiati come segue:"
+
+#. Type: error
+#. Description
+#: ../linux-base.templates:5001
+msgid "Configuration files still contain deprecated device names"
+msgstr ""
+"I file di configurazione contengono ancora i nomi obsoleti dei dispositivi"
+
+#. Type: error
+#. Description
+#: ../linux-base.templates:5001
+msgid ""
+"The following configuration files still use some device names that may "
+"change when using the new kernel:"
+msgstr ""
+"I seguenti file di configurazione usano ancora alcuni nomi di dispositivi "
+"che potrebbero cambiare utilizzando il nuovo kernel:"
+
+#. Type: error
+#. Description
+#: ../linux-base.templates:6001
+msgid "Boot loader configuration check needed"
+msgstr "È necessario controllare la configurazione del boot loader"
+
+#. Type: error
+#. Description
+#: ../linux-base.templates:6001
+msgid ""
+"The boot loader configuration for this system was not recognized. These "
+"settings in the configuration may need to be updated:"
+msgstr ""
+"La configurazione del boot loader per questo sistema non è stata "
+"riconosciuta. I seguenti parametri di configurazione potrebbero aver bisogno "
+"di essere aggiornati:"
+
+#. Type: error
+#. Description
+#: ../linux-base.templates:6001
+msgid ""
+" * The root device ID passed as a kernel parameter;\n"
+" * The boot device ID used to install and update the boot loader."
+msgstr ""
+" * L'ID del dispositivo di root passato come parametro del kernel;\n"
+" * L'ID del dispositivo di boot utilizzato per installare e aggiornare il "
+"boot loader."
+
+#. Type: error
+#. Description
+#: ../linux-base.templates:6001
+msgid ""
+"You should generally identify these devices by UUID or label. However, on "
+"MIPS systems the root device must be identified by name."
+msgstr ""
+"Generalmente questi dispositivi dovrebbero venire identificati tramite UUID "
+"o etichette. Tuttavia, nei sistemi MIPS il dispositivo di root deve essere "
+"identificato dal nome."
+
+#. Type: error
+#. Description
+#: ../linux-base.templates:8001
+msgid "Boot loader may need to be upgraded"
+msgstr "Potrebbe essere necessario aggiornare il boot loader"
+
+#. Type: error
+#. Description
+#: ../linux-base.templates:8001
+msgid "Kernel packages no longer update a default boot loader."
+msgstr ""
+"I pacchetti del kernel non provvedono più all'aggiornamento del boot loader "
+"predefinito."
+
+#. Type: error
+#. Description
+#: ../linux-base.templates:8001 ../templates/temp.image.plain/templates:5001
+msgid ""
+"If the boot loader needs to be updated whenever a new kernel is installed, "
+"the boot loader package should install a script in /etc/kernel/postinst.d. "
+"Alternately, you can specify the command to update the boot loader by "
+"setting the 'postinst_hook' variable in /etc/kernel-img.conf."
+msgstr ""
+"Se il boot loader necessita di essere aggiornato ad ogni installazione di "
+"nuovi kernel, il pacchetto relativo dovrebbe installare uno script in /etc/"
+"kernel/postinst.d. In alternativa, è possibile specificare il comando di "
+"aggiornamento tramite la variabile «postinst_hook» in /etc/kernel-img.conf."
+
+#. Type: boolean
+#. Description
+#: ../templates/temp.image.plain/templates:2001
+msgid "Abort installation after depmod error?"
+msgstr "Interrompere l'installazione a seguito dell'errore di depmod?"
+
+#. Type: boolean
+#. Description
+#: ../templates/temp.image.plain/templates:2001
+msgid ""
+"The 'depmod' command exited with the exit code ${exit_value} "
+"(${SIGNAL}${CORE})."
+msgstr ""
+"Il comando «depmod» è terminato con codice d'uscita ${exit_value} "
+"(${SIGNAL}${CORE})."
+
+#. Type: boolean
+#. Description
+#: ../templates/temp.image.plain/templates:2001
+msgid ""
+"Since this image uses initrd, the ${modules_base}/=V/modules.dep file will "
+"not be deleted, even though it may be invalid."
+msgstr ""
+"Poiché questa immagine usa un initrd, il file ${modules_base}/=V/modules.dep "
+"non viene eliminato, anche se potrebbe risultare non più valido."
+
+#. Type: boolean
+#. Description
+#: ../templates/temp.image.plain/templates:2001
+msgid ""
+"You should abort the installation and fix the errors in depmod, or "
+"regenerate the initrd image with a known good modules.dep file. If you don't "
+"abort the installation, there is a danger that the system will fail to boot."
+msgstr ""
+"Si consiglia di interrompere l'installazione e correggere gli errori di "
+"depmod, o ricreare l'immagine initrd con un file modules.dep valido. Se "
+"l'installazione non viene interrotta, è possibile che il sistema possa "
+"risultare non avviabile."
+
+#. Type: boolean
+#. Description
+#: ../templates/temp.image.plain/templates:3001
+msgid "Abort kernel removal?"
+msgstr "Interrompere la rimozione del kernel?"
+
+#. Type: boolean
+#. Description
+#: ../templates/temp.image.plain/templates:3001
+msgid ""
+"You are running a kernel (version ${running}) and attempting to remove the "
+"same version."
+msgstr ""
+"Nel sistema è in esecuzione un kernel (versione ${running}) e si sta "
+"cercando di rimuovere la stessa versione."
+
+#. Type: boolean
+#. Description
+#: ../templates/temp.image.plain/templates:3001
+msgid ""
+"This can make the system unbootable as it will remove /boot/vmlinuz-"
+"${running} and all modules under the directory /lib/modules/${running}. This "
+"can only be fixed with a copy of the kernel image and the corresponding "
+"modules."
+msgstr ""
+"Ciò potrebbe rendere il sistema non avviabile poiché rimuoverà /boot/vmlinuz-"
+"${running} e tutti i moduli nella directory /lib/modules/${running}. A "
+"questo si potrà rimediare solo con una copia dell'immagine del kernel e dei "
+"moduli corrispondenti."
+
+#. Type: boolean
+#. Description
+#: ../templates/temp.image.plain/templates:3001
+msgid ""
+"It is highly recommended to abort the kernel removal unless you are prepared "
+"to fix the system after removal."
+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
+#: ../templates/temp.image.plain/templates:4001
+msgid "Required firmware files may be missing"
+msgstr "Alcuni firmware richiesti potrebbero non essere presenti"
+
+#. Type: note
+#. Description
+#: ../templates/temp.image.plain/templates: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
+#: ../templates/temp.image.plain/templates: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."
+
+#. Type: error
+#. Description
+#: ../templates/temp.image.plain/templates:5001
+msgid "Boot loader configuration must be updated"
+msgstr "La configurazione del boot loader deve essere aggiornata"
+
+#. Type: error
+#. Description
+#: ../templates/temp.image.plain/templates:5001
+msgid ""
+"Kernel packages no longer update a default boot loader. You should remove "
+"'do_bootloader = yes' from /etc/kernel-img.conf."
+msgstr ""
+"I pacchetti del kernel non provvedono più all'aggiornamento del boot loader "
+"predefinito. Si dovrebbe rimuovere la riga «do_bootloader = yes» da /etc/"
+"kernel-img.conf."
Modified: dists/trunk/linux-2.6/debian/po/ja.po
==============================================================================
--- dists/trunk/linux-2.6/debian/po/ja.po Wed Dec 22 02:13:49 2010 (r16728)
+++ dists/trunk/linux-2.6/debian/po/ja.po Wed Dec 22 03:46:48 2010 (r16729)
@@ -1,20 +1,23 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
-#
+# Copyright (C) 2010 Kenshi Muto <kmuto at debian.org>
+# Copyright (C) 2010 Nobuhiro Iwamatsu <iwamatsu at debian.org>
+# This file is distributed under the same license as the linux-2.6 package.
+# Kenshi Muto <kmuto at debian.org>, 2010.
+# Nobuhiro Iwamatsu <iwamatsu at debian.org>, 2010.
+
msgid ""
msgstr ""
"Project-Id-Version: linux-2.6\n"
-"Report-Msgid-Bugs-To: linux-2.6 at packages.debian.org\n"
-"POT-Creation-Date: 2010-07-16 15:55+0100\n"
-"PO-Revision-Date: 2010-05-09 19:10+0900\n"
-"Last-Translator: Kenshi Muto <kmuto at debian.org>\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2010-10-21 10:37+0200\n"
+"PO-Revision-Date: 2010-10-31 06:32+0900\n"
+"Last-Translator: Nobuhiro Iwamatsu <iwamatsu at debian.org>\n"
"Language-Team: Japanese <debian-japanese at lists.debian.org>\n"
-"Language: ja\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
+"Language: ja\n"
+"X-Poedit-Language: Japanese\n"
+"X-Poedit-Country: JAPAN\n"
#. Type: boolean
#. Description
@@ -25,44 +28,27 @@
#. Type: boolean
#. Description
#: ../linux-base.templates:2001
-msgid ""
-"The new Linux kernel version provides different drivers for some PATA (IDE) "
-"controllers. The names of some hard disk, CD-ROM, and tape devices may "
-"change."
-msgstr ""
-"新しい Linux カーネルバージョンでは、いくつかの PATA (IDE) コントローラについ"
-"て別のドライバを提供します。ハードディスク、CD-ROM、テープデバイスの名前のい"
-"くつかは変更される可能性があります。"
+msgid "The new Linux kernel version provides different drivers for some PATA (IDE) controllers. The names of some hard disk, CD-ROM, and tape devices may change."
+msgstr "新しい Linux カーネルバージョンでは、いくつかの PATA (IDE) コントローラについて別のドライバを提供します。ハードディスク、CD-ROM、テープデバイスの名前のいくつかは変更される可能性があります。"
#. Type: boolean
#. Description
#: ../linux-base.templates:2001
-msgid ""
-"It is now recommended to identify disk devices in configuration files by "
-"label or UUID (unique identifier) rather than by device name, which will "
-"work with both old and new kernel versions."
-msgstr ""
-"新旧両方のカーネルバージョンで動作させつつ、設定ファイル中でディスクデバイス"
-"を識別するために、デバイス名よりもラベルまたは UUID (固有識別子) を使うこと"
-"が、現在推奨されます。"
+msgid "It is now recommended to identify disk devices in configuration files by label or UUID (unique identifier) rather than by device name, which will work with both old and new kernel versions."
+msgstr "新旧両方のカーネルバージョンで動作させつつ、設定ファイル中でディスクデバイスを識別するために、デバイス名よりもラベルまたは UUID (固有識別子) を使うことが、現在推奨されます。"
#. Type: boolean
#. Description
#: ../linux-base.templates:2001
-msgid ""
-"If you choose to not update the system configuration automatically, you must "
-"update device IDs yourself before the next system reboot or the system may "
-"become unbootable."
-msgstr ""
-"システムの設定を自動更新することを選ばない場合は、次のシステム再起動の前にあ"
-"なた自身でデバイス ID を更新する必要があります。さもないと、システムは起動不"
-"能になってしまうかもしれません。"
+msgid "If you choose to not update the system configuration automatically, you must update device IDs yourself before the next system reboot or the system may become unbootable."
+msgstr "システムの設定を自動更新することを選ばない場合は、次のシステム再起動の前にあなた自身でデバイス ID を更新する必要があります。さもないと、システムは起動不能になってしまうかもしれません。"
#. Type: boolean
#. Description
#. Type: boolean
#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
+#: ../linux-base.templates:3001
+#: ../linux-base.templates:4001
msgid "Apply configuration changes to disk device IDs?"
msgstr "ディスクデバイス ID の設定変更を適用しますか?"
@@ -76,7 +62,8 @@
#. Description
#. Type: boolean
#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
+#: ../linux-base.templates:3001
+#: ../linux-base.templates:4001
msgid "These configuration files will be updated:"
msgstr "次の設定ファイルは更新されます:"
@@ -84,7 +71,8 @@
#. Description
#. Type: boolean
#. Description
-#: ../linux-base.templates:3001 ../linux-base.templates:4001
+#: ../linux-base.templates:3001
+#: ../linux-base.templates:4001
msgid "The device IDs will be changed as follows:"
msgstr "デバイス ID は次のように変更されます:"
@@ -97,12 +85,8 @@
#. Type: error
#. Description
#: ../linux-base.templates:5001
-msgid ""
-"The following configuration files still use some device names that may "
-"change when using the new kernel:"
-msgstr ""
-"次の設定ファイルは依然として、新しいカーネルの使用時に変更され得るいくつかの"
-"デバイス名を使っています:"
+msgid "The following configuration files still use some device names that may change when using the new kernel:"
+msgstr "次の設定ファイルは依然として、新しいカーネルの使用時に変更され得るいくつかのデバイス名を使っています:"
#. Type: error
#. Description
@@ -113,12 +97,8 @@
#. Type: error
#. Description
#: ../linux-base.templates:6001
-msgid ""
-"The boot loader configuration for this system was not recognized. These "
-"settings in the configuration may need to be updated:"
-msgstr ""
-"このシステムのブートローダ設定を認識できませんでした。設定中の次の定義は、更"
-"新する必要があるかもしれません:"
+msgid "The boot loader configuration for this system was not recognized. These settings in the configuration may need to be updated:"
+msgstr "このシステムのブートローダ設定を認識できませんでした。設定中の次の定義は、更新する必要があるかもしれません:"
#. Type: error
#. Description
@@ -133,34 +113,27 @@
#. Type: error
#. Description
#: ../linux-base.templates:6001
-msgid ""
-"You should generally identify these devices by UUID or label. However, on "
-"MIPS systems the root device must be identified by name."
-msgstr ""
-"一般にこれらのデバイスは、UUID またはラベルで識別すべきです。ただし、MIPS シ"
-"ステムではルートデバイスは名前で識別しなければなりません。"
+msgid "You should generally identify these devices by UUID or label. However, on MIPS systems the root device must be identified by name."
+msgstr "一般にこれらのデバイスは、UUID またはラベルで識別すべきです。ただし、MIPS システムではルートデバイスは名前で識別しなければなりません。"
#. Type: error
#. Description
#: ../linux-base.templates:8001
msgid "Boot loader may need to be upgraded"
-msgstr ""
+msgstr "ブートローダは、アップグレードする必要があるかもしれません"
#. Type: error
#. Description
#: ../linux-base.templates:8001
msgid "Kernel packages no longer update a default boot loader."
-msgstr ""
+msgstr "カーネルパッケージは、デフォルトブートローダをもはやアップデートしません。"
#. Type: error
#. Description
-#: ../linux-base.templates:8001 ../templates/temp.image.plain/templates:5001
-msgid ""
-"If the boot loader needs to be updated whenever a new kernel is installed, "
-"the boot loader package should install a script in /etc/kernel/postinst.d. "
-"Alternately, you can specify the command to update the boot loader by "
-"setting the 'postinst_hook' variable in /etc/kernel-img.conf."
-msgstr ""
+#: ../linux-base.templates:8001
+#: ../templates/temp.image.plain/templates:5001
+msgid "If the boot loader needs to be updated whenever a new kernel is installed, the boot loader package should install a script in /etc/kernel/postinst.d. Alternately, you can specify the command to update the boot loader by setting the 'postinst_hook' variable in /etc/kernel-img.conf."
+msgstr "新しいカーネルがインストールされるときに、いつでもブートローダがアップデートされる必要があるなら、ブートローダパッケージは /etc/kernel/postinst.d にスクリプトをインストールしなければなりません。あるいは、/etc/kernel-img.conf にある 'postinst_hook' 変数を設定することによって、ブートローダをアップデートするコマンドを指定できます。"
#. Type: boolean
#. Description
@@ -171,34 +144,20 @@
#. Type: boolean
#. Description
#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"The 'depmod' command exited with the exit code ${exit_value} "
-"(${SIGNAL}${CORE})."
-msgstr ""
-"'depmod' コマンドは終了コード ${exit_value} (${SIGNAL}${CORE}) で終了しまし"
-"た。"
+msgid "The 'depmod' command exited with the exit code ${exit_value} (${SIGNAL}${CORE})."
+msgstr "'depmod' コマンドは終了コード ${exit_value} (${SIGNAL}${CORE}) で終了しました。"
#. Type: boolean
#. Description
#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"Since this image uses initrd, the ${modules_base}/=V/modules.dep file will "
-"not be deleted, even though it may be invalid."
-msgstr ""
-"このイメージは initrd を使っているので、${modules_base}/=V/modules.dep ファイ"
-"ルは (たとえ無効なものであったとしても) 削除されません。"
+msgid "Since this image uses initrd, the ${modules_base}/=V/modules.dep file will not be deleted, even though it may be invalid."
+msgstr "このイメージは initrd を使っているので、${modules_base}/=V/modules.dep ファイルは (たとえ無効なものであったとしても) 削除されません。"
#. Type: boolean
#. Description
#: ../templates/temp.image.plain/templates:2001
-msgid ""
-"You should abort the installation and fix the errors in depmod, or "
-"regenerate the initrd image with a known good modules.dep file. If you don't "
-"abort the installation, there is a danger that the system will fail to boot."
-msgstr ""
-"インストールを中止して depmod のエラーを修正するか、問題がないとわかっている "
-"modules.dep ファイルで initrd イメージを再生成すべきです。インストールを中止"
-"しないと、システムの起動に失敗する恐れがあります。"
+msgid "You should abort the installation and fix the errors in depmod, or regenerate the initrd image with a known good modules.dep file. If you don't abort the installation, there is a danger that the system will fail to boot."
+msgstr "インストールを中止して depmod のエラーを修正するか、問題がないとわかっている modules.dep ファイルで initrd イメージを再生成すべきです。インストールを中止しないと、システムの起動に失敗する恐れがあります。"
#. Type: boolean
#. Description
@@ -209,36 +168,20 @@
#. Type: boolean
#. Description
#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"You are running a kernel (version ${running}) and attempting to remove the "
-"same version."
-msgstr ""
-"現在カーネル (バージョン ${running}) を実行しており、同一バージョンのカーネル"
-"の削除を試みています。"
+msgid "You are running a kernel (version ${running}) and attempting to remove the same version."
+msgstr "現在カーネル (バージョン ${running}) を実行しており、同一バージョンのカーネルの削除を試みています。"
#. Type: boolean
#. Description
#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"This can make the system unbootable as it will remove /boot/vmlinuz-"
-"${running} and all modules under the directory /lib/modules/${running}. This "
-"can only be fixed with a copy of the kernel image and the corresponding "
-"modules."
-msgstr ""
-"この操作は /boot/vmlinuz-${running} および /lib/modules/${running} ディレクト"
-"リ下のすべてのモジュールを削除するので、システムを起動不能にする可能性があり"
-"ます。これは、カーネルイメージおよび関連モジュールのコピーがない限り直せませ"
-"ん。"
+msgid "This can make the system unbootable as it will remove /boot/vmlinuz-${running} and all modules under the directory /lib/modules/${running}. This can only be fixed with a copy of the kernel image and the corresponding modules."
+msgstr "この操作は /boot/vmlinuz-${running} および /lib/modules/${running} ディレクトリ下のすべてのモジュールを削除するので、システムを起動不能にする可能性があります。これは、カーネルイメージおよび関連モジュールのコピーがない限り直せません。"
#. Type: boolean
#. Description
#: ../templates/temp.image.plain/templates:3001
-msgid ""
-"It is highly recommended to abort the kernel removal unless you are prepared "
-"to fix the system after removal."
-msgstr ""
-"削除後でもシステムに問題がないような準備を済ませるまで、カーネルの削除を中止"
-"することを強くお勧めします。"
+msgid "It is highly recommended to abort the kernel removal unless you are prepared to fix the system after removal."
+msgstr "削除後でもシステムに問題がないような準備を済ませるまで、カーネルの削除を中止することを強くお勧めします。"
#. Type: note
#. Description
@@ -249,41 +192,24 @@
#. Type: note
#. Description
#: ../templates/temp.image.plain/templates: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} "
-"をインストールしようとしています。新しいバージョンでは、このシステムで使われ"
-"るドライバのいくつかは追加のファームウェアファイルを必要とするかもしれません:"
+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
#: ../templates/temp.image.plain/templates: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 セ"
-"クションを含むようパッケージマネージャを再設定する必要があるかもしれません。"
+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 セクションを含むようパッケージマネージャを再設定する必要があるかもしれません。"
#. Type: error
#. Description
#: ../templates/temp.image.plain/templates:5001
-#, fuzzy
-#| msgid "Boot loader configuration check needed"
msgid "Boot loader configuration must be updated"
-msgstr "ブートローダ設定の確認が必要です"
+msgstr "ブートローダ設定を更新する必要があります"
#. Type: error
#. Description
#: ../templates/temp.image.plain/templates:5001
-msgid ""
-"Kernel packages no longer update a default boot loader. You should remove "
-"'do_bootloader = yes' from /etc/kernel-img.conf."
-msgstr ""
+msgid "Kernel packages no longer update a default boot loader. You should remove 'do_bootloader = yes' from /etc/kernel-img.conf."
+msgstr "カーネルパッケージはデフォルトブートローダをもはやアップデートしません。/etc/kernel-img.conf から 'do_bootloader = yes' の行を削除しなければなりません。"
+
Added: dists/trunk/linux-2.6/debian/po/pt_BR.po
==============================================================================
--- /dev/null 00:00:00 1970 (empty, because file is newly added)
+++ dists/trunk/linux-2.6/debian/po/pt_BR.po Wed Dec 22 03:46:48 2010 (r16729)
@@ -0,0 +1,309 @@
+# linux-2.6 Brazilian Portuguese debconf template translation.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the linux-2.6 package.
+# Flamarion Jorge <jorge.flamarion at gmail.com>, 2010.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: linux-2.6\n"
+"Report-Msgid-Bugs-To: linux-2.6 at packages.debian.org\n"
+"POT-Creation-Date: 2010-09-19 10:42+0200\n"
+"PO-Revision-Date: 2010-10-02 12:29-0300\n"
+"Last-Translator: Flamarion Jorge <jorge.flamarion at gmail.com>\n"
+"Language-Team: Brazilian Portuguese <debian-l10n-portuguese at lists.debian."
+"org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"pt_BR utf-8\n"
+
+#. Type: boolean
+#. Description
+#: ../linux-base.templates:2001
+msgid "Update disk device IDs in system configuration?"
+msgstr "Atualizar os IDs de dispositivos de disco na configuração do sistema?"
+
+#. Type: boolean
+#. Description
+#: ../linux-base.templates:2001
+msgid ""
+"The new Linux kernel version provides different drivers for some PATA (IDE) "
+"controllers. The names of some hard disk, CD-ROM, and tape devices may "
+"change."
+msgstr ""
+"A nova versão do kernel Linux fornece drivers diferentes para alguns "
+"controladores PATA (IDE). Os nomes de alguns dispositivos de disco rígido, "
+"CD-ROM e fita podem mudar."
+
+#. Type: boolean
+#. Description
+#: ../linux-base.templates:2001
+msgid ""
+"It is now recommended to identify disk devices in configuration files by "
+"label or UUID (unique identifier) rather than by device name, which will "
+"work with both old and new kernel versions."
+msgstr ""
+"Agora é recomendado identificar dispositivos de disco nos arquivos de "
+"configuração por rótulo (\"label\") ou UUID (identificador único) em vez de "
+"por nome de dispositivo, o que funcionará tanto em antigas como em novas "
+"versões do kernel."
+
+#. Type: boolean
+#. Description
+#: ../linux-base.templates:2001
+msgid ""
+"If you choose to not update the system configuration automatically, you must "
+"update device IDs yourself before the next system reboot or the system may "
+"become unbootable."
+msgstr ""
+"Se você escolher não atualizar a configuração do sistema automaticamente, "
+"você deverá atualizar os identificadores de dispositivo (\"IDs\") por sua "
+"conta antes da próxima reinicialização do sistema, ou talvez o sistema se "
+"torne não inicializável."
+
+#. Type: boolean
+#. Description
+#. Type: boolean
+#. Description
+#: ../linux-base.templates:3001 ../linux-base.templates:4001
+msgid "Apply configuration changes to disk device IDs?"
+msgstr ""
+"Aplicar mudanças nas configurações para identificadores de discos (\"IDs\")?"
+
+#. Type: boolean
+#. Description
+#: ../linux-base.templates:3001
+msgid "These devices will be assigned UUIDs or labels:"
+msgstr "Estes dispositivos serão associados a UUIDs ou rótulos (\"labels\"):"
+
+#. Type: boolean
+#. Description
+#. Type: boolean
+#. Description
+#: ../linux-base.templates:3001 ../linux-base.templates:4001
+msgid "These configuration files will be updated:"
+msgstr "Estes arquivos de configuração serão atualizados:"
+
+#. Type: boolean
+#. Description
+#. Type: boolean
+#. Description
+#: ../linux-base.templates:3001 ../linux-base.templates:4001
+msgid "The device IDs will be changed as follows:"
+msgstr ""
+"Os identificadores de dispositivo (\"IDs\") serão modificados como segue:"
+
+#. Type: error
+#. Description
+#: ../linux-base.templates:5001
+msgid "Configuration files still contain deprecated device names"
+msgstr "Arquivos de configuração ainda contêm nomes de dispositivos obsoletos"
+
+#. Type: error
+#. Description
+#: ../linux-base.templates:5001
+msgid ""
+"The following configuration files still use some device names that may "
+"change when using the new kernel:"
+msgstr ""
+"O seguintes arquivos de configuração ainda usam alguns nomes de dispositivo "
+"que podem mudar ao usar o novo kernel:"
+
+#. Type: error
+#. Description
+#: ../linux-base.templates:6001
+msgid "Boot loader configuration check needed"
+msgstr ""
+"É necessário verificar a configuração do carregador de inicialização (\"boot "
+"loader\")"
+
+#. Type: error
+#. Description
+#: ../linux-base.templates:6001
+msgid ""
+"The boot loader configuration for this system was not recognized. These "
+"settings in the configuration may need to be updated:"
+msgstr ""
+"A configuração do carregador de inicialização para este sistema não foi "
+"reconhecida. Estes ajustes na configuração talvez precisem ser atualizados:"
+
+#. Type: error
+#. Description
+#: ../linux-base.templates:6001
+msgid ""
+" * The root device ID passed as a kernel parameter;\n"
+" * The boot device ID used to install and update the boot loader."
+msgstr ""
+" * O ID do dispositivo raiz passado como um parâmetro do kernel;\n"
+" * O ID do dispositivo de inicialização (\"boot\") usado para instalar e "
+"atualizar o carregador de inicialização."
+
+#. Type: error
+#. Description
+#: ../linux-base.templates:6001
+msgid ""
+"You should generally identify these devices by UUID or label. However, on "
+"MIPS systems the root device must be identified by name."
+msgstr ""
+"Geralmente você deveria identificar estes dispositivos pelo UUID ou rótulo "
+"(\"label\"). Entretanto, em sistemas MIPS o dispositivo raiz deve ser "
+"identificado pelo nome."
+
+#. Type: error
+#. Description
+#: ../linux-base.templates:8001
+msgid "Boot loader may need to be upgraded"
+msgstr ""
+"O carregador de inicialização (\"boot loader\") pode precisar ser atualizado"
+
+#. Type: error
+#. Description
+#: ../linux-base.templates:8001
+msgid "Kernel packages no longer update a default boot loader."
+msgstr ""
+"Pacotes do kernel já não atualizam o carregador de inicialização padrão."
+
+#. Type: error
+#. Description
+#: ../linux-base.templates:8001 ../templates/temp.image.plain/templates:5001
+msgid ""
+"If the boot loader needs to be updated whenever a new kernel is installed, "
+"the boot loader package should install a script in /etc/kernel/postinst.d. "
+"Alternately, you can specify the command to update the boot loader by "
+"setting the 'postinst_hook' variable in /etc/kernel-img.conf."
+msgstr ""
+"Se o carregador de inicialização precisa ser atualizado sempre que um novo "
+"kernel é instalado, o pacote do carregador de inicialização deveria instalar "
+"um script em /etc/kernel/postinst.d. Alternativamente, você pode especificar "
+"o comando para atualizar o carregador de inicialização definindo a variável "
+"'postinst_hook' em /etc/kernel-img.conf."
+
+#. Type: boolean
+#. Description
+#: ../templates/temp.image.plain/templates:2001
+msgid "Abort installation after depmod error?"
+msgstr "Cancelar instalação após erro do depmod?"
+
+#. Type: boolean
+#. Description
+#: ../templates/temp.image.plain/templates:2001
+msgid ""
+"The 'depmod' command exited with the exit code ${exit_value} (${SIGNAL}"
+"${CORE})."
+msgstr ""
+"O comando 'depmod' terminou com o código de saída ${exit_value} (${SIGNAL}"
+"${CORE})."
+
+#. Type: boolean
+#. Description
+#: ../templates/temp.image.plain/templates:2001
+msgid ""
+"Since this image uses initrd, the ${modules_base}/=V/modules.dep file will "
+"not be deleted, even though it may be invalid."
+msgstr ""
+"Uma vez que esta imagem usa o initrd, o arquivo ${modules_base}/=V/modules."
+"dep não será removido, embora possa ser considerado inválido."
+
+#. Type: boolean
+#. Description
+#: ../templates/temp.image.plain/templates:2001
+msgid ""
+"You should abort the installation and fix the errors in depmod, or "
+"regenerate the initrd image with a known good modules.dep file. If you don't "
+"abort the installation, there is a danger that the system will fail to boot."
+msgstr ""
+"Você deve cancelar a instalação e consertar os erros no depmod, ou regerar a "
+"imagem do initrd com um arquivo modules.dep em bom estado. Se você não "
+"cancelar a instalação, existe um perigo de seu sistema falhar na "
+"inicialização."
+
+#. Type: boolean
+#. Description
+#: ../templates/temp.image.plain/templates:3001
+msgid "Abort kernel removal?"
+msgstr "Cancelar remoção do kernel?"
+
+#. Type: boolean
+#. Description
+#: ../templates/temp.image.plain/templates:3001
+msgid ""
+"You are running a kernel (version ${running}) and attempting to remove the "
+"same version."
+msgstr ""
+"Você está executando um kernel (version ${running}) e tentando remover a "
+"mesma versão."
+
+#. Type: boolean
+#. Description
+#: ../templates/temp.image.plain/templates:3001
+msgid ""
+"This can make the system unbootable as it will remove /boot/vmlinuz-"
+"${running} and all modules under the directory /lib/modules/${running}. This "
+"can only be fixed with a copy of the kernel image and the corresponding "
+"modules."
+msgstr ""
+"Isto pode tornar o sistema não inicializável, pois removerá /boot/vmlinuz-"
+"${running} e todos os módulos sob o diretório /lib/modules/${running}. Isto "
+"só pode ser consertado com uma cópia da imagem do kernel e dos módulos "
+"correspondentes."
+
+#. Type: boolean
+#. Description
+#: ../templates/temp.image.plain/templates:3001
+msgid ""
+"It is highly recommended to abort the kernel removal unless you are prepared "
+"to fix the system after removal."
+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
+#: ../templates/temp.image.plain/templates:4001
+msgid "Required firmware files may be missing"
+msgstr "Arquivos de firmware necessários podem estar faltando"
+
+#. Type: note
+#. Description
+#: ../templates/temp.image.plain/templates: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
+#: ../templates/temp.image.plain/templates: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."
+
+#. Type: error
+#. Description
+#: ../templates/temp.image.plain/templates:5001
+msgid "Boot loader configuration must be updated"
+msgstr "A configuração do carregador de inicialização deve ser atualizada"
+
+#. Type: error
+#. Description
+#: ../templates/temp.image.plain/templates:5001
+msgid ""
+"Kernel packages no longer update a default boot loader. You should remove "
+"'do_bootloader = yes' from /etc/kernel-img.conf."
+msgstr ""
+"Os pacotes do kernel não atualizam mais o carregador de inicialização "
+"padrão. Você deve remover 'do_bootloader = yes' do arquivo /etc/kernel-img."
+"conf."
Modified: dists/trunk/linux-2.6/debian/po/vi.po
==============================================================================
--- dists/trunk/linux-2.6/debian/po/vi.po Wed Dec 22 02:13:49 2010 (r16728)
+++ dists/trunk/linux-2.6/debian/po/vi.po Wed Dec 22 03:46:48 2010 (r16729)
@@ -1,13 +1,13 @@
-# Vietnamese translation for Linux 2.6.
+# Vietnamese Debconf translation for Linux 2.6.
# Copyright © 2010 Free Software Foundation, Inc.
# Clytie Siddall <clytie at riverland.net.au>, 2010.
#
msgid ""
msgstr ""
-"Project-Id-Version: linux-2.6\n"
+"Project-Id-Version: linux-2.6 2.6.32-26\n"
"Report-Msgid-Bugs-To: linux-2.6 at packages.debian.org\n"
-"POT-Creation-Date: 2010-07-16 15:55+0100\n"
-"PO-Revision-Date: 2010-04-26 21:53+0930\n"
+"POT-Creation-Date: 2010-10-21 10:37+0200\n"
+"PO-Revision-Date: 2010-10-27 15:21+1030\n"
"Last-Translator: Clytie Siddall <clytie at riverland.net.au>\n"
"Language-Team: Vietnamese <vi-VN at googlegroups.com>\n"
"Language: vi\n"
@@ -145,13 +145,13 @@
#. Description
#: ../linux-base.templates:8001
msgid "Boot loader may need to be upgraded"
-msgstr ""
+msgstr "Có thể là cần phải nâng cấp bộ nạp khởi động"
#. Type: error
#. Description
#: ../linux-base.templates:8001
msgid "Kernel packages no longer update a default boot loader."
-msgstr ""
+msgstr "Gói hạt nhân không còn nâng cấp lại bộ nạp khởi động mặc định."
#. Type: error
#. Description
@@ -161,7 +161,7 @@
"the boot loader package should install a script in /etc/kernel/postinst.d. "
"Alternately, you can specify the command to update the boot loader by "
"setting the 'postinst_hook' variable in /etc/kernel-img.conf."
-msgstr ""
+msgstr "Nếu bộ nạp khởi động cần phải được cập nhật khi nào cài đặt một hạt nhân mới thì gói bộ nạp khởi động nên cài đặt một văn lệnh vào « /etc/kernel/postinst.d ». Hoặc bạn có thể ghi rõ câu lệnh cập nhật bộ nạp khởi động bằng cách lập biến « postinst_hook » (hàm móc hậu xử lý) trong tập tin cấu hình « /etc/kernel-img.conf »."
#. Type: boolean
#. Description
@@ -275,10 +275,8 @@
#. Type: error
#. Description
#: ../templates/temp.image.plain/templates:5001
-#, fuzzy
-#| msgid "Boot loader configuration check needed"
msgid "Boot loader configuration must be updated"
-msgstr "Yêu cầu kiểm tra cấu hình bộ nạp khởi động"
+msgstr "Cần phải cập nhật cấu hình của bộ nạp khởi động"
#. Type: error
#. Description
@@ -286,4 +284,4 @@
msgid ""
"Kernel packages no longer update a default boot loader. You should remove "
"'do_bootloader = yes' from /etc/kernel-img.conf."
-msgstr ""
+msgstr "Gói hạt nhân không còn cập nhật lại bộ nạp khởi động mặc định. Bạn nên gỡ bỏ chuỗi « do_bootloader = yes » (làm bộ nạp khởi động = có) khỏi tập tin cấu hình « /etc/kernel-img.conf »."
More information about the Kernel-svn-changes
mailing list