Merge lp:~mitya57/ubuntu/saucy/memtest86+/lp537998 into lp:ubuntu/saucy/memtest86+

Proposed by Dmitry Shachnev
Status: Merged
Merge reported by: Sebastien Bacher
Merged at revision: not available
Proposed branch: lp:~mitya57/ubuntu/saucy/memtest86+/lp537998
Merge into: lp:ubuntu/saucy/memtest86+
Diff against target: 121 lines (+34/-6)
4 files modified
debian/changelog (+6/-0)
debian/grub (+6/-4)
debian/po/templates.pot (+17/-1)
debian/rules (+5/-1)
To merge this branch: bzr merge lp:~mitya57/ubuntu/saucy/memtest86+/lp537998
Reviewer Review Type Date Requested Status
Ubuntu branches Pending
Review via email: mp+163521@code.launchpad.net

Description of the change

This enables translation of 4 strings visible in the boot menu (see bug 537998):

- "Memory test (memtest86+)"
- "Memory test (memtest86+, serial console 115200)"
- "Memory test (memtest86+, experimental multiboot)"
- "Memory test (memtest86+, serial console 115200, experimental multiboot)"

Unfortunately intltool-extract doesn't support shell files, so the .pot template has to be generated manually (or using xgettext). I've modified debian/rules to make sure that the clean target won't touch the .pot template.

Someone will also need to enable automatic import of templates in Rosetta to get this actually working: https://translations.launchpad.net/ubuntu/saucy/+source/memtest86+.

I will submit this to Debian when/if this lands in saucy and is working there.

To post a comment you must log in.
Revision history for this message
Sebastien Bacher (seb128) wrote :

