diffstat for memtest86+_4.20-1.1 memtest86+_4.20-1.1ubuntu8 debian/po/zh_CN.po | 50 +++++ debian/po/zh_HK.po | 49 +++++ debian/po/zh_TW.po | 49 +++++ memtest.lds | 2 memtest86+-4.20/debian/changelog | 227 +++++++++++++++++++++++++ memtest86+-4.20/debian/control | 3 memtest86+-4.20/debian/grub | 56 +++--- memtest86+-4.20/debian/grub-menu.lst | 4 memtest86+-4.20/debian/po/cs.po | 18 + memtest86+-4.20/debian/po/da.po | 18 + memtest86+-4.20/debian/po/de.po | 18 + memtest86+-4.20/debian/po/es.po | 18 + memtest86+-4.20/debian/po/fr.po | 18 + memtest86+-4.20/debian/po/it.po | 18 + memtest86+-4.20/debian/po/ja.po | 18 + memtest86+-4.20/debian/po/nl.po | 18 + memtest86+-4.20/debian/po/pt.po | 18 + memtest86+-4.20/debian/po/ru.po | 18 + memtest86+-4.20/debian/po/sk.po | 18 + memtest86+-4.20/debian/po/sr@ijekavian.po | 18 + memtest86+-4.20/debian/po/sr@ijekavianlatin.po | 18 + memtest86+-4.20/debian/po/sv.po | 18 + memtest86+-4.20/debian/po/templates.pot | 18 + memtest86+-4.20/debian/postinst | 9 memtest86+-4.20/debian/postrm | 3 memtest86+-4.20/debian/rules | 10 - test.c | 2 27 files changed, 688 insertions(+), 46 deletions(-) diff -u memtest86+-4.20/debian/changelog memtest86+-4.20/debian/changelog --- memtest86+-4.20/debian/changelog +++ memtest86+-4.20/debian/changelog @@ -1,3 +1,62 @@ +memtest86+ (4.20-1.1ubuntu8) trusty; urgency=medium + + * Adds Chinese (zh_TW, zh_HK, zh_CN) translations. (LP: #1261663) + + -- Anthony Wong Wed, 12 Mar 2014 13:27:34 +0100 + +memtest86+ (4.20-1.1ubuntu7) trusty; urgency=low + + * Revert to using linux16 memtest image when using serial console. As + knetbsd + elf + serial console does not work. (LP: #560839) + + -- Dave Chiluk Thu, 06 Mar 2014 01:07:09 -0600 + +memtest86+ (4.20-1.1ubuntu6) trusty; urgency=low + + [ Rajeev V. Pillai ] + * Use ELF memtest86+ binary and load into high memory. This solves the error + "error: too small lower memory" with certain bioses. (LP: #560839) + + -- Dave Chiluk Tue, 03 Dec 2013 14:43:44 -0600 + +memtest86+ (4.20-1.1ubuntu5) saucy; urgency=low + + * Do not update grub configuration, if running in container, or + update-grub not present, or grub config has not been previously + generated. + + -- Dmitrijs Ledkovs Mon, 17 Jun 2013 10:43:17 +0100 + +memtest86+ (4.20-1.1ubuntu4) saucy; urgency=low + + * Support localization of GRUB menu entries (LP: #537998). + + -- Dmitry Shachnev Mon, 13 May 2013 15:06:15 +0400 + +memtest86+ (4.20-1.1ubuntu3) raring; urgency=low + + * Fix test#7 false positives due to compiler issues. (LP: #1071209) + Original patch author Torsten Duwe . + + -- Chris J Arges Tue, 04 Dec 2012 16:23:35 -0600 + +memtest86+ (4.20-1.1ubuntu2) quantal; urgency=low + + * Don't present the GRUB menu option on EFI systems, since it won't work + (see LP #883017). + + -- Colin Watson Thu, 11 Oct 2012 14:14:55 +0100 + +memtest86+ (4.20-1.1ubuntu1) precise; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Only run update-grub in the postrm on remove/purge. + - Drop the multiboot image from the GRUB menu for now, since it's + experimental and has known problems detecting all memory on some + systems at the moment. + + -- Colin Watson Sun, 27 Nov 2011 09:55:42 +0000 + memtest86+ (4.20-1.1) unstable; urgency=low * Non-maintainer upload. @@ -11,6 +70,16 @@ -- Christian Perrier Tue, 28 Jun 2011 07:15:27 +0200 +memtest86+ (4.20-1ubuntu1) oneiric; urgency=low + + * Resynchronise with Debian (LP: #772252). Remaining changes: + - Only run update-grub in the postrm on remove/purge. + - Drop the multiboot image from the GRUB menu for now, since it's + experimental and has known problems detecting all memory on some + systems at the moment. + + -- Colin Watson Mon, 02 May 2011 23:45:56 +0100 + memtest86+ (4.20-1) unstable; urgency=low * New upstream release. @@ -25,6 +94,16 @@ -- Yann Dirson Sat, 19 Mar 2011 23:40:07 +0100 +memtest86+ (4.10-1.1ubuntu1) natty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - Only run update-grub in the postrm on remove/purge. + - Drop the multiboot image from the GRUB menu for now, since it's + experimental and has known problems detecting all memory on some + systems at the moment. + + -- Colin Watson Fri, 22 Oct 2010 12:17:13 +0100 + memtest86+ (4.10-1.1) unstable; urgency=low * Non-maintainer upload. @@ -34,6 +113,23 @@ -- Christian Perrier Tue, 19 Oct 2010 07:24:39 +0200 +memtest86+ (4.10-1ubuntu2) maverick; urgency=low + + * Drop the multiboot image from the GRUB menu for now, since it's + experimental and has known problems detecting all memory on some systems + at the moment (LP: #640686). + + -- Colin Watson Fri, 24 Sep 2010 16:45:47 +0100 + +memtest86+ (4.10-1ubuntu1) maverick; urgency=low + + * Merge from Debian unstable. (LP: #599070) Remaining changes: + - Only run update-grub in the postrm on remove/purge. + (forwarded to debian as #587340) + - Update maintainer field. + + -- Luke Faraone Sun, 27 Jun 2010 12:54:15 -0400 + memtest86+ (4.10-1) unstable; urgency=low * The "not yet source format 3.0" release. @@ -85,6 +181,33 @@ -- Iustin Pop Sun, 06 Dec 2009 12:20:39 +0100 +memtest86+ (4.00-2ubuntu3) lucid; urgency=low + + * Only run update-grub in the postrm on remove/purge. + + -- Colin Watson Tue, 23 Mar 2010 09:26:27 +0000 + +memtest86+ (4.00-2ubuntu2) lucid; urgency=low + + * Reapply dropped patch from karmic: + - Don't emit grub2 menu items if /boot is on a loop-mounted device (e.g. + Wubi; LP: #435153). + * Cache results of prepare_grub_to_access_device to speed up update-grub + runs a little. + + -- Colin Watson Mon, 22 Feb 2010 16:06:40 +0000 + +memtest86+ (4.00-2ubuntu1) lucid; urgency=low + + * Merge from debian testing, remaining changes: + - Makefile: Add -fno-stack-protector to CFLAGS, since this package does + not link against libc. + - debian/grub: check for existance of /usr/lib/grub/grub-mkconfig_lib + - debian/postinst: Only run update-grub2 in postinst if + /boot/grub/grub.cfg exists + + -- Michael Vogt Mon, 09 Nov 2009 17:09:57 +0100 + memtest86+ (4.00-2) unstable; urgency=low * Fix wrong integration of grub2 patch (Closes: #549125). @@ -104,6 +227,46 @@ -- Yann Dirson Tue, 29 Sep 2009 23:40:15 +0200 +memtest86+ (2.11-3ubuntu5) karmic; urgency=low + + * debian/grub: + - check for existance of /usr/lib/grub/grub-mkconfig_lib before + sourcing it (LP: #459080). This fixes a upgrade failure when + the memtest86+ postinst is run but the new grub-common is not + yet installed + + -- Michael Vogt Fri, 23 Oct 2009 16:14:27 +0200 + +memtest86+ (2.11-3ubuntu4) karmic; urgency=low + + * Don't emit grub2 menu items if /boot is on a loop-mounted device (e.g. + Wubi; LP: #435153). + + -- Colin Watson Mon, 28 Sep 2009 10:01:25 +0100 + +memtest86+ (2.11-3ubuntu3) karmic; urgency=low + + * Use grub2's 16-bit Linux loader, not the 32-bit one (LP: #424506). + + -- Colin Watson Fri, 04 Sep 2009 22:19:32 +0100 + +memtest86+ (2.11-3ubuntu2) karmic; urgency=low + + * Fix grub2 menu hook to use grub-mkconfig_lib rather than the deprecated + update-grub_lib (thanks, Alex Valavanis; LP: #384627). + * Only run update-grub2 in postinst if /boot/grub/grub.cfg exists. This + makes installation in chroots work rather better. + + -- Colin Watson Wed, 24 Jun 2009 16:55:39 +0100 + +memtest86+ (2.11-3ubuntu1) jaunty; urgency=low + + * Merge from debian unstable (Closes LP: #299161), remaining changes: + - Makefile: Add -fno-stack-protector to CFLAGS, since this package does + not link against libc. + + -- Chris Cheney Thu, 26 Mar 2009 11:45:00 -0500 + memtest86+ (2.11-3) unstable; urgency=low * Upload to squeeze. @@ -152,6 +315,18 @@ -- Yann Dirson Sat, 31 Jan 2009 00:26:54 +0100 +memtest86+ (2.01-1.1ubuntu1) jaunty; urgency=low + + * Resynchronise with Debian. Remaining changes: + - debian/control: Add lpia as supported architecture. + - Makefile: Add -fno-stack-protector to CFLAGS, since this package does + not link against libc. + - Check for existence of /boot/grub in postrm. + - Install ELF image of memtest86+ in the binary package. + * Sync up postrm should-we-run-update-grub2 check with postinst. + + -- Colin Watson Thu, 13 Nov 2008 10:37:16 +0000 + memtest86+ (2.01-1.1) unstable; urgency=low * Non-maintainer upload. @@ -160,6 +335,30 @@ -- Barry deFreese Thu, 02 Oct 2008 21:13:33 -0400 +memtest86+ (2.01-1ubuntu2) intrepid; urgency=low + + * Build with -O1 rather than -Os (from + https://qa.mandriva.com/show_bug.cgi?id=42679; LP: #246412). + + -- Colin Watson Thu, 11 Sep 2008 21:03:51 +0100 + +memtest86+ (2.01-1ubuntu1) intrepid; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/control: Add lpia as supported architecture. + - Makefile: Add -fno-stack-protector to CFLAGS, since this package does + not link against libc. + - Merge basically the same as the one from Saïvann Carignan, thanks for + your work! LP: #192517 + * Simplify the patch from LP #129614, the preinst is fine in debian, the + postinst needs to check for presence of /boot/grub. + * Do not call update-grub, but update-grub2. See + http://bugs.debian.org/460080 for details. + * install ELF image of memtest86+ in the binary package Thanks to Forest + Bond for the patch. (LP: #175720). + + -- Reinhard Tartler Tue, 20 May 2008 17:04:27 +0200 + memtest86+ (2.01-1) unstable; urgency=low * New upstream release (Closes: #468780). @@ -171,6 +370,17 @@ -- Yann Dirson Wed, 23 Apr 2008 21:21:47 +0200 +memtest86+ (1.70-3ubuntu1) gutsy; urgency=low + + * Merge from debian unstable, remaining changes: + - debian/control: Add lpia as supported architecture. + - Makefile: Add -fno-stack-protector to CFLAGS, since this package does + not link against libc. + * Check for /boot/grub/menu.lst rather than /boot/grub/menu.lst in + post{inst,rm}, LP: #129614 + + -- Reinhard Tartler Wed, 26 Sep 2007 22:43:24 +0200 + memtest86+ (1.70-3) unstable; urgency=low * Build-depend on gcc-multilib on amd64 (Closes: #426239). @@ -182,6 +392,23 @@ -- Yann Dirson Sun, 29 Jul 2007 16:17:18 +0200 +memtest86+ (1.70-2ubuntu2) gutsy; urgency=low + + * debian/control: Add lpia as supported architecture. + + -- Matthias Klose Tue, 31 Jul 2007 00:04:33 +0200 + +memtest86+ (1.70-2ubuntu1) gutsy; urgency=low + + * Merge to Debian unstable; remaining Ubuntu changes: + - debian/control: Add libc6-dev-i386 build dependency on amd64 to fix + FTBFS. + - Makefile: Add -fno-stack-protector to CFLAGS, since this package does + not link against libc. + * debian/control: Set Ubuntu maintainer. + + -- Martin Pitt Mon, 21 May 2007 09:39:41 +0200 + memtest86+ (1.70-2) unstable; urgency=low * Upload to unstable now that etch is released. diff -u memtest86+-4.20/debian/postrm memtest86+-4.20/debian/postrm --- memtest86+-4.20/debian/postrm +++ memtest86+-4.20/debian/postrm @@ -1,7 +1,8 @@ #!/bin/sh set -e -if test -e /boot/grub/grub.cfg && which update-grub2 > /dev/null ; then +if ([ "$1" = remove ] || [ "$1" = purge ]) && \ + test -e /boot/grub/grub.cfg && which update-grub2 > /dev/null ; then update-grub2 fi diff -u memtest86+-4.20/debian/control memtest86+-4.20/debian/control --- memtest86+-4.20/debian/control +++ memtest86+-4.20/debian/control @@ -1,7 +1,8 @@ Source: memtest86+ Section: misc Priority: optional -Maintainer: Yann Dirson +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Yann Dirson Build-Depends: debhelper (>> 5.0.0), dh-buildinfo, gcc-multilib [amd64 kfreebsd-amd64], po-debconf, genisoimage Homepage: http://www.memtest.org/ diff -u memtest86+-4.20/debian/grub-menu.lst memtest86+-4.20/debian/grub-menu.lst --- memtest86+-4.20/debian/grub-menu.lst +++ memtest86+-4.20/debian/grub-menu.lst @@ -8,5 +8,5 @@ -kernel /boot/memtest86+.bin +kernel /boot/memtest86+.elf title memtest86+ (serial console 115200) root (hd0,0) -kernel /boot/memtest86+.bin console=ttyS0,115200n8 +kernel /boot/memtest86+.elf console=ttyS0,115200n8 diff -u memtest86+-4.20/debian/grub memtest86+-4.20/debian/grub --- memtest86+-4.20/debian/grub +++ memtest86+-4.20/debian/grub @@ -16,44 +16,58 @@ +# We need 16-bit boot, which isn't available on EFI. +if [ -d /sys/firmware/efi ]; then + exit 0 +fi + # We can't cope with loop-mounted devices here. case ${GRUB_DEVICE_BOOT} in /dev/loop/*|/dev/loop[0-9]) exit 0 ;; esac +export TEXTDOMAIN=memtest86+ + prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")" -if test -e /boot/memtest86+.bin ; then - MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest86+.bin" ) +if test -e /boot/memtest86+.elf ; then + MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest86+.elf" ) echo "Found memtest86+ image: $MEMTESTPATH" >&2 cat << EOF -menuentry "Memory test (memtest86+)" { -EOF - printf '%s\n' "${prepare_boot_cache}" - cat << EOF - $LX $MEMTESTPATH -} -menuentry "Memory test (memtest86+, serial console 115200)" { +menuentry '$(gettext_printf "Memory test (memtest86+)")' { EOF printf '%s\n' "${prepare_boot_cache}" cat << EOF - $LX $MEMTESTPATH console=ttyS0,115200n8 + knetbsd $MEMTESTPATH } EOF fi -if test -e /boot/memtest86+_multiboot.bin ; then - MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest86+_multiboot.bin" ) - echo "Found memtest86+ multiboot image: $MEMTESTPATH" >&2 - cat << EOF -menuentry "Memory test (memtest86+, experimental multiboot)" { -EOF - printf '%s\n' "${prepare_boot_cache}" +if test -e /boot/memtest86+.bin ; then + MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest86+.bin" ) + echo "Found memtest86+ image: $MEMTESTPATH" >&2 cat << EOF - multiboot $MEMTESTPATH -} -menuentry "Memory test (memtest86+, serial console 115200, experimental multiboot)" { +menuentry '$(gettext_printf "Memory test (memtest86+, serial console 115200)")' { EOF printf '%s\n' "${prepare_boot_cache}" cat << EOF - multiboot $MEMTESTPATH console=ttyS0,115200n8 + $LX $MEMTESTPATH console=ttyS0,115200n8 } EOF fi + +#if test -e /boot/memtest86+_multiboot.bin ; then +# MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest86+_multiboot.bin" ) +# echo "Found memtest86+ multiboot image: $MEMTESTPATH" >&2 +# cat << EOF +#menuentry '$(gettext_printf "Memory test (memtest86+, experimental multiboot)")' { +#EOF +# printf '%s\n' "${prepare_boot_cache}" +# cat << EOF +# multiboot $MEMTESTPATH +#} +#menuentry '$(gettext_printf "Memory test (memtest86+, serial console 115200, experimental multiboot)")' { +#EOF +# printf '%s\n' "${prepare_boot_cache}" +# cat << EOF +# multiboot $MEMTESTPATH console=ttyS0,115200n8 +#} +#EOF +#fi diff -u memtest86+-4.20/debian/rules memtest86+-4.20/debian/rules --- memtest86+-4.20/debian/rules +++ memtest86+-4.20/debian/rules @@ -15,6 +15,9 @@ $(MAKE) # CC=gcc-2.95 ./makeiso.sh + ls debian/po --hide *.pot --hide *.in | sed 's/\.po//g' | xargs -I {} -t sh -c \ + "mkdir -p debian/locale/{}/LC_MESSAGES/ && \ + msgfmt debian/po/{}.po -o debian/locale/{}/LC_MESSAGES/memtest86+.mo" touch build-stamp clean: @@ -25,7 +28,7 @@ [ ! -f Makefile ] || $(MAKE) clean # make sure PO files are always up-to-date - debconf-updatepo + debconf-updatepo --skip-pot dh_clean @@ -37,7 +40,9 @@ install -d debian/$(PACKAGE)/usr/bin install -D -m644 memtest.bin debian/$(PACKAGE)/boot/$(PACKAGE).bin - install -D -m644 memtest debian/$(PACKAGE)/usr/lib/$(PACKAGE)/$(PACKAGE).elf + install -D -m644 memtest debian/$(PACKAGE)/boot/$(PACKAGE).elf + install -d debian/$(PACKAGE)/usr/lib/$(PACKAGE) + ln -sf /boot/$(PACKAGE).elf debian/$(PACKAGE)/usr/lib/$(PACKAGE)/$(PACKAGE).elf install -D -m644 mt*.iso debian/$(PACKAGE)/usr/lib/$(PACKAGE)/$(PACKAGE).iso install -D -m644 -s memtest_shared debian/$(PACKAGE)/boot/$(PACKAGE)_multiboot.bin install -D -m755 debian/grub debian/$(PACKAGE)/etc/grub.d/20_$(PACKAGE) @@ -45,6 +50,7 @@ install -d debian/$(PACKAGE)/usr/share/lintian/overrides install -m644 debian/lintian-overrides \ debian/$(PACKAGE)/usr/share/lintian/overrides/$(PACKAGE) + mv debian/locale debian/$(PACKAGE)/usr/share # Build architecture-independent files here. binary-indep: build install diff -u memtest86+-4.20/debian/postinst memtest86+-4.20/debian/postinst --- memtest86+-4.20/debian/postinst +++ memtest86+-4.20/debian/postinst @@ -3,6 +3,11 @@ . /usr/share/debconf/confmodule +running_in_container() +{ + type running-in-container >/dev/null 2>&1 && running-in-container >/dev/null +} + if [ "$1" = configure ]; then db_get shared/memtest86-run-lilo if [ "$RET" = true ] && @@ -12,8 +17,8 @@ lilo fi - if [ -e /boot/grub/grub.cfg ] && [ -x "`which update-grub2 2>/dev/null`" ] ; then - update-grub2 + if [ -e /boot/grub/grub.cfg ] && type update-grub >/dev/null 2>&1 && ! running_in_container ; then + update-grub fi fi diff -u memtest86+-4.20/debian/po/fr.po memtest86+-4.20/debian/po/fr.po --- memtest86+-4.20/debian/po/fr.po +++ memtest86+-4.20/debian/po/fr.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: memtest86+@packages.debian.org\n" -"POT-Creation-Date: 2009-12-02 22:23+0100\n" +"POT-Creation-Date: 2013-05-13 16:14+0400\n" "PO-Revision-Date: 2010-01-02 18:44+0100\n" "Last-Translator: Christian Perrier \n" "Language-Team: French \n" @@ -38,0 +39,16 @@ + +#: ../grub:34 +msgid "Memory test (memtest86+)" +msgstr "" + +#: ../grub:40 +msgid "Memory test (memtest86+, serial console 115200)" +msgstr "" + +#: ../grub:53 +msgid "Memory test (memtest86+, experimental multiboot)" +msgstr "" + +#: ../grub:59 +msgid "Memory test (memtest86+, serial console 115200, experimental multiboot)" +msgstr "" diff -u memtest86+-4.20/debian/po/sk.po memtest86+-4.20/debian/po/sk.po --- memtest86+-4.20/debian/po/sk.po +++ memtest86+-4.20/debian/po/sk.po @@ -9,7 +9,7 @@ msgstr "" "Project-Id-Version: memtest86+ 4.20-1\n" "Report-Msgid-Bugs-To: memtest86+@packages.debian.org\n" -"POT-Creation-Date: 2009-12-02 22:23+0100\n" +"POT-Creation-Date: 2013-05-13 16:14+0400\n" "PO-Revision-Date: 2011-04-10 09:43+0200\n" "Last-Translator: Slavko \n" "Language-Team: Slovak \n" @@ -38,0 +39,16 @@ + +#: ../grub:34 +msgid "Memory test (memtest86+)" +msgstr "" + +#: ../grub:40 +msgid "Memory test (memtest86+, serial console 115200)" +msgstr "" + +#: ../grub:53 +msgid "Memory test (memtest86+, experimental multiboot)" +msgstr "" + +#: ../grub:59 +msgid "Memory test (memtest86+, serial console 115200, experimental multiboot)" +msgstr "" diff -u memtest86+-4.20/debian/po/sr@ijekavian.po memtest86+-4.20/debian/po/sr@ijekavian.po --- memtest86+-4.20/debian/po/sr@ijekavian.po +++ memtest86+-4.20/debian/po/sr@ijekavian.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: 4.20-1\n" "Report-Msgid-Bugs-To: memtest86+@packages.debian.org\n" -"POT-Creation-Date: 2009-12-02 22:23+0100\n" +"POT-Creation-Date: 2013-05-13 16:14+0400\n" "PO-Revision-Date: 2011-07-23 21:46+0100\n" "Last-Translator: Zlatan Todoric \n" "Language-Team: LANGUAGE Soon to come\n" @@ -34,0 +35,16 @@ + +#: ../grub:34 +msgid "Memory test (memtest86+)" +msgstr "" + +#: ../grub:40 +msgid "Memory test (memtest86+, serial console 115200)" +msgstr "" + +#: ../grub:53 +msgid "Memory test (memtest86+, experimental multiboot)" +msgstr "" + +#: ../grub:59 +msgid "Memory test (memtest86+, serial console 115200, experimental multiboot)" +msgstr "" diff -u memtest86+-4.20/debian/po/it.po memtest86+-4.20/debian/po/it.po --- memtest86+-4.20/debian/po/it.po +++ memtest86+-4.20/debian/po/it.po @@ -8,7 +8,7 @@ msgstr "" "Project-Id-Version: memtest86+\n" "Report-Msgid-Bugs-To: memtest86+@packages.debian.org\n" -"POT-Creation-Date: 2009-12-02 22:23+0100\n" +"POT-Creation-Date: 2013-05-13 16:14+0400\n" "PO-Revision-Date: 2010-10-14 08:49+0200\n" "Last-Translator: Vincenzo Campanella \n" "Language-Team: Italian \n" @@ -36,0 +37,16 @@ + +#: ../grub:34 +msgid "Memory test (memtest86+)" +msgstr "" + +#: ../grub:40 +msgid "Memory test (memtest86+, serial console 115200)" +msgstr "" + +#: ../grub:53 +msgid "Memory test (memtest86+, experimental multiboot)" +msgstr "" + +#: ../grub:59 +msgid "Memory test (memtest86+, serial console 115200, experimental multiboot)" +msgstr "" diff -u memtest86+-4.20/debian/po/templates.pot memtest86+-4.20/debian/po/templates.pot --- memtest86+-4.20/debian/po/templates.pot +++ memtest86+-4.20/debian/po/templates.pot @@ -16,7 +16,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: memtest86+@packages.debian.org\n" -"POT-Creation-Date: 2009-12-02 22:23+0100\n" +"POT-Creation-Date: 2013-05-13 16:14+0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -40,0 +41,16 @@ + +#: ../grub:34 +msgid "Memory test (memtest86+)" +msgstr "" + +#: ../grub:40 +msgid "Memory test (memtest86+, serial console 115200)" +msgstr "" + +#: ../grub:53 +msgid "Memory test (memtest86+, experimental multiboot)" +msgstr "" + +#: ../grub:59 +msgid "Memory test (memtest86+, serial console 115200, experimental multiboot)" +msgstr "" diff -u memtest86+-4.20/debian/po/ru.po memtest86+-4.20/debian/po/ru.po --- memtest86+-4.20/debian/po/ru.po +++ memtest86+-4.20/debian/po/ru.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: memtest86+ 4.00-2.1\n" "Report-Msgid-Bugs-To: memtest86+@packages.debian.org\n" -"POT-Creation-Date: 2009-12-02 22:23+0100\n" +"POT-Creation-Date: 2013-05-13 16:14+0400\n" "PO-Revision-Date: 2010-01-13 19:22+0300\n" "Last-Translator: Yuri Kozlov \n" "Language-Team: Russian \n" @@ -37,0 +38,16 @@ + +#: ../grub:34 +msgid "Memory test (memtest86+)" +msgstr "" + +#: ../grub:40 +msgid "Memory test (memtest86+, serial console 115200)" +msgstr "" + +#: ../grub:53 +msgid "Memory test (memtest86+, experimental multiboot)" +msgstr "" + +#: ../grub:59 +msgid "Memory test (memtest86+, serial console 115200, experimental multiboot)" +msgstr "" diff -u memtest86+-4.20/debian/po/ja.po memtest86+-4.20/debian/po/ja.po --- memtest86+-4.20/debian/po/ja.po +++ memtest86+-4.20/debian/po/ja.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: memtest86+ 4.00-2.1\n" "Report-Msgid-Bugs-To: memtest86+@packages.debian.org\n" -"POT-Creation-Date: 2009-12-02 22:23+0100\n" +"POT-Creation-Date: 2013-05-13 16:14+0400\n" "PO-Revision-Date: 2009-12-27 13:52+0900\n" "Last-Translator: Hideki Yamane (Debian-JP) \n" "Language-Team: Japanese \n" @@ -35,0 +36,16 @@ + +#: ../grub:34 +msgid "Memory test (memtest86+)" +msgstr "" + +#: ../grub:40 +msgid "Memory test (memtest86+, serial console 115200)" +msgstr "" + +#: ../grub:53 +msgid "Memory test (memtest86+, experimental multiboot)" +msgstr "" + +#: ../grub:59 +msgid "Memory test (memtest86+, serial console 115200, experimental multiboot)" +msgstr "" diff -u memtest86+-4.20/debian/po/sv.po memtest86+-4.20/debian/po/sv.po --- memtest86+-4.20/debian/po/sv.po +++ memtest86+-4.20/debian/po/sv.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: memtest86+\n" "Report-Msgid-Bugs-To: memtest86+@packages.debian.org\n" -"POT-Creation-Date: 2009-12-02 22:23+0100\n" +"POT-Creation-Date: 2013-05-13 16:14+0400\n" "PO-Revision-Date: 2010-01-09 19:01+0100\n" "Last-Translator: Martin Bagge \n" "Language-Team: Swedish \n" @@ -37,0 +38,16 @@ + +#: ../grub:34 +msgid "Memory test (memtest86+)" +msgstr "" + +#: ../grub:40 +msgid "Memory test (memtest86+, serial console 115200)" +msgstr "" + +#: ../grub:53 +msgid "Memory test (memtest86+, experimental multiboot)" +msgstr "" + +#: ../grub:59 +msgid "Memory test (memtest86+, serial console 115200, experimental multiboot)" +msgstr "" diff -u memtest86+-4.20/debian/po/pt.po memtest86+-4.20/debian/po/pt.po --- memtest86+-4.20/debian/po/pt.po +++ memtest86+-4.20/debian/po/pt.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: memtest86+ 4.00-2.1\n" "Report-Msgid-Bugs-To: memtest86+@packages.debian.org\n" -"POT-Creation-Date: 2009-12-02 22:23+0100\n" +"POT-Creation-Date: 2013-05-13 16:14+0400\n" "PO-Revision-Date: 2009-12-28 20:18+0000\n" "Last-Translator: Américo Monteiro \n" "Language-Team: Portuguese \n" @@ -37,0 +38,16 @@ + +#: ../grub:34 +msgid "Memory test (memtest86+)" +msgstr "" + +#: ../grub:40 +msgid "Memory test (memtest86+, serial console 115200)" +msgstr "" + +#: ../grub:53 +msgid "Memory test (memtest86+, experimental multiboot)" +msgstr "" + +#: ../grub:59 +msgid "Memory test (memtest86+, serial console 115200, experimental multiboot)" +msgstr "" diff -u memtest86+-4.20/debian/po/de.po memtest86+-4.20/debian/po/de.po --- memtest86+-4.20/debian/po/de.po +++ memtest86+-4.20/debian/po/de.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: memtest86+ 4.00\n" "Report-Msgid-Bugs-To: memtest86+@packages.debian.org\n" -"POT-Creation-Date: 2009-12-02 22:23+0100\n" +"POT-Creation-Date: 2013-05-13 16:14+0400\n" "PO-Revision-Date: 2010-01-01 19:47+0100\n" "Last-Translator: Thomas Mueller \n" "Language-Team: German \n" @@ -37,0 +38,16 @@ + +#: ../grub:34 +msgid "Memory test (memtest86+)" +msgstr "" + +#: ../grub:40 +msgid "Memory test (memtest86+, serial console 115200)" +msgstr "" + +#: ../grub:53 +msgid "Memory test (memtest86+, experimental multiboot)" +msgstr "" + +#: ../grub:59 +msgid "Memory test (memtest86+, serial console 115200, experimental multiboot)" +msgstr "" diff -u memtest86+-4.20/debian/po/da.po memtest86+-4.20/debian/po/da.po --- memtest86+-4.20/debian/po/da.po +++ memtest86+-4.20/debian/po/da.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: memtest86+\n" "Report-Msgid-Bugs-To: memtest86+@packages.debian.org\n" -"POT-Creation-Date: 2009-12-02 22:23+0100\n" +"POT-Creation-Date: 2013-05-13 16:14+0400\n" "PO-Revision-Date: 2010-10-19 19:21+0100\n" "Last-Translator: Joe Hansen \n" "Language-Team: Danish \n" @@ -35,0 +36,16 @@ + +#: ../grub:34 +msgid "Memory test (memtest86+)" +msgstr "" + +#: ../grub:40 +msgid "Memory test (memtest86+, serial console 115200)" +msgstr "" + +#: ../grub:53 +msgid "Memory test (memtest86+, experimental multiboot)" +msgstr "" + +#: ../grub:59 +msgid "Memory test (memtest86+, serial console 115200, experimental multiboot)" +msgstr "" diff -u memtest86+-4.20/debian/po/sr@ijekavianlatin.po memtest86+-4.20/debian/po/sr@ijekavianlatin.po --- memtest86+-4.20/debian/po/sr@ijekavianlatin.po +++ memtest86+-4.20/debian/po/sr@ijekavianlatin.po @@ -6,7 +6,7 @@ msgstr "" "Project-Id-Version: 4.20-1\n" "Report-Msgid-Bugs-To: memtest86+@packages.debian.org\n" -"POT-Creation-Date: 2009-12-02 22:23+0100\n" +"POT-Creation-Date: 2013-05-13 16:14+0400\n" "PO-Revision-Date: 2011-07-23 23:39+0100\n" "Last-Translator: Zlatan Todoric \n" "Language-Team: Soon to come\n" @@ -34,0 +35,16 @@ + +#: ../grub:34 +msgid "Memory test (memtest86+)" +msgstr "" + +#: ../grub:40 +msgid "Memory test (memtest86+, serial console 115200)" +msgstr "" + +#: ../grub:53 +msgid "Memory test (memtest86+, experimental multiboot)" +msgstr "" + +#: ../grub:59 +msgid "Memory test (memtest86+, serial console 115200, experimental multiboot)" +msgstr "" diff -u memtest86+-4.20/debian/po/nl.po memtest86+-4.20/debian/po/nl.po --- memtest86+-4.20/debian/po/nl.po +++ memtest86+-4.20/debian/po/nl.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: memtest 86+-4.20\n" "Report-Msgid-Bugs-To: memtest86+@packages.debian.org\n" -"POT-Creation-Date: 2009-12-02 22:23+0100\n" +"POT-Creation-Date: 2013-05-13 16:14+0400\n" "PO-Revision-Date: 2011-04-14 16:08+0200\n" "Last-Translator: Jeroen Schot \n" "Language-Team: Debian l10n Dutch \n" @@ -35,0 +36,16 @@ + +#: ../grub:34 +msgid "Memory test (memtest86+)" +msgstr "" + +#: ../grub:40 +msgid "Memory test (memtest86+, serial console 115200)" +msgstr "" + +#: ../grub:53 +msgid "Memory test (memtest86+, experimental multiboot)" +msgstr "" + +#: ../grub:59 +msgid "Memory test (memtest86+, serial console 115200, experimental multiboot)" +msgstr "" diff -u memtest86+-4.20/debian/po/cs.po memtest86+-4.20/debian/po/cs.po --- memtest86+-4.20/debian/po/cs.po +++ memtest86+-4.20/debian/po/cs.po @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: memtest86+ 4.10-1\n" "Report-Msgid-Bugs-To: memtest86+@packages.debian.org\n" -"POT-Creation-Date: 2009-12-02 22:23+0100\n" +"POT-Creation-Date: 2013-05-13 16:14+0400\n" "PO-Revision-Date: 2010-07-21 11:31+0200\n" "Last-Translator: Michal Simunek \n" "Language-Team: Czech \n" @@ -35,0 +36,16 @@ + +#: ../grub:34 +msgid "Memory test (memtest86+)" +msgstr "" + +#: ../grub:40 +msgid "Memory test (memtest86+, serial console 115200)" +msgstr "" + +#: ../grub:53 +msgid "Memory test (memtest86+, experimental multiboot)" +msgstr "" + +#: ../grub:59 +msgid "Memory test (memtest86+, serial console 115200, experimental multiboot)" +msgstr "" diff -u memtest86+-4.20/debian/po/es.po memtest86+-4.20/debian/po/es.po --- memtest86+-4.20/debian/po/es.po +++ memtest86+-4.20/debian/po/es.po @@ -28,7 +28,7 @@ msgstr "" "Project-Id-Version: memtest86+ 4.00-2.2\n" "Report-Msgid-Bugs-To: memtest86+@packages.debian.org\n" -"POT-Creation-Date: 2009-12-02 22:23+0100\n" +"POT-Creation-Date: 2013-05-13 16:14+0400\n" "PO-Revision-Date: 2010-04-28 10:10+0200\n" "Last-Translator: Francisco Javier Cuadrado \n" "Language-Team: Debian l10n Spanish \n" @@ -58,0 +59,16 @@ + +#: ../grub:34 +msgid "Memory test (memtest86+)" +msgstr "" + +#: ../grub:40 +msgid "Memory test (memtest86+, serial console 115200)" +msgstr "" + +#: ../grub:53 +msgid "Memory test (memtest86+, experimental multiboot)" +msgstr "" + +#: ../grub:59 +msgid "Memory test (memtest86+, serial console 115200, experimental multiboot)" +msgstr "" only in patch2: unchanged: --- memtest86+-4.20.orig/debian/po/zh_CN.po +++ memtest86+-4.20/debian/po/zh_CN.po @@ -0,0 +1,50 @@ +# Chinese (Simplified) translation for memtest86+ +# Copyright (c) 2014 THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the memtest86+ package. +# +msgid "" +msgstr "" +"Project-Id-Version: memtest86+\n" +"Report-Msgid-Bugs-To: memtest86+@packages.debian.org\n" +"POT-Creation-Date: 2013-05-13 16:14+0400\n" +"PO-Revision-Date: 2014-03-08 10:27+0800\n" +"Last-Translator: Luo Lei \n" +"Language-Team: Chinese (simplified) \n" +"Language: zh_CN\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"X-Generator: Poedit 1.5.4\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Run lilo automatically after upgrade (if found)?" +msgstr "如果检测到 lilo，则在升级后自动执行？" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"If lilo is installed and its configuration file contains the memtest86/" +"memtest86+ image, then it should be re-run in order to allow booting the new " +"image." +msgstr "" +"如果安装了 lilo 且其配置文件中包含 memtest86/memtest86+ 镜像，则应当重新执行" +"它才能启动新的镜像。" + +#: ../grub:34 +msgid "Memory test (memtest86+)" +msgstr "内存测试 (memtest86+)" + +#: ../grub:40 +msgid "Memory test (memtest86+, serial console 115200)" +msgstr "内存测试 (memtest86+, 串口终端 115200)" + +#: ../grub:53 +msgid "Memory test (memtest86+, experimental multiboot)" +msgstr "内存测试 (memtest86+, 试验性多重引导)" + +#: ../grub:59 +msgid "Memory test (memtest86+, serial console 115200, experimental multiboot)" +msgstr "内存测试 (memtest86+, 串口终端 115200，试验性多重引导)" only in patch2: unchanged: --- memtest86+-4.20.orig/debian/po/zh_HK.po +++ memtest86+-4.20/debian/po/zh_HK.po @@ -0,0 +1,49 @@ +# Chinese (Traditional, Hong Kong) translation for memtest86+ +# Copyright (c) 2014 Anthony Wong +# This file is distributed under the same license as the memtest86+ package. +# +msgid "" +msgstr "" +"Project-Id-Version: memtest86+\n" +"Report-Msgid-Bugs-To: memtest86+@packages.debian.org\n" +"POT-Creation-Date: 2013-05-13 16:14+0400\n" +"PO-Revision-Date: 2014-03-10 23:11+0800\n" +"Last-Translator: Anthony Wong \n" +"Language-Team: Chinese \n" +"Language: zh\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Run lilo automatically after upgrade (if found)?" +msgstr "如果檢測到 lilo，則在升級後自動執行？" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"If lilo is installed and its configuration file contains the memtest86/" +"memtest86+ image, then it should be re-run in order to allow booting the new " +"image." +msgstr "" +"如果安裝了 lilo 且其設定檔中包含 memtest86/memtest86+ 鏡像，則應當重新執行它" +"才能啟動新的鏡像。" + +#: ../grub:34 +msgid "Memory test (memtest86+)" +msgstr "記憶體測試 (memtest86+)" + +#: ../grub:40 +msgid "Memory test (memtest86+, serial console 115200)" +msgstr "記憶體測試 (memtest86+, 串聯控制台 115200)" + +#: ../grub:53 +msgid "Memory test (memtest86+, experimental multiboot)" +msgstr "記憶體測試 (memtest86+, 試驗性多重引導)" + +#: ../grub:59 +msgid "Memory test (memtest86+, serial console 115200, experimental multiboot)" +msgstr "記憶體測試 (memtest86+, 串聯控制台 115200，試驗性多重引導)" only in patch2: unchanged: --- memtest86+-4.20.orig/debian/po/zh_TW.po +++ memtest86+-4.20/debian/po/zh_TW.po @@ -0,0 +1,49 @@ +# Chinese (Traditional) translation for memtest86+ +# Copyright (c) 2014 Anthony Wong +# This file is distributed under the same license as the memtest86+ package. +# +msgid "" +msgstr "" +"Project-Id-Version: memtest86+\n" +"Report-Msgid-Bugs-To: memtest86+@packages.debian.org\n" +"POT-Creation-Date: 2013-05-13 16:14+0400\n" +"PO-Revision-Date: 2014-03-10 23:11+0800\n" +"Last-Translator: Anthony Wong \n" +"Language-Team: Chinese \n" +"Language: zh\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "Run lilo automatically after upgrade (if found)?" +msgstr "如果檢測到 lilo，則在升級後自動執行？" + +#. Type: boolean +#. Description +#: ../templates:1001 +msgid "" +"If lilo is installed and its configuration file contains the memtest86/" +"memtest86+ image, then it should be re-run in order to allow booting the new " +"image." +msgstr "" +"如果安裝了 lilo 且其設定檔中包含 memtest86/memtest86+ 鏡像，則應當重新執行它" +"才能啟動新的鏡像。" + +#: ../grub:34 +msgid "Memory test (memtest86+)" +msgstr "記憶體測試 (memtest86+)" + +#: ../grub:40 +msgid "Memory test (memtest86+, serial console 115200)" +msgstr "記憶體測試 (memtest86+, 串聯控制台 115200)" + +#: ../grub:53 +msgid "Memory test (memtest86+, experimental multiboot)" +msgstr "記憶體測試 (memtest86+, 試驗性多重引導)" + +#: ../grub:59 +msgid "Memory test (memtest86+, serial console 115200, experimental multiboot)" +msgstr "記憶體測試 (memtest86+, 串聯控制台 115200，試驗性多重引導)" only in patch2: unchanged: --- memtest86+-4.20.orig/memtest.lds +++ memtest86+-4.20/memtest.lds @@ -3,7 +3,7 @@ ENTRY(_start); SECTIONS { - . = 0x5000; + . = 0x100000; _start = . ; .data : { *(.data) only in patch2: unchanged: --- memtest86+-4.20.orig/test.c +++ memtest86+-4.20/test.c @@ -313,7 +313,7 @@ "jb L200\n\t" : "=D" (p) : "D" (p), "b" (pe) - : "eax", "edx" + : "eax", "ecx", "edx" ); do_tick();