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

[Dmitry Shachnev]

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.

[Sebastien Bacher (seb128)]

Thank you for your work

=== 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 @@
+memtest86+ (4.20-1.1ubuntu4) UNRELEASED; urgency=low
+
+  * Support localization of GRUB menu entries (LP: #537998).
+
+ -- Dmitry Shachnev <[e-mail]>  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)

=== 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 @@
   /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" )
   echo "Found memtest86+ image: $MEMTESTPATH" >&2
   cat << EOF
-menuentry "Memory test (memtest86+)" {
+menuentry '$(gettext_printf "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+, serial console 115200)")' {
 EOF
   printf '%s\n' "${prepare_boot_cache}"
   cat << EOF
@@ -48,13 +50,13 @@
 #  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)" {
+#menuentry '$(gettext_printf "Memory test (memtest86+, experimental multiboot)")' {
 #EOF
 #  printf '%s\n' "${prepare_boot_cache}"
 #  cat << EOF
 #	multiboot	$MEMTESTPATH
 #}
-#menuentry "Memory test (memtest86+, serial console 115200, experimental multiboot)" {
+#menuentry '$(gettext_printf "Memory test (memtest86+, serial console 115200, experimental multiboot)")' {
 #EOF
 #  printf '%s\n' "${prepare_boot_cache}"
 #  cat << EOF

=== 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 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: [e-mail]\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 <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[e-mail]>\n"
@@ -38,3 +38,19 @@
 "memtest86+ image, then it should be re-run in order to allow booting the new "
 "image."
 msgstr ""
+
+#: ../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 ""

=== 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 @@
 
 	$(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
 
@@ -45,6 +48,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