migrate from intltools to gettext

author: Wu Xiaotian <[email protected]> 2019-12-25 13:30:24 +0800
committer: ZenWalker <[email protected]> 2020-01-05 13:56:24 +0100
commit: 5a0d1fa2dcf6dc972f17b4c443d321c25e39c68a (patch)
tree: 7c93bc1ff5809468ccfb80983c1e7ce49df33e3e
parent: 66c9f25ba4db120a2ede11d5cc56952ecfcadcda (diff)
download: mate-netbook-5a0d1fa2dcf6dc972f17b4c443d321c25e39c68a.tar.bz2
mate-netbook-5a0d1fa2dcf6dc972f17b4c443d321c25e39c68a.tar.xz
8 files changed, 103 insertions, 27 deletions
diff --git a/Makefile.am b/Makefile.am
index 885dd70..ec4ff04 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -5,8 +5,8 @@ ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 DISTCHECK_CONFIGURE_FLAGS = \
 CFLAGS='-Wno-deprecated-declarations'
 
-EXTRA_DIST = autogen.sh intltool-merge.in intltool-extract.in intltool-update.in
-DISTCLEANFILES = intltool-merge intltool-update intltool-extract
+EXTRA_DIST = autogen.sh
+DISTCLEANFILES =
 
 MAINTAINERCLEANFILES = aclocal.m4 compile config.guess config.sub configure depcomp install-sh ltmain.sh Makefile.in missing
 
diff --git a/configure.ac b/configure.ac
index 55eb123..92aefa9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,16 +14,14 @@ AC_PROG_LIBTOOL
 dnl ==========================================================================
 dnl i18n
 dnl ==========================================================================
+AM_GNU_GETTEXT_VERSION([0.19.8])
+AM_GNU_GETTEXT([external])
 
 GETTEXT_PACKAGE=mate-netbook
 AC_SUBST(GETTEXT_PACKAGE)
 AC_SUBST([CONFIG_STATUS_DEPENDENCIES],['$(top_srcdir)/po/LINGUAS'])
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Define to the Gettext package name])
 
-IT_PROG_INTLTOOL([0.50.1])
-
-AM_GLIB_GNU_GETTEXT
-
 #if test "x$GCC" = "xyes"; then
 # GCC_FLAGS="-g -Wall -Werror"
 #fi
diff --git a/mate-window-picker-applet/Makefile.am b/mate-window-picker-applet/Makefile.am
index 71bfd50..78dd600 100644
--- a/mate-window-picker-applet/Makefile.am
+++ b/mate-window-picker-applet/Makefile.am
@@ -25,15 +25,16 @@ mate_window_picker_applet_SOURCES = \
 task-title.h 
 
 appletdir = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.panel.MateWindowPicker.mate-panel-applet.in
-applet_DATA = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet)
+applet_in_files = org.mate.panel.MateWindowPicker.mate-panel-applet.desktop.in
+applet_DATA = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet)
 
 $(applet_in_files): $(applet_in_files).in Makefile
 $(AM_V_GEN)sed \
 -e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \
 $< > $@
 
-org.mate.panel.MateWindowPicker.mate-panel-applet: org.mate.panel.MateWindowPicker.mate-panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
+$(applet_DATA): $(applet_in_files) Makefile
+ $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
 
 APPLET_LOCATION=$(libexecdir)/mate-window-picker-applet
 
@@ -46,7 +47,6 @@ org.mate.panel.applet.MateWindowPickerFactory.service: $(service_in_files)
 -e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \
 $< > $@
 
-@INTLTOOL_XML_NOMERGE_RULE@
 gsettingsschema_in_files = org.mate.panel.applet.mate-window-picker-applet.gschema.xml.in
 
 gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
@@ -56,7 +56,7 @@ xmluidir = $(datadir)/mate-panel/ui
 xmlui_DATA = mate-window-picker-applet-menu.xml
 
 EXTRA_DIST = \
- org.mate.panel.MateWindowPicker.mate-panel-applet.in.in \
+ $(applet_in_files).in \
 $(service_in_files) \
 $(ui_DATA) \
 $(convert_DATA) \
@@ -65,7 +65,7 @@ EXTRA_DIST = \
 
 CLEANFILES = \
 $(applet_DATA) \
- $(applet_DATA).in \
+ $(applet_in_files) \
 $(gsettings_SCHEMAS) \
 *.gschema.valid \
 $(service_DATA)
