From 21770a3057ad62d692787d19e9e23d4350076d4d Mon Sep 17 00:00:00 2001 From: Wu Xiaotian Date: Wed, 15 May 2019 19:04:00 +0800 Subject: migrate intltool to gettext --- Makefile.am | 11 +--- configure.ac | 8 +-- data/Makefile.am | 8 ++- data/caja-autorun-software.desktop.in | 2 +- data/caja-browser.desktop.in | 6 +- data/caja-computer.desktop.in | 4 +- data/caja-file-management-properties.desktop.in | 4 +- data/caja-folder-handler.desktop.in | 4 +- data/caja-home.desktop.in | 4 +- data/caja.appdata.xml.in | 6 +- data/caja.desktop.in | 4 +- data/caja.xml.in | 2 +- libcaja-private/Makefile.am | 2 - po/Makevars | 79 +++++++++++++++++++++++++ po/POTFILES.in | 9 ++- src/Makefile.am | 8 +-- src/mate-network-scheme.desktop.in | 4 +- 17 files changed, 117 insertions(+), 48 deletions(-) create mode 100644 po/Makevars diff --git a/Makefile.am b/Makefile.am index 21d98a08..8e085e5d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,34 +1,27 @@ include $(top_srcdir)/Makefile.shared SUBDIRS = \ + po \ eel \ libcaja-extension \ libegg \ libcaja-private \ src \ test \ - po \ data \ icons \ docs \ $(NULL) EXTRA_DIST = \ + its \ autogen.sh \ COPYING.LIB \ COPYING.EXTENSIONS \ HACKING \ - intltool-extract.in \ - intltool-merge.in \ - intltool-update.in \ Makefile.shared \ $(NULL) -DISTCLEANFILES = \ - intltool-extract \ - intltool-merge \ - intltool-update - DISTCHECK_CONFIGURE_FLAGS = \ --disable-update-mimedb \ --disable-icon-update \ diff --git a/configure.ac b/configure.ac index b93cf5cb..60df9083 100644 --- a/configure.ac +++ b/configure.ac @@ -83,9 +83,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", AH_TEMPLATE([ENABLE_INSTALLER]) AH_TEMPLATE([ENABLE_NLS]) -AH_TEMPLATE([GETTEXT_PACKAGE]) AH_TEMPLATE([HAVE_CATGETS]) -AH_TEMPLATE([HAVE_GETTEXT]) AH_TEMPLATE([HAVE_LC_MESSAGES]) AH_TEMPLATE([HAVE_LIBBZ2]) AH_TEMPLATE([HAVE_LIBJPEG]) @@ -108,10 +106,8 @@ AC_DEFINE([HAVE_GTK_MULTIHEAD], [], [needed for egg-screen-exec functions]) AH_TEMPLATE([HAVE_STARTUP_NOTIFICATION]) AH_TEMPLATE([HAVE_EXIF]) -AM_GLIB_GNU_GETTEXT -GLIB_DEFINE_LOCALEDIR(MATELOCALEDIR) - -IT_PROG_INTLTOOL([0.50.1]) +AM_GNU_GETTEXT_VERSION([0.19.8]) +AM_GNU_GETTEXT([external]) dnl ========================================================================== diff --git a/data/Makefile.am b/data/Makefile.am index 42a9dea2..92d6e824 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -2,7 +2,8 @@ NULL = xml_in_files = caja.xml.in xml_files = $(xml_in_files:.xml.in=.xml) -@INTLTOOL_XML_RULE@ +$(xml_files): $(xml_in_files) + $(AM_V_GEN) GETTEXTDATADIR=$(top_srcdir) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@ desktopdir = $(datadir)/applications desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) @@ -14,7 +15,8 @@ desktop_in_files = \ caja-file-management-properties.desktop.in \ caja-browser.desktop.in \ caja-autorun-software.desktop.in -@INTLTOOL_DESKTOP_RULE@ +%.desktop: %.desktop.in + $(AM_V_GEN) GETTEXTDATADIR=$(top_srcdir) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ mimedir = $(datadir)/mime/packages mime_DATA = $(xml_files) @@ -41,6 +43,8 @@ cajadata_DATA = \ appdatadir = $(datadir)/metainfo appdata_in_files = caja.appdata.xml.in appdata_DATA = $(appdata_in_files:.xml.in=.xml) +$(appdata_DATA): $(appdata_in_files) + $(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@ EXTRA_DIST = $(cajadata_DATA) \ caja.desktop \ diff --git a/data/caja-autorun-software.desktop.in b/data/caja-autorun-software.desktop.in index 054ef010..0db85788 100644 --- a/data/caja-autorun-software.desktop.in +++ b/data/caja-autorun-software.desktop.in @@ -1,5 +1,5 @@ [Desktop Entry] -_Name=Autorun Prompt +Name=Autorun Prompt TryExec=caja-autorun-software Exec=caja-autorun-software %u Icon=application-x-executable diff --git a/data/caja-browser.desktop.in b/data/caja-browser.desktop.in index 9c0a8f06..a9a40eb0 100644 --- a/data/caja-browser.desktop.in +++ b/data/caja-browser.desktop.in @@ -1,7 +1,7 @@ [Desktop Entry] -_Name=Caja -_GenericName=File Browser -_Comment=Browse the file system with the file manager +Name=Caja +GenericName=File Browser +Comment=Browse the file system with the file manager TryExec=caja Exec=caja --no-desktop --browser %U Icon=system-file-manager diff --git a/data/caja-computer.desktop.in b/data/caja-computer.desktop.in index b085e6e0..25c1ba24 100644 --- a/data/caja-computer.desktop.in +++ b/data/caja-computer.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] -_Name=Computer -_Comment=Browse all local and remote disks and folders accessible from this computer +Name=Computer +Comment=Browse all local and remote disks and folders accessible from this computer TryExec=caja Exec=caja --no-desktop computer: Icon=computer diff --git a/data/caja-file-management-properties.desktop.in b/data/caja-file-management-properties.desktop.in index 288a0d06..14ee8f24 100644 --- a/data/caja-file-management-properties.desktop.in +++ b/data/caja-file-management-properties.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] -_Name=File Management -_Comment=Change the behaviour and appearance of file manager windows +Name=File Management +Comment=Change the behaviour and appearance of file manager windows Exec=caja-file-management-properties Icon=system-file-manager Terminal=false diff --git a/data/caja-folder-handler.desktop.in b/data/caja-folder-handler.desktop.in index e7f40676..b536bf89 100644 --- a/data/caja-folder-handler.desktop.in +++ b/data/caja-folder-handler.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] -_Name=Caja -_GenericName=Open Folder +Name=Caja +GenericName=Open Folder TryExec=caja Exec=caja --no-desktop %U NoDisplay=true diff --git a/data/caja-home.desktop.in b/data/caja-home.desktop.in index aa0a6f04..3aad993f 100644 --- a/data/caja-home.desktop.in +++ b/data/caja-home.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] -_Name=Home Folder -_Comment=Open your personal folder +Name=Home Folder +Comment=Open your personal folder TryExec=caja Exec=caja --no-desktop Icon=user-home diff --git a/data/caja.appdata.xml.in b/data/caja.appdata.xml.in index 3830c719..5f07f4b8 100644 --- a/data/caja.appdata.xml.in +++ b/data/caja.appdata.xml.in @@ -5,8 +5,8 @@ CC0-1.0 GPL-2.0+ Caja - <_summary>File manager for the MATE desktop environment - <_description> + File manager for the MATE desktop environment +

