# 
# patch "ChangeLog"
#  from [9d262eb7915ece188de5f0d5a85b00599fcdb4c6]
#    to [cb0692c3cd110060fa14c6bbcdeea68f30add0d3]
# 
# patch "po/Makevars"
#  from [ba95e10f69eae3e0645b3146a2c70bfc991a0481]
#    to [9f9d9179aaa8771ab4ddd5300c063d6a2f9e2f11]
# 
========================================================================
--- ChangeLog	9d262eb7915ece188de5f0d5a85b00599fcdb4c6
+++ ChangeLog	cb0692c3cd110060fa14c6bbcdeea68f30add0d3
@@ -1,3 +1,9 @@
+2005-09-03  Nathaniel Smith  <address@hidden>
+
+	* po/Makevars (XGETTEXT_OPTIONS): N_ != ngettext.
+	Add c-format flags on F() and FP() calls (only partially
+	successful on latter, because of bug in xgettext).
+	
 2005-09-02  Nathaniel Smith  <address@hidden>
 
 	* paths.{hh,cc}: Add split_path typedef.  Use it.
========================================================================
--- po/Makevars	ba95e10f69eae3e0645b3146a2c70bfc991a0481
+++ po/Makevars	9f9d9179aaa8771ab4ddd5300c063d6a2f9e2f11
@@ -8,7 +8,8 @@
 top_builddir = ..
 
 # These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=F --keyword=FP:1,2 --keyword=_ --keyword=N_:1,2
+# the second --flag=FP option is ineffective, because of a bug in gettext.
+XGETTEXT_OPTIONS = --keyword=F --keyword=FP:1,2 --keyword=_ --keyword=N_ --flag=F:1:c-format --flag=FP:1:c-format --flag=FP:2:c-format
 
 # This is the copyright holder that gets inserted into the header of the
 # $(DOMAIN).pot file.  Set this to the copyright holder of the surrounding