merged mainstream into crypto

po/LINGUAS

@@ -0,0 +1,2 @@
+ca
+id

po/POTFILES

@@ -0,0 +1,14 @@
+# List of files which contain translatable strings.
+util/i386/pc/grub-mkimage.c
+util/i386/pc/grub-setup.c
+
+util/mkisofs/eltorito.c
+util/mkisofs/joliet.c
+util/mkisofs/mkisofs.c
+util/mkisofs/mkisofs.h
+util/mkisofs/multi.c
+util/mkisofs/rock.c
+util/mkisofs/tree.c
+util/mkisofs/write.c
+
+normal/menu_text.c

po/POTFILES-shell

@@ -0,0 +1,4 @@
+# List of files which contain translatable strings.  Only files written in
+# Shell language are included here.
+util/grub.d/10_kfreebsd.in
+util/grub.d/10_linux.in