Merge branch 'maint'

Also bump the devel version on the master branch to 3.2.0devel.

1 files changed, 2 insertions, 2 deletions

diff --git a/po/Makevars b/po/Makevars
index 94d8294a..38a4692e 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -9,8 +9,8 @@ top_builddir = ../
 
 # These options get passed to xgettext.
 XGETTEXT_OPTIONS = \
-  --keyword=_ --flag=_:1:pass-c-format \
-  --keyword=N_ --flag=N_:1:pass-c-format
+  --keyword=_ --flag=_:1:c-format \
+  --keyword=N_ --flag=N_:1:c-format
 
 # This is the copyright holder that gets inserted into the header of the
 # $(DOMAIN).pot file.