# 
# 
# patch "ChangeLog"
#  from [49448ad317b1c775d85e45c0d740b405e125e541]
#    to [9467e2050b184b04da1102580822782560bac60a]
# 
# patch "po/Makevars"
#  from [658c8e7d7bc64b91caa440d65c1713c69f7b6002]
#    to [39ebd1daa879a3c8906b2b98d764f82a337c42e1]
# 
============================================================
--- ChangeLog	49448ad317b1c775d85e45c0d740b405e125e541
+++ ChangeLog	9467e2050b184b04da1102580822782560bac60a
@@ -1,3 +1,7 @@
+2006-01-12  Nathaniel Smith  <address@hidden>
+
+	* po/Makevars (XGETTEXT_OPTIONS): This time for sure!
+
 2006-01-13  Nathaniel Smith  <address@hidden>
 
 	* database.cc (check_rosterified): Clarify message emitted when db
============================================================
--- po/Makevars	658c8e7d7bc64b91caa440d65c1713c69f7b6002
+++ po/Makevars	39ebd1daa879a3c8906b2b98d764f82a337c42e1
@@ -20,8 +20,8 @@
 # directly.  Also, intltool-update doesn't seem to grok line
 # continuations, so XGETTEXT_OPTIONS needs to fit all one one line.
 # So... be careful if touching this stuff.
-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"
-XGETTEXT_OPTIONS_NO_FLAG="--keyword=F --keyword=FP:1,2 --keyword=_ --keyword=N_"
+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
+XGETTEXT_OPTIONS_NO_FLAG=--keyword=F --keyword=FP:1,2 --keyword=_ --keyword=N_
 
 # 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