diff --git a/mate-window-picker-applet/org.mate.panel.MateWindowPicker.mate-panel-applet.desktop.in.in b/mate-window-picker-applet/org.mate.panel.MateWindowPicker.mate-panel-applet.desktop.in.in
new file mode 100644
index 0000000..f0ac6ff
--- /dev/null
+++ b/mate-window-picker-applet/org.mate.panel.MateWindowPicker.mate-panel-applet.desktop.in.in
@@ -0,0 +1,12 @@
+[Applet Factory]
+Id=MateWindowPickerFactory
+Location=@LOCATION@
+Name=Window Picker Applet Factory
+Description=Window Picker
+
+[MateWindowPicker]
+Name=Window Picker
+Description=Window Picker
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+Icon=preferences-system-windows
+BonoboId=OAFIID:MATE_WindowPicker
diff --git a/mate-window-picker-applet/org.mate.panel.MateWindowPicker.mate-panel-applet.in.in b/mate-window-picker-applet/org.mate.panel.MateWindowPicker.mate-panel-applet.in.in
deleted file mode 100644
index ffc4b98..0000000
--- a/mate-window-picker-applet/org.mate.panel.MateWindowPicker.mate-panel-applet.in.in
+++ /dev/null
@@ -1,11 +0,0 @@
-[Applet Factory]
-Id=MateWindowPickerFactory
-Location=@LOCATION@
-_Name=Window Picker Applet Factory
-_Description=Window Picker
-
-[MateWindowPicker]
-_Name=Window Picker
-_Description=Window Picker
-Icon=preferences-system-windows
-BonoboId=OAFIID:MATE_WindowPicker
diff --git a/maximus/Makefile.am b/maximus/Makefile.am
index b827cb8..0ea9bad 100644
--- a/maximus/Makefile.am
+++ b/maximus/Makefile.am
@@ -30,7 +30,6 @@ mate_maximus_SOURCES = \
 xutils.c \
 xutils.h 
 
-@INTLTOOL_XML_NOMERGE_RULE@
 gsettingsschema_in_files = org.mate.maximus.gschema.xml.in
 
 gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
diff --git a/po/Makevars b/po/Makevars
new file mode 100644
index 0000000..8d493dc
--- /dev/null
+++ b/po/Makevars
@@ -0,0 +1,78 @@
+# Makefile variables for PO directory in any package using GNU gettext.
+
+# Usually the message domain is the same as the package name.
+DOMAIN = $(PACKAGE)
+
+# These two variables depend on the location of this directory.
+subdir = po
+top_builddir = ..
+
+# These options get passed to xgettext.
+XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=g_dngettext:2,3 --add-comments=Translators:
+
+# 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
+# package. (Note that the msgstr strings, extracted from the package's
+# sources, belong to the copyright holder of the package.) Translators are
+# expected to transfer the copyright for their translations to this person
+# or entity, or to disclaim their copyright. The empty string stands for
+# the public domain; in this case the translators are expected to disclaim
+# their copyright.
+COPYRIGHT_HOLDER = MATE Desktop Environment team
+
+# 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
+# in the GNU gettext documentation, section 'Preparing Strings'.
+# - Strings which use unclear terms or require additional context to be
+# understood.
+# - Strings which make invalid assumptions about notation of date, time or
+# money.
+# - Pluralisation problems.
+# - Incorrect English spelling.
+# - Incorrect formatting.
+# 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 =
+
+# 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 =
+
+# 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 = 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
diff --git a/po/POTFILES.in b/po/POTFILES.in
index daf5b51..4d5af16 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,6 +1,6 @@
-[type: gettext/gsettings]mate-window-picker-applet/org.mate.panel.applet.mate-window-picker-applet.gschema.xml.in
-[type: gettext/ini]mate-window-picker-applet/org.mate.panel.MateWindowPicker.mate-panel-applet.in.in
+mate-window-picker-applet/org.mate.panel.applet.mate-window-picker-applet.gschema.xml.in
+mate-window-picker-applet/org.mate.panel.MateWindowPicker.mate-panel-applet.desktop.in.in
 mate-window-picker-applet/applet.c
 mate-window-picker-applet/task-title.c
 mate-window-picker-applet/task-item.c
-[type: gettext/gsettings]maximus/org.mate.maximus.gschema.xml.in
+maximus/org.mate.maximus.gschema.xml.in
author	Wu Xiaotian <[email protected]>	2019-12-25 13:30:24 +0800
committer	ZenWalker <[email protected]>	2020-01-05 13:56:24 +0100
commit	5a0d1fa2dcf6dc972f17b4c443d321c25e39c68a (patch)
tree	7c93bc1ff5809468ccfb80983c1e7ce49df33e3e
parent	66c9f25ba4db120a2ede11d5cc56952ecfcadcda (diff)
download	mate-netbook-5a0d1fa2dcf6dc972f17b4c443d321c25e39c68a.tar.bz2 mate-netbook-5a0d1fa2dcf6dc972f17b4c443d321c25e39c68a.tar.xz