Caja is the official file manager for the MATE desktop. It allows for browsing directories, as well as previewing files and launching applications @@ -17,7 +17,7 @@ Caja is extensible through a plugin system, similar to that of GNOME Nautilus, of which Caja is a fork.

- + diff --git a/data/caja.desktop.in b/data/caja.desktop.in index 66df07bf..ce4f8340 100644 --- a/data/caja.desktop.in +++ b/data/caja.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] -_Name=Caja -_GenericName=File Manager +Name=Caja +GenericName=File Manager Exec=caja Icon=system-file-manager Terminal=false diff --git a/data/caja.xml.in b/data/caja.xml.in index 5d69859d..c9a908a4 100644 --- a/data/caja.xml.in +++ b/data/caja.xml.in @@ -2,7 +2,7 @@ - <_comment>Saved search + Saved search diff --git a/libcaja-private/Makefile.am b/libcaja-private/Makefile.am index 7d724641..611ed821 100644 --- a/libcaja-private/Makefile.am +++ b/libcaja-private/Makefile.am @@ -212,8 +212,6 @@ caja-marshal.list: $(libcaja_private_la_SOURCES) Makefile.am gsettings_SCHEMAS = org.mate.caja.gschema.xml org.mate.media-handling.gschema.xml -@INTLTOOL_XML_NOMERGE_RULE@ - @GSETTINGS_RULES@ EXTRA_DIST = \ diff --git a/po/Makevars b/po/Makevars new file mode 100644 index 00000000..71210e1b --- /dev/null +++ b/po/Makevars @@ -0,0 +1,79 @@ +# 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 + +# 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 +$(DOMAIN).pot-update: export GETTEXTDATADIR = $(top_srcdir) diff --git a/po/POTFILES.in b/po/POTFILES.in index ebe93e17..f9b43db1 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,6 +1,5 @@ # List of source files containing translatable strings. # Please keep this file sorted alphabetically. -[encoding: UTF-8] data/browser.xml data/caja.appdata.xml.in data/caja-autorun-software.desktop.in @@ -50,8 +49,8 @@ libcaja-private/caja-search-directory-file.c libcaja-private/caja-tree-view-drag-dest.c libcaja-private/caja-undostack-manager.c libcaja-private/caja-vfs-file.c -[type: gettext/gsettings]libcaja-private/org.mate.caja.gschema.xml -[type: gettext/gsettings]libcaja-private/org.mate.media-handling.gschema.xml +libcaja-private/org.mate.caja.gschema.xml +libcaja-private/org.mate.media-handling.gschema.xml libegg/eggdesktopfile.c libegg/eggsmclient.c src/file-manager/fm-desktop-icon-view.c @@ -72,14 +71,14 @@ src/file-manager/caja-list-view-ui.xml src/caja-application.c src/caja-autorun-software.c src/caja-bookmarks-window.c -[type: gettext/glade]src/caja-bookmarks-window.ui +src/caja-bookmarks-window.ui src/caja-connect-server-dialog-main.c src/caja-connect-server-dialog.c src/caja-desktop-window.c src/caja-emblem-sidebar.c src/caja-file-management-properties-main.c src/caja-file-management-properties.c -[type: gettext/glade]src/caja-file-management-properties.ui +src/caja-file-management-properties.ui src/caja-history-sidebar.c src/caja-image-properties-page.c src/caja-information-panel.c diff --git a/src/Makefile.am b/src/Makefile.am index 06bd831d..0f917ea4 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -19,6 +19,7 @@ AM_CPPFLAGS = \ -DDATADIR=\""$(datadir)"\" \ -DLIBDIR=\""$(libdir)"\" \ -DCAJA_DATADIR=\""$(datadir)/caja"\" \ + -DMATELOCALEDIR=\""$(datadir)/locale"\" \ -DUIDIR=\""$(datadir)/caja/ui"\" \ -DCAJA_PIXMAPDIR=\""$(datadir)/pixmaps/caja"\" \ -DPREFIX=\""$(prefix)"\" \ @@ -50,12 +51,13 @@ $(dbus_freedesktop_built_sources) : Makefile.am $(top_srcdir)/data/freedesktop-d $(top_srcdir)/data/freedesktop-dbus-interfaces.xml \ $(NULL) -@INTLTOOL_DESKTOP_RULE@ - desktop_in_files=mate-network-scheme.desktop.in desktop_files=$(desktop_in_files:.desktop.in=.desktop) desktopdir = $(datadir)/mate/network/ +$(desktop_files): $(desktop_in_files) + $(AM_V_GEN) GETTEXTDATADIR=$(top_srcdir) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ + schemedir = $(datadir)/applications scheme_DATA = mate-network-scheme.desktop @@ -206,8 +208,6 @@ if ENABLE_SELF_CHECK TESTS=check-caja endif -@INTLTOOL_SERVER_RULE@ - uidir = $(datadir)/caja/ui ui_DATA = \ caja-shell-ui.xml \ diff --git a/src/mate-network-scheme.desktop.in b/src/mate-network-scheme.desktop.in index 023c2cd3..d3449fa5 100644 --- a/src/mate-network-scheme.desktop.in +++ b/src/mate-network-scheme.desktop.in @@ -1,6 +1,6 @@ [Desktop Entry] -_Name=Network -_Comment=Browse bookmarked and local network locations +Name=Network +Comment=Browse bookmarked and local network locations TryExec=caja Exec=caja --no-desktop network: Terminal=false -- cgit v1.2.1