From 740f50083fead0d409d590586ea4a8e306e7d6d6 Mon Sep 17 00:00:00 2001 From: Ben Hutchings Date: Tue, 18 May 2010 02:17:18 +0000 Subject: [PATCH] Merge /dists/sid/linux-2.6 (2.6.32-13). svn path=/dists/trunk/linux-2.6/; revision=15735 --- debian/changelog | 85 ++++ debian/config/amd64/defines | 3 + debian/config/armel/config.kirkwood | 1 + debian/config/config | 4 +- debian/config/featureset-xen/defines | 3 + debian/config/hppa/config | 2 +- debian/config/i386/defines | 3 + debian/config/i386/openvz/defines | 2 + debian/config/kernelarch-x86/config-arch-64 | 2 +- debian/config/mips/config.sb1-bcm91250a | 5 - debian/config/powerpc/config | 2 +- debian/config/sparc/config | 2 +- debian/linux-base.postinst | 27 +- debian/linux-base.templates | 58 ++- .../bugfix/all/3c503-Fix-IRQ-probing.patch | 104 +++++ .../all/SCSI-implement-sd_set_capacity.patch | 95 ++++ ...-DVB-budget-Select-correct-frontends.patch | 34 ++ ...estart-partition-scan-after-resizing.patch | 71 +++ ...invalidate_bdev-drain-all-add-caches.patch | 38 ++ .../all/drm-edid-Fix-1024x768@85Hz.patch | 34 ++ ...ta-implement-on-demand-HPA-unlocking.patch | 114 +++++ ...arged-capacity-after-late-HPA-unlock.patch | 36 ++ ...be-unknown-AGP-devices-the-right-way.patch | 89 ++++ ...-Remove-SIS-760-handled-by-amd64-agp.patch | 37 ++ debian/patches/features/arm/guruplug.patch | 187 ++++++++ debian/patches/series/base | 12 + debian/po/cs.po | 360 +++++++++++++++ debian/po/da.po | 371 ++++++++++++++++ debian/po/de.po | 382 ++++++++++++++++ debian/po/es.po | 411 ++++++++++++++++++ debian/po/et.po | 367 ++++++++++++++++ debian/po/fr.po | 390 +++++++++++++++++ debian/po/ja.po | 369 ++++++++++++++++ debian/po/pt.po | 394 +++++++++++++++++ debian/po/ru.po | 372 ++++++++++++++++ debian/po/sv.po | 370 ++++++++++++++++ debian/po/templates.pot | 188 ++++---- debian/po/vi.po | 369 ++++++++++++++++ debian/rules.real | 14 +- debian/templates/temp.image.plain/templates | 19 +- 40 files changed, 5279 insertions(+), 147 deletions(-) create mode 100644 debian/patches/bugfix/all/3c503-Fix-IRQ-probing.patch create mode 100644 debian/patches/bugfix/all/SCSI-implement-sd_set_capacity.patch create mode 100644 debian/patches/bugfix/all/V4L-DVB-budget-Select-correct-frontends.patch create mode 100644 debian/patches/bugfix/all/block-restart-partition-scan-after-resizing.patch create mode 100644 debian/patches/bugfix/all/buffer-make-invalidate_bdev-drain-all-add-caches.patch create mode 100644 debian/patches/bugfix/all/drm-edid-Fix-1024x768@85Hz.patch create mode 100644 debian/patches/bugfix/all/libata-implement-on-demand-HPA-unlocking.patch create mode 100644 debian/patches/bugfix/all/libata-use-enlarged-capacity-after-late-HPA-unlock.patch create mode 100644 debian/patches/bugfix/x86/amd64-agp-Probe-unknown-AGP-devices-the-right-way.patch create mode 100644 debian/patches/bugfix/x86/sis-agp-Remove-SIS-760-handled-by-amd64-agp.patch create mode 100644 debian/patches/features/arm/guruplug.patch create mode 100644 debian/po/cs.po create mode 100644 debian/po/da.po create mode 100644 debian/po/de.po create mode 100644 debian/po/es.po create mode 100644 debian/po/et.po create mode 100644 debian/po/fr.po create mode 100644 debian/po/ja.po create mode 100644 debian/po/pt.po create mode 100644 debian/po/ru.po create mode 100644 debian/po/sv.po create mode 100644 debian/po/vi.po diff --git a/debian/changelog b/debian/changelog index b2ec5a2d2..b243c6d1d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -140,6 +140,91 @@ linux-2.6 (2.6.33-1~experimental.1) experimental; urgency=low -- maximilian attems Thu, 25 Feb 2010 15:21:38 +0100 +linux-2.6 (2.6.32-13) unstable; urgency=low + + [ Frederik Schueler ] + * sparc: Fix use of uid16_t and gid16_t in asm/stat.h + + [ Moritz Muehlenhoff ] + * Enable tomoyo (Closes: #562486) + + [ maximilian attems] + * backport KVM: x86: Extend KVM_SET_VCPU_EVENTS with selective updates. + (closes: #580652) + * KEYS: find_keyring_by_name() can gain access to a freed keyring. + CVE-2010-1437 + * hppa, sparc, powerpc disable BLK_DEV_CMD64X. + * topconfig enable PATA_CMD64X. (closes: #580799) + * x86: Disable CRYPTO_AES_NI_INTEL as it causes boot failures on T410. + * Add stable 2.6.32.13: + - [SCSI] Enable retries for SYNCRONIZE_CACHE commands to fix I/O error. + - [SCSI] Retry commands with UNIT_ATTENTION sense codes to fix ext3/ext4 + I/O errors. + - [SCSI] skip sense logging for some ATA PASS-THROUGH cdbs + (Closes: #578129) + - raid6: fix recovery performance regression. + - raid456: Enable error-correction on singly-degraded RAID6 + (Closes: #581392) + - r8169: fix broken register writes (Closes: #407217, #573007) + - V4L/DVB: budget: Fix crash in case of failure to attach frontend + (Closes: #575207) + * drm/edid: Fix 1024x768@85Hz. + + [ Ben Hutchings ] + * linux-base: Fix typo in disk relabelling code (Closes: #580467) + * linux-base: Don't quote boot device name in elilo.conf + (Closes: #580710; works-around: #581173) + * rtl8192su: Add IDs for several more devices (Closes: #580740) + * Add drm and sfc changes from stable 2.6.33.4 + * Improve workaround for HPAs (Host Protected Areas) overlapping + partitions, thanks to Tejun Heo: + - SCSI/libata: Disable HPA if it overlaps a partition (Closes: #572618) + - buffer: Make invalidate_bdev() drain all percpu LRU add caches + - block: Rescan partition tables after HPA is disabled + - libata: Disable HPA if it is only enabled after suspend + * V4L/DVB: budget: Select correct frontend drivers (Closes: #575223) + * 3c503: Fix IRQ probing (Closes: #566522) + * sis-agp: Remove SIS 760, handled by amd64-agp + * amd64-agp: Probe unknown AGP devices the right way (Closes: #548090) + + [ Aurelien Jarno ] + * mips/swarm: fix boot from IDE based media (Sebastian Andrzej Siewior) + (closes: #466977). + * backport mips/swarm: fix M3 TLB exception handler. + * backport MIPS FPU emulator: allow Cause bits of FCSR to be writeable + by ctc1. (closes: #580602). + * mips/swarm: enable adm* hwmon drivers. + * backport Input: Add support of Synaptics Clickpad device (Closes: #572842) + + [ Bastian Blank ] + * Fix symlinks in several packages. + * Update Xen patch. + * [amd64, i386/{686-bigmem,openvz-686,vserver-686-bigmem,xen-686}] + Build debugging symbols. (closes: #365349) + * Ignore crypto ABI changes. + + [ Martin Michlmayr ] + * Backport GuruPlug support. + + [ Christian Perrier ] + * Update debconf templates: + - English revised by the debian-l10n-english team as part of the Smith + review project (Closes: #578349) + - Vietnamese (Clytie Siddall) (Closes: #579234) + - German (Holger Wansing) (Closes: #579864) + - Russian (Yuri Kozlov) (Closes: #578994) + - Estonian (mihkel) (Closes: #579019) + - Czech (Michal Simunek) (Closes: #579268) + - Swedish (Martin Bagge) (Closes: #579308) + - French (David Prévot) (Closes: #579763) + - Spanish (Omar Campagne) (Closes: #580538) + - Portuguese (Américo Monteiro) (Closes: #577227) + - Japanese (Kenshi Muto) (Closes: #580855) + - Danish (Joe Hansen) (Closes: #580915) + - Czech (Michal Simunek) (Closes: #581399) + + -- maximilian attems Mon, 17 May 2010 15:29:27 +0200 + linux-2.6 (2.6.32-12) unstable; urgency=low * The "Microwave Background" release diff --git a/debian/config/amd64/defines b/debian/config/amd64/defines index 71edc6e1c..b5f208957 100644 --- a/debian/config/amd64/defines +++ b/debian/config/amd64/defines @@ -12,6 +12,9 @@ configs: kernelarch-x86/config suggests: grub | lilo +[image-dbg] +enabled: true + [amd64_description] hardware: 64-bit PCs hardware-long: PCs with AMD64 or Intel 64 processors diff --git a/debian/config/armel/config.kirkwood b/debian/config/armel/config.kirkwood index 5d948acc8..bd01ae28a 100644 --- a/debian/config/armel/config.kirkwood +++ b/debian/config/armel/config.kirkwood @@ -59,6 +59,7 @@ CONFIG_MACH_RD88F6192_NAS=y CONFIG_MACH_RD88F6281=y CONFIG_MACH_SHEEVAPLUG=y CONFIG_MACH_ESATA_SHEEVAPLUG=y +CONFIG_MACH_GURUPLUG=y CONFIG_MACH_TS219=y CONFIG_MACH_TS41X=y CONFIG_MACH_OPENRD=y diff --git a/debian/config/config b/debian/config/config index 329781971..d4f45aaca 100644 --- a/debian/config/config +++ b/debian/config/config @@ -114,7 +114,7 @@ CONFIG_PATA_ARTOP=m CONFIG_PATA_ATP867X=m # CONFIG_PATA_ATIIXP is not set # CONFIG_PATA_CMD640_PCI is not set -# CONFIG_PATA_CMD64X is not set +CONFIG_PATA_CMD64X=m # CONFIG_PATA_CS5520 is not set # CONFIG_PATA_CS5530 is not set # CONFIG_PATA_CYPRESS is not set @@ -4042,7 +4042,7 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 ## ## file: security/tomoyo/Kconfig ## -# CONFIG_SECURITY_TOMOYO is not set +CONFIG_SECURITY_TOMOYO=y ## ## file: sound/Kconfig diff --git a/debian/config/featureset-xen/defines b/debian/config/featureset-xen/defines index 780433b09..c9a5a6466 100644 --- a/debian/config/featureset-xen/defines +++ b/debian/config/featureset-xen/defines @@ -4,5 +4,8 @@ part-long-xen: This kernel also runs on a Xen hypervisor. It supports both privileged (dom0) and unprivileged (domU) operation. part-short-xen: Xen dom0 support +[image-dbg] +enabled: true + [xen] dom0-support: true diff --git a/debian/config/hppa/config b/debian/config/hppa/config index 4583b4f8e..72fe4f7ff 100644 --- a/debian/config/hppa/config +++ b/debian/config/hppa/config @@ -106,7 +106,7 @@ CONFIG_IDE_GENERIC=m # CONFIG_BLK_DEV_AEC62XX is not set # CONFIG_BLK_DEV_ALI15X3 is not set # CONFIG_BLK_DEV_AMD74XX is not set -CONFIG_BLK_DEV_CMD64X=m +# CONFIG_BLK_DEV_CMD64X is not set # CONFIG_BLK_DEV_TRIFLEX is not set # CONFIG_BLK_DEV_CY82C693 is not set # CONFIG_BLK_DEV_CS5520 is not set diff --git a/debian/config/i386/defines b/debian/config/i386/defines index 367df2eaf..2512e4046 100644 --- a/debian/config/i386/defines +++ b/debian/config/i386/defines @@ -42,6 +42,9 @@ configs: kernelarch-x86/config-arch-32 recommends: libc6-i686 +[686-bigmem_image-dbg] +enabled: true + [amd64_description] hardware: 64-bit PCs hardware-long: PCs with AMD64 or Intel 64 processors diff --git a/debian/config/i386/openvz/defines b/debian/config/i386/openvz/defines index 28dd50918..c4635f300 100644 --- a/debian/config/i386/openvz/defines +++ b/debian/config/i386/openvz/defines @@ -6,3 +6,5 @@ flavours: configs: i386/none/config.686-bigmem +[686_image-dbg] +enabled: true diff --git a/debian/config/kernelarch-x86/config-arch-64 b/debian/config/kernelarch-x86/config-arch-64 index d3541bc32..673e3ee47 100644 --- a/debian/config/kernelarch-x86/config-arch-64 +++ b/debian/config/kernelarch-x86/config-arch-64 @@ -41,7 +41,7 @@ CONFIG_XEN_MAX_DOMAIN_MEMORY=32 ## file: crypto/Kconfig ## CONFIG_CRYPTO_AES_X86_64=m -CONFIG_CRYPTO_AES_NI_INTEL=m +# CONFIG_CRYPTO_AES_NI_INTEL is not set CONFIG_CRYPTO_SALSA20_X86_64=m CONFIG_CRYPTO_TWOFISH_X86_64=m diff --git a/debian/config/mips/config.sb1-bcm91250a b/debian/config/mips/config.sb1-bcm91250a index ae6280d06..f3289e4c2 100644 --- a/debian/config/mips/config.sb1-bcm91250a +++ b/debian/config/mips/config.sb1-bcm91250a @@ -200,11 +200,6 @@ CONFIG_USB_HID=m ## CONFIG_HWMON=y # CONFIG_HWMON_DEBUG_CHIP is not set -# CONFIG_SENSORS_ADM1021 is not set -# CONFIG_SENSORS_ADM1025 is not set -# CONFIG_SENSORS_ADM1026 is not set -# CONFIG_SENSORS_ADM1031 is not set -# CONFIG_SENSORS_ADM9240 is not set # CONFIG_SENSORS_ASB100 is not set # CONFIG_SENSORS_ATXP1 is not set # CONFIG_SENSORS_DS1621 is not set diff --git a/debian/config/powerpc/config b/debian/config/powerpc/config index 59afedfcb..50c295c45 100644 --- a/debian/config/powerpc/config +++ b/debian/config/powerpc/config @@ -278,7 +278,7 @@ CONFIG_BLK_DEV_GENERIC=m CONFIG_BLK_DEV_AEC62XX=m # CONFIG_BLK_DEV_ALI15X3 is not set # CONFIG_BLK_DEV_AMD74XX is not set -CONFIG_BLK_DEV_CMD64X=m +# CONFIG_BLK_DEV_CMD64X is not set # CONFIG_BLK_DEV_TRIFLEX is not set # CONFIG_BLK_DEV_CY82C693 is not set # CONFIG_BLK_DEV_CS5520 is not set diff --git a/debian/config/sparc/config b/debian/config/sparc/config index 3bedd07cf..451971fb1 100644 --- a/debian/config/sparc/config +++ b/debian/config/sparc/config @@ -150,7 +150,7 @@ CONFIG_BLK_DEV_GENERIC=m # CONFIG_BLK_DEV_AEC62XX is not set CONFIG_BLK_DEV_ALI15X3=m # CONFIG_BLK_DEV_AMD74XX is not set -CONFIG_BLK_DEV_CMD64X=m +# CONFIG_BLK_DEV_CMD64X is not set # CONFIG_BLK_DEV_TRIFLEX is not set CONFIG_BLK_DEV_CY82C693=m CONFIG_BLK_DEV_CS5520=m diff --git a/debian/linux-base.postinst b/debian/linux-base.postinst index cd7d554d2..e932f6b8c 100644 --- a/debian/linux-base.postinst +++ b/debian/linux-base.postinst @@ -499,8 +499,8 @@ sub lilo_list { return @bdevs; } -sub lilo_update { - my ($old, $new, $map) = @_; +sub _lilo_update { + my ($old, $new, $map, $replace) = @_; my @tokens = lilo_tokenize($old); my $i = 0; my $in_generic = 1; # global or image=/vmlinuz or image=/vmlinuz.old @@ -533,7 +533,8 @@ sub lilo_update { } if (defined($new_value)) { $new_value =~ s/\\/\\\\/g; - $text = "\n# $name = $value\n$name = \"$new_value\"\n"; + $text = &{$replace}($name, $value, $new_value) || + "\n# $name = $value\n$name = \"$new_value\"\n"; } else { $text .= $tokens[$i + 1][0] . $tokens[$i + 2][0]; } @@ -546,6 +547,11 @@ sub lilo_update { } } +sub lilo_update { + my ($old, $new, $map) = @_; + _lilo_update($old, $new, $map, sub { return undef }); +} + sub lilo_post { _system('lilo'); } @@ -558,6 +564,17 @@ sub silo_post { ### ELILO +sub elilo_update { + my ($old, $new, $map) = @_; + # Work around bug #581173 - boot value must have no space before + # and no quotes around it. + sub replace { + my ($name, $value, $new_value) = @_; + return ($name eq 'boot') ? "# boot=$value\nboot=$new_value\n" : undef; + } + _lilo_update($old, $new, $map, \&replace); +} + sub elilo_post { _system('elilo'); } @@ -970,7 +987,7 @@ my @config_files = ({packages => 'mount', {packages => 'elilo', path => '/etc/elilo.conf', list => \&lilo_list, - update => \&lilo_update, + update => \&elilo_update, post_update => \&elilo_post, is_boot_loader => 1}, {packages => 'extlinux', @@ -1313,7 +1330,7 @@ sub assign_new_ids { next; } - my $label_len = $filesystem_types{$type}->{len}; + my $label_len = $filesystem_types{$type}->{label_len}; my $label; use bytes; # string lengths are in bytes diff --git a/debian/linux-base.templates b/debian/linux-base.templates index fb9fe845e..7d46c9808 100644 --- a/debian/linux-base.templates +++ b/debian/linux-base.templates @@ -1,20 +1,33 @@ +# These templates have been reviewed by the debian-l10n-english +# team +# +# If modifications/additions/rewording are needed, please ask +# debian-l10n-english@lists.debian.org for advice. +# +# Even minor modifications require translation updates and such +# changes should be coordinated with translators and reviewers. + Template: linux-base/disk-id-convert-auto Type: boolean Default: true -_Description: Update disk device ids in system configuration? - 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. +_Description: Update disk device IDs in system configuration? + 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. . - You are recommended to identify disk devices in configuration files + 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. Your system - configuration can be updated automatically in most cases. + which will work with both old and new kernel versions. + . + 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. Template: linux-base/disk-id-convert-plan Type: boolean Default: true -_Description: Apply these configuration changes to disk device ids? +#flag:translate!:3,5,7 +_Description: Apply configuration changes to disk device IDs? These devices will be assigned UUIDs or labels: . ${relabel} @@ -23,38 +36,41 @@ _Description: Apply these configuration changes to disk device ids? . ${files} . - The device ids will be changed as follows: + The device IDs will be changed as follows: . ${id_map} Template: linux-base/disk-id-convert-plan-no-relabel Type: boolean Default: true -_Description: Apply these configuration changes to disk device ids? +#flag:translate!:3,5 +_Description: Apply configuration changes to disk device IDs? These configuration files will be updated: . ${files} . - The device ids will be changed as follows: + The device IDs will be changed as follows: . ${id_map} Template: linux-base/disk-id-manual -Type: note -_Description: Please check these configuration files before rebooting - These configuration files still use some device names that may +Type: error +#flag:translate!:3 +_Description: Configuration files still contain deprecated device names + The following configuration files still use some device names that may change when using the new kernel: . ${unconverted} Template: linux-base/disk-id-manual-boot-loader -Type: note -_Description: Check the boot loader configuration before rebooting - The boot loader configuration for this system was not recognised. These +Type: error +_Description: Boot loader configuration check needed + The boot loader configuration for this system was not recognized. These settings in the configuration may need to be updated: . - * The root device id passed as a kernel parameter - * The boot device id used to install and update the boot loader + * The root device ID passed as a kernel parameter; + * The boot device ID used to install and update the boot loader. . - We recommend that you identify these devices by UUID or label, except that - on MIPS systems this is not supported for the root device. + You should generally identify these devices by UUID or + label. However, on MIPS systems the root device must be identified by + name. diff --git a/debian/patches/bugfix/all/3c503-Fix-IRQ-probing.patch b/debian/patches/bugfix/all/3c503-Fix-IRQ-probing.patch new file mode 100644 index 000000000..69aee2d2e --- /dev/null +++ b/debian/patches/bugfix/all/3c503-Fix-IRQ-probing.patch @@ -0,0 +1,104 @@ +From b0cf4dfb7cd21556efd9a6a67edcba0840b4d98d Mon Sep 17 00:00:00 2001 +From: Ben Hutchings +Date: Wed, 7 Apr 2010 20:55:47 -0700 +Subject: [PATCH] 3c503: Fix IRQ probing + +The driver attempts to select an IRQ for the NIC automatically by +testing which of the supported IRQs are available and then probing +each available IRQ with probe_irq_{on,off}(). There are obvious race +conditions here, besides which: +1. The test for availability is done by passing a NULL handler, which + now always returns -EINVAL, thus the device cannot be opened: + +2. probe_irq_off() will report only the first ISA IRQ handled, + potentially leading to a false negative. + +There was another bug that meant it ignored all error codes from +request_irq() except -EBUSY, so it would 'succeed' despite this +(possibly causing conflicts with other ISA devices). This was fixed +by ab08999d6029bb2c79c16be5405d63d2bedbdfea 'WARNING: some +request_irq() failures ignored in el2_open()', which exposed bug 1. + +This patch: +1. Replaces the use of probe_irq_{on,off}() with a real interrupt handler +2. Adds a delay before checking the interrupt-seen flag +3. Disables interrupts on all failure paths +4. Distinguishes error codes from the second request_irq() call, + consistently with the first + +Compile-tested only. + +Signed-off-by: Ben Hutchings +Signed-off-by: David S. Miller +--- + drivers/net/3c503.c | 42 ++++++++++++++++++++++++++++++------------ + 1 files changed, 30 insertions(+), 12 deletions(-) + +diff --git a/drivers/net/3c503.c b/drivers/net/3c503.c +index 66e0323..b74a0ea 100644 +--- a/drivers/net/3c503.c ++++ b/drivers/net/3c503.c +@@ -380,6 +380,12 @@ out: + return retval; + } + ++static irqreturn_t el2_probe_interrupt(int irq, void *seen) ++{ ++ *(bool *)seen = true; ++ return IRQ_HANDLED; ++} ++ + static int + el2_open(struct net_device *dev) + { +@@ -391,23 +397,35 @@ el2_open(struct net_device *dev) + + outb(EGACFR_NORM, E33G_GACFR); /* Enable RAM and interrupts. */ + do { +- retval = request_irq(*irqp, NULL, 0, "bogus", dev); +- if (retval >= 0) { ++ bool seen; ++ ++ retval = request_irq(*irqp, el2_probe_interrupt, 0, ++ dev->name, &seen); ++ if (retval == -EBUSY) ++ continue; ++ if (retval < 0) ++ goto err_disable; ++ + /* Twinkle the interrupt, and check if it's seen. */ +- unsigned long cookie = probe_irq_on(); ++ seen = false; ++ smp_wmb(); + outb_p(0x04 << ((*irqp == 9) ? 2 : *irqp), E33G_IDCFR); + outb_p(0x00, E33G_IDCFR); +- if (*irqp == probe_irq_off(cookie) && /* It's a good IRQ line! */ +- ((retval = request_irq(dev->irq = *irqp, +- eip_interrupt, 0, +- dev->name, dev)) == 0)) +- break; +- } else { +- if (retval != -EBUSY) +- return retval; +- } ++ msleep(1); ++ free_irq(*irqp, el2_probe_interrupt); ++ if (!seen) ++ continue; ++ ++ retval = request_irq(dev->irq = *irqp, eip_interrupt, 0, ++ dev->name, dev); ++ if (retval == -EBUSY) ++ continue; ++ if (retval < 0) ++ goto err_disable; + } while (*++irqp); ++ + if (*irqp == 0) { ++ err_disable: + outb(EGACFR_IRQOFF, E33G_GACFR); /* disable interrupts. */ + return -EAGAIN; + } +-- +1.7.1 + diff --git a/debian/patches/bugfix/all/SCSI-implement-sd_set_capacity.patch b/debian/patches/bugfix/all/SCSI-implement-sd_set_capacity.patch new file mode 100644 index 000000000..737e06edf --- /dev/null +++ b/debian/patches/bugfix/all/SCSI-implement-sd_set_capacity.patch @@ -0,0 +1,95 @@ +From: Tejun Heo +To: jeff@garzik.org, linux-ide@vger.kernel.org, jens.axboe@oracle.com, linux-scsi@vger.kernel.org, James.Bottomley@suse.de, linux-kernel@vger.kernel.org +Cc: ben@decadent.org.uk, Tejun Heo +Date: Thu, 13 May 2010 17:56:44 +0200 +Subject: [PATCH 2/4] SCSI: implement sd_set_capacity() + +Implement sd_set_capacity() method which calls into +hostt->set_capacity() if implemented. This will be invoked by block +layer if partitions extend beyond the end of the device and can be +used to implement, for example, on-demand ATA host protected area +unlocking. + +Signed-off-by: Tejun Heo +Cc: Ben Hutchings +--- + drivers/scsi/sd.c | 26 ++++++++++++++++++++++++++ + include/scsi/scsi_host.h | 11 +++++++++++ + 2 files changed, 37 insertions(+), 0 deletions(-) + +diff --git a/drivers/scsi/sd.c b/drivers/scsi/sd.c +index 8b827f3..59d5e8f 100644 +--- a/drivers/scsi/sd.c ++++ b/drivers/scsi/sd.c +@@ -97,6 +97,8 @@ MODULE_ALIAS_SCSI_DEVICE(TYPE_RBC); + #endif + + static int sd_revalidate_disk(struct gendisk *); ++static unsigned long long sd_set_capacity(struct gendisk *disk, ++ unsigned long long new_capacity); + static int sd_probe(struct device *); + static int sd_remove(struct device *); + static void sd_shutdown(struct device *); +@@ -1100,6 +1102,7 @@ static const struct block_device_operations sd_fops = { + #endif + .media_changed = sd_media_changed, + .revalidate_disk = sd_revalidate_disk, ++ .set_capacity = sd_set_capacity, + }; + + static unsigned int sd_completed_bytes(struct scsi_cmnd *scmd) +@@ -2101,6 +2104,29 @@ static int sd_revalidate_disk(struct gendisk *disk) + } + + /** ++ * sd_set_capacity - set disk capacity ++ * @disk: struct gendisk to set capacity for ++ * @new_capacity: new target capacity ++ * ++ * Block layer calls this function if it detects that partitions ++ * on @disk reach beyond the end of the device. If the SCSI host ++ * implements set_capacity method, it's invoked to give it a ++ * chance to adjust the device capacity. ++ * ++ * CONTEXT: ++ * Defined by block layer. Might sleep. ++ */ ++static unsigned long long sd_set_capacity(struct gendisk *disk, ++ unsigned long long new_capacity) ++{ ++ struct scsi_device *sdev = scsi_disk(disk)->device; ++ ++ if (sdev->host->hostt->set_capacity) ++ return sdev->host->hostt->set_capacity(sdev, new_capacity); ++ return 0; ++} ++ ++/** + * sd_format_disk_name - format disk name + * @prefix: name prefix - ie. "sd" for SCSI disks + * @index: index of the disk to format name for +diff --git a/include/scsi/scsi_host.h b/include/scsi/scsi_host.h +index c50a97f..31dba89 100644 +--- a/include/scsi/scsi_host.h ++++ b/include/scsi/scsi_host.h +@@ -327,6 +327,17 @@ struct scsi_host_template { + sector_t, int []); + + /* ++ * This function is called when one or more partitions on the ++ * device reach beyond the end of the device. This function ++ * should return the new capacity if disk was successfully ++ * enlarged. Return values smaller than the current capacity ++ * are ignored. ++ * ++ * Status: OPTIONAL ++ */ ++ sector_t (*set_capacity)(struct scsi_device *, sector_t); ++ ++ /* + * Can be used to export driver statistics and other infos to the + * world outside the kernel ie. userspace and it also provides an + * interface to feed the driver with information. +-- +1.6.4.2 + diff --git a/debian/patches/bugfix/all/V4L-DVB-budget-Select-correct-frontends.patch b/debian/patches/bugfix/all/V4L-DVB-budget-Select-correct-frontends.patch new file mode 100644 index 000000000..167d7c64a --- /dev/null +++ b/debian/patches/bugfix/all/V4L-DVB-budget-Select-correct-frontends.patch @@ -0,0 +1,34 @@ +From 67b0f5b1177a0c348d1293ab78de4d1d6a736048 Mon Sep 17 00:00:00 2001 +From: Ben Hutchings +Date: Sat, 15 May 2010 16:45:29 +0100 +Subject: [PATCH] V4L/DVB: budget: Select correct frontends + +Update the Kconfig selections to match the code. +--- + drivers/media/dvb/ttpci/Kconfig | 5 +++-- + 1 files changed, 3 insertions(+), 2 deletions(-) + +diff --git a/drivers/media/dvb/ttpci/Kconfig b/drivers/media/dvb/ttpci/Kconfig +index d8d4214..32a7ec6 100644 +--- a/drivers/media/dvb/ttpci/Kconfig ++++ b/drivers/media/dvb/ttpci/Kconfig +@@ -68,13 +68,14 @@ config DVB_BUDGET + select DVB_VES1820 if !DVB_FE_CUSTOMISE + select DVB_L64781 if !DVB_FE_CUSTOMISE + select DVB_TDA8083 if !DVB_FE_CUSTOMISE +- select DVB_TDA10021 if !DVB_FE_CUSTOMISE +- select DVB_TDA10023 if !DVB_FE_CUSTOMISE + select DVB_S5H1420 if !DVB_FE_CUSTOMISE + select DVB_TDA10086 if !DVB_FE_CUSTOMISE + select DVB_TDA826X if !DVB_FE_CUSTOMISE + select DVB_LNBP21 if !DVB_FE_CUSTOMISE + select DVB_TDA1004X if !DVB_FE_CUSTOMISE ++ select DVB_ISL6423 if !DVB_FE_CUSTOMISE ++ select DVB_STV090x if !DVB_FE_CUSTOMISE ++ select DVB_STV6110x if !DVB_FE_CUSTOMISE + help + Support for simple SAA7146 based DVB cards (so called Budget- + or Nova-PCI cards) without onboard MPEG2 decoder, and without +-- +1.7.1 + diff --git a/debian/patches/bugfix/all/block-restart-partition-scan-after-resizing.patch b/debian/patches/bugfix/all/block-restart-partition-scan-after-resizing.patch new file mode 100644 index 000000000..23f95a7f9 --- /dev/null +++ b/debian/patches/bugfix/all/block-restart-partition-scan-after-resizing.patch @@ -0,0 +1,71 @@ +From: Tejun Heo +To: jeff@garzik.org, linux-ide@vger.kernel.org, jens.axboe@oracle.com, linux-scsi@vger.kernel.org, James.Bottomley@suse.de, linux-kernel@vger.kernel.org, ben@decadent.org.uk, davem@davemloft.net, bzolnier@gmail.com +Cc: Tejun Heo +Date: Sat, 15 May 2010 20:09:28 +0200 +Subject: [PATCH 2/8] block: restart partition scan after resizing a device + +Device resize via ->set_capacity() can reveal new partitions (e.g. in +chained partition table formats such as dos extended parts). Restart +partition scan from the beginning after resizing a device. This +change also makes libata always revalidate the disk after resize which +makes lower layer native capacity unlocking implementation simpler and +more robust as resize can be handled in the usual path. + +Signed-off-by: Tejun Heo +Reported-by: Ben Hutchings +--- + fs/partitions/check.c | 16 ++++++---------- + 1 files changed, 6 insertions(+), 10 deletions(-) + +diff --git a/fs/partitions/check.c b/fs/partitions/check.c +index e238ab2..8f01df3 100644 +--- a/fs/partitions/check.c ++++ b/fs/partitions/check.c +@@ -544,7 +544,7 @@ int rescan_partitions(struct gendisk *disk, struct block_device *bdev) + struct hd_struct *part; + struct parsed_partitions *state; + int p, highest, res; +- ++rescan: + if (bdev->bd_part_count) + return -EBUSY; + res = invalidate_partition(disk, 0); +@@ -581,7 +581,7 @@ int rescan_partitions(struct gendisk *disk, struct block_device *bdev) + /* add partitions */ + for (p = 1; p < state->limit; p++) { + sector_t size, from; +-try_scan: ++ + size = state->parts[p].size; + if (!size) + continue; +@@ -596,7 +596,6 @@ try_scan: + + if (from + size > get_capacity(disk)) { + const struct block_device_operations *bdops = disk->fops; +- unsigned long long capacity; + + printk(KERN_WARNING + "%s: p%d size %llu exceeds device capacity, ", +@@ -605,14 +604,11 @@ try_scan: + if (bdops->set_capacity && + (disk->flags & GENHD_FL_NATIVE_CAPACITY) == 0) { + printk(KERN_CONT "enabling native capacity\n"); +- capacity = bdops->set_capacity(disk, ~0ULL); ++ bdops->set_capacity(disk, ~0ULL); + disk->flags |= GENHD_FL_NATIVE_CAPACITY; +- if (capacity > get_capacity(disk)) { +- set_capacity(disk, capacity); +- check_disk_size_change(disk, bdev); +- bdev->bd_invalidated = 0; +- } +- goto try_scan; ++ /* free state and restart */ ++ kfree(state); ++ goto rescan; + } else { + /* + * we can not ignore partitions of broken tables +-- +1.6.4.2 + diff --git a/debian/patches/bugfix/all/buffer-make-invalidate_bdev-drain-all-add-caches.patch b/debian/patches/bugfix/all/buffer-make-invalidate_bdev-drain-all-add-caches.patch new file mode 100644 index 000000000..9e5759e29 --- /dev/null +++ b/debian/patches/bugfix/all/buffer-make-invalidate_bdev-drain-all-add-caches.patch @@ -0,0 +1,38 @@ +From: Tejun Heo +To: jeff@garzik.org, linux-ide@vger.kernel.org, jens.axboe@oracle.com, linux-scsi@vger.kernel.org, James.Bottomley@suse.de, linux-kernel@vger.kernel.org, ben@decadent.org.uk, davem@davemloft.net, bzolnier@gmail.com +Cc: Tejun Heo +Date: Sat, 15 May 2010 20:09:27 +0200 +Subject: [PATCH 1/8] buffer: make invalidate_bdev() drain all percpu LRU + add caches + +invalidate_bdev() should release all page cache pages which are clean +and not being used; however, if some pages are still in the percpu LRU +add caches on other cpus, those pages are considered in used and don't +get released. Fix it by calling lru_add_drain_all() before trying to +invalidate pages. + +This problem was discovered while testing block automatic native +capacity unlocking. Null pages which were read before automatic +unlocking didn't get released by invalidate_bdev() and ended up +interfering with partition scan after unlocking. + +Signed-off-by: Tejun Heo +--- + fs/buffer.c | 1 + + 1 files changed, 1 insertions(+), 0 deletions(-) + +diff --git a/fs/buffer.c b/fs/buffer.c +index c9c266d..08e422d 100644 +--- a/fs/buffer.c ++++ b/fs/buffer.c +@@ -275,6 +275,7 @@ void invalidate_bdev(struct block_device *bdev) + return; + + invalidate_bh_lrus(); ++ lru_add_drain_all(); /* make sure all lru add caches are flushed */ + invalidate_mapping_pages(mapping, 0, -1); + } + EXPORT_SYMBOL(invalidate_bdev); +-- +1.6.4.2 + diff --git a/debian/patches/bugfix/all/drm-edid-Fix-1024x768@85Hz.patch b/debian/patches/bugfix/all/drm-edid-Fix-1024x768@85Hz.patch new file mode 100644 index 000000000..2bd020e57 --- /dev/null +++ b/debian/patches/bugfix/all/drm-edid-Fix-1024x768@85Hz.patch @@ -0,0 +1,34 @@ +From: Adam Jackson +To: dri-devel@lists.freedesktop.org +Subject: [PATCH] drm/edid: Fix 1024x768@85Hz +Date: Thu, 13 May 2010 14:55:28 -0400 +Message-Id: <1273776928-16924-1-git-send-email-ajax@redhat.com> + +Having hsync both start and end on pixel 1072 ain't gonna work very +well. Matches the X server's list. + +Signed-off-by: Adam Jackson +--- + drivers/gpu/drm/drm_edid.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/drivers/gpu/drm/drm_edid.c b/drivers/gpu/drm/drm_edid.c +index 18f41d7..10348d3 100644 +--- a/drivers/gpu/drm/drm_edid.c ++++ b/drivers/gpu/drm/drm_edid.c +@@ -335,7 +335,7 @@ static struct drm_display_mode drm_dmt_modes[] = { + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, + /* 1024x768@85Hz */ + { DRM_MODE("1024x768", DRM_MODE_TYPE_DRIVER, 94500, 1024, 1072, +- 1072, 1376, 0, 768, 769, 772, 808, 0, ++ 1168, 1376, 0, 768, 769, 772, 808, 0, + DRM_MODE_FLAG_PHSYNC | DRM_MODE_FLAG_PVSYNC) }, + /* 1152x864@75Hz */ + { DRM_MODE("1152x864", DRM_MODE_TYPE_DRIVER, 108000, 1152, 1216, +-- +1.7.0.1 + +_______________________________________________ +dri-devel mailing list +dri-devel@lists.freedesktop.org +http://lists.freedesktop.org/mailman/listinfo/dri-devel diff --git a/debian/patches/bugfix/all/libata-implement-on-demand-HPA-unlocking.patch b/debian/patches/bugfix/all/libata-implement-on-demand-HPA-unlocking.patch new file mode 100644 index 000000000..171de789d --- /dev/null +++ b/debian/patches/bugfix/all/libata-implement-on-demand-HPA-unlocking.patch @@ -0,0 +1,114 @@ +From: Tejun Heo +To: jeff@garzik.org, linux-ide@vger.kernel.org, jens.axboe@oracle.com, linux-scsi@vger.kernel.org, James.Bottomley@suse.de, linux-kernel@vger.kernel.org +Cc: ben@decadent.org.uk, Tejun Heo +Date: Thu, 13 May 2010 17:56:46 +0200 +Subject: [PATCH 4/4] libata: implement on-demand HPA unlocking + +Implement ata_scsi_set_capacity() which will be called through SCSI +layer when block layer notices that partitions on a device extend +beyond the end of the device. ata_scsi_set_capacity() requests EH to +unlock HPA, waits for completion and returns the current device +capacity. + +This allows libata to unlock HPA on demand instead of having to decide +whether to unlock upfront. Unlocking on demand is safer than +unlocking by upfront because some BIOSes write private data to the +area beyond HPA limit. This was suggested by Ben Hutchings. + +Signed-off-by: Tejun Heo +Suggested-by: Ben Hutchings +--- + drivers/ata/libata-core.c | 1 + + drivers/ata/libata-scsi.c | 42 ++++++++++++++++++++++++++++++++++++++++++ + include/linux/libata.h | 3 +++ + 3 files changed, 46 insertions(+), 0 deletions(-) + +diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c +index 9d6e92d..56badb4 100644 +--- a/drivers/ata/libata-core.c ++++ b/drivers/ata/libata-core.c +@@ -6797,6 +6797,7 @@ EXPORT_SYMBOL_GPL(ata_dummy_port_info); + EXPORT_SYMBOL_GPL(ata_link_next); + EXPORT_SYMBOL_GPL(ata_dev_next); + EXPORT_SYMBOL_GPL(ata_std_bios_param); ++EXPORT_SYMBOL_GPL(ata_scsi_set_capacity); + EXPORT_SYMBOL_GPL(ata_host_init); + EXPORT_SYMBOL_GPL(ata_host_alloc); + EXPORT_SYMBOL_GPL(ata_host_alloc_pinfo); +diff --git a/drivers/ata/libata-scsi.c b/drivers/ata/libata-scsi.c +index 0088cde..2523943 100644 +--- a/drivers/ata/libata-scsi.c ++++ b/drivers/ata/libata-scsi.c +@@ -415,6 +415,48 @@ int ata_std_bios_param(struct scsi_device *sdev, struct block_device *bdev, + } + + /** ++ * ata_scsi_set_capacity - adjust device capacity ++ * @sdev: SCSI device to adjust device capacity for ++ * @new_capacity: new target capacity ++ * ++ * This function is called if a partition on @sdev extends beyond ++ * the end of the device. It requests EH to unlock HPA and ++ * returns the possibly adjusted capacity. ++ * ++ * LOCKING: ++ * Defined by the SCSI layer. Might sleep. ++ * ++ * RETURNS: ++ * New capacity if adjusted successfully. 0 if device is not ++ * found. ++ */ ++sector_t ata_scsi_set_capacity(struct scsi_device *sdev, sector_t new_capacity) ++{ ++ struct ata_port *ap = ata_shost_to_port(sdev->host); ++ sector_t capacity = 0; ++ struct ata_device *dev; ++ unsigned long flags; ++ ++ spin_lock_irqsave(ap->lock, flags); ++ ++ dev = ata_scsi_find_dev(ap, sdev); ++ if (dev && dev->n_sectors < new_capacity && ++ dev->n_sectors < dev->n_native_sectors) { ++ struct ata_eh_info *ehi = &dev->link->eh_info; ++ ++ dev->flags |= ATA_DFLAG_UNLOCK_HPA; ++ ehi->action |= ATA_EH_RESET; ++ ata_port_schedule_eh(ap); ++ spin_unlock_irqrestore(ap->lock, flags); ++ ata_port_wait_eh(ap); ++ capacity = dev->n_sectors; ++ } else ++ spin_unlock_irqrestore(ap->lock, flags); ++ ++ return capacity; ++} ++ ++/** + * ata_get_identity - Handler for HDIO_GET_IDENTITY ioctl + * @ap: target port + * @sdev: SCSI device to get identify data for +diff --git a/include/linux/libata.h b/include/linux/libata.h +index 242eb26..1082956 100644 +--- a/include/linux/libata.h ++++ b/include/linux/libata.h +@@ -1027,6 +1027,8 @@ extern void ata_scsi_simulate(struct ata_device *dev, struct scsi_cmnd *cmd, + extern int ata_std_bios_param(struct scsi_device *sdev, + struct block_device *bdev, + sector_t capacity, int geom[]); ++extern sector_t ata_scsi_set_capacity(struct scsi_device *sdev, ++ sector_t new_capacity); + extern int ata_scsi_slave_config(struct scsi_device *sdev); + extern void ata_scsi_slave_destroy(struct scsi_device *sdev); + extern int ata_scsi_change_queue_depth(struct scsi_device *sdev, +@@ -1181,6 +1183,7 @@ extern struct device_attribute *ata_common_sdev_attrs[]; + .slave_configure = ata_scsi_slave_config, \ + .slave_destroy = ata_scsi_slave_destroy, \ + .bios_param = ata_std_bios_param, \ ++ .set_capacity = ata_scsi_set_capacity, \ + .sdev_attrs = ata_common_sdev_attrs + + #define ATA_NCQ_SHT(drv_name) \ +-- +1.6.4.2 + diff --git a/debian/patches/bugfix/all/libata-use-enlarged-capacity-after-late-HPA-unlock.patch b/debian/patches/bugfix/all/libata-use-enlarged-capacity-after-late-HPA-unlock.patch new file mode 100644 index 000000000..324e3b458 --- /dev/null +++ b/debian/patches/bugfix/all/libata-use-enlarged-capacity-after-late-HPA-unlock.patch @@ -0,0 +1,36 @@ +From: Tejun Heo +To: jeff@garzik.org, linux-ide@vger.kernel.org, jens.axboe@oracle.com, linux-scsi@vger.kernel.org, James.Bottomley@suse.de, linux-kernel@vger.kernel.org +Cc: ben@decadent.org.uk, Tejun Heo +Date: Thu, 13 May 2010 17:56:45 +0200 +Subject: [PATCH 3/4] libata: use the enlarged capacity after late HPA unlock + +After late HPA unlock, libata kept using the original capacity +ignoring the new larger native capacity. Enlarging device on the fly +doesn't cause any harm. Use the larger native capacity instead. This +will enable on-demand HPA unlocking. + +Signed-off-by: Tejun Heo +Cc: Ben Hutchings +--- + drivers/ata/libata-core.c | 5 ++--- + 1 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c +index 86f405b..9d6e92d 100644 +--- a/drivers/ata/libata-core.c ++++ b/drivers/ata/libata-core.c +@@ -4212,9 +4212,8 @@ int ata_dev_revalidate(struct ata_device *dev, unsigned int new_class, + dev->n_sectors > n_sectors && dev->n_sectors == n_native_sectors) { + ata_dev_printk(dev, KERN_WARNING, + "new n_sectors matches native, probably " +- "late HPA unlock, continuing\n"); +- /* keep using the old n_sectors */ +- dev->n_sectors = n_sectors; ++ "late HPA unlock, n_sectors updated\n"); ++ /* use the larger n_sectors */ + return 0; + } + +-- +1.6.4.2 + diff --git a/debian/patches/bugfix/x86/amd64-agp-Probe-unknown-AGP-devices-the-right-way.patch b/debian/patches/bugfix/x86/amd64-agp-Probe-unknown-AGP-devices-the-right-way.patch new file mode 100644 index 000000000..eaf6e2cec --- /dev/null +++ b/debian/patches/bugfix/x86/amd64-agp-Probe-unknown-AGP-devices-the-right-way.patch @@ -0,0 +1,89 @@ +Subject: [PATCH 2/2] amd64-agp: Probe unknown AGP devices the right way +From: Ben Hutchings +To: David Airlie +Cc: FUJITA Tomonori , Greg Kroah-Hartman , LKML +Date: Wed, 24 Mar 2010 03:36:32 +0000 + +The current initialisation code probes 'unsupported' AGP devices +simply by calling its own probe function. It does not lock these +devices or even check whether another driver is already bound to +them. + +We must use the device core to manage this. So if the specific +device id table didn't match anything and agp_try_unsupported=1, +switch the device id table and call driver_attach() again. + +Signed-off-by: Ben Hutchings +--- + drivers/char/agp/amd64-agp.c | 27 +++++++++++++++------------ + 1 files changed, 15 insertions(+), 12 deletions(-) + +diff --git a/drivers/char/agp/amd64-agp.c b/drivers/char/agp/amd64-agp.c +index fd50ead..93f56d6 100644 +--- a/drivers/char/agp/amd64-agp.c ++++ b/drivers/char/agp/amd64-agp.c +@@ -499,6 +499,10 @@ static int __devinit agp_amd64_probe(struct pci_dev *pdev, + u8 cap_ptr; + int err; + ++ /* The Highlander principle */ ++ if (agp_bridges_found) ++ return -ENODEV; ++ + cap_ptr = pci_find_capability(pdev, PCI_CAP_ID_AGP); + if (!cap_ptr) + return -ENODEV; +@@ -562,6 +566,8 @@ static void __devexit agp_amd64_remove(struct pci_dev *pdev) + amd64_aperture_sizes[bridge->aperture_size_idx].size); + agp_remove_bridge(bridge); + agp_put_bridge(bridge); ++ ++ agp_bridges_found--; + } + + #ifdef CONFIG_PM +@@ -709,6 +715,11 @@ static struct pci_device_id agp_amd64_pci_table[] = { + + MODULE_DEVICE_TABLE(pci, agp_amd64_pci_table); + ++static DEFINE_PCI_DEVICE_TABLE(agp_amd64_pci_promisc_table) = { ++ { PCI_DEVICE_CLASS(0, 0) }, ++ { } ++}; ++ + static struct pci_driver agp_amd64_pci_driver = { + .name = "agpgart-amd64", + .id_table = agp_amd64_pci_table, +@@ -734,7 +745,6 @@ int __init agp_amd64_init(void) + return err; + + if (agp_bridges_found == 0) { +- struct pci_dev *dev; + if (!agp_try_unsupported && !agp_try_unsupported_boot) { + printk(KERN_INFO PFX "No supported AGP bridge found.\n"); + #ifdef MODULE +@@ -750,17 +760,10 @@ int __init agp_amd64_init(void) + return -ENODEV; + + /* Look for any AGP bridge */ +- dev = NULL; +- err = -ENODEV; +- for_each_pci_dev(dev) { +- if (!pci_find_capability(dev, PCI_CAP_ID_AGP)) +- continue; +- /* Only one bridge supported right now */ +- if (agp_amd64_probe(dev, NULL) == 0) { +- err = 0; +- break; +- } +- } ++ agp_amd64_pci_driver.id_table = agp_amd64_pci_promisc_table; ++ err = driver_attach(&agp_amd64_pci_driver.driver); ++ if (err == 0 && agp_bridges_found == 0) ++ err = -ENODEV; + } + return err; + } +-- +1.7.0 + diff --git a/debian/patches/bugfix/x86/sis-agp-Remove-SIS-760-handled-by-amd64-agp.patch b/debian/patches/bugfix/x86/sis-agp-Remove-SIS-760-handled-by-amd64-agp.patch new file mode 100644 index 000000000..1270254ba --- /dev/null +++ b/debian/patches/bugfix/x86/sis-agp-Remove-SIS-760-handled-by-amd64-agp.patch @@ -0,0 +1,37 @@ +Subject: [PATCH 1/2] sis-agp: Remove SIS 760, handled by amd64-agp +From: Ben Hutchings +To: David Airlie +Cc: FUJITA Tomonori , LKML +Date: Wed, 24 Mar 2010 03:33:48 +0000 + +SIS 760 is listed in the device tables for both amd64-agp and sis-agp. +amd64-agp is apparently preferable since it has workarounds for some +BIOS misconfigurations that sis-agp doesn't handle. + +Signed-off-by: Ben Hutchings +--- + drivers/char/agp/sis-agp.c | 8 -------- + 1 files changed, 0 insertions(+), 8 deletions(-) + +diff --git a/drivers/char/agp/sis-agp.c b/drivers/char/agp/sis-agp.c +index 6c3837a..95fdd4d 100644 +--- a/drivers/char/agp/sis-agp.c ++++ b/drivers/char/agp/sis-agp.c +@@ -415,14 +415,6 @@ static struct pci_device_id agp_sis_pci_table[] = { + .subvendor = PCI_ANY_ID, + .subdevice = PCI_ANY_ID, + }, +- { +- .class = (PCI_CLASS_BRIDGE_HOST << 8), +- .class_mask = ~0, +- .vendor = PCI_VENDOR_ID_SI, +- .device = PCI_DEVICE_ID_SI_760, +- .subvendor = PCI_ANY_ID, +- .subdevice = PCI_ANY_ID, +- }, + { } + }; + +-- +1.7.0 + diff --git a/debian/patches/features/arm/guruplug.patch b/debian/patches/features/arm/guruplug.patch new file mode 100644 index 000000000..ea763f1fe --- /dev/null +++ b/debian/patches/features/arm/guruplug.patch @@ -0,0 +1,187 @@ +From: Siddarth Gore +Date: Mon, 22 Mar 2010 09:28:20 +0000 (-0700) +Subject: [ARM] Kirkwood: Marvell GuruPlug support +X-Git-Url: http://git.marvell.com/?p=orion.git;a=commitdiff_plain;h=d8f089d2ad35861c432618900fa08ca70c168d76 + +[ARM] Kirkwood: Marvell GuruPlug support + +GuruPlug Standard: 1 Gb Ethernet, 2 USB 2.0 +GuruPlug Plus: 2 Gb Ethernet, 2 USB 2.0, 1 eSATA, 1 uSD slot + +References: +http://www.globalscaletechnologies.com/t-guruplugdetails.aspx +http://plugcomputer.org + +This patch is for GuruPlug Plus, but it supports Standard version +as well. + +Signed-off-by: Siddarth Gore +Signed-off-by: Nicolas Pitre +--- + +diff --git a/arch/arm/mach-kirkwood/Kconfig b/arch/arm/mach-kirkwood/Kconfig +index 17879a8..05a8552 100644 +--- a/arch/arm/mach-kirkwood/Kconfig ++++ b/arch/arm/mach-kirkwood/Kconfig +@@ -38,6 +38,12 @@ config MACH_ESATA_SHEEVAPLUG + Say 'Y' here if you want your kernel to support the + Marvell eSATA SheevaPlug Reference Board. + ++config MACH_GURUPLUG ++ bool "Marvell GuruPlug Reference Board" ++ help ++ Say 'Y' here if you want your kernel to support the ++ Marvell GuruPlug Reference Board. ++ + config MACH_TS219 + bool "QNAP TS-110, TS-119, TS-210, TS-219 and TS-219P Turbo NAS" + help +diff --git a/arch/arm/mach-kirkwood/Makefile b/arch/arm/mach-kirkwood/Makefile +index a5530e3..85b3a39 100644 +--- a/arch/arm/mach-kirkwood/Makefile ++++ b/arch/arm/mach-kirkwood/Makefile +@@ -6,6 +6,7 @@ obj-$(CONFIG_MACH_RD88F6281) += rd88f6281-setup.o + obj-$(CONFIG_MACH_MV88F6281GTW_GE) += mv88f6281gtw_ge-setup.o + obj-$(CONFIG_MACH_SHEEVAPLUG) += sheevaplug-setup.o + obj-$(CONFIG_MACH_ESATA_SHEEVAPLUG) += sheevaplug-setup.o ++obj-$(CONFIG_MACH_GURUPLUG) += guruplug-setup.o + obj-$(CONFIG_MACH_TS219) += ts219-setup.o tsx1x-common.o + obj-$(CONFIG_MACH_TS41X) += ts41x-setup.o tsx1x-common.o + obj-$(CONFIG_MACH_OPENRD_BASE) += openrd_base-setup.o +diff --git a/arch/arm/mach-kirkwood/guruplug-setup.c b/arch/arm/mach-kirkwood/guruplug-setup.c +new file mode 100644 +index 0000000..54d07c8 +--- /dev/null ++++ b/arch/arm/mach-kirkwood/guruplug-setup.c +@@ -0,0 +1,131 @@ ++/* ++ * arch/arm/mach-kirkwood/guruplug-setup.c ++ * ++ * Marvell GuruPlug Reference Board Setup ++ * ++ * This file is licensed under the terms of the GNU General Public ++ * License version 2. This program is licensed "as is" without any ++ * warranty of any kind, whether express or implied. ++ */ ++ ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include ++#include "common.h" ++#include "mpp.h" ++ ++static struct mtd_partition guruplug_nand_parts[] = { ++ { ++ .name = "u-boot", ++ .offset = 0, ++ .size = SZ_1M ++ }, { ++ .name = "uImage", ++ .offset = MTDPART_OFS_NXTBLK, ++ .size = SZ_4M ++ }, { ++ .name = "root", ++ .offset = MTDPART_OFS_NXTBLK, ++ .size = MTDPART_SIZ_FULL ++ }, ++}; ++ ++static struct mv643xx_eth_platform_data guruplug_ge00_data = { ++ .phy_addr = MV643XX_ETH_PHY_ADDR(0), ++}; ++ ++static struct mv643xx_eth_platform_data guruplug_ge01_data = { ++ .phy_addr = MV643XX_ETH_PHY_ADDR(1), ++}; ++ ++static struct mv_sata_platform_data guruplug_sata_data = { ++ .n_ports = 1, ++}; ++ ++static struct mvsdio_platform_data guruplug_mvsdio_data = { ++ /* unfortunately the CD signal has not been connected */ ++}; ++ ++static struct gpio_led guruplug_led_pins[] = { ++ { ++ .name = "guruplug:red:health", ++ .gpio = 46, ++ .active_low = 1, ++ }, ++ { ++ .name = "guruplug:green:health", ++ .gpio = 47, ++ .active_low = 1, ++ }, ++ { ++ .name = "guruplug:red:wmode", ++ .gpio = 48, ++ .active_low = 1, ++ }, ++ { ++ .name = "guruplug:green:wmode", ++ .gpio = 49, ++ .active_low = 1, ++ }, ++}; ++ ++static struct gpio_led_platform_data guruplug_led_data = { ++ .leds = guruplug_led_pins, ++ .num_leds = ARRAY_SIZE(guruplug_led_pins), ++}; ++ ++static struct platform_device guruplug_leds = { ++ .name = "leds-gpio", ++ .id = -1, ++ .dev = { ++ .platform_data = &guruplug_led_data, ++ } ++}; ++ ++static unsigned int guruplug_mpp_config[] __initdata = { ++ MPP46_GPIO, /* M_RLED */ ++ MPP47_GPIO, /* M_GLED */ ++ MPP48_GPIO, /* B_RLED */ ++ MPP49_GPIO, /* B_GLED */ ++ 0 ++}; ++ ++static void __init guruplug_init(void) ++{ ++ /* ++ * Basic setup. Needs to be called early. ++ */ ++ kirkwood_init(); ++ kirkwood_mpp_conf(guruplug_mpp_config); ++ ++ kirkwood_uart0_init(); ++ kirkwood_nand_init(ARRAY_AND_SIZE(guruplug_nand_parts), 25); ++ ++ kirkwood_ehci_init(); ++ kirkwood_ge00_init(&guruplug_ge00_data); ++ kirkwood_ge01_init(&guruplug_ge01_data); ++ kirkwood_sata_init(&guruplug_sata_data); ++ kirkwood_sdio_init(&guruplug_mvsdio_data); ++ ++ platform_device_register(&guruplug_leds); ++} ++ ++MACHINE_START(GURUPLUG, "Marvell GuruPlug Reference Board") ++ /* Maintainer: Siddarth Gore */ ++ .phys_io = KIRKWOOD_REGS_PHYS_BASE, ++ .io_pg_offst = ((KIRKWOOD_REGS_VIRT_BASE) >> 18) & 0xfffc, ++ .boot_params = 0x00000100, ++ .init_machine = guruplug_init, ++ .map_io = kirkwood_map_io, ++ .init_irq = kirkwood_init_irq, ++ .timer = &kirkwood_timer, ++MACHINE_END diff --git a/debian/patches/series/base b/debian/patches/series/base index 139ede480..fd1374a8a 100644 --- a/debian/patches/series/base +++ b/debian/patches/series/base @@ -57,3 +57,15 @@ + bugfix/all/p54pci-fix-regression.patch + bugfix/all/cifs-allow-null-nd-on-create.patch + bugfix/mips/mips-ide-flush-dcache.patch + ++ features/arm/guruplug.patch ++ bugfix/all/buffer-make-invalidate_bdev-drain-all-add-caches.patch ++ bugfix/all/block-restart-partition-scan-after-resizing.patch ++ bugfix/all/SCSI-implement-sd_set_capacity.patch ++ bugfix/all/libata-use-enlarged-capacity-after-late-HPA-unlock.patch ++ bugfix/all/libata-implement-on-demand-HPA-unlocking.patch ++ bugfix/all/V4L-DVB-budget-Select-correct-frontends.patch ++ bugfix/all/drm-edid-Fix-1024x768@85Hz.patch ++ bugfix/all/3c503-Fix-IRQ-probing.patch ++ bugfix/x86/sis-agp-Remove-SIS-760-handled-by-amd64-agp.patch ++ bugfix/x86/amd64-agp-Probe-unknown-AGP-devices-the-right-way.patch diff --git a/debian/po/cs.po b/debian/po/cs.po new file mode 100644 index 000000000..cae8d5326 --- /dev/null +++ b/debian/po/cs.po @@ -0,0 +1,360 @@ +# Czech PO debconf template translation of linux-2.6. +# Copyright (C) 2010 Michal Simunek +# This file is distributed under the same license as the linux-2.6 package. +# Michal Simunek , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: linux-2.6\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-23 22:14+0200\n" +"PO-Revision-Date: 2010-05-12 18:02+0200\n" +"Last-Translator: Michal Simunek \n" +"Language-Team: Czech \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 "Aktualizovat v nastavení systému ID diskových zařízení?" + +#. 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 "" +"Nová verze Linuxového jádra přináší pro některé PATA (IDE) řadiče jiné " +"ovladače. Názvy u některých pevných disků, CD-ROM a páskových mechanik se " +"mohly změnit." + +#. 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 "" +"Nyní je doporučeno v konfiguračních souborech označovat disková zařízení " +"spíše než názvem zařízení raději popiskem či UUID (unikátním " +"identifikátorem), což funguje jak se starou, tak i s novou verzí jádra." + +#. 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 "" +"Pokud se rozhodnete, že nechcete aktualizovat nastavení systému automaticky, " +"musíte před příštím restartem systému aktualizovat ID zařízení ručně, jinak " +"se systém může stát nezaveditelným." + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 ../linux-base.templates:4001 +msgid "Apply configuration changes to disk device IDs?" +msgstr "Použít změny v nastavení ID diskových zařízení?" + +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 +msgid "These devices will be assigned UUIDs or labels:" +msgstr "Těmto zařízením bude přiřazeno UUID či popisek:" + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 ../linux-base.templates:4001 +msgid "These configuration files will be updated:" +msgstr "Tyto konfigurační soubory budou aktualizovány:" + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 ../linux-base.templates:4001 +msgid "The device IDs will be changed as follows:" +msgstr "ID diskových zařízení se změní následovně:" + +#. Type: error +#. Description +#: ../linux-base.templates:5001 +msgid "Configuration files still contain deprecated device names" +msgstr "Konfigurační soubory stále obsahují zastaralé názvy zařízení" + +#. 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 "" +"Následující konfigurační soubory stále používají názvy zařízení, které je " +"při používání nového jádra třeba změnit:" + +#. Type: error +#. Description +#: ../linux-base.templates:6001 +msgid "Boot loader configuration check needed" +msgstr "Je vyžadováno ověření nastavení zavaděče" + +#. 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 "" +"Nastavení zavaděče v tomto systému nebylo rozpoznáno. Tato nastavení může " +"být nutné aktualizovat:" + +#. 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 "" +" * ID kořenového zařízení předané jako parametr jádra;\n" +" * ID zaváděcího zařízení k instalaci a aktualizaci zavaděče." + +#. 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 "" +"Tato zařízení bysta běžně měli označovat jejich UUID či popiskem. Na " +"systémech MIPS však musí být kořenové zařízení označeno názvem." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:2001 +msgid "Abort installation after depmod error?" +msgstr "Přerušit po chybě depmod instalaci?" + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:2001 +msgid "" +"The 'depmod' command exited with the exit code ${exit_value} (${SIGNAL}" +"${CORE})." +msgstr "Příkaz 'depmod' skončil s chybou ${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 "" +"Vzhledem k tomu, že tento obraz používá initrd, nebude soubor " +"${modules_base}/=V/modules.dep smazán, přesto že může být neplatný." + +#. 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 "" +"Měli byste přerušit instalaci a opravit chyby v depmod, nebo vytvořit obraz " +"initrd s prověřeným souborem modules.dep. Nepřerušíte-li instalaci, " +"vystavujete se riziku, že se nepodaří systém zavést." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "Run the default boot loader?" +msgstr "Spustit výchozí zavaděč?" + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"The default boot loader for this architecture is $loader, which is present." +msgstr "Výchozí nainstalovaný zavaděč pro tuto architekturu je $loader." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"However, there is no explicit request to run that boot loader in /etc/kernel-" +"img.conf while GRUB seems to be installed with a postinst hook set." +msgstr "" +"Nicméně, neexistuje žádný explicitní požadavek na spuštění zavaděče v /etc/" +"kernel-img.conf, když byl po instalaci systému nainstalován a nastaven GRUB." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"It thus seems that this system is using GRUB as boot loader instead of " +"$loader." +msgstr "Zdá se tedy, že tento systém používá místo $loader jako zavaděč GRUB." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"Please choose which should run: the default boot loader now, or the GRUB " +"update later." +msgstr "" +"Zvolte prosím, který se má spustit: současný výchozí zavaděč, nebo později " +"aktualizovaný GRUB." + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:4001 +msgid "Error running the boot loader in test mode" +msgstr "Chyba při spouštění zavaděče v testovacím režimu" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:4001 +msgid "An error occurred while running the ${loader} boot loader in test mode." +msgstr "Při spouštění zavaděče ${loader} v testovacím režimu nastala chyba." + +#. Type: note +#. Description +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:4001 +#: ../templates/temp.image.plain/templates:5001 +msgid "" +"A log is available in ${temp_file_name}. Please edit /etc/${loader}.conf " +"manually and re-run ${loader} to fix that issue and keep this system " +"bootable." +msgstr "" +"Log je dostupný v ${temp_file_name}. Pro opravení této chyby a zachování " +"zaveditelnosti systému, prosím ručně upravte /etc/${loader}.conf a znovu " +"spusťte ${loader}." + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:5001 +msgid "Error running the boot loader" +msgstr "Chyba při spouštění zavaděče" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:5001 +msgid "An error occurred while running the ${loader} boot loader." +msgstr "Při spouštění zavaděče ${loader} nastala chyba." + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:6001 +#: ../templates/temp.image.plain/templates:7001 +msgid "Abort kernel removal?" +msgstr "Přerušit odstraňování jádra?" + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:6001 +msgid "" +"You are running a kernel (version ${running}) and attempting to remove the " +"same version." +msgstr "" +"Pokoušíte se odstranit verzi jádra (version ${running}), která nyní běží." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:6001 +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 "" +"To může způsobit, že se nepodaří zavést systém, a také bude odstraněno /boot/" +"vmlinuz-${running} a všechny moduly v adresáři /lib/modules/${running}. Toto " +"je možné opravit pouze nakopírováním obrazu jádra a příslušných modulů." + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:6001 +#: ../templates/temp.image.plain/templates:7001 +msgid "" +"It is highly recommended to abort the kernel removal unless you are prepared " +"to fix the system after removal." +msgstr "" +"Je silně doporučeno přerušit odstraňování jádra, pokud nejste připraveni " +"opravovat systém po jeho odstranění." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:7001 +msgid "" +"This system uses a valid /etc/${loader}.conf file that mentions ${kimage}-" +"=V. Removing =ST-image-=V will invalidate that file." +msgstr "" +"Tento systém používá platný soubor /etc/${loader}.conf, který obsahuje " +"${kimage}-=V. Odstranění =ST-image-=V tento soubor zneplatní." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:7001 +msgid "" +"You will need to edit /etc/${loader}.conf or re-target symbolic links " +"mentioned there (typically, /vmlinuz and /vmlinuz.old) to not refer to " +"${kimage}-=V. Then, you will have to re-run ${loader}." +msgstr "" +"Bude potřeba, abyste upravili /etc/${loader}.conf, nebo přesměrovali " +"symbolické odkazy, které jsou zde uvedené (běžně /vmlinuz a /vmlinuz.old), " +"aby neodkazovaly na ${kimage}-=V. Potom musíte znovu spustit ${loader}." + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:8001 +msgid "Required firmware files may be missing" +msgstr "Mohou chybět potřebné soubory s firmwarem" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:8001 +msgid "" +"This system is currently running Linux ${runningversion} and you are " +"installing Linux ${version}. In the new version some of the drivers used on " +"this system may require additional firmware files:" +msgstr "" +"Systém nyní běží na Linuxu ${runningversion} a vy instalujete Linux " +"${version}. V nové verzi mohou některé ovladače používané v tomto systému, " +"vyžadovat dodatečné soubory s firmwarem:" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:8001 +msgid "${missing}" +msgstr "${missing}" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:8001 +msgid "" +"Most firmware files are not included in the system because they do not " +"conform to the Debian Free Software Guidelines. You may need to reconfigure " +"the package manager to include the contrib and non-free sections of the " +"package archive before you can install these firmware files." +msgstr "" +"Většina souborů s firmwarem není zahrnuta v systému, protože nejsou v " +"souladu se Zásadami svobodného softwaru Debianu. Než budete moci tyto " +"soubory s firmwarem nainstalovat, budete možná muset nastavit správce " +"balíčků, aby zahrnoval archiv sekce balíčků non-free." diff --git a/debian/po/da.po b/debian/po/da.po new file mode 100644 index 000000000..c78f9d736 --- /dev/null +++ b/debian/po/da.po @@ -0,0 +1,371 @@ +# Danish translation linux-2.6. +# Copyright (C) 2010 linux-2.6 & Joe Hansen. +# This file is distributed under the same license as the linux-2.6 package. +# Joe Hansen , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: linux-2.6\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-23 22:14+0200\n" +"PO-Revision-Date: 2010-05-13 17:30+01:00\n" +"Last-Translator: Joe Hansen \n" +"Language-Team: Danish \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 "Opdater diskenheds-id'er i systemkonfigurationen?" + +#. 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 "" +"Den nye version af Linuxkernen har forskellige drivere for nogle PATA-" +"kontrollere (IDE). Navnene på nogle harddiske, cd-rom og båndenheder kan " +"skifte." + +#. 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 "" +"Det anbefales, at du identificerer diskenheder i konfigurationsfiler med " +"etiket eller UUID (unik identifikation) fremfor via enhedsnavn, som vil " +"virke med både gamle og nye kerneversioner." + +#. 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 "" +"Hvis du vælger at opdatere systemkonfigurationen automatisk, skal du selv " +"opdatere enheds-id'er før systemets næste genstart eller også kan systemet " +"måske ikke startes." + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 ../linux-base.templates:4001 +msgid "Apply configuration changes to disk device IDs?" +msgstr "Anvend disse konfigurationsændringer til diskenheds-id'er?" + +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 +msgid "These devices will be assigned UUIDs or labels:" +msgstr "Disse enheder vil få tildelt UUID'er eller etiketter:" + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 ../linux-base.templates:4001 +msgid "These configuration files will be updated:" +msgstr "Disse konfigurationsfiler vil blive opdateret:" + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 ../linux-base.templates:4001 +msgid "The device IDs will be changed as follows:" +msgstr "Enheds-id'erne vil blive ændret som vist i det følgende:" + +#. Type: error +#. Description +#: ../linux-base.templates:5001 +msgid "Configuration files still contain deprecated device names" +msgstr "Konfigurationsfiler inderholder stadig forældede enhedsnavne" + +#. 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 "" +"De følgende konfigurationsfiler bruger stadig nogle enhedsnavne som måske vil " +"ændre sig, når den nye kerne bruges:" + +#. Type: error +#. Description +#: ../linux-base.templates:6001 +msgid "Boot loader configuration check needed" +msgstr "Behov for tjek af opstartsindlæseren (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 "" +"Opstartslæserens (boot loader) konfiguration på dette system blev ikke " +"genkendt. Disse indstillinger i konfigurationen skal måske opdateres:" + +#. 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 "" +" * Rootenheds-id'et passeret som en kerneparameter;\n" +" * Rootenheds-id'et brugt til at installere og opdatere opstartsindlæseren " +"(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 "" +"Vi anbefaler, at du identificerer disse enheder efter UUID eller etiket. " +"På MIPS-systemer skal rootenheden dog være identificeret med navn." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:2001 +msgid "Abort installation after depmod error?" +msgstr "Afbryd installation efter depmod-fejl?" + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:2001 +msgid "" +"The 'depmod' command exited with the exit code ${exit_value} (${SIGNAL}" +"${CORE})." +msgstr "" +"Kommandoen depmod afsluttedes med koden afslutningskoden ${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 "" +"Da dette aftryk bruger initrd, vil filen ${modules_base}/=V/modules.dep ikke " +"blive slettet, selvom den måske er ugyldig." + +#. 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 "" +"Du skal afbryde installationen og rette fejlene i depmod, eller gendanne " +"initrd-aftrykket med en kendt god fil af typen modules-dep. Hvis du ikke " +"afbryder installationen, er der fare for at systemet vil fejle ved opstart." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "Run the default boot loader?" +msgstr "Kør standardopstartsindlæseren?" + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"The default boot loader for this architecture is $loader, which is present." +msgstr "" +"Standardopstartsindlæseren for denne arkitektur er $loader, som er til stede." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"However, there is no explicit request to run that boot loader in /etc/kernel-" +"img.conf while GRUB seems to be installed with a postinst hook set." +msgstr "" +"Der er dog ingen eksplicit krav om at køre den opstartsindlæser i /etc/" +"kernel-img.conf mens GRUB ser ud til at være installeret med et postinst " +"hooksæt." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"It thus seems that this system is using GRUB as boot loader instead of " +"$loader." +msgstr "" +"Det ser ud til at dette system bruger GRUB som opstartsindlæser (boot " +"loader) i steden for $loader." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"Please choose which should run: the default boot loader now, or the GRUB " +"update later." +msgstr "" +"Vælg venligst hvilken der skal køre: Standardopstartsindlæseren nu, eller " +"GRUB-opdatering senere." + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:4001 +msgid "Error running the boot loader in test mode" +msgstr "Fejl ved kørsel af opstartsindlæseren i testtilstand" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:4001 +msgid "An error occurred while running the ${loader} boot loader in test mode." +msgstr "" +"En fejl opstod under kørsel af opstartsindlæseren ${loader} i testtilstand." + +#. Type: note +#. Description +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:4001 +#: ../templates/temp.image.plain/templates:5001 +msgid "" +"A log is available in ${temp_file_name}. Please edit /etc/${loader}.conf " +"manually and re-run ${loader} to fix that issue and keep this system " +"bootable." +msgstr "" +"En log er tilgængelig i ${temp_file_name}. Rediger venligst /etc/${loader}." +"conf manuelt og genkør ${loader} for at rette dette og sikre at dette system " +"stadig kan startes op." + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:5001 +msgid "Error running the boot loader" +msgstr "Fejl ved kørsel af opstartsindlæseren" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:5001 +msgid "An error occurred while running the ${loader} boot loader." +msgstr "En fejl opstod under kørsel af opstartsindlæseren ${loader}." + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:6001 +#: ../templates/temp.image.plain/templates:7001 +msgid "Abort kernel removal?" +msgstr "Afbryd kernefjernelse?" + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:6001 +msgid "" +"You are running a kernel (version ${running}) and attempting to remove the " +"same version." +msgstr "" +"Du kører en kerne (version ${running}) og forsøger at fjerne den samme " +"version." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:6001 +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 "" +"Dette kan gøre at systemet ikke kan starte op da det vil fjerne /boot/" +"vmlinuz-${running} og alle moduler i mappen /lib/modules//${running}. Dette " +"kan kun rettes med en kopi af kerneaftrykket og de tilsvarende moduler." + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:6001 +#: ../templates/temp.image.plain/templates:7001 +msgid "" +"It is highly recommended to abort the kernel removal unless you are prepared " +"to fix the system after removal." +msgstr "" +"Det anbefales stærkt, at afbryde kernefjernelsen med mindre du er forberedt " +"på at rette systemet op efter fjernelsen." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:7001 +msgid "" +"This system uses a valid /etc/${loader}.conf file that mentions ${kimage}-" +"=V. Removing =ST-image-=V will invalidate that file." +msgstr "" +"Dette system bruger en gyldig /etc/${loader}.conf-fil som nævner ${kimage}-" +"=V. Fjernelse af =ST-image-=V vil invalidere den fil." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:7001 +msgid "" +"You will need to edit /etc/${loader}.conf or re-target symbolic links " +"mentioned there (typically, /vmlinuz and /vmlinuz.old) to not refer to " +"${kimage}-=V. Then, you will have to re-run ${loader}." +msgstr "" +"Du vil skulle redigere /etc//${loader}.conf eller geninstallere symbolske " +"henvisninger nævnt der (typisk, /vmlinuz og /vmlinuz.old) til ikke at " +"referere til ${kimage}-=V. Derefter skal du genkøre ${loader}." + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:8001 +msgid "Required firmware files may be missing" +msgstr "Krævet firmwarefiler mangler måske" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:8001 +msgid "" +"This system is currently running Linux ${runningversion} and you are " +"installing Linux ${version}. In the new version some of the drivers used on " +"this system may require additional firmware files:" +msgstr "" +"Dette system kører aktuelt Linux ${runningversion}, og du installerer Linux " +"${version}. I den nye version kræver nogle af driverne på dette system måske " +"yderligere firmwarefiler:" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:8001 +msgid "${missing}" +msgstr "${missing}" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:8001 +msgid "" +"Most firmware files are not included in the system because they do not " +"conform to the Debian Free Software Guidelines. You may need to reconfigure " +"the package manager to include the contrib and non-free sections of the " +"package archive before you can install these firmware files." +msgstr "" +"De fleste firmwarefiler er ikke inkluderet i Debiansystemet, da de " +"ikke overholder Debian Free Softwares retningslinjer. Du skal måske " +"rekonfigurere pakkehåndteringen for at inkludere contrib og det ikke " +"frie afsnit af Debianarkivet, før du kan installere disse firmwarefiler." + + diff --git a/debian/po/de.po b/debian/po/de.po new file mode 100644 index 000000000..71b267882 --- /dev/null +++ b/debian/po/de.po @@ -0,0 +1,382 @@ +# Translation of linux-2.6 templates to german. +# Copyright (C) 2010 Holger Wansing. +# This file is distributed under the same license as the linux-2.6 package. +# Holger Wansing , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: linux-2.6 2.6.32-11\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-23 22:14+0200\n" +"PO-Revision-Date: 2010-05-08 11:40+0200\n" +"Last-Translator: Holger Wansing \n" +"Language-Team: Debian German \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 "Laufwerk-Geräte-IDs in der Systemkonfiguration aktualisieren?" + +#. 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 "" +"Die neue Version des Linux-Kernels stellt andere Treiber für einige PATA-" +"(IDE-)Controller zur Verfügung. Die Namen einiger Festplatten-, CD-ROM- und " +"Bandspeichergeräte könnten sich ändern." + +#. 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 "" +"Es wird jetzt empfohlen, solche Geräte in Konfigurationsdateien über die " +"Kennung (Label) oder die UUID (Unique Identifier) zu identifizieren statt " +"über den Gerätenamen, was sowohl mit alten wie auch neuen Kernel-Versionen " +"funktionieren wird." + +#. 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 "" +"Falls Sie sich entscheiden, die Systemkonfiguration nicht automatisch " +"aktualisieren zu lassen, müssen Sie die Geräte-IDs selbst aktualisieren, " +"bevor Sie das System das nächste Mal neu starten; andernfalls könnte es " +"sein, dass Ihr System nicht mehr startfähig ist." + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 ../linux-base.templates:4001 +msgid "Apply configuration changes to disk device IDs?" +msgstr "Konfigurationsänderungen für Laufwerk-Geräte-IDs anwenden?" + +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 +msgid "These devices will be assigned UUIDs or labels:" +msgstr "Diese Geräte werden über UUIDs oder Kennungen identifiziert:" + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 ../linux-base.templates:4001 +msgid "These configuration files will be updated:" +msgstr "Diese Konfigurationsdateien werden aktualisiert:" + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 ../linux-base.templates:4001 +msgid "The device IDs will be changed as follows:" +msgstr "Die Geräte-IDs werden wie folgt geändert:" + +#. Type: error +#. Description +#: ../linux-base.templates:5001 +msgid "Configuration files still contain deprecated device names" +msgstr "Konfigurationsdateien enthalten noch veraltete Gerätenamen" + +#. 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 "" +"Die folgenden Konfigurationsdateien enthalten noch einige Gerätenamen, die " +"sich ändern könnten, wenn der neue Kernel verwendet wird:" + +#. Type: error +#. Description +#: ../linux-base.templates:6001 +msgid "Boot loader configuration check needed" +msgstr "Überprüfung der Bootloader-Konfiguration erforderlich" + +#. 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 "" +"Die Bootloader-Konfiguration für dieses System konnte nicht erkannt werden. " +"Folgende Einstellungen in der Konfiguration müssen aktualisiert werden:" + +#. 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 "" +" * Die Geräte-ID der Root-Partition, die als Kernel-Parameter angegeben\n" +" wird;\n" +" * Die Geräte-ID der Boot-Partition, die für die Installation und\n" +" Aktualisierung des Bootloaders verwendet wird." + +#. 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 "" +"Sie sollten diese Geräte grundsätzlich per UUID oder Kennung identifizieren. " +"Auf MIPS-Systemen muss das Root-Gerät jedoch über den Namen identifiziert " +"werden." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:2001 +msgid "Abort installation after depmod error?" +msgstr "Installation nach depmod-Fehler abbrechen?" + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:2001 +msgid "" +"The 'depmod' command exited with the exit code ${exit_value} (${SIGNAL}" +"${CORE})." +msgstr "" +"Der »depmod«-Befehl wurde beendet: Rückgabewert ${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 "" +"Da dieses Image eine initrd verwendet, wird die Datei ${modules_base}/=V/" +"modules.dep nicht gelöscht, obwohl sie ungültig sein könnte." + +#. 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 "" +"Sie sollten die Installation abbrechen und die Fehler bezüglich depmod " +"beheben, oder erstellen Sie das initrd-Image neu mit einer bekanntermaßen " +"korrekten modules.dep-Datei. Falls Sie die Installation nicht abbrechen, " +"besteht die Gefahr, dass das System nicht mehr neu starten kann." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "Run the default boot loader?" +msgstr "Den Standard-Bootloader ausführen?" + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"The default boot loader for this architecture is $loader, which is present." +msgstr "" +"Der Standard-Bootloader für diese Architektur ist $loader und dieser ist " +"auch vorhanden." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"However, there is no explicit request to run that boot loader in /etc/kernel-" +"img.conf while GRUB seems to be installed with a postinst hook set." +msgstr "" +"Allerdings gibt es keinen expliziten Aufruf in /etc/kernel-img.conf, diesen " +"Bootloader auszuführen, während GRUB scheinbar über ein postinst-hook-set " +"installiert wird." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"It thus seems that this system is using GRUB as boot loader instead of " +"$loader." +msgstr "" +"Daher scheint es, als ob dieses System GRUB als Bootloader verwendet statt " +"$loader." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"Please choose which should run: the default boot loader now, or the GRUB " +"update later." +msgstr "" +"Bitte wählen Sie aus, ob Sie jetzt den Standard-Bootloader ausführen möchten " +"oder später den GRUB-Bootloader." + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:4001 +msgid "Error running the boot loader in test mode" +msgstr "Fehler bei Ausführung des Bootloaders im Testmodus" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:4001 +msgid "An error occurred while running the ${loader} boot loader in test mode." +msgstr "" +"Bei der Ausführung des ${loader}-Bootloaders im Testmodus ist ein Fehler " +"aufgetreten." + +#. Type: note +#. Description +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:4001 +#: ../templates/temp.image.plain/templates:5001 +msgid "" +"A log is available in ${temp_file_name}. Please edit /etc/${loader}.conf " +"manually and re-run ${loader} to fix that issue and keep this system " +"bootable." +msgstr "" +"Ein Protokoll ist in ${temp_file_name} verfügbar. Bitte passen Sie /etc/" +"${loader}.conf von Hand an und führen Sie ${loader} erneut aus, um das " +"Problem zu beheben und die Startfähigkeit des Systems zu erhalten." + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:5001 +msgid "Error running the boot loader" +msgstr "Fehler bei Ausführung des Bootloaders" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:5001 +msgid "An error occurred while running the ${loader} boot loader." +msgstr "" +"Bei der Ausführung des ${loader}-Bootloaders ist ein Fehler aufgetreten." + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:6001 +#: ../templates/temp.image.plain/templates:7001 +msgid "Abort kernel removal?" +msgstr "Entfernen des Kernels abbrechen?" + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:6001 +msgid "" +"You are running a kernel (version ${running}) and attempting to remove the " +"same version." +msgstr "" +"Es läuft derzeit ein Kernel Version ${running} und Sie versuchen, die " +"gleiche Version zu entfernen." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:6001 +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 "" +"Das kann dazu führen, dass das System nicht mehr startfähig ist, da dadurch /" +"boot/vmlinuz-${running} und alle Module unterhalb des Verzeichnisses /lib/" +"modules/${running} entfernt werden. Dies kann nur mit einer Kopie des Kernel-" +"Images und der dazugehörigen Module behoben werden." + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:6001 +#: ../templates/temp.image.plain/templates:7001 +msgid "" +"It is highly recommended to abort the kernel removal unless you are prepared " +"to fix the system after removal." +msgstr "" +"Es wird dringend empfohlen, das Entfernen des Kernels abzubrechen, " +"ausgenommen Sie sind darauf vorbereitet, das System nach der Entfernung " +"wieder instandzusetzen." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:7001 +msgid "" +"This system uses a valid /etc/${loader}.conf file that mentions ${kimage}-" +"=V. Removing =ST-image-=V will invalidate that file." +msgstr "" +"Dieses System nutzt eine gültige /etc/${loader}.conf-Datei, in der ${kimage}-" +"=V enthalten ist. Durch das Entfernen von =ST-image-=V wird diese Datei " +"ungültig." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:7001 +msgid "" +"You will need to edit /etc/${loader}.conf or re-target symbolic links " +"mentioned there (typically, /vmlinuz and /vmlinuz.old) to not refer to " +"${kimage}-=V. Then, you will have to re-run ${loader}." +msgstr "" +"Sie werden /etc/${loader}.conf anpassen müssen. Oder Sie weisen den " +"symbolischen Verknüpfungen, die dort verwendet sind (typischerweise /vmlinuz " +"und /vmlinuz.old) neue Ziele zu, so dass sie nicht mehr auf ${kimage}-=V " +"verweisen. Danach müssen Sie ${loader} erneut ausführen." + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:8001 +msgid "Required firmware files may be missing" +msgstr "Benötigte Firmware-Dateien möglicherweise nicht vorhanden" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:8001 +msgid "" +"This system is currently running Linux ${runningversion} and you are " +"installing Linux ${version}. In the new version some of the drivers used on " +"this system may require additional firmware files:" +msgstr "" +"Auf diesem System läuft derzeit Linux ${runningversion} und Sie installieren " +"gerade Linux ${version}. In der neuen Version könnten einige Treiber, die " +"auf diesem System verwendet werden, zusätzliche Firmware-Dateien benötigen:" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:8001 +msgid "${missing}" +msgstr "${missing}" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:8001 +msgid "" +"Most firmware files are not included in the system because they do not " +"conform to the Debian Free Software Guidelines. You may need to reconfigure " +"the package manager to include the contrib and non-free sections of the " +"package archive before you can install these firmware files." +msgstr "" +"Die meisten Firmware-Dateien sind nicht im System enthalten, da sie nicht " +"mit den Debian-Richtlinien für Freie Software (DFSG) konform sind. Sie " +"müssen unter Umständen den Paketmanager neu konfigurieren, so dass die " +"contrib- und non-free-Sektionen des Paketarchivs ebenfalls enthalten sind, " +"bevor Sie diese Firmware-Dateien installieren können." diff --git a/debian/po/es.po b/debian/po/es.po new file mode 100644 index 000000000..a422140db --- /dev/null +++ b/debian/po/es.po @@ -0,0 +1,411 @@ +# linux-2.6 po-debconf translation to Spanish +# Copyright (C) 2010 Software in the Public Interest +# This file is distributed under the same license as the linux-2.6 package. +# +# Changes: +# - Initial translation +# Omar Campagne , 2010 +# +# - Updates +# TRANSLATOR +# +# Traductores, si no conocen el formato PO, merece la pena leer la +# documentación de gettext, especialmente las secciones dedicadas a este +# formato, por ejemplo ejecutando: +# info -n '(gettext)PO Files' +# info -n '(gettext)Header Entry' +# +# Equipo de traducción al español, por favor lean antes de traducir +# los siguientes documentos: +# +# - El proyecto de traducción de Debian al español +# http://www.debian.org/intl/spanish/ +# especialmente las notas y normas de traducción en +# http://www.debian.org/intl/spanish/notas +# +# - La guía de traducción de po's de debconf: +# /usr/share/doc/po-debconf/README-trans +# o http://www.debian.org/intl/l10n/po-debconf/README-trans +msgid "" +msgstr "" +"Project-Id-Version: linux-image-2.6 2.6.32+5\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-23 22:14+0200\n" +"PO-Revision-Date: 2010-05-08 12:17+0200\n" +"Last-Translator: Omar Campagne <>\n" +"Language-Team: Debian l10n Spanish \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.0\n" + +#. Type: boolean +#. Description +#: ../linux-base.templates:2001 +msgid "Update disk device IDs in system configuration?" +msgstr "" +"¿Desea actualizar los identificadores de los dispositivos de disco en la " +"configuración del 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 nueva versión del núcleo Linux proporciona controladores diferentes para " +"algunos controladores PATA (IDE). Puede que cambien los nombres de algunos " +"dispositivos de disco duro, disco óptico y de cinta." + +#. 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 "" +"Se recomienda identificar los dispositivos de disco en los ficheros de " +"configuración mediante la etiqueta o el UUID (identificador único), en lugar " +"del nombre de dispositivo, lo cual funcionará con las versiones antiguas y " +"recientes del núcleo." + +#. 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 selecciona no actualizar la configuración del sistema automáticamente, " +"tendrá que actualizar los identificadores de dispositivo manualmente antes " +"del siguiente arranque del sistema, o puede que el sistema no pueda arrancar." + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 ../linux-base.templates:4001 +msgid "Apply configuration changes to disk device IDs?" +msgstr "" +"¿Desea realizar estos cambios en la configuración de los identificadores de " +"dispositivos de disco?" + +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 +msgid "These devices will be assigned UUIDs or labels:" +msgstr "Se van a asignar etiquetas o UUID a los siguientes dispositivos:" + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 ../linux-base.templates:4001 +msgid "These configuration files will be updated:" +msgstr "Se van a actualizar los siguientes ficheros de configuración:" + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 ../linux-base.templates:4001 +msgid "The device IDs will be changed as follows:" +msgstr "" +"Se van a modificar los identificadores de dispositivo de la siguiente forma:" + +#. Type: error +#. Description +#: ../linux-base.templates:5001 +msgid "Configuration files still contain deprecated device names" +msgstr "" +"Los ficheros de configuración aún contienen nombres obsoletos de dispositivo" + +#. 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 "" +"Los siguientes ficheros de configuración aún usan algunos nombres de " +"dispositivo que pueden cambiar al usar el núcleo nuevo:" + +#. Type: error +#. Description +#: ../linux-base.templates:6001 +msgid "Boot loader configuration check needed" +msgstr "Se necesita comprobar la configuración del gestor de arranque" + +#. 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 se reconoció la configuración del gestor de arranque en este sistema. " +"Puede que se tengan que actualizar estas opciones de configuración." + +#. 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 "" +" * 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" + +#. 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 "" +"Se recomienda identificar estos dispositivos mediante la etiqueta o el UUID. " +"Por otra parte, en los sistemas MIPS tiene que identificar el dispositivo " +"raíz por su nombre." + +#. 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?" + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:2001 +msgid "" +"The 'depmod' command exited with the exit code ${exit_value} (${SIGNAL}" +"${CORE})." +msgstr "" +"La orden «depmod» finalizó con el código de salida «${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 "" +"Debido a que esta imagen usa una imagen de arranque «initrd», no se eliminará " +"el fichero «${modules_base}/=V/modules.dep», aún cuando no sea vá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 "" +"Debería cancelar la instalación y arreglar los errores de depmod, o " +"regenerar la imagen de arranque «initrd» con un fichero «modules.dep» fiable. " +"Si no cancela la instalación, existe el peligro de que el sistema no pueda " +"arrancar." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "Run the default boot loader?" +msgstr "¿Desea ejecutar el gestor de arranque predefinido?" + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"The default boot loader for this architecture is $loader, which is present." +msgstr "" +"El gestor de arranque predefinido para esta arquitectura es $loader, el cual " +"está presente en el sistema." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"However, there is no explicit request to run that boot loader in /etc/kernel-" +"img.conf while GRUB seems to be installed with a postinst hook set." +msgstr "" +"Sin embargo, no hay una petición explicita en «/etc/kernel-img.conf» para " +"iniciar ese gestor de arranque, mientras que GRUB parece estar instalado con " +"un «hook» de post-instalación definido." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"It thus seems that this system is using GRUB as boot loader instead of " +"$loader." +msgstr "" +"Por lo tanto, parece que este sistema está usando GRUB como gestor de " +"arranque en lugar de $loader." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"Please choose which should run: the default boot loader now, or the GRUB " +"update later." +msgstr "" +"Por favor, seleccione cual se debería ejecutar: el gestor de arranque " +"predefinido, o la actualización de GRUB más tarde." + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:4001 +msgid "Error running the boot loader in test mode" +msgstr "" +"Se produjo un fallo al ejecutar el gestor de arranque en modo de pruebas" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:4001 +msgid "An error occurred while running the ${loader} boot loader in test mode." +msgstr "" +"Se produjo un fallo al ejecutar el gestor de arranque ${loader} en modo de " +"pruebas." + +#. Type: note +#. Description +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:4001 +#: ../templates/temp.image.plain/templates:5001 +msgid "" +"A log is available in ${temp_file_name}. Please edit /etc/${loader}.conf " +"manually and re-run ${loader} to fix that issue and keep this system " +"bootable." +msgstr "" +"Dispone de un registro en «${temp_file_name}». Edite «/etc/${loader}.conf» " +"manualmente y ejecute ${loader} otra vez para arreglar el fallo, y permitir " +"el arranque del sistema." + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:5001 +msgid "Error running the boot loader" +msgstr "Se produjo un fallo al ejecutar el gestor de arranque" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:5001 +msgid "An error occurred while running the ${loader} boot loader." +msgstr "Se produjo un fallo al ejecutar el gestor de arranque ${loader}." + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:6001 +#: ../templates/temp.image.plain/templates:7001 +msgid "Abort kernel removal?" +msgstr "¿Desea cancelar la eliminación del núcleo?" + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:6001 +msgid "" +"You are running a kernel (version ${running}) and attempting to remove the " +"same version." +msgstr "" +"Su sistema está ejecutando el núcleo (versión ${running}), y está intentando " +"eliminar la misma versión del núcleo." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:6001 +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 "" +"Puede que el sistema no pueda arrancar posteriormente, ya que eliminará «/" +"boot/vmlinuz-${running}» y todos los módulos en el directorio «/lib/modules/" +"${running}». Esto sólo se puede arreglar con una copia de la imagen del " +"núcleo y los correspondientes módulos." + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:6001 +#: ../templates/temp.image.plain/templates:7001 +msgid "" +"It is highly recommended to abort the kernel removal unless you are prepared " +"to fix the system after removal." +msgstr "" +"Se recomienda encarecidamente cancelar la eliminación del núcleo, a menos " +"que esté preparado para arreglar el sistema después de la eliminación." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:7001 +msgid "" +"This system uses a valid /etc/${loader}.conf file that mentions ${kimage}-" +"=V. Removing =ST-image-=V will invalidate that file." +msgstr "" +"Este sistema usa un fichero «/etc/${loader}.conf» válido que menciona " +"«${kimage}-=V». Eliminar «=ST-image-=V» invalidará ese fichero." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:7001 +msgid "" +"You will need to edit /etc/${loader}.conf or re-target symbolic links " +"mentioned there (typically, /vmlinuz and /vmlinuz.old) to not refer to " +"${kimage}-=V. Then, you will have to re-run ${loader}." +msgstr "" +"Necesitará editar «/etc/${loader}.conf», o direccionar nuevamente los enlaces " +"simbólicos ahí mencionados (habitualmente, «/vmlinuz» y «/vmlinuz.old») para " +"que no se refieran a «${kimage}-=V». Por último, tendrá que ejecutar " +"${loader} otra vez." + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:8001 +msgid "Required firmware files may be missing" +msgstr "Puede que los ficheros de firmware requeridos no estén disponibles" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:8001 +msgid "" +"This system is currently running Linux ${runningversion} and you are " +"installing Linux ${version}. In the new version some of the drivers used on " +"this system may require additional firmware files:" +msgstr "" +"Este sistema ejecuta actualmente la versión ${runningversion} de Linux, y se " +"está instalando la versión ${version}. Puede que los controladores incluidos " +"en la nueva versión requieran ficheros de firmware adicionales." + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:8001 +msgid "${missing}" +msgstr "${missing}" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:8001 +msgid "" +"Most firmware files are not included in the system because they do not " +"conform to the Debian Free Software Guidelines. You may need to reconfigure " +"the package manager to include the contrib and non-free sections of the " +"package archive before you can install these firmware files." +msgstr "" +"La mayoría de ficheros de firmware no se incluyen en el sistema porque no " +"cumplen las normas de software libre de Debian («Debian Free Software " +"Guidelines»). Puede que tenga que reconfigurar el gestor de paquetes para " +"incluir las secciones «contrib» y «non-free» del archivo de Debian antes de " +"instalar estos ficheros de firmware." diff --git a/debian/po/et.po b/debian/po/et.po new file mode 100644 index 000000000..a3c2ff4a1 --- /dev/null +++ b/debian/po/et.po @@ -0,0 +1,367 @@ +# linux-2.6-debconf estonian translation +# linux-2.6-debconf eesti keele tõlge +# Copyright (C) 2010 Debian GNU/Linux +# This file is distributed under the same license as the PACKAGE package. +# +# mihkel , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: linux-2.6 2.6.32-11\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-23 22:14+0200\n" +"PO-Revision-Date: 2010-04-24 14:20+0300\n" +"Last-Translator: mihkel \n" +"Language-Team: Estonian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Emacs\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 "Värskenda süsteemi seadetes ketta seadmete ID-d?" + +#. 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 "" +"Uus Linuxi tuuma versioon pakub teistsuguseid nimesid mõnedele PATA (IDE) " +"kontrolleritele. Osade kõvaketaste, CD-ROM-de ja lindiseadete nimed võivad " +"muutuda." + +#. 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 "" +"Nüüdsest on soovituslik konfiguratsioonifailides identifitseerida kettaid " +"siltide või UUID (unikaalne idendifikaator) järgi, mitte seadme nime järgi. " +"Nii töötavad nad nii vanade kui ka uute tuumadega." + +#. 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 "" +"Kui valid mitte automaatselt uuendada süsteemi konfiguratsiooni, siis pead " +"ise käsitsi muutma seadmete ID-d enne järgmist taaskäivitust või süsteem ei " +"käivitu enam." + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 ../linux-base.templates:4001 +msgid "Apply configuration changes to disk device IDs?" +msgstr "Rakenda ketta seadmete ID-de konfiratsiooni muudatused?" + +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 +msgid "These devices will be assigned UUIDs or labels:" +msgstr "Nendele seadmetele määratakse UUID-d või sildid:" + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 ../linux-base.templates:4001 +msgid "These configuration files will be updated:" +msgstr "Need konfiguratsioonifailid uuendatakse:" + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 ../linux-base.templates:4001 +msgid "The device IDs will be changed as follows:" +msgstr "Seadme ID-d muudetakse järgnevalt:" + +#. Type: error +#. Description +#: ../linux-base.templates:5001 +msgid "Configuration files still contain deprecated device names" +msgstr "Konfiguratsioonifailid sisaldavad ikka iganenud seadmete nimesid" + +#. 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 "" +"Järgnevad konfiguratsioonifailid sisaldavad ikka seadmete nimesid, mis " +"võivad uue tuumaga muutuda:" + +#. Type: error +#. Description +#: ../linux-base.templates:6001 +msgid "Boot loader configuration check needed" +msgstr "Vajalik alglaaduri konfiguratsiooni kontroll" + +#. 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 "" +"Selle süsteemi alglaaduri konfiguratsiooni ei tuntud ära. Need " +"konfiguratsiooniseaded võivad vajada uuendamist:" + +#. 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 "" +" * Root seadme ID edastatud kui tuuma parameeter;\n" +" * Boot seadme ID, mida kasutati alglaaduri paigaldamisel ja uuendamisel. " + +#. 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 "" +"Üldjuhul peaks need seadmed identifitseerima UUID või sildi järgi. Kuid MIPS " +"süsteemidel peab root seade olema idendifitseeritud nime järgi." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:2001 +msgid "Abort installation after depmod error?" +msgstr "Katkesta paigaldus peale depmod veateadet?" + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:2001 +msgid "" +"The 'depmod' command exited with the exit code ${exit_value} (${SIGNAL}" +"${CORE})." +msgstr "" +"'depmod' käsk lõpetas väljumise koodiga ${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 "" +"Kuna tõmmis kasutab initrd-d, siis ${modules_base}/=V/modules.dep faili ei " +"kustutata, kuigi ta võib olla vigane." + +#. 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 "" +"Sa peaksid paigaldamise katkestama ja parandama depmodi vead või " +"regenereerima initrd tõmmise heade modules.dep failiga. Kui sa ei katkesta, " +"siis suure tõenäosusega süsteem enam ei käivitu alglaadimisel." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "Run the default boot loader?" +msgstr "Käivita vaikimisi alglaadur?" + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"The default boot loader for this architecture is $loader, which is present." +msgstr "Selle arhitektuuri vaikimisi alglaadur on $loader, mis on ka olemas." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"However, there is no explicit request to run that boot loader in /etc/kernel-" +"img.conf while GRUB seems to be installed with a postinst hook set." +msgstr "" +"Alglaadurit käivitada pole /etc/kernel-img.conf andmetel otsest vajadust, " +"GRUB tundub olevat paigaldatud postinst haagiga." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"It thus seems that this system is using GRUB as boot loader instead of " +"$loader." +msgstr "Paistab, et see süsteem kasutab $loader asemel GRUB-i alglaadurina." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"Please choose which should run: the default boot loader now, or the GRUB " +"update later." +msgstr "" +"Vali, milline peaks käivituma: vaikimisi alglaadur kohe või GRUB update " +"hiljem." + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:4001 +msgid "Error running the boot loader in test mode" +msgstr "Alglaaduri käivitamisel testi režiimis tekkis viga" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:4001 +msgid "An error occurred while running the ${loader} boot loader in test mode." +msgstr "${loader} alglaaduri käivitamisel testi režiimis tekkis viga." + +#. Type: note +#. Description +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:4001 +#: ../templates/temp.image.plain/templates:5001 +msgid "" +"A log is available in ${temp_file_name}. Please edit /etc/${loader}.conf " +"manually and re-run ${loader} to fix that issue and keep this system " +"bootable." +msgstr "" +"Logi fail on saadaval ${temp_file_name}. Palun redigeeri käsitsi faili /etc/" +"${loader}.conf ja taaskäivita ${loader} parandamaks need vead ja hoia see " +"süsteem töökorras." + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:5001 +msgid "Error running the boot loader" +msgstr "Viga alglaaduri käivitamisel" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:5001 +msgid "An error occurred while running the ${loader} boot loader." +msgstr "Tekkis viga alglaaduri ${loader} käivitamisel." + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:6001 +#: ../templates/temp.image.plain/templates:7001 +msgid "Abort kernel removal?" +msgstr "Katkesta tuuma eemaldamine?" + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:6001 +msgid "" +"You are running a kernel (version ${running}) and attempting to remove the " +"same version." +msgstr "" +"Sa kasutad tuuma versiooni (version ${running}) ning üritad seda sama " +"versiooni eemaldada." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:6001 +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 "" +"See võib süsteemi muuta mitte käivitatavaks kuna eemaldatakse /boot/vmlinuz-" +"${running} ja kõik moodulid kataloogist /lib/modules/${running}. Seda saab " +"parandada ainult sama tumma ja vastavate moodulite kopeerimisega õigetesse " +"kohtadesse." + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:6001 +#: ../templates/temp.image.plain/templates:7001 +msgid "" +"It is highly recommended to abort the kernel removal unless you are prepared " +"to fix the system after removal." +msgstr "" +"On äärmiselt soovituslik katkestada tuuma eemaldamine, kui sa just pole " +"valmistunud süsteemi ise parandama." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:7001 +msgid "" +"This system uses a valid /etc/${loader}.conf file that mentions ${kimage}-" +"=V. Removing =ST-image-=V will invalidate that file." +msgstr "" +"See süsteem kasutab kehtivat /etc/${loader}.conf faili, mis mainib ${kimage}-" +"=V. Eemaldades =ST-image-=V muudab selle faili kehtetuks." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:7001 +msgid "" +"You will need to edit /etc/${loader}.conf or re-target symbolic links " +"mentioned there (typically, /vmlinuz and /vmlinuz.old) to not refer to " +"${kimage}-=V. Then, you will have to re-run ${loader}." +msgstr "" +"Sa pead muutma /etc/${loader}.conf faili või ümber suunama seal mainitud " +"sümboolsed lingid (tavaliselt /vmlinuz ja /vmlinuz.old), et nad ei viitaks " +"${kimage}-=V. Siis pead taaskäivitama ${loader}." + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:8001 +msgid "Required firmware files may be missing" +msgstr "Vajalikud püsivara failid võivad olla puudu" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:8001 +msgid "" +"This system is currently running Linux ${runningversion} and you are " +"installing Linux ${version}. In the new version some of the drivers used on " +"this system may require additional firmware files:" +msgstr "" +"See süsteem kasutab praegu Linuxi versiooni ${runningversion} ja sina " +"paigaldad versiooni ${version}. Uues versionis võivad mõned ajurid vajada " +"lisaks püsivara faile:" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:8001 +msgid "${missing}" +msgstr "${missing}" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:8001 +msgid "" +"Most firmware files are not included in the system because they do not " +"conform to the Debian Free Software Guidelines. You may need to reconfigure " +"the package manager to include the contrib and non-free sections of the " +"package archive before you can install these firmware files." +msgstr "" +"Enamik püsivara faile ei ole kaasatud süsteemi, sest nad ei vasta Debian " +"vaba tarkvara juhtnööridele (Debian Free Software Guidelines). Võimalik, et " +"pead enne oma pakimajandajat ümber seadistama, et kaasata varamutesse ka " +"contrib ja non-free harud, kui saad need püsivara failid paigaldada." diff --git a/debian/po/fr.po b/debian/po/fr.po new file mode 100644 index 000000000..52f0e962f --- /dev/null +++ b/debian/po/fr.po @@ -0,0 +1,390 @@ +# Translation of linux-2.6 debconf templates to French +# Copyright (C) 2010 Debian French l10n team +# This file is distributed under the same license as the linux-2.6 package. +# +# David Prévot , 2010. +msgid "" +msgstr "" +"Project-Id-Version: linux-2.6 2.6.32-11\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-23 22:14+0200\n" +"PO-Revision-Date: 2010-04-30 05:35-0400\n" +"Last-Translator: David Prévot \n" +"Language-Team: French \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 1.0\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 "" +"Faut-il mettre à jour les identifiants des partitions dans la configuration " +"du système ?" + +#. 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 nouvelle version du noyau Linux fournit des pilotes différents pour " +"certains contrôleurs PATA (IDE). Les noms de certains disques durs, lecteurs " +"de CD-ROM et de bandes peuvent être modifiés." + +#. 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 "" +"Il est conseillé d'identifier, dans les fichiers de configuration, les " +"partitions par leur étiquette (« label ») ou leur UUID (identifiant unique " +"universel) plutôt que par leur nom. Ainsi le système fonctionnera à la fois " +"avec les anciennes et les nouvelles versions du noyau." + +#. 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 vous choisissez de ne pas mettre à jour automatiquement la configuration " +"du système, vous devez mettre à jour vous-même les identifiants des " +"périphériques avant de redémarrer le système. Dans le cas contraire, le " +"système risque de ne pas pouvoir redémarrer correctement." + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 ../linux-base.templates:4001 +msgid "Apply configuration changes to disk device IDs?" +msgstr "" +"Appliquer les changements de configuration aux identifiants des partitions ?" + +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 +msgid "These devices will be assigned UUIDs or labels:" +msgstr "" +"Les périphériques suivants seront identifiés par une étiquette (« label ») ou " +"un UUID :" + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 ../linux-base.templates:4001 +msgid "These configuration files will be updated:" +msgstr "Les fichiers de configuration suivants seront mis à jour :" + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 ../linux-base.templates:4001 +msgid "The device IDs will be changed as follows:" +msgstr "Les identifiants des périphériques seront modifiés comme suit :" + +#. Type: error +#. Description +#: ../linux-base.templates:5001 +msgid "Configuration files still contain deprecated device names" +msgstr "" +"Les noms des périphériques utilisés dans certains fichiers de configuration " +"sont déconseillés." + +#. 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 "" +"Les noms des périphériques utilisés dans les fichiers de configuration " +"suivants peuvent changer lors de l'utilisation du nouveau noyau : " + +#. Type: error +#. Description +#: ../linux-base.templates:6001 +msgid "Boot loader configuration check needed" +msgstr "Vérification indispensable de la configuration du programme d'amorçage" + +#. 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 configuration du programme d'amorçage de ce système n'a pas été reconnue. " +"Les paramètres de configuration suivants peuvent nécessiter une mise à jour :" + +#. 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 "" +" - identifiant de la partition racine (« root »), passé en tant\n" +" que paramètre du noyau ;\n" +" - identifiant de la partition de démarrage (« boot »), utilisé\n" +" pour installer et mettre à jour le programme d'amorçage." + +#. 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 "" +"Normalement, vous devriez identifier ces partitions par leur UUID ou leur " +"étiquette (« label »). Toutefois, pour l'architecture MIPS, la partition " +"racine (« root ») doit être identifiée par son nom." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:2001 +msgid "Abort installation after depmod error?" +msgstr "Abandonner l'installation après l'erreur 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 "" +"La commande depmod s'est terminée avec le code de sortie ${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 "" +"Puisque cette image du noyau utilise initrd, le fichier ${modules_base}/=V/" +"modules.dep ne sera pas effacé, mais il peut ne pas être valable." + +#. 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 "" +"Vous devriez abandonner l'installation et corriger les erreurs de dépendance " +"entre les modules du noyau (depmod), ou créer une nouvelle image initrd avec " +"un fichier modules.dep valable. Si vous n'annulez pas l'installation, le " +"système risque de ne pas redémarrer correctement." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "Run the default boot loader?" +msgstr "Faut-il exécuter le programme d'amorçage par défaut ?" + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"The default boot loader for this architecture is $loader, which is present." +msgstr "" +"Le programme d'amorçage par défaut pour cette architecture, $loader, est " +"présent." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"However, there is no explicit request to run that boot loader in /etc/kernel-" +"img.conf while GRUB seems to be installed with a postinst hook set." +msgstr "" +"Cependant, il n'est pas explicitement demandé de l'exécuter dans /etc/kernel-" +"img.conf alors que GRUB semble être configuré par un script exécuté en fin " +"d'installation (« postinst hook »)." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"It thus seems that this system is using GRUB as boot loader instead of " +"$loader." +msgstr "" +"Il semble donc que ce système utilise GRUB comme programme d'amorçage au " +"lieu de $loader." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"Please choose which should run: the default boot loader now, or the GRUB " +"update later." +msgstr "" +"Veuillez choisir lequel doit être exécuté : le programme d'amorçage par " +"défaut maintenant, ou la mise à jour de GRUB plus tard." + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:4001 +msgid "Error running the boot loader in test mode" +msgstr "Erreur d'exécution du programme d'amorçage en mode test" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:4001 +msgid "An error occurred while running the ${loader} boot loader in test mode." +msgstr "" +"Une erreur s'est produite lors de l'exécution du programme d'amorçage " +"${loader} en mode test." + +#. Type: note +#. Description +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:4001 +#: ../templates/temp.image.plain/templates:5001 +msgid "" +"A log is available in ${temp_file_name}. Please edit /etc/${loader}.conf " +"manually and re-run ${loader} to fix that issue and keep this system " +"bootable." +msgstr "" +"Un journal est disponible dans ${temp_file_name}. Veuillez modifier /etc/" +"${loader}.conf vous-même et exécuter de nouveau ${loader} afin de corriger " +"ce problème et conserver le système amorçable." + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:5001 +msgid "Error running the boot loader" +msgstr "Erreur d'exécution du programme d'amorçage" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:5001 +msgid "An error occurred while running the ${loader} boot loader." +msgstr "" +"Une erreur s'est produite lors de l'exécution du programme d'amorçage " +"${loader}." + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:6001 +#: ../templates/temp.image.plain/templates:7001 +msgid "Abort kernel removal?" +msgstr "Abandonner la suppression du noyau ?" + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:6001 +msgid "" +"You are running a kernel (version ${running}) and attempting to remove the " +"same version." +msgstr "" +"Le noyau actuellement utilisé (version ${running}) est en train d'être " +"supprimé." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:6001 +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 "" +"Le système risque de ne plus pouvoir démarrer car /boot/vmlinuz-${running} " +"sera enlevé ainsi que tous les modules du répertoire /lib/modules/" +"${running}. Cela peut seulement être réparé avec une copie de l'image du " +"noyau et des modules correspondants." + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:6001 +#: ../templates/temp.image.plain/templates:7001 +msgid "" +"It is highly recommended to abort the kernel removal unless you are prepared " +"to fix the system after removal." +msgstr "" +"Il est fortement recommandé d'interrompre la suppression du noyau à moins " +"d'être ensuite prêt à réparer le système." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:7001 +msgid "" +"This system uses a valid /etc/${loader}.conf file that mentions ${kimage}-" +"=V. Removing =ST-image-=V will invalidate that file." +msgstr "" +"Le fichier /etc/${loader}.conf contenant la mention « ${kimage}-=V » est " +"valable. Enlever « =ST-image-=V » rendra ce fichier non valable." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:7001 +msgid "" +"You will need to edit /etc/${loader}.conf or re-target symbolic links " +"mentioned there (typically, /vmlinuz and /vmlinuz.old) to not refer to " +"${kimage}-=V. Then, you will have to re-run ${loader}." +msgstr "" +"Il est nécessaire de modifier /etc/${loader}.conf ou la cible du lien " +"symbolique qui y est mentionné (en général, /vmlinuz et /vmlinuz.old) afin " +"de ne pas pointer vers ${kimage}-=V. Il sera ensuite nécessaire d'exécuter " +"de nouveau ${loader}." + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:8001 +msgid "Required firmware files may be missing" +msgstr "Microprogrammes (« firmwares ») probablement manquants" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:8001 +msgid "" +"This system is currently running Linux ${runningversion} and you are " +"installing Linux ${version}. In the new version some of the drivers used on " +"this system may require additional firmware files:" +msgstr "" +"Ce système utilise actuellement Linux ${runningversion}, et Linux ${version} " +"va être installé. Dans la nouvelle version, certains pilotes utilisés par ce " +"système peuvent avoir besoin des microprogrammes additionnels :" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:8001 +msgid "${missing}" +msgstr "${missing}" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:8001 +msgid "" +"Most firmware files are not included in the system because they do not " +"conform to the Debian Free Software Guidelines. You may need to reconfigure " +"the package manager to include the contrib and non-free sections of the " +"package archive before you can install these firmware files." +msgstr "" +"La plupart des microprogrammes ne sont pas intégrés car ils ne sont pas " +"conformes aux principes du logiciel libre selon Debian. Il est probablement " +"nécessaire de modifier la configuration du gestionnaire de paquets et " +"d'ajouter les sections « contrib » (contributions) et « non-free » (non libre) " +"de l'archive avant de pouvoir installer ces fichiers." diff --git a/debian/po/ja.po b/debian/po/ja.po new file mode 100644 index 000000000..472d36c09 --- /dev/null +++ b/debian/po/ja.po @@ -0,0 +1,369 @@ +# 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 , YEAR. +# +msgid "" +msgstr "" +"Project-Id-Version: linux-2.6\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-23 22:14+0200\n" +"PO-Revision-Date: 2010-05-09 19:10+0900\n" +"Last-Translator: Kenshi Muto \n" +"Language-Team: Japanese \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 "システム設定のディスクデバイス ID を更新しますか?" + +#. 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、テープデバイスの名前のい" +"くつかは変更される可能性があります。" + +#. 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 (固有識別子) を使うこと" +"が、現在推奨されます。" + +#. 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 を更新する必要があります。さもないと、システムは起動不" +"能になってしまうかもしれません。" + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 ../linux-base.templates:4001 +msgid "Apply configuration changes to disk device IDs?" +msgstr "ディスクデバイス ID の設定変更を適用しますか?" + +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 +msgid "These devices will be assigned UUIDs or labels:" +msgstr "次のデバイスは UUID またはラベルに割り当てられます:" + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 ../linux-base.templates:4001 +msgid "These configuration files will be updated:" +msgstr "次の設定ファイルは更新されます:" + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 ../linux-base.templates:4001 +msgid "The device IDs will be changed as follows:" +msgstr "デバイス ID は次のように変更されます:" + +#. Type: error +#. Description +#: ../linux-base.templates:5001 +msgid "Configuration files still contain deprecated device names" +msgstr "設定ファイルはまだ問題のあるデバイス名を含んでいます" + +#. 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 "" +"次の設定ファイルは依然として、新しいカーネルの使用時に変更され得るいくつかの" +"デバイス名を使っています:" + +#. Type: error +#. Description +#: ../linux-base.templates:6001 +msgid "Boot loader configuration check needed" +msgstr "ブートローダ設定の確認が必要です" + +#. 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 "" +"このシステムのブートローダ設定を認識できませんでした。設定中の次の定義は、更" +"新する必要があるかもしれません:" + +#. 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 "" +" * ルートデバイス ID はカーネルパラメータとして渡されます;\n" +" * ブートデバイス ID はブートローダのインストールおよび更新に使われます。" + +#. 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 シ" +"ステムではルートデバイスは名前で識別しなければなりません。" + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:2001 +msgid "Abort installation after depmod error?" +msgstr "depmod のエラー後にインストールを中止しますか?" + +#. 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}) で終了しまし" +"た。" + +#. 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 ファイ" +"ルは (たとえ無効なものであったとしても) 削除されません。" + +#. 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 イメージを再生成すべきです。インストールを中止" +"しないと、システムの起動に失敗する恐れがあります。" + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "Run the default boot loader?" +msgstr "デフォルトのブートローダを実行しますか?" + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"The default boot loader for this architecture is $loader, which is present." +msgstr "" +"このアーキテクチャのデフォルトのブートローダは $loader で、現在提供されていま" +"す。" + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"However, there is no explicit request to run that boot loader in /etc/kernel-" +"img.conf while GRUB seems to be installed with a postinst hook set." +msgstr "" +"ただし、GRUB が postinst フックセットでインストールされたようですが、/etc/" +"kernel-img.conf でブートローダを実行する明示的な要求がありません。" + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"It thus seems that this system is using GRUB as boot loader instead of " +"$loader." +msgstr "" +"したがってこのシステムは、$loader の代わりに GRUB をブートローダとして使用し" +"ています。" + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"Please choose which should run: the default boot loader now, or the GRUB " +"update later." +msgstr "" +"デフォルトのブートローダを今実行するか、GRUB の更新を後で行うかのどちらをすべ" +"きか選んでください。" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:4001 +msgid "Error running the boot loader in test mode" +msgstr "テストモードでのブートローダの実行中にエラー" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:4001 +msgid "An error occurred while running the ${loader} boot loader in test mode." +msgstr "テストモードでブートローダ ${loader} を実行中にエラーが発生しました。" + +#. Type: note +#. Description +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:4001 +#: ../templates/temp.image.plain/templates:5001 +msgid "" +"A log is available in ${temp_file_name}. Please edit /etc/${loader}.conf " +"manually and re-run ${loader} to fix that issue and keep this system " +"bootable." +msgstr "" +"ログは ${temp_file_name} から参照できます。/etc/${loader}.conf を手で編集し、" +"問題を修正してこのシステムが起動できる状態を保つために ${loader} を再実行して" +"ください。" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:5001 +msgid "Error running the boot loader" +msgstr "ブートローダの実行中にエラー" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:5001 +msgid "An error occurred while running the ${loader} boot loader." +msgstr "ブートローダ ${loader} の実行中にエラーが発生しました。" + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:6001 +#: ../templates/temp.image.plain/templates:7001 +msgid "Abort kernel removal?" +msgstr "カーネルの削除を中止しますか?" + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:6001 +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:6001 +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 +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:6001 +#: ../templates/temp.image.plain/templates:7001 +msgid "" +"It is highly recommended to abort the kernel removal unless you are prepared " +"to fix the system after removal." +msgstr "" +"削除後でもシステムに問題がないような準備を済ませるまで、カーネルの削除を中止" +"することを強くお勧めします。" + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:7001 +msgid "" +"This system uses a valid /etc/${loader}.conf file that mentions ${kimage}-" +"=V. Removing =ST-image-=V will invalidate that file." +msgstr "" +"このシステムは、${kimage}-=V について記述した有効な /etc/${loader}.conf ファ" +"イルを使用しています。=ST-image-=V の削除はこのファイルを無効化することになり" +"ます。" + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:7001 +msgid "" +"You will need to edit /etc/${loader}.conf or re-target symbolic links " +"mentioned there (typically, /vmlinuz and /vmlinuz.old) to not refer to " +"${kimage}-=V. Then, you will have to re-run ${loader}." +msgstr "" +"${kimage}-=V を参照しないように、/etc/${loader}.conf を編集するか、関連するシ" +"ンボリックリンク (通常 /vmlinuz および /vmlinuz.old) のターゲットを再設定する" +"必要があります。その後、${loader} を再実行してください。" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:8001 +msgid "Required firmware files may be missing" +msgstr "必要なファームウェアファイルがなくなっている可能性があります" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:8001 +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:8001 +msgid "${missing}" +msgstr "${missing}" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:8001 +msgid "" +"Most firmware files are not included in the system because they do not " +"conform to the Debian Free Software Guidelines. You may need to reconfigure " +"the package manager to include the contrib and non-free sections of the " +"package archive before you can install these firmware files." +msgstr "" +"ほとんどのファームウェアファイルは、Debian フリーソフトウェアガイドラインに合" +"致しないため、システムに含まれていません。これらのファームウェアファイルをイ" +"ンストール可能にするために、パッケージアーカイブの contrib および non-free セ" +"クションを含むようパッケージマネージャを再設定する必要があるかもしれません。" diff --git a/debian/po/pt.po b/debian/po/pt.po new file mode 100644 index 000000000..ebe12d484 --- /dev/null +++ b/debian/po/pt.po @@ -0,0 +1,394 @@ +# Translation of linux-2.6 debconf messages to Portuguese +# Copyright (C) 2010 the linux-2.6's copyright holder +# This file is distributed under the same license as the linux-2.6 package. +# +# Américo Monteiro , 2010. +msgid "" +msgstr "" +"Project-Id-Version: linux-2.6 2.6.32-11\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-23 22:14+0200\n" +"PO-Revision-Date: 2010-04-23 22:12+0100\n" +"Last-Translator: Américo Monteiro \n" +"Language-Team: Portuguese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Lokalize 1.0\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 "" +"Actualizar os IDs dos 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 de kernel Linux disponibiliza drivers diferentes para alguns " +"controladores PATA (IDE). Os nomes de alguns discos rígidos, CD-ROM e " +"dispositivos de fita magnética poderão 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 os dispositivos de discos nos ficheiros de " +"configuração pela etiqueta ou UUID (identificador único) em vez do nome de " +"dispositivo, o qual irá funcionar com ambas versões de kernel antiga e 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 "" +"Se escolher não actualizar a configuração do sistema automaticamente, você " +"tem de actualizar os IDs dos dispositivos antes de reiniciar o sistema ou o " +"sistema pode não arrancar." + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 ../linux-base.templates:4001 +msgid "Apply configuration changes to disk device IDs?" +msgstr "" +"Aplicar estas alterações de configuração aos IDs de dispositivos de discos?" + +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 +msgid "These devices will be assigned UUIDs or labels:" +msgstr "A estes dispositivos serão atribuídos UUIDs ou etiquetas:" + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 ../linux-base.templates:4001 +msgid "These configuration files will be updated:" +msgstr "Estes ficheiros de configuração irão ser actualizados:" + +#. 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 IDs de dispositivos irão ser alterados de acordo com o seguinte:" + +#. Type: error +#. Description +#: ../linux-base.templates:5001 +msgid "Configuration files still contain deprecated device names" +msgstr "" +"Os ficheiros de configuração ainda contêm nomes obsoletos de dispositivos" + +#. 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 "" +"Os seguintes ficheiros de configuração ainda usam alguns nomes de " +"dispositivos que podem alterar quando usar o novo kernel:" + +#. Type: error +#. Description +#: ../linux-base.templates:6001 +msgid "Boot loader configuration check needed" +msgstr "Necessária verificação da configuração do gestor de arranque" + +#. 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 gestor de arranque para este sistema não foi reconhecida. " +"Estas definições na configuração podem precisar de ser actualizadas:" + +#. 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 root passado como parâmetro do kernel\n" +" * O ID do dispositivo boot usado para instalar e actualizar o gestor de " +"arranque" + +#. 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 deve-se identificar estes dispositivos pelo UUID ou etiqueta. No " +"entanto, em sistemas MIPS, o dispositivo root tem de ser identificado pelo " +"nome." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:2001 +msgid "Abort installation after depmod error?" +msgstr "Abortar a 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 erro ${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 "" +"Como esta imagem usa initrd, o ficheiro ${modules_base}/=V/modules.dep não " +"será apagado, apesar de poder ser 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 abortar a instalação e corrigir os erros do depmod, ou gerar " +"novamente a imagem initrd com um ficheiro modules.dep conhecido como bom. Se " +"não abortar a instalação, existe o perigo do sistema falhar no arranque." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "Run the default boot loader?" +msgstr "Correr o gestor de arranque predefinido?" + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"The default boot loader for this architecture is $loader, which is present." +msgstr "" +"O gestor de arranque predefinido para esta arquitectura é $loader, o qual " +"está presente." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"However, there is no explicit request to run that boot loader in /etc/kernel-" +"img.conf while GRUB seems to be installed with a postinst hook set." +msgstr "" +"No entanto, não existe um pedido específico para correr esse gestor de " +"arranque em /etc/kernel-img.conf embora o GRUB pareça estar instalado com um " +"hook de pós-instalação definido." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"It thus seems that this system is using GRUB as boot loader instead of " +"$loader." +msgstr "" +"Assim, parece que este sistema usa o GRUB como gestor de arranque em vez de " +"$loader." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"Please choose which should run: the default boot loader now, or the GRUB " +"update later." +msgstr "" +"Por favor escolha qual deve correr: o gestor de arranque predefinido agora, " +"ou a actualização ao GRUB mais tarde." + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:4001 +msgid "Error running the boot loader in test mode" +msgstr "Erro ao correr o gestor de arranque em modo de teste" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:4001 +msgid "An error occurred while running the ${loader} boot loader in test mode." +msgstr "" +"Ocorreu um erro ao correr o gestor de arranque ${loader} em modo de teste." + +#. Type: note +#. Description +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:4001 +#: ../templates/temp.image.plain/templates:5001 +msgid "" +"A log is available in ${temp_file_name}. Please edit /etc/${loader}.conf " +"manually and re-run ${loader} to fix that issue and keep this system " +"bootable." +msgstr "" +"Está disponível um relatório em ${temp_file_name}. Por favor edite o /etc/" +"${loader}.conf manualmente e execute de novo ${loader} para corrigir esse " +"problema e manter este sistema de forma a que possa arrancar." + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:5001 +msgid "Error running the boot loader" +msgstr "Erro ao correr o gestor de arranque" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:5001 +msgid "An error occurred while running the ${loader} boot loader." +msgstr "Ocorreu um erro ao correr o gestor de arranque ${loader}." + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:6001 +#: ../templates/temp.image.plain/templates:7001 +msgid "Abort kernel removal?" +msgstr "Abortar a remoção do kernel?" + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:6001 +msgid "" +"You are running a kernel (version ${running}) and attempting to remove the " +"same version." +msgstr "" +"Você está a correr um kernel (versão ${running}) e a tentar remover essa " +"mesma versão." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:6001 +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 fazer com que o sistema não arranque porque irá remover /boot/" +"vmlinuz-${running} e todos os módulos no directório /lib/modules/${running}. " +"Isto só pode ser corrigido com uma cópia da imagem do kernel e dos " +"correspondentes módulos." + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:6001 +#: ../templates/temp.image.plain/templates:7001 +msgid "" +"It is highly recommended to abort the kernel removal unless you are prepared " +"to fix the system after removal." +msgstr "" +"É altamente recomendado abortar a remoção do kernel a menos que esteja " +"preparado para corrigir o sistema após a remoção." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:7001 +msgid "" +"This system uses a valid /etc/${loader}.conf file that mentions ${kimage}-" +"=V. Removing =ST-image-=V will invalidate that file." +msgstr "" +"Este sistema usa um ficheiro /etc/${loader}.conf válido que menciona " +"${kimage}-=V. Remover =ST-image-=V irá invalidar esse ficheiro." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:7001 +msgid "" +"You will need to edit /etc/${loader}.conf or re-target symbolic links " +"mentioned there (typically, /vmlinuz and /vmlinuz.old) to not refer to " +"${kimage}-=V. Then, you will have to re-run ${loader}." +msgstr "" +"Você precisa de editar o /etc/${loader}.conf ou re-orientar os links " +"simbólicos mencionados lá (tipicamente, /vmlinuz and /vmlinuz.old) para não " +"apontarem para ${kimage}-=V. Depois terá que executar novamente o ${loader}." + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:8001 +msgid "Required firmware files may be missing" +msgstr "Podem estar em falta ficheiros de firmware necessários" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:8001 +msgid "" +"This system is currently running Linux ${runningversion} and you are " +"installing Linux ${version}. In the new version some of the drivers used on " +"this system may require additional firmware files:" +msgstr "" +"Este sistema está actualmente a correr Linux ${runningversion} e você está a " +"instalar Linux ${version}. Na nova versão algumas das drivers usadas neste " +"sistema podem necessitar dos ficheiros de firmware adicionais:" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:8001 +msgid "${missing}" +msgstr "${missing}" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:8001 +msgid "" +"Most firmware files are not included in the system because they do not " +"conform to the Debian Free Software Guidelines. You may need to reconfigure " +"the package manager to include the contrib and non-free sections of the " +"package archive before you can install these firmware files." +msgstr "" +"A maioria dos ficheiros de firmware não estão incluídos no sistema porque " +"não respeitam as Guidelines da Debian Free Software. Você pode precisar de " +"reconfigurar o gestor de pacotes para incluir as secções contrib e non-free " +"do arquivo de pacotes antes de poder instalar estes ficheiros de firmware." + +#~ msgid "${relabel}" +#~ msgstr "${relabel}" + +#~ msgid "${files}" +#~ msgstr "${files}" + +#~ msgid "${id_map}" +#~ msgstr "${id_map}" + +#~ msgid "Please check these configuration files before rebooting" +#~ msgstr "" +#~ "Por favor verifique estes ficheiros de configuração antes de reiniciar o " +#~ "sistema" + +#~ msgid "${unconverted}" +#~ msgstr "${unconverted}" diff --git a/debian/po/ru.po b/debian/po/ru.po new file mode 100644 index 000000000..1bcf52a83 --- /dev/null +++ b/debian/po/ru.po @@ -0,0 +1,372 @@ +# translation of ru.po to Russian +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. +# +# Yuri Kozlov , 2010. +msgid "" +msgstr "" +"Project-Id-Version: linux-2.6 new\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-23 22:14+0200\n" +"PO-Revision-Date: 2010-04-24 10:31+0400\n" +"Last-Translator: Yuri Kozlov \n" +"Language-Team: Russian \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: KBabel 1.11.4\n" +"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%" +"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n" + +#. Type: boolean +#. Description +#: ../linux-base.templates:2001 +msgid "Update disk device IDs in system configuration?" +msgstr "Обновить ID дисковых устройств в настройках системы?" + +#. 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 и ленточных накопителей." + +#. 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 (уникальных идентификаторов), а не имён устройств. Это будет " +"работать и в старых и в новых версиях ядер." + +#. 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 устройств самостоятельно до следующей перезагрузки, иначе " +"система не запустится." + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 ../linux-base.templates:4001 +msgid "Apply configuration changes to disk device IDs?" +msgstr "Применить изменение настроек для ID дисковых устройств?" + +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 +msgid "These devices will be assigned UUIDs or labels:" +msgstr "Следующим устройствам будут назначены UUID или метки:" + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 ../linux-base.templates:4001 +msgid "These configuration files will be updated:" +msgstr "Следующие файлы настройки будут обновлены:" + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 ../linux-base.templates:4001 +msgid "The device IDs will be changed as follows:" +msgstr "ID устройств будут изменены следующим образом:" + +#. Type: error +#. Description +#: ../linux-base.templates:5001 +msgid "Configuration files still contain deprecated device names" +msgstr "Файлы настройки всё ещё содержат устаревшие имена устройств" + +#. 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 "" +"В следующих файлах настройки всё ещё используются некоторые имена устройств, " +"которые могут измениться при использовании нового ядра:" + +#. Type: error +#. Description +#: ../linux-base.templates:6001 +msgid "Boot loader configuration check needed" +msgstr "Требуется проверка настроек системного загрузчика" + +#. 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 "" +"Не удалось определить настройки системного загрузчика данной системы. " +"Следующие настройки может потребоваться изменить:" + +#. 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 "" +" * ID корневого устройства, передаваемого параметром ядра;\n" +" * ID загрузочного устройства, используемого для установки и обновления " +"системного загрузчика." + +#. 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 корневое устройство должно быть определено по имени." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:2001 +msgid "Abort installation after depmod error?" +msgstr "Прервать установку после ошибки depmod?" + +#. 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})." + +#. 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 не " +"будет удалён, даже если он может быть неправильным." + +#. 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, или пересобрать " +"образ initrd с работающим файлом modules.dep. Если вы не прервёте установку, " +"то система больше не сможет загружаться." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "Run the default boot loader?" +msgstr "Запустить системный загрузчик по умолчанию?" + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"The default boot loader for this architecture is $loader, which is present." +msgstr "" +"Для данной архитектуры системным загрузчиком по умолчанию является $loader " +"(уже установлен)." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"However, there is no explicit request to run that boot loader in /etc/kernel-" +"img.conf while GRUB seems to be installed with a postinst hook set." +msgstr "" +"Однако нет явного указания запускать данный системный загрузчик в /etc/" +"kernel-img.conf, так как, вероятно, GRUB установлен с помощью " +"заключительного сценария установки пакета (postinst)." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"It thus seems that this system is using GRUB as boot loader instead of " +"$loader." +msgstr "" +"Вероятно, что на данной системе в качестве системного загрузчика " +"используется GRUB, а не $loader." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"Please choose which should run: the default boot loader now, or the GRUB " +"update later." +msgstr "" +"Выберите что нужно запускать: системный загрузчик по умолчанию прямо сейчас " +"или позднее GRUB." + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:4001 +msgid "Error running the boot loader in test mode" +msgstr "Ошибка при работе системного загрузчика в тестовом режиме" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:4001 +msgid "An error occurred while running the ${loader} boot loader in test mode." +msgstr "" +"При работе системного загрузчика ${loader} в тестовом режиме произошла " +"ошибка." + +#. Type: note +#. Description +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:4001 +#: ../templates/temp.image.plain/templates:5001 +msgid "" +"A log is available in ${temp_file_name}. Please edit /etc/${loader}.conf " +"manually and re-run ${loader} to fix that issue and keep this system " +"bootable." +msgstr "" +"Журнал работы доступен в файле ${temp_file_name}. Отредактируйте /etc/" +"${loader}.conf вручную и перезапустите ${loader} для исправления ошибки и " +"сохранения загрузочного состояния системы." + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:5001 +msgid "Error running the boot loader" +msgstr "Ошибка при работе системного загрузчика" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:5001 +msgid "An error occurred while running the ${loader} boot loader." +msgstr "При работе системного загрузчика ${loader} произошла ошибка." + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:6001 +#: ../templates/temp.image.plain/templates:7001 +msgid "Abort kernel removal?" +msgstr "Прервать удаление ядра?" + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:6001 +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:6001 +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 +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:6001 +#: ../templates/temp.image.plain/templates:7001 +msgid "" +"It is highly recommended to abort the kernel removal unless you are prepared " +"to fix the system after removal." +msgstr "" +"Настоятельно рекомендуется прервать удаление ядра, если вы не готовы чинить " +"систему после его удаления." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:7001 +msgid "" +"This system uses a valid /etc/${loader}.conf file that mentions ${kimage}-" +"=V. Removing =ST-image-=V will invalidate that file." +msgstr "" +"В данной системе используется корректный файл /etc/${loader}.conf, в котором " +"указано ${kimage}-=V. Удаление =ST-image-=V сделает файл некорректным." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:7001 +msgid "" +"You will need to edit /etc/${loader}.conf or re-target symbolic links " +"mentioned there (typically, /vmlinuz and /vmlinuz.old) to not refer to " +"${kimage}-=V. Then, you will have to re-run ${loader}." +msgstr "" +"Вам будет нужно отредактировать /etc/${loader}.conf или переназначить " +"символьные ссылки, упомянутые там (обычно, /vmlinuz и /vmlinuz.old), на " +"неуказывающие на ${kimage}-=V. Затем нужно перезапустить ${loader}." + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:8001 +msgid "Required firmware files may be missing" +msgstr "Могут отсутствовать необходимые файлы микропрограмм" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:8001 +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:8001 +msgid "${missing}" +msgstr "${missing}" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:8001 +msgid "" +"Most firmware files are not included in the system because they do not " +"conform to the Debian Free Software Guidelines. You may need to reconfigure " +"the package manager to include the contrib and non-free sections of the " +"package archive before you can install these firmware files." +msgstr "" +"Большинства файлов микропрограмм нет в дистрибутиве, так как они не " +"удовлетворяют критериям свободного ПО Debian. Для установки этих файлов из " +"архива вам может потребоваться перенастроить менеджер пакетов, чтобы " +"включить разделы contrib и non-free." diff --git a/debian/po/sv.po b/debian/po/sv.po new file mode 100644 index 000000000..3d51f20e9 --- /dev/null +++ b/debian/po/sv.po @@ -0,0 +1,370 @@ +# Translation of linux-2.6 debconf template to Swedish +# Copyright (C) 2010 Martin Bagge +# This file is distributed under the same license as the linux-2.6 package. +# +# Martin Bagge , 2010 +msgid "" +msgstr "" +"Project-Id-Version: linux-2.6\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-23 22:14+0200\n" +"PO-Revision-Date: 2010-04-26 23:37+0100\n" +"Last-Translator: Martin Bagge \n" +"Language-Team: Swedish \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 "Uppdatera diskenheters ID i systeminställningar?" + +#. 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 "" +"Den nya versionen av Linuxkärnan tillhandahåller olika drivrutiner för några " +"PATA(IDE)-kontroller. Namnen på en del hårddiskar, CD-Rom- och band-enheter " +"kan ändras." + +#. 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 "" +"Det är rekomenderat att identifiera diskenheter i konfigurationsfiler med " +"ettikett eller UUID (unik identifierare) snarare än efter enhetsnamn. " +"Ettikett och UUID fungerar både med nya och äldre verisioner av kärnan." + +#. 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 "" +"Om du väljer att inte uppdatera systeminställningarna automatiskt måste du " +"uppdatera enhets-ID själv innan nästa omstart av systemet annars kan " +"systemet bli ostartbart." + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 ../linux-base.templates:4001 +msgid "Apply configuration changes to disk device IDs?" +msgstr "Genomför förändring av enheternas ID?" + +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 +msgid "These devices will be assigned UUIDs or labels:" +msgstr "Dessa enheter kommer att få UUID eller ettiketter:" + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 ../linux-base.templates:4001 +msgid "These configuration files will be updated:" +msgstr "Dessa konfigurationsfiler kommer att uppdateras:" + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 ../linux-base.templates:4001 +msgid "The device IDs will be changed as follows:" +msgstr "Enhets-ID kommer att anges som följer:" + +#. Type: error +#. Description +#: ../linux-base.templates:5001 +msgid "Configuration files still contain deprecated device names" +msgstr "Konfigurationsfiler innehåller fortfarande utfasade enhetsnamn" + +#. 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 "" +"Följande konfigurationsfiler använder fortfarande några enhetsnamn som kan " +"komma att ändras med den nya kärnan:" + +#. Type: error +#. Description +#: ../linux-base.templates:6001 +msgid "Boot loader configuration check needed" +msgstr "Kontroll av konfigurationen i uppstartshanteraren behövs" + +#. 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 "" +"Inställningarna för uppstartshanteraren i det här systemet kunde inte kännas " +"igen. Dessa inställningar kan behöva uppdateras:" + +#. 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 "" +"* rotenhetens ID som en parameter till kärnan\n" +"* uppstartsenhetens ID som används för att installera och uppdatera " +"uppstartshanteraren" + +#. 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 "" +"Generellt sett ska dessa enheter identifierac med UUID eller ettikett. Dock " +"måste rotenheten identifieras med namn på Mips-system." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:2001 +msgid "Abort installation after depmod error?" +msgstr "Avbryt installation efter fel i depmod?" + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:2001 +msgid "" +"The 'depmod' command exited with the exit code ${exit_value} (${SIGNAL}" +"${CORE})." +msgstr "" +"Kommandot \"depmod\" avslutades med felkod ${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 "" +"Eftersom denna avbildning använder initrd kommer inte filen ${modules_base}/" +"=V/modules.dep att raderas, trots att den kan vara felaktig." + +#. 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 "" +"Du bör avbryta installationen och laga felen i depmod eller skapa en ny " +"initrd-avbildning med en fungerande modules.dep-fil. Om du inte avbryter " +"installationen kan systemet hamna i ett läge där det inte kan starta." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "Run the default boot loader?" +msgstr "Kör uppstartshanteraren?" + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"The default boot loader for this architecture is $loader, which is present." +msgstr "" +"Uppstartshanteraren för den här arkitekturen är $loader och den finns " +"installerad." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"However, there is no explicit request to run that boot loader in /etc/kernel-" +"img.conf while GRUB seems to be installed with a postinst hook set." +msgstr "" +"Det finns dock ingen specifik begäran att köra uppstartshanteraren i filen /" +"etc/kernel-img.conf medan GRUB verkar vara installerad med alternativet för " +"uppdatering efter installaitonen angiven (\"postinst hook\")." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"It thus seems that this system is using GRUB as boot loader instead of " +"$loader." +msgstr "" +"Det verkar därför som att detta system använder GRUB som uppstartshanterare " +"istället för $loader." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"Please choose which should run: the default boot loader now, or the GRUB " +"update later." +msgstr "" +"Ange vad som ska köras, standardhanteraren för uppstart nu eller GRUB vid " +"ett senare tillfälle." + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:4001 +msgid "Error running the boot loader in test mode" +msgstr "Fel vid körning av uppstartshanteraren i testläge" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:4001 +msgid "An error occurred while running the ${loader} boot loader in test mode." +msgstr "" +"Ett fel uppstod när uppstartshanteraren ${loader} skulle köras i testläge." + +#. Type: note +#. Description +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:4001 +#: ../templates/temp.image.plain/templates:5001 +msgid "" +"A log is available in ${temp_file_name}. Please edit /etc/${loader}.conf " +"manually and re-run ${loader} to fix that issue and keep this system " +"bootable." +msgstr "" +"En logg finns i ${temp_file_name}. Redigera filen /etc/${loader}.conf " +"manuellt och kör sedan ${loader} på nytt för att laga felet och hålla " +"systemet startbart." + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:5001 +msgid "Error running the boot loader" +msgstr "Fel vid körning av uppstartshanteraren" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:5001 +msgid "An error occurred while running the ${loader} boot loader." +msgstr "Ett fel uppstod när uppstartshanteraren ${loader} skulle köras." + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:6001 +#: ../templates/temp.image.plain/templates:7001 +msgid "Abort kernel removal?" +msgstr "Avbryt radering av kärnan?" + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:6001 +msgid "" +"You are running a kernel (version ${running}) and attempting to remove the " +"same version." +msgstr "" +"Den kärna du kör (version ${running}) och den du försöker ta bort är samma " +"version." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:6001 +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 "" +"Detta kan göra systemet ostartbart eftersom det kommer att innebära att /" +"boot/vmlinuz-${running} och alla moduler i /lib/modules/${running} raderas. " +"Detta kan endast återställas med en kopia av kärnavbildningen och " +"motsvarande moduler." + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:6001 +#: ../templates/temp.image.plain/templates:7001 +msgid "" +"It is highly recommended to abort the kernel removal unless you are prepared " +"to fix the system after removal." +msgstr "" +"Det rekomenderas starkt att du avbryter raderingen av kärnan om du inte är " +"beredd på att laga systemet efter raderingen." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:7001 +msgid "" +"This system uses a valid /etc/${loader}.conf file that mentions ${kimage}-" +"=V. Removing =ST-image-=V will invalidate that file." +msgstr "" +"Detta system använder en korrekt /etc/${loader}.conf-fil som pekar ut " +"${kimage}-=V. Att ta bort =ST-image-=V kommer göra filen inaktuell." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:7001 +msgid "" +"You will need to edit /etc/${loader}.conf or re-target symbolic links " +"mentioned there (typically, /vmlinuz and /vmlinuz.old) to not refer to " +"${kimage}-=V. Then, you will have to re-run ${loader}." +msgstr "" +"Du måte redigera filen /etc/${loader}.conf eller ställa om symboliska länkar " +"som omnämns där (vanligen /vmlinuz och /vmlinuz.old) så att de inte pekar på " +"${kimage}-=V. Därefter ska du åter köra ${loader}." + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:8001 +msgid "Required firmware files may be missing" +msgstr "Firmware-filer som krävs kan saknas" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:8001 +msgid "" +"This system is currently running Linux ${runningversion} and you are " +"installing Linux ${version}. In the new version some of the drivers used on " +"this system may require additional firmware files:" +msgstr "" +"Detta system kör Linux ${runningversion} och du installerar Linux " +"${version}. I den nya versionen kan vissa drivrutiner behöva ytterligare " +"firmware-filer:" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:8001 +msgid "${missing}" +msgstr "${missing}" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:8001 +msgid "" +"Most firmware files are not included in the system because they do not " +"conform to the Debian Free Software Guidelines. You may need to reconfigure " +"the package manager to include the contrib and non-free sections of the " +"package archive before you can install these firmware files." +msgstr "" +"På grund av bestämmelserna i Debian Free Software Guidelines kan de flesta " +"firmware-filer inte inkluderas i systemet. Du kan behöva anpassa " +"pakethanteraren för att inkludera sektionerna \"contrib\" och \"non-free\" i " +"paketarkivet innan du kan installera dessa filer." diff --git a/debian/po/templates.pot b/debian/po/templates.pot index 9284240e5..d7664e133 100644 --- a/debian/po/templates.pot +++ b/debian/po/templates.pot @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"Report-Msgid-Bugs-To: linux-2.6@packages.debian.org\n" -"POT-Creation-Date: 2010-03-29 14:15+0100\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-23 22:14+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -18,54 +18,56 @@ msgstr "" #. Type: boolean #. Description -#: ../linux-base.templates:1001 -msgid "Update disk device ids in system configuration?" +#: ../linux-base.templates:2001 +msgid "Update disk device IDs in system configuration?" msgstr "" #. Type: boolean #. Description -#: ../linux-base.templates:1001 +#: ../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 " +"controllers. The names of some hard disk, CD-ROM, and tape devices may " "change." msgstr "" #. Type: boolean #. Description -#: ../linux-base.templates:1001 +#: ../linux-base.templates:2001 msgid "" -"You are 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. Your system configuration can be updated " -"automatically in most cases." -msgstr "" - -#. Type: boolean -#. Description -#. Type: boolean -#. Description -#: ../linux-base.templates:2001 ../linux-base.templates:3001 -msgid "Apply these configuration changes to disk device ids?" +"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 "" #. 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 "" + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 ../linux-base.templates:4001 +msgid "Apply configuration changes to disk device IDs?" +msgstr "" + +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 msgid "These devices will be assigned UUIDs or labels:" msgstr "" #. Type: boolean #. Description -#: ../linux-base.templates:2001 -msgid "${relabel}" -msgstr "" - #. Type: boolean #. Description -#. Type: boolean -#. Description -#: ../linux-base.templates:2001 ../linux-base.templates:3001 +#: ../linux-base.templates:3001 ../linux-base.templates:4001 msgid "These configuration files will be updated:" msgstr "" @@ -73,85 +75,63 @@ msgstr "" #. Description #. Type: boolean #. Description -#: ../linux-base.templates:2001 ../linux-base.templates:3001 -msgid "${files}" +#: ../linux-base.templates:3001 ../linux-base.templates:4001 +msgid "The device IDs will be changed as follows:" msgstr "" -#. Type: boolean -#. Description -#. Type: boolean -#. Description -#: ../linux-base.templates:2001 ../linux-base.templates:3001 -msgid "The device ids will be changed as follows:" -msgstr "" - -#. Type: boolean -#. Description -#. Type: boolean -#. Description -#: ../linux-base.templates:2001 ../linux-base.templates:3001 -msgid "${id_map}" -msgstr "" - -#. Type: note -#. Description -#: ../linux-base.templates:4001 -msgid "Please check these configuration files before rebooting" -msgstr "" - -#. Type: note -#. Description -#: ../linux-base.templates:4001 -msgid "" -"These configuration files still use some device names that may change when " -"using the new kernel:" -msgstr "" - -#. Type: note -#. Description -#: ../linux-base.templates:4001 -msgid "${unconverted}" -msgstr "" - -#. Type: note +#. Type: error #. Description #: ../linux-base.templates:5001 -msgid "Check the boot loader configuration before rebooting" +msgid "Configuration files still contain deprecated device names" msgstr "" -#. Type: note +#. Type: error #. Description #: ../linux-base.templates:5001 msgid "" -"The boot loader configuration for this system was not recognised. These " +"The following configuration files still use some device names that may " +"change when using the new kernel:" +msgstr "" + +#. Type: error +#. Description +#: ../linux-base.templates:6001 +msgid "Boot loader configuration check needed" +msgstr "" + +#. 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 "" -#. Type: note +#. Type: error #. Description -#: ../linux-base.templates:5001 +#: ../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" +" * The root device ID passed as a kernel parameter;\n" +" * The boot device ID used to install and update the boot loader." msgstr "" -#. Type: note +#. Type: error #. Description -#: ../linux-base.templates:5001 +#: ../linux-base.templates:6001 msgid "" -"We recommend that you identify these devices by UUID or label, except that " -"on MIPS systems this is not supported for the root device." +"You should generally identify these devices by UUID or label. However, on " +"MIPS systems the root device must be identified by name." msgstr "" #. Type: boolean #. Description -#: ../templates/temp.image.plain/templates:1001 +#: ../templates/temp.image.plain/templates:2001 msgid "Abort installation after depmod error?" msgstr "" #. Type: boolean #. Description -#: ../templates/temp.image.plain/templates:1001 +#: ../templates/temp.image.plain/templates:2001 msgid "" "The 'depmod' command exited with the exit code ${exit_value} (${SIGNAL}" "${CORE})." @@ -159,7 +139,7 @@ msgstr "" #. Type: boolean #. Description -#: ../templates/temp.image.plain/templates:1001 +#: ../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." @@ -167,7 +147,7 @@ msgstr "" #. Type: boolean #. Description -#: ../templates/temp.image.plain/templates:1001 +#: ../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 " @@ -176,20 +156,20 @@ msgstr "" #. Type: boolean #. Description -#: ../templates/temp.image.plain/templates:2001 +#: ../templates/temp.image.plain/templates:3001 msgid "Run the default boot loader?" msgstr "" #. Type: boolean #. Description -#: ../templates/temp.image.plain/templates:2001 +#: ../templates/temp.image.plain/templates:3001 msgid "" "The default boot loader for this architecture is $loader, which is present." msgstr "" #. Type: boolean #. Description -#: ../templates/temp.image.plain/templates:2001 +#: ../templates/temp.image.plain/templates:3001 msgid "" "However, there is no explicit request to run that boot loader in /etc/kernel-" "img.conf while GRUB seems to be installed with a postinst hook set." @@ -197,7 +177,7 @@ msgstr "" #. Type: boolean #. Description -#: ../templates/temp.image.plain/templates:2001 +#: ../templates/temp.image.plain/templates:3001 msgid "" "It thus seems that this system is using GRUB as boot loader instead of " "$loader." @@ -205,7 +185,7 @@ msgstr "" #. Type: boolean #. Description -#: ../templates/temp.image.plain/templates:2001 +#: ../templates/temp.image.plain/templates:3001 msgid "" "Please choose which should run: the default boot loader now, or the GRUB " "update later." @@ -213,13 +193,13 @@ msgstr "" #. Type: note #. Description -#: ../templates/temp.image.plain/templates:3001 +#: ../templates/temp.image.plain/templates:4001 msgid "Error running the boot loader in test mode" msgstr "" #. Type: note #. Description -#: ../templates/temp.image.plain/templates:3001 +#: ../templates/temp.image.plain/templates:4001 msgid "An error occurred while running the ${loader} boot loader in test mode." msgstr "" @@ -227,8 +207,8 @@ msgstr "" #. Description #. Type: note #. Description -#: ../templates/temp.image.plain/templates:3001 #: ../templates/temp.image.plain/templates:4001 +#: ../templates/temp.image.plain/templates:5001 msgid "" "A log is available in ${temp_file_name}. Please edit /etc/${loader}.conf " "manually and re-run ${loader} to fix that issue and keep this system " @@ -237,13 +217,13 @@ msgstr "" #. Type: note #. Description -#: ../templates/temp.image.plain/templates:4001 +#: ../templates/temp.image.plain/templates:5001 msgid "Error running the boot loader" msgstr "" #. Type: note #. Description -#: ../templates/temp.image.plain/templates:4001 +#: ../templates/temp.image.plain/templates:5001 msgid "An error occurred while running the ${loader} boot loader." msgstr "" @@ -251,14 +231,14 @@ msgstr "" #. Description #. Type: boolean #. Description -#: ../templates/temp.image.plain/templates:5001 #: ../templates/temp.image.plain/templates:6001 +#: ../templates/temp.image.plain/templates:7001 msgid "Abort kernel removal?" msgstr "" #. Type: boolean #. Description -#: ../templates/temp.image.plain/templates:5001 +#: ../templates/temp.image.plain/templates:6001 msgid "" "You are running a kernel (version ${running}) and attempting to remove the " "same version." @@ -266,7 +246,7 @@ msgstr "" #. Type: boolean #. Description -#: ../templates/temp.image.plain/templates:5001 +#: ../templates/temp.image.plain/templates:6001 msgid "" "This can make the system unbootable as it will remove /boot/vmlinuz-" "${running} and all modules under the directory /lib/modules/${running}. This " @@ -278,8 +258,8 @@ msgstr "" #. Description #. Type: boolean #. Description -#: ../templates/temp.image.plain/templates:5001 #: ../templates/temp.image.plain/templates:6001 +#: ../templates/temp.image.plain/templates:7001 msgid "" "It is highly recommended to abort the kernel removal unless you are prepared " "to fix the system after removal." @@ -287,7 +267,7 @@ msgstr "" #. Type: boolean #. Description -#: ../templates/temp.image.plain/templates:6001 +#: ../templates/temp.image.plain/templates:7001 msgid "" "This system uses a valid /etc/${loader}.conf file that mentions ${kimage}-" "=V. Removing =ST-image-=V will invalidate that file." @@ -295,7 +275,7 @@ msgstr "" #. Type: boolean #. Description -#: ../templates/temp.image.plain/templates:6001 +#: ../templates/temp.image.plain/templates:7001 msgid "" "You will need to edit /etc/${loader}.conf or re-target symbolic links " "mentioned there (typically, /vmlinuz and /vmlinuz.old) to not refer to " @@ -304,13 +284,13 @@ msgstr "" #. Type: note #. Description -#: ../templates/temp.image.plain/templates:7001 +#: ../templates/temp.image.plain/templates:8001 msgid "Required firmware files may be missing" msgstr "" #. Type: note #. Description -#: ../templates/temp.image.plain/templates:7001 +#: ../templates/temp.image.plain/templates:8001 msgid "" "This system is currently running Linux ${runningversion} and you are " "installing Linux ${version}. In the new version some of the drivers used on " @@ -319,16 +299,16 @@ msgstr "" #. Type: note #. Description -#: ../templates/temp.image.plain/templates:7001 +#: ../templates/temp.image.plain/templates:8001 msgid "${missing}" msgstr "" #. Type: note #. Description -#: ../templates/temp.image.plain/templates:7001 +#: ../templates/temp.image.plain/templates:8001 msgid "" -"Most firmware files are not included in the Debian system because no source " -"code is available for them. You may need to reconfigure the package manager " -"to include the non-free section of the Debian archive before you can install " -"these firmware files." +"Most firmware files are not included in the system because they do not " +"conform to the Debian Free Software Guidelines. You may need to reconfigure " +"the package manager to include the contrib and non-free sections of the " +"package archive before you can install these firmware files." msgstr "" diff --git a/debian/po/vi.po b/debian/po/vi.po new file mode 100644 index 000000000..3a93e0b64 --- /dev/null +++ b/debian/po/vi.po @@ -0,0 +1,369 @@ +# Vietnamese translation for Linux 2.6. +# Copyright © 2010 Free Software Foundation, Inc. +# Clytie Siddall , 2010. +# +msgid "" +msgstr "" +"Project-Id-Version: linux-2.6\n" +"Report-Msgid-Bugs-To: \n" +"POT-Creation-Date: 2010-04-23 22:14+0200\n" +"PO-Revision-Date: 2010-04-26 21:53+0930\n" +"Last-Translator: Clytie Siddall \n" +"Language-Team: Vietnamese \n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=1; plural=0;\n" +"X-Generator: LocFactoryEditor 1.8\n" + +#. Type: boolean +#. Description +#: ../linux-base.templates:2001 +msgid "Update disk device IDs in system configuration?" +msgstr "Cập nhật các mã số thiết bị đĩa trong cấu hình hệ thống ?" + +#. 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 "" +"Phiên bản hạt nhân Linux mới cung cấp các trình điều khiển khác nhau cho một " +"số bộ điều khiển PATA (IDE). Vì thế có thể thay đổi tên của một số thiết bị " +"loại đĩa cứng, đĩa CD và băng." + +#. 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 "" +"Giờ khuyến khích xác định thiết bị đĩa (trong tập tin cấu hình) theo nhãn " +"hay UUID (mã số duy nhất) hơn là theo tên thiết bị, mà có tác động trong " +"phiên bản hạt nhân cả hai cũ và mới." + +#. 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 "" +"Nếu bạn chọn không tự động cập nhật cấu hình hệ thống thì bạn cần phải tự " +"cập nhật các mã số thiết bị trước lần khởi động hệ thống kế tiếp: không thì " +"hệ thống có thể không khởi động được." + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 ../linux-base.templates:4001 +msgid "Apply configuration changes to disk device IDs?" +msgstr "Áp dụng thay đổi cấu hình cho các mã số thiết bị đĩa ?" + +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 +msgid "These devices will be assigned UUIDs or labels:" +msgstr "UUID hay nhãn sẽ được gán cho những thiết bị này:" + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 ../linux-base.templates:4001 +msgid "These configuration files will be updated:" +msgstr "Sắp cập nhật những tập tin cấu hình này:" + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../linux-base.templates:3001 ../linux-base.templates:4001 +msgid "The device IDs will be changed as follows:" +msgstr "Các mã số thiết bị sẽ được thay đổi như theo sau :" + +#. Type: error +#. Description +#: ../linux-base.templates:5001 +msgid "Configuration files still contain deprecated device names" +msgstr "Tập tin cấu hình vẫn còn chứa tên thiết bị bị phản đối" + +#. 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 "" +"Những tập tin cấu hình theo đây vẫn còn sử dụng một số tên thiết bị mà có " +"thể thay đổi khi sử dụng hạt nhân mới:" + +#. Type: error +#. Description +#: ../linux-base.templates:6001 +msgid "Boot loader configuration check needed" +msgstr "Yêu cầu kiểm tra cấu hình bộ nạp khởi động" + +#. 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 "" +"Không nhận ra cấu hình bộ nạp khởi động cho hệ thống này. Trong cấu hình thì " +"có thể cần phải cập nhật những thiết lập này:" + +#. 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 "" +" * Mã số thiết bị gốc được gửi dưới dạng một tham số hạt nhân\n" +" * Mã số thiết bị khởi động được dùng để cài đặt và cập nhật bộ nạp khởi động" + +#. 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 "" +"Nói chung bạn nên xác định thiết bị này theo UUID hay nhãn. Tuy nhiên, trên " +"hệ thống MIPS thiết bị gốc phải được xác định theo tên." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:2001 +msgid "Abort installation after depmod error?" +msgstr "Hủy bỏ tiến trình cài đặt sau khi gặp lỗi 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ệnh « depmod » đã thoát với mã thoát ${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 "" +"Vì ảnh này sử dụng initrd, tập tin ${modules_base}/=V/modules.dep sẽ không " +"bị xoá, dù là nó có thể không thích hợp." + +#. 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 "" +"Bạn nên hủy bỏ tiến trình cài đặt và sửa chữa các lỗi trong depmod, hoặc tạo " +"lại ảnh initrd với một tập tin « modules.dep » tốt. Không hủy bỏ tiến trình " +"cài đặt thì hệ thống có thể không khởi động được." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "Run the default boot loader?" +msgstr "Chạy bộ nạp khởi động mặc định ?" + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"The default boot loader for this architecture is $loader, which is present." +msgstr "Bộ nạp khởi động mặc định cho kiến trúc này là $loader (có)." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"However, there is no explicit request to run that boot loader in /etc/kernel-" +"img.conf while GRUB seems to be installed with a postinst hook set." +msgstr "" +"Tuy nhiên, không có yêu cầu dứt khoát chạy bộ nạp khởi động đó trong tập tin " +"cấu hình « /etc/kernel-img.conf » còn hình như GRUB được cài đặt với một tập " +"hợp hàm móc cuối cùng cài đặt." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"It thus seems that this system is using GRUB as boot loader instead of " +"$loader." +msgstr "" +"Do đó hình như hệ thống này đang sử dụng GRUB làm bộ nạp khởi động, thay cho " +"$loader." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:3001 +msgid "" +"Please choose which should run: the default boot loader now, or the GRUB " +"update later." +msgstr "" +"Hãy chọn bộ nạp khởi động nên chạy: bộ nạp khởi động mặc định ngay bây giờ, " +"hoặc bản cập nhật GRUB về sau." + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:4001 +msgid "Error running the boot loader in test mode" +msgstr "Lỗi chạy bộ nạp khởi động ở chế độ thử" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:4001 +msgid "An error occurred while running the ${loader} boot loader in test mode." +msgstr "Gặp lỗi trong khi chạy bộ nạp khởi động ${loader} ở chế độ thử." + +#. Type: note +#. Description +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:4001 +#: ../templates/temp.image.plain/templates:5001 +msgid "" +"A log is available in ${temp_file_name}. Please edit /etc/${loader}.conf " +"manually and re-run ${loader} to fix that issue and keep this system " +"bootable." +msgstr "" +"Một sổ theo dõi sẵn sàng trong « ${temp_file_name} ». Hãy chỉnh sửa « /etc/" +"${loader}.conf » bằng tay, và chạy lại ${loader} để sửa chữa vấn đề đó và " +"bảo tồn hệ thống này có khả năng khởi động." + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:5001 +msgid "Error running the boot loader" +msgstr "Lỗi chạy bộ nạp khởi động" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:5001 +msgid "An error occurred while running the ${loader} boot loader." +msgstr "Gặp lỗi trong khi chạy bộ nạp khởi động ${loader}." + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:6001 +#: ../templates/temp.image.plain/templates:7001 +msgid "Abort kernel removal?" +msgstr "Hủy bỏ tiến trình gỡ bỏ hạt nhân ?" + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:6001 +msgid "" +"You are running a kernel (version ${running}) and attempting to remove the " +"same version." +msgstr "" +"Bạn đang chạy một hạt nhân phiên bản ${running} trong khi thử gỡ bỏ phiên " +"bản đó." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:6001 +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 "" +"Hành động này có thể làm cho hệ thống không có khả năng khởi động, vì nó gỡ " +"bỏ « /boot/vmlinuz-${running} » và tất cả các mô-đụn nằm dưới thư mục « /lib/" +"modules/${running} »." + +#. Type: boolean +#. Description +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:6001 +#: ../templates/temp.image.plain/templates:7001 +msgid "" +"It is highly recommended to abort the kernel removal unless you are prepared " +"to fix the system after removal." +msgstr "" +"Rất khuyên bạn hủy bỏ tiến trình gỡ bỏ hạt nhân, nếu bạn không sẵn sàng sửa " +"chữa hệ thống sau khi gỡ bỏ." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:7001 +msgid "" +"This system uses a valid /etc/${loader}.conf file that mentions ${kimage}-" +"=V. Removing =ST-image-=V will invalidate that file." +msgstr "" +"Hệ thống này sử dụng một tập tin cấu hình « /etc/${loader}.conf » mà xác định " +"« ${kimage}-=V ». Gỡ bỏ mục « =ST-image-=V » thì làm cho tập tin đó không có " +"hiệu lực." + +#. Type: boolean +#. Description +#: ../templates/temp.image.plain/templates:7001 +msgid "" +"You will need to edit /etc/${loader}.conf or re-target symbolic links " +"mentioned there (typically, /vmlinuz and /vmlinuz.old) to not refer to " +"${kimage}-=V. Then, you will have to re-run ${loader}." +msgstr "" +"Bạn cần phải chỉnh sửa « /etc/${loader}.conf » hoặc thay đổi đích đến của " +"liên kết tượng trưng bên trong (bình thường là « /vmlinuz » và « /vmlinuz.old " +"») để không tham chiếu đến « ${kimage}-=V ». Sau đó thì bạn cần phải chạy lại " +"${loader}." + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:8001 +msgid "Required firmware files may be missing" +msgstr "Có thể thiếu một số tập tin phần vững cần thiết" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:8001 +msgid "" +"This system is currently running Linux ${runningversion} and you are " +"installing Linux ${version}. In the new version some of the drivers used on " +"this system may require additional firmware files:" +msgstr "" +"Hệ thống này hiện thời chạy Linux ${runningversion} còn bạn đang cài đặt " +"Linux ${version}. Trong phiên bản mới, một số trình điều khiển dùng trên hệ " +"thống này có thể yêu cầu tập tin phần vững bổ sung:" + +# Biến: đừng dịch +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:8001 +msgid "${missing}" +msgstr "${missing}" + +#. Type: note +#. Description +#: ../templates/temp.image.plain/templates:8001 +msgid "" +"Most firmware files are not included in the system because they do not " +"conform to the Debian Free Software Guidelines. You may need to reconfigure " +"the package manager to include the contrib and non-free sections of the " +"package archive before you can install these firmware files." +msgstr "" +"Phần lớn các tập tin phần vững không phải có sẵn trong hệ thống do không làm " +"cho hợp với Nguyên tắc Chỉ đạo Phần mềm Tự do Debian. Có thể là bạn cần phải " +"cấu hình lại trình quản lý gói phần mềm để bao gồm phần đóng góp (contrib) " +"và phần khác tự do (non-free) của kho lưu gói trước khi có khả năng cài đặt " +"tập tin phần vững như vậy." diff --git a/debian/rules.real b/debian/rules.real index a96579f07..1c8ad1510 100644 --- a/debian/rules.real +++ b/debian/rules.real @@ -145,7 +145,6 @@ $(STAMPS_DIR)/build-doc: $(STAMPS_DIR)/source install-base: dh_installchangelogs dh_installdocs - dh_installdebconf dh_strip dh_compress dh_fixperms @@ -159,7 +158,7 @@ install-dummy: dh_testdir dh_testroot dh_prep - $(MAKE_SELF) install-base + +$(MAKE_SELF) install-base install-doc: PACKAGE_NAME = linux-doc-$(VERSION) install-doc: DIR = $(BUILD_DIR)/build-doc @@ -410,6 +409,17 @@ install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_templates: -e 's/=S//g' \ $$i > debian/$(PACKAGE_NAME).$$(basename $$i); \ done + mkdir -p debian/$(PACKAGE_NAME).po + for i in $(wildcard debian/po/*.po); do \ + sed \ + -e 's/=ST/linux/g' \ + -e 's/=V/$(REAL_VERSION)/g' \ + $$i > debian/$(PACKAGE_NAME).po/$$(basename $$i); \ + done + mkdir -p debian/$(PACKAGE_NAME)/DEBIAN + po2debconf --podir debian/$(PACKAGE_NAME).po \ + -o debian/$(PACKAGE_NAME)/DEBIAN/templates \ + debian/$(PACKAGE_NAME).templates install-image_$(ARCH)_$(FEATURESET)_$(FLAVOUR)_plain_bug: dh_installdirs usr/share/bug/$(PACKAGE_NAME) diff --git a/debian/templates/temp.image.plain/templates b/debian/templates/temp.image.plain/templates index 157824b8e..c3ec75ea2 100644 --- a/debian/templates/temp.image.plain/templates +++ b/debian/templates/temp.image.plain/templates @@ -1,3 +1,12 @@ +# These templates have been reviewed by the debian-l10n-english +# team +# +# If modifications/additions/rewording are needed, please ask +# debian-l10n-english@lists.debian.org for advice. +# +# Even minor modifications require translation updates and such +# changes should be coordinated with translators and reviewers. + Template: =ST-image-=V/postinst/depmod-error-initrd-=V Type: boolean Default: false @@ -80,6 +89,7 @@ _Description: Abort kernel removal? Template: =ST-image-=V/postinst/missing-firmware-=V Type: note +#flag:translate!:3 _Description: Required firmware files may be missing This system is currently running Linux ${runningversion} and you are installing Linux ${version}. In the new version some of the drivers @@ -87,7 +97,8 @@ _Description: Required firmware files may be missing . ${missing} . - Most firmware files are not included in the Debian system because - no source code is available for them. You may need to reconfigure - the package manager to include the non-free section of the Debian - archive before you can install these firmware files. + 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.