Merge branch 'nsenter-keep-caps' of https://github.com/dgibson/util-linux into next

[thirdparty/util-linux.git] / po / Makevars

diff --git a/po/Makevars b/po/Makevars
index f6e320c3de981d9065b8fd059b303255e13e87f5..6ac83812c39d67cab47f29584adf288572d08d1a 100644 (file)
--- a/po/Makevars
+++ b/po/Makevars
@@ -8,7 +8,10 @@ subdir = po
 top_builddir = ..
 
 # These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=P_:1,2
+
+# This option gets passed to msgmerge.
+MSGMERGE_OPTIONS = --no-wrap --previous
 
 # 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
@@ -34,7 +37,7 @@ COPYRIGHT_HOLDER = Karel Zak <kzak@redhat.com>
 # 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 = Karel Zak <kzak@redhat.com>
+MSGID_BUGS_ADDRESS = util-linux@vger.kernel.org
 
 # This is the list of locale categories, beyond LC_MESSAGES, for which the
 # message catalogs shall be used.  It is usually empty.