Fix translations to install again, fixes #64

l3ib · Feb 11, 2017 · b7b9ef1 · b7b9ef1
1 parent 0cbfa51
commit b7b9ef1
Show file tree

Hide file tree

Showing 13 changed files with 717 additions and 625 deletions.
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,15 @@
+2017-02-11  gettextize  <bug-gnu-gettext@gnu.org>
+
+	* m4/gettext.m4: Upgrade to gettext-0.19.7.
+	* m4/iconv.m4: Upgrade to gettext-0.19.7.
+	* m4/lib-ld.m4: Upgrade to gettext-0.19.7.
+	* m4/lib-link.m4: Upgrade to gettext-0.19.7.
+	* m4/lib-prefix.m4: Upgrade to gettext-0.19.7.
+	* m4/nls.m4: Upgrade to gettext-0.19.7.
+	* m4/po.m4: Upgrade to gettext-0.19.7.
+	* m4/progtest.m4: Upgrade to gettext-0.19.7.
+	* configure.ac (AM_GNU_GETTEXT_VERSION): Bump to 0.19.7.
+
 2013-12-19  gettextize  <bug-gnu-gettext@gnu.org>
 
 	* Makefile.am (EXTRA_DIST): Add m4/ChangeLog.

diff --git a/README b/README
@@ -24,6 +24,10 @@ BUILDING:
           the target system. For instance, CXXFLAGS=" -std=c++11" if using 
           gcc 5.x.
 
+    NOTE: If you want to install translations locally, you'll need to invoke
+          `make dist` to build the .gmo files before `make install`. No, I 
+          don't know why.
+
 USAGE:
     See the man page. It *might* be up to date.
 

diff --git a/configure.ac b/configure.ac
@@ -41,7 +41,7 @@ AC_CHECK_LIB(X11, XOpenDisplay, [NITROGEN_LIBS="$NITROGEN_LIBS -lX11"])
 
 ALL_LINGUAS=""
 AM_GNU_GETTEXT([external])
-AM_GNU_GETTEXT_VERSION([0.16])
+AM_GNU_GETTEXT_VERSION([0.19.7])
 AC_DEFINE_UNQUOTED([LOCALEDIR], ["${prefix}/${DATADIRNAME}/locale"], [Name of gettext locale directory])
 
 AC_LANG([C++])

diff --git a/po/ChangeLog b/po/ChangeLog
@@ -1,3 +1,8 @@
+2017-02-11  gettextize  <bug-gnu-gettext@gnu.org>
+
+	* Makefile.in.in: Upgrade to gettext-0.19.7.
+	* Rules-quot: Upgrade to gettext-0.19.7.
+
 2013-12-19  gettextize  <bug-gnu-gettext@gnu.org>
 
 	* Makefile.in.in: New file, from gettext-0.18.3.

diff --git a/po/LINGUAS b/po/LINGUAS
@@ -0,0 +1,3 @@
+# Set of available languages
+bs fi hr pl ru sr
+
diff --git a/po/Makevars b/po/Makevars
@@ -20,6 +20,13 @@ XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
 # their copyright.
 COPYRIGHT_HOLDER = l3ib.org
 
+# 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,3 +58,21 @@ USE_MSGCTXT = no
 #   --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 = yes
+
+# This tells whether or not to forcibly update $(DOMAIN).pot and
+# regenerate PO files on "make dist".  Possible values are "yes" and
+# "no".  Set this to no if the POT file and PO files are maintained
+# externally.
+DIST_DEPENDS_ON_UPDATE_PO = yes