merge mainline into mips

po/POTFILES

@@ -1,12 +1,81 @@
 # List of files which contain translatable strings.
-commands/i386/pc/play.c
-commands/loadenv.c
-commands/search.c
+commands/acpi.c
+commands/blocklist.c
+commands/boot.c
+commands/cat.c
+commands/cmp.c
+commands/configfile.c
+commands/crc.c
+commands/date.c
+commands/echo.c
+commands/efi/fixvideo.c
+commands/efi/loadbios.c
+commands/gptsync.c
+commands/halt.c
+commands/handler.c
+commands/hdparm.c
 commands/help.c
+commands/hexdump.c
+commands/i386/cpuid.c
+commands/i386/pc/drivemap.c
+commands/i386/pc/halt.c
+commands/i386/pc/play.c
+commands/i386/pc/pxecmd.c
+commands/i386/pc/vbeinfo.c
+commands/i386/pc/vbetest.c
+commands/ieee1275/suspend.c
+commands/keystatus.c
+commands/loadenv.c
+commands/ls.c
+commands/lsmmap.c
+commands/lspci.c
+commands/memrw.c
+commands/minicmd.c
+commands/parttool.c
+commands/password.c
+commands/probe.c
+commands/read.c
+commands/reboot.c
+commands/search.c
+commands/search_file.c
+commands/search_label.c
+commands/search_uuid.c
+commands/sleep.c
+commands/test.c
+commands/true.c
+commands/usbtest.c
+commands/videotest.c
+commands/xnu_uuid.c
+
+disk/loopback.c
+
+hello/hello.c
 
 lib/arg.c
 
+loader/efi/appleloader.c
+loader/efi/chainloader.c
+loader/i386/bsd.c
+loader/i386/efi/linux.c
+loader/i386/ieee1275/linux.c
+loader/i386/linux.c
+loader/i386/pc/chainloader.c
+loader/i386/pc/linux.c
+loader/i386/xnu.c
+loader/multiboot_loader.c
+loader/powerpc/ieee1275/linux.c
+loader/sparc64/ieee1275/linux.c
+loader/xnu.c
+
+normal/auth.c
+normal/color.c
 normal/dyncmd.c
+normal/main.c
+normal/menu_entry.c
+normal/menu_text.c
+normal/misc.c
+
+term/i386/pc/serial.c
 
 util/grub-mkrawimage.c
 util/i386/pc/grub-setup.c
@@ -19,10 +88,3 @@ util/mkisofs/multi.c
 util/mkisofs/rock.c
 util/mkisofs/tree.c
 util/mkisofs/write.c
-
-normal/auth.c
-normal/color.c
-normal/main.c
-normal/menu_entry.c
-normal/menu_text.c
-normal/misc.c