Thank you for your work

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'debian/changelog'
--- debian/changelog 2012-12-04 16:23:35 +0000
+++ debian/changelog 2013-05-13 12:46:31 +0000
@@ -1,3 +1,9 @@
1memtest86+ (4.20-1.1ubuntu4) UNRELEASED; urgency=low
2
3 * Support localization of GRUB menu entries (LP: #537998).
4
5 -- Dmitry Shachnev <mitya57@ubuntu.com> Mon, 13 May 2013 15:06:15 +0400
6
1memtest86+ (4.20-1.1ubuntu3) raring; urgency=low7memtest86+ (4.20-1.1ubuntu3) raring; urgency=low
28
3 * Fix test#7 false positives due to compiler issues. (LP: #1071209)9 * Fix test#7 false positives due to compiler issues. (LP: #1071209)
410
=== modified file 'debian/grub'
--- debian/grub 2012-10-11 13:14:32 +0000
+++ debian/grub 2013-05-13 12:46:31 +0000
@@ -23,19 +23,21 @@
23 /dev/loop/*|/dev/loop[0-9]) exit 0 ;;23 /dev/loop/*|/dev/loop[0-9]) exit 0 ;;
24esac24esac
2525
26export TEXTDOMAIN=memtest86+
27
26prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"28prepare_boot_cache="$(prepare_grub_to_access_device ${GRUB_DEVICE_BOOT} | sed -e "s/^/\t/")"
2729
28if test -e /boot/memtest86+.bin ; then30if test -e /boot/memtest86+.bin ; then
29 MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest86+.bin" )31 MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest86+.bin" )
30 echo "Found memtest86+ image: $MEMTESTPATH" >&232 echo "Found memtest86+ image: $MEMTESTPATH" >&2
31 cat << EOF33 cat << EOF
32menuentry "Memory test (memtest86+)" {34menuentry '$(gettext_printf "Memory test (memtest86+)")' {
33EOF35EOF
34 printf '%s\n' "${prepare_boot_cache}"36 printf '%s\n' "${prepare_boot_cache}"
35 cat << EOF37 cat << EOF
36 $LX $MEMTESTPATH38 $LX $MEMTESTPATH
37}39}
38menuentry "Memory test (memtest86+, serial console 115200)" {40menuentry '$(gettext_printf "Memory test (memtest86+, serial console 115200)")' {
39EOF41EOF
40 printf '%s\n' "${prepare_boot_cache}"42 printf '%s\n' "${prepare_boot_cache}"
41 cat << EOF43 cat << EOF
@@ -48,13 +50,13 @@
48# MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest86+_multiboot.bin" )50# MEMTESTPATH=$( make_system_path_relative_to_its_root "/boot/memtest86+_multiboot.bin" )
49# echo "Found memtest86+ multiboot image: $MEMTESTPATH" >&251# echo "Found memtest86+ multiboot image: $MEMTESTPATH" >&2
50# cat << EOF52# cat << EOF
51#menuentry "Memory test (memtest86+, experimental multiboot)" {53#menuentry '$(gettext_printf "Memory test (memtest86+, experimental multiboot)")' {
52#EOF54#EOF
53# printf '%s\n' "${prepare_boot_cache}"55# printf '%s\n' "${prepare_boot_cache}"
54# cat << EOF56# cat << EOF
55# multiboot $MEMTESTPATH57# multiboot $MEMTESTPATH
56#}58#}
57#menuentry "Memory test (memtest86+, serial console 115200, experimental multiboot)" {59#menuentry '$(gettext_printf "Memory test (memtest86+, serial console 115200, experimental multiboot)")' {
58#EOF60#EOF
59# printf '%s\n' "${prepare_boot_cache}"61# printf '%s\n' "${prepare_boot_cache}"
60# cat << EOF62# cat << EOF
6163
=== modified file 'debian/po/templates.pot'
--- debian/po/templates.pot 2011-06-28 07:15:27 +0000
+++ debian/po/templates.pot 2013-05-13 12:46:31 +0000
@@ -16,7 +16,7 @@
16msgstr ""16msgstr ""
17"Project-Id-Version: PACKAGE VERSION\n"17"Project-Id-Version: PACKAGE VERSION\n"
18"Report-Msgid-Bugs-To: memtest86+@packages.debian.org\n"18"Report-Msgid-Bugs-To: memtest86+@packages.debian.org\n"
19"POT-Creation-Date: 2009-12-02 22:23+0100\n"19"POT-Creation-Date: 2013-05-13 16:14+0400\n"
20"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"20"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
21"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"21"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
22"Language-Team: LANGUAGE <LL@li.org>\n"22"Language-Team: LANGUAGE <LL@li.org>\n"
@@ -38,3 +38,19 @@
38"memtest86+ image, then it should be re-run in order to allow booting the new "38"memtest86+ image, then it should be re-run in order to allow booting the new "
39"image."39"image."
40msgstr ""40msgstr ""
41
42#: ../grub:34
43msgid "Memory test (memtest86+)"
44msgstr ""
45
46#: ../grub:40
47msgid "Memory test (memtest86+, serial console 115200)"
48msgstr ""
49
50#: ../grub:53
51msgid "Memory test (memtest86+, experimental multiboot)"
52msgstr ""
53
54#: ../grub:59
55msgid "Memory test (memtest86+, serial console 115200, experimental multiboot)"
56msgstr ""
4157
=== modified file 'debian/rules'
--- debian/rules 2011-11-27 09:51:14 +0000
+++ debian/rules 2013-05-13 12:46:31 +0000
@@ -15,6 +15,9 @@
1515
16 $(MAKE) # CC=gcc-2.9516 $(MAKE) # CC=gcc-2.95
17 ./makeiso.sh17 ./makeiso.sh
18 ls debian/po --hide *.pot --hide *.in | sed 's/\.po//g' | xargs -I {} -t sh -c \
19 "mkdir -p debian/locale/{}/LC_MESSAGES/ && \
20 msgfmt debian/po/{}.po -o debian/locale/{}/LC_MESSAGES/memtest86+.mo"
18 touch build-stamp21 touch build-stamp
1922
20clean:23clean:
@@ -25,7 +28,7 @@
25 [ ! -f Makefile ] || $(MAKE) clean28 [ ! -f Makefile ] || $(MAKE) clean
2629
27 # make sure PO files are always up-to-date30 # make sure PO files are always up-to-date
28 debconf-updatepo31 debconf-updatepo --skip-pot
2932
30 dh_clean33 dh_clean
3134
@@ -45,6 +48,7 @@
45 install -d debian/$(PACKAGE)/usr/share/lintian/overrides48 install -d debian/$(PACKAGE)/usr/share/lintian/overrides
46 install -m644 debian/lintian-overrides \49 install -m644 debian/lintian-overrides \
47 debian/$(PACKAGE)/usr/share/lintian/overrides/$(PACKAGE)50 debian/$(PACKAGE)/usr/share/lintian/overrides/$(PACKAGE)
51 mv debian/locale debian/$(PACKAGE)/usr/share
4852
49# Build architecture-independent files here.53# Build architecture-independent files here.
50binary-indep: build install54binary-indep: build install

Subscribers

People subscribed via source and target branches