[shotwell/wip/autotools] Update Makevars

[Jens Georg <jensgeorg src gnome org>]

commit bbd12caab53ad0f8c01f0767df870618f191f9f8
Author: Jens Georg <mail jensge org>
Date:   Wed Jun 29 21:28:09 2016 +0200

    Update Makevars
    
    Signed-off-by: Jens Georg <mail jensge org>

 po/Makevars |   53 +++++++++++++++++++++++++++++++----------------------
 1 files changed, 31 insertions(+), 22 deletions(-)
---
diff --git a/po/Makevars b/po/Makevars
index 1e701ed..0293363 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -8,24 +8,7 @@ subdir = po
 top_builddir = ..
 
 # These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ \
-        --keyword=C_:1c,2 --keyword=NC_:1c,2 \
-        --keyword=g_dngettext:2,3 \
-        --flag=g_dngettext:2:pass-c-format \
-        --flag=g_strdup_printf:1:c-format \
-        --flag=g_string_printf:2:c-format \
-        --flag=g_string_append_printf:2:c-format \
-        --flag=g_error_new:3:c-format \
-        --flag=g_set_error:4:c-format \
-        --flag=g_markup_printf_escaped:1:c-format \
-        --flag=g_log:3:c-format \
-        --flag=g_print:1:c-format \
-        --flag=g_printerr:1:c-format \
-        --flag=g_printf:1:c-format \
-        --flag=g_fprintf:2:c-format \
-        --flag=g_sprintf:2:c-format \
-        --flag=g_snprintf:3:c-format
-
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --from-code=UTF-8
 
 # 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
@@ -37,6 +20,13 @@ XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ \
 # their copyright.
 COPYRIGHT_HOLDER = Translation copyright holder
 
+# This tells whether or not to prepend "GNU " prefix to the package
+# name that gets inserted into the header of the $(DOMAIN).pot file.
+# Possible values are "yes", "no", or empty.  If it is empty, try to
+# detect it automatically by scanning the files in $(top_srcdir) for
+# "GNU packagename" string.
+PACKAGE_GNU =
+
 # This is the email address or URL to which the translators shall report
 # bugs in the untranslated strings:
 # - Strings which are not entire sentences, see the maintainer guidelines
@@ -51,15 +41,34 @@ COPYRIGHT_HOLDER = Translation copyright holder
 # It can be your email address, or a mailing list address where translators
 # can write to without being subscribed, or the URL of a web page through
 # which the translators can contact you.
-MSGID_BUGS_ADDRESS = http://bugzilla.gnome.org/enter_bug.cgi?product=shotwell
+MSGID_BUGS_ADDRESS =
 
 # This is the list of locale categories, beyond LC_MESSAGES, for which the
 # message catalogs shall be used.  It is usually empty.
 EXTRA_LOCALE_CATEGORIES =
 
-# Ignore the timestamp of the .pot file, as git clones do not have
-# deterministic timestamps, and .po files are updated by translators
-# (only) in GNOME projects.
+# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
+# context.  Possible values are "yes" and "no".  Set this to yes if the
+# package uses functions taking also a message context, like pgettext(), or
+# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
+USE_MSGCTXT = no
+
+# These options get passed to msgmerge.
+# Useful options are in particular:
+#   --previous            to keep previous msgids of translated messages,
+#   --quiet               to reduce the verbosity.
+MSGMERGE_OPTIONS =
+
+# These options get passed to msginit.
+# If you want to disable line wrapping when writing PO files, add
+# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
+# MSGINIT_OPTIONS.
+MSGINIT_OPTIONS =
+
+# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
+# has changed.  Possible values are "yes" and "no".  Set this to no if
+# the POT file is checked in the repository and the version control
+# program ignores timestamps.
 PO_DEPENDS_ON_POT = no
 
 # This tells whether or not to forcibly update $(DOMAIN).pot and