merge mainline into mips

po/ChangeLog

@@ -1,43 +0,0 @@
-2009-11-24  Robert Millan  <rmh.grub@aybabtu.com>
-
-	* zh_CN.po: New file.
-	* LINGUAS: Add `zh_CN'.
-
-2009-11-23  Robert Millan  <rmh.grub@aybabtu.com>
-
-	* id.po: New file.
-	* LINGUAS: Add `id'.
-
-2009-11-23  Carles Pina i Estany <carles@pina.cat>
-
-	* POTFILES: Add `normal/menu_text.c'.
-	* ca.po: Add new translations.
-
-2009-11-19  Robert Millan  <rmh.grub@aybabtu.com>
-
-	* POTFILES: Add `util/i386/pc/grub-setup.c'.
-
-2009-11-19  Robert Millan  <rmh.grub@aybabtu.com>
-
-	* POTFILES: Add `util/mkisofs/eltorito.c', `util/mkisofs/joliet.c',
-	`util/mkisofs/mkisofs.c', `util/mkisofs/multi.c',
-	`util/mkisofs/rock.c', `util/mkisofs/tree.c', and
-	`util/mkisofs/write.c'.
-
-2009-11-18  Robert Millan  <rmh.grub@aybabtu.com>
-
-	* POTFILES-shell: New file.  List `util/grub.d/10_kfreebsd.in'
-	and `util/grub.d/10_linux.in'.
-
-2009-11-17  Robert Millan  <rmh.grub@aybabtu.com>
-
-	* ca.po: Fix PO-Revision-Date and Language-Team fields.
-
-2009-11-17  Robert Millan  <rmh.grub@aybabtu.com>
-
-	* LINGUAS: New file.
-
-2009-11-16  Robert Millan  <rmh.grub@aybabtu.com>
-
-	* POTFILES: New file.
-	* ca.po: New file.

po/LINGUAS

@@ -1,3 +0,0 @@
-ca
-id
-zh_CN

po/README

@@ -0,0 +1,24 @@
+
+If you checked out this source tree directly from GRUB Bazaar, you might
+be wondering where are the POT and PO files.  Here are some instructions
+that will hopefully clarify the situation.
+
+  - If you're a user or a distributor, simply fill the po directory by
+    importing translations from the Translation Project:
+
+      rsync -Lrtvz  translationproject.org::tp/latest/grub/ po
+
+    GRUB's build system will automatically detect those and include them
+    in your install.
+
+  - If you're a translator and want to add a new translation or improve an
+    existing one, get in touch with the Translation Project
+    (http://translationproject.org/).  The GRUB project doesn't interact
+    with translators directly (but we dearly appreciate your work!).
+
+  - If you're a developer adding/removing/modifiing translatable strings,
+    you can check that these turn into a sane POT file by using the
+    `po/grub.pot' make rule.
+
+  - If you're the maintainer of GNU GRUB preparing a new release, don't
+    forget to include the latest PO files in your source tarball!