From acee1df17030892911000024620003ad2aa29843 Mon Sep 17 00:00:00 2001 From: Wu Xiaotian Date: Tue, 29 Oct 2019 14:16:00 +0800 Subject: migrate from intltools to gettext --- Makefile.am | 3 +- configure.ac | 8 +-- desktop-directories/Makefile.am | 3 +- desktop-directories/mate-audio-video.directory.in | 4 +- desktop-directories/mate-development.directory.in | 4 +- desktop-directories/mate-education.directory.in | 2 +- desktop-directories/mate-game.directory.in | 4 +- desktop-directories/mate-graphics.directory.in | 4 +- desktop-directories/mate-hardware.directory.in | 4 +- .../mate-internet-and-network.directory.in | 4 +- .../mate-look-and-feel.directory.in | 4 +- .../mate-menu-applications.directory.in | 4 +- desktop-directories/mate-menu-system.directory.in | 4 +- desktop-directories/mate-network.directory.in | 4 +- desktop-directories/mate-office.directory.in | 4 +- desktop-directories/mate-other.directory.in | 4 +- desktop-directories/mate-personal.directory.in | 4 +- .../mate-settings-system.directory.in | 4 +- desktop-directories/mate-settings.directory.in | 4 +- desktop-directories/mate-system-tools.directory.in | 4 +- desktop-directories/mate-system.directory.in | 4 +- .../mate-utility-accessibility.directory.in | 4 +- desktop-directories/mate-utility.directory.in | 4 +- po/Makevars | 78 ++++++++++++++++++++++ 24 files changed, 124 insertions(+), 46 deletions(-) create mode 100644 po/Makevars diff --git a/Makefile.am b/Makefile.am index 81e7b6b..e7c40bf 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = libmenu desktop-directories layout util po +SUBDIRS = po libmenu desktop-directories layout util ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} @@ -21,7 +21,6 @@ MAINTAINERCLEANFILES = \ $(srcdir)/mkinstalldirs \ `find "$(srcdir)" -type f -name Makefile.in -print` \ $(srcdir)/configure \ - $(srcdir)/m4/intltool.m4 \ $(srcdir)/m4/libtool.m4 \ $(srcdir)/m4/ltoptions.m4 \ $(srcdir)/m4/ltsugar.m4 \ diff --git a/configure.ac b/configure.ac index faba3d1..baa4985 100644 --- a/configure.ac +++ b/configure.ac @@ -22,14 +22,14 @@ MATE_MAINTAINER_MODE_DEFINES LIB_MENU_LT_VERSION=6:9:4 AC_SUBST(LIB_MENU_LT_VERSION) +AM_GNU_GETTEXT_VERSION([0.19.8]) +AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.8]) +AM_GNU_GETTEXT([external]) + GETTEXT_PACKAGE=mate-menus AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Name of default gettext domain]) AC_SUBST(GETTEXT_PACKAGE) -AM_GLIB_GNU_GETTEXT - -IT_PROG_INTLTOOL([0.40.0]) - AC_PROG_CC AC_STDC_HEADERS AC_ARG_PROGRAM diff --git a/desktop-directories/Makefile.am b/desktop-directories/Makefile.am index 4bcc63c..042899d 100644 --- a/desktop-directories/Makefile.am +++ b/desktop-directories/Makefile.am @@ -28,7 +28,8 @@ directory_in_files = \ directory_DATA = $(directory_in_files:.directory.in=.directory) -@INTLTOOL_DIRECTORY_RULE@ +%.directory: %.directory.in + $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ EXTRA_DIST= $(directory_in_files) diff --git a/desktop-directories/mate-audio-video.directory.in b/desktop-directories/mate-audio-video.directory.in index 966fda1..5e5c766 100644 --- a/desktop-directories/mate-audio-video.directory.in +++ b/desktop-directories/mate-audio-video.directory.in @@ -1,5 +1,5 @@ [Desktop Entry] -_Name=Sound & Video -_Comment=Multimedia menu +Name=Sound & Video +Comment=Multimedia menu Icon=applications-multimedia Type=Directory diff --git a/desktop-directories/mate-development.directory.in b/desktop-directories/mate-development.directory.in index d7e9de9..225fe44 100644 --- a/desktop-directories/mate-development.directory.in +++ b/desktop-directories/mate-development.directory.in @@ -1,5 +1,5 @@ [Desktop Entry] -_Name=Programming -_Comment=Tools for software development +Name=Programming +Comment=Tools for software development Icon=applications-development Type=Directory diff --git a/desktop-directories/mate-education.directory.in b/desktop-directories/mate-education.directory.in index 689168a..402d371 100644 --- a/desktop-directories/mate-education.directory.in +++ b/desktop-directories/mate-education.directory.in @@ -1,4 +1,4 @@ [Desktop Entry] -_Name=Education +Name=Education Icon=applications-science Type=Directory diff --git a/desktop-directories/mate-game.directory.in b/desktop-directories/mate-game.directory.in index 610bbd8..3f19147 100644 --- a/desktop-directories/mate-game.directory.in +++ b/desktop-directories/mate-game.directory.in @@ -1,5 +1,5 @@ [Desktop Entry] -_Name=Games -_Comment=Games and amusements +Name=Games +Comment=Games and amusements Icon=applications-games Type=Directory diff --git a/desktop-directories/mate-graphics.directory.in b/desktop-directories/mate-graphics.directory.in index d2b4bb6..6514673 100644 --- a/desktop-directories/mate-graphics.directory.in +++ b/desktop-directories/mate-graphics.directory.in @@ -1,5 +1,5 @@ [Desktop Entry] -_Name=Graphics -_Comment=Graphics applications +Name=Graphics +Comment=Graphics applications Icon=applications-graphics Type=Directory diff --git a/desktop-directories/mate-hardware.directory.in b/desktop-directories/mate-hardware.directory.in index e80430e..fbff4c9 100644 --- a/desktop-directories/mate-hardware.directory.in +++ b/desktop-directories/mate-hardware.directory.in @@ -1,5 +1,5 @@ [Desktop Entry] -_Name=Hardware -_Comment=Settings for several hardware devices +Name=Hardware +Comment=Settings for several hardware devices Icon=preferences-desktop-peripherals Type=Directory diff --git a/desktop-directories/mate-internet-and-network.directory.in b/desktop-directories/mate-internet-and-network.directory.in index a37586f..a1a9645 100644 --- a/desktop-directories/mate-internet-and-network.directory.in +++ b/desktop-directories/mate-internet-and-network.directory.in @@ -1,5 +1,5 @@ [Desktop Entry] -_Name=Internet and Network -_Comment=Network-related settings +Name=Internet and Network +Comment=Network-related settings Icon=preferences-system-network Type=Directory diff --git a/desktop-directories/mate-look-and-feel.directory.in b/desktop-directories/mate-look-and-feel.directory.in index ad8b187..fcebf90 100644 --- a/desktop-directories/mate-look-and-feel.directory.in +++ b/desktop-directories/mate-look-and-feel.directory.in @@ -1,5 +1,5 @@ [Desktop Entry] -_Name=Look and Feel -_Comment=Settings controlling the desktop appearance and behavior +Name=Look and Feel +Comment=Settings controlling the desktop appearance and behavior Icon=preferences-desktop Type=Directory diff --git a/desktop-directories/mate-menu-applications.directory.in b/desktop-directories/mate-menu-applications.directory.in index d4106cb..e56b3da 100644 --- a/desktop-directories/mate-menu-applications.directory.in +++ b/desktop-directories/mate-menu-applications.directory.in @@ -1,5 +1,5 @@ [Desktop Entry] -_Name=Applications -_Comment=Applications +Name=Applications +Comment=Applications Icon=applications-other Type=Directory diff --git a/desktop-directories/mate-menu-system.directory.in b/desktop-directories/mate-menu-system.directory.in index 643f042..26ea2de 100644 --- a/desktop-directories/mate-menu-system.directory.in +++ b/desktop-directories/mate-menu-system.directory.in @@ -1,5 +1,5 @@ [Desktop Entry] -_Name=System -_Comment=Personal preferences and administration settings +Name=System +Comment=Personal preferences and administration settings Icon=preferences-other Type=Directory diff --git a/desktop-directories/mate-network.directory.in b/desktop-directories/mate-network.directory.in index bc88bee..f27a5a2 100644 --- a/desktop-directories/mate-network.directory.in +++ b/desktop-directories/mate-network.directory.in @@ -1,5 +1,5 @@ [Desktop Entry] -_Name=Internet -_Comment=Programs for Internet access such as web and email +Name=Internet +Comment=Programs for Internet access such as web and email Icon=applications-internet Type=Directory diff --git a/desktop-directories/mate-office.directory.in b/desktop-directories/mate-office.directory.in index d6c8d9e..23c9e8f 100644 --- a/desktop-directories/mate-office.directory.in +++ b/desktop-directories/mate-office.directory.in @@ -1,5 +1,5 @@ [Desktop Entry] -_Name=Office -_Comment=Office Applications +Name=Office +Comment=Office Applications Icon=applications-office Type=Directory diff --git a/desktop-directories/mate-other.directory.in b/desktop-directories/mate-other.directory.in index 898d406..ab799b7 100644 --- a/desktop-directories/mate-other.directory.in +++ b/desktop-directories/mate-other.directory.in @@ -1,5 +1,5 @@ [Desktop Entry] -_Name=Other -_Comment=Applications that did not fit in other categories +Name=Other +Comment=Applications that did not fit in other categories Icon=applications-other Type=Directory diff --git a/desktop-directories/mate-personal.directory.in b/desktop-directories/mate-personal.directory.in index 9f11595..3bb43bb 100644 --- a/desktop-directories/mate-personal.directory.in +++ b/desktop-directories/mate-personal.directory.in @@ -1,6 +1,6 @@ [Desktop Entry] # Translators: this is Personal as in "Personal settings" -_Name=Personal -_Comment=Personal settings +Name=Personal +Comment=Personal settings Icon=preferences-desktop-personal Type=Directory diff --git a/desktop-directories/mate-settings-system.directory.in b/desktop-directories/mate-settings-system.directory.in index 5dbb708..b5506e5 100644 --- a/desktop-directories/mate-settings-system.directory.in +++ b/desktop-directories/mate-settings-system.directory.in @@ -1,5 +1,5 @@ [Desktop Entry] Type=Directory -_Name=Administration -_Comment=Change system-wide settings (affects all users) +Name=Administration +Comment=Change system-wide settings (affects all users) Icon=preferences-system diff --git a/desktop-directories/mate-settings.directory.in b/desktop-directories/mate-settings.directory.in index 7c663a6..ed1a087 100644 --- a/desktop-directories/mate-settings.directory.in +++ b/desktop-directories/mate-settings.directory.in @@ -1,5 +1,5 @@ [Desktop Entry] -_Name=Preferences -_Comment=Personal preferences +Name=Preferences +Comment=Personal preferences Icon=preferences-desktop Type=Directory diff --git a/desktop-directories/mate-system-tools.directory.in b/desktop-directories/mate-system-tools.directory.in index d1d85be..bf8643e 100644 --- a/desktop-directories/mate-system-tools.directory.in +++ b/desktop-directories/mate-system-tools.directory.in @@ -1,5 +1,5 @@ [Desktop Entry] -_Name=System Tools -_Comment=System configuration and monitoring +Name=System Tools +Comment=System configuration and monitoring Icon=applications-system Type=Directory diff --git a/desktop-directories/mate-system.directory.in b/desktop-directories/mate-system.directory.in index 9de63bf..71536de 100644 --- a/desktop-directories/mate-system.directory.in +++ b/desktop-directories/mate-system.directory.in @@ -1,5 +1,5 @@ [Desktop Entry] -_Name=System -_Comment=System settings +Name=System +Comment=System settings Icon=preferences-system Type=Directory diff --git a/desktop-directories/mate-utility-accessibility.directory.in b/desktop-directories/mate-utility-accessibility.directory.in index 358b3a9..042f92e 100644 --- a/desktop-directories/mate-utility-accessibility.directory.in +++ b/desktop-directories/mate-utility-accessibility.directory.in @@ -1,5 +1,5 @@ [Desktop Entry] -_Name=Universal Access -_Comment=Universal Access Settings +Name=Universal Access +Comment=Universal Access Settings Type=Directory Icon=preferences-desktop-accessibility diff --git a/desktop-directories/mate-utility.directory.in b/desktop-directories/mate-utility.directory.in index 0edeeef..491dbb2 100644 --- a/desktop-directories/mate-utility.directory.in +++ b/desktop-directories/mate-utility.directory.in @@ -1,5 +1,5 @@ [Desktop Entry] -_Name=Accessories -_Comment=Desktop accessories +Name=Accessories +Comment=Desktop accessories Icon=applications-accessories Type=Directory diff --git a/po/Makevars b/po/Makevars new file mode 100644 index 0000000..b6668e6 --- /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 -L Desktop --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 -- cgit v1.2.1