diff options
| -rw-r--r-- | Makefile.am | 13 | ||||
| -rw-r--r-- | caja/Makefile.am | 7 | ||||
| -rw-r--r-- | caja/libcaja-engrampa.caja-extension.desktop.in.in | 9 | ||||
| -rw-r--r-- | caja/libcaja-engrampa.caja-extension.in.in | 8 | ||||
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | data/Makefile.am | 9 | ||||
| -rw-r--r-- | data/engrampa.appdata.xml.in | 6 | ||||
| -rw-r--r-- | data/engrampa.desktop.in.in | 9 | ||||
| -rw-r--r-- | po/Makevars | 78 | ||||
| -rw-r--r-- | po/POTFILES.in | 27 |
10 files changed, 125 insertions, 48 deletions
diff --git a/Makefile.am b/Makefile.am index 5472341..2d90115 100644 --- a/Makefile.am +++ b/Makefile.am @@ -25,16 +25,9 @@ EXTRA_DIST = \ HACKING \ NEWS \ README \ - autogen.sh \ - intltool-merge.in \ - intltool-update.in \ - intltool-extract.in - -DISTCLEANFILES = \ - po/.intltool-merge-cache \ - intltool-extract \ - intltool-merge \ - intltool-update + autogen.sh + +DISTCLEANFILES = DISTCHECK_CONFIGURE_FLAGS = \ --with-cajadir='$${libdir}/caja/extensions-2.0-distcheck' \ diff --git a/caja/Makefile.am b/caja/Makefile.am index 4821897..3ef86f4 100644 --- a/caja/Makefile.am +++ b/caja/Makefile.am @@ -19,9 +19,10 @@ libcaja_engrampa_la_LDFLAGS = -module -avoid-version -no-undefined libcaja_engrampa_la_LIBADD = $(CAJA_LIBS) extensiondir = $(datadir)/caja/extensions -extension_in_files = libcaja-engrampa.caja-extension.in -extension_DATA = $(extension_in_files:.caja-extension.in=.caja-extension) -%.caja-extension: %.caja-extension.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(AM_V_GEN) LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@ +extension_in_files = libcaja-engrampa.caja-extension.desktop.in +extension_DATA = $(extension_in_files:.caja-extension.desktop.in=.caja-extension) +$(extension_DATA): $(extension_in_files) + $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@ CLEANFILES = $(extension_DATA) diff --git a/caja/libcaja-engrampa.caja-extension.desktop.in.in b/caja/libcaja-engrampa.caja-extension.desktop.in.in new file mode 100644 index 0000000..022b7ba --- /dev/null +++ b/caja/libcaja-engrampa.caja-extension.desktop.in.in @@ -0,0 +1,9 @@ +[Caja Extension] +# Translators: Do NOT translate or transliterate this text (this is an icon file name)! +Icon=engrampa +Name=Engrampa +Description=Allows to create and extract archives +Author=Paolo Bacchilega <[email protected]>;Perberos <[email protected]> +Copyright=Copyright (C) 2001–2010 Free Software Foundation, Inc.\nCopyright (C) 2012–2019 The MATE developers +Version=@VERSION@ +Website=http://www.mate-desktop.org/ diff --git a/caja/libcaja-engrampa.caja-extension.in.in b/caja/libcaja-engrampa.caja-extension.in.in deleted file mode 100644 index d2f3e5b..0000000 --- a/caja/libcaja-engrampa.caja-extension.in.in +++ /dev/null @@ -1,8 +0,0 @@ -[Caja Extension] -Icon=engrampa -_Name=Engrampa -_Description=Allows to create and extract archives -Author=Paolo Bacchilega <[email protected]>;Perberos <[email protected]> -_Copyright=Copyright (C) 2001–2010 Free Software Foundation, Inc.\nCopyright (C) 2012–2019 The MATE developers -Version=@VERSION@ -Website=http://www.mate-desktop.org/ diff --git a/configure.ac b/configure.ac index b093325..af8446d 100644 --- a/configure.ac +++ b/configure.ac @@ -131,8 +131,9 @@ GETTEXT_PACKAGE=engrampa AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [GetText Package]) -AM_GLIB_GNU_GETTEXT -IT_PROG_INTLTOOL([0.50.1]) +AM_GNU_GETTEXT_VERSION([0.19.8]) +AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.8]) +AM_GNU_GETTEXT([external]) if test "x${prefix}" = "xNONE"; then AC_DEFINE_UNQUOTED(LOCALEDIR, "${ac_default_prefix}/${DATADIRNAME}/locale", [Locale dir]) @@ -189,7 +190,7 @@ AC_CONFIG_FILES([Makefile src/sh/Makefile src/ui/Makefile caja/Makefile - caja/libcaja-engrampa.caja-extension.in + caja/libcaja-engrampa.caja-extension.desktop.in help/Makefile po/Makefile.in]) AC_OUTPUT diff --git a/data/Makefile.am b/data/Makefile.am index 7d6017e..f52df44 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -4,8 +4,8 @@ desktopdir = $(datadir)/applications desktop_in_in_files = engrampa.desktop.in.in desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.desktop.in) desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) - -@INTLTOOL_DESKTOP_RULE@ +$(desktop_DATA): $(desktop_in_files) + $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ matchdir = $(datadir)/engrampa match_DATA = packages.match @@ -16,10 +16,11 @@ service_DATA = $(service_in_files:.service.in=.service) $(service_DATA): $(service_in_files) Makefile $(AM_V_GEN) $(SED) -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@ -@INTLTOOL_XML_RULE@ appdatadir = $(datadir)/metainfo appdata_in_files = engrampa.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 $@ gsettingsschema_in_files = org.mate.engrampa.gschema.xml.in gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml) @@ -65,7 +66,7 @@ CLEANFILES = \ engrampa.appdata.xml \ $(NULL) -dist-hook: +dist-hook: cd $(distdir); rm -f $(CLEANFILES) -include $(top_srcdir)/git.mk diff --git a/data/engrampa.appdata.xml.in b/data/engrampa.appdata.xml.in index a624adb..d4f2967 100644 --- a/data/engrampa.appdata.xml.in +++ b/data/engrampa.appdata.xml.in @@ -5,8 +5,8 @@ <metadata_license>CC0-1.0</metadata_license> <project_license>GPL-2.0+</project_license> <name>Engrampa Archive Manager</name> - <_summary>An Archive Manager for the MATE desktop environment</_summary> - <_description> + <summary>An Archive Manager for the MATE desktop environment</summary> + <description> <p> Engrampa is an archive manager for the MATE environment. It allows you to create and modify archives, view the contents of an archive, view a @@ -48,7 +48,7 @@ If you would like to know more about MATE and Engrampa, please visit the project's home page. </p> - </_description> + </description> <screenshots> <screenshot type="default"> <image width="960" height="540"> diff --git a/data/engrampa.desktop.in.in b/data/engrampa.desktop.in.in index 2ead7e3..82fc57d 100644 --- a/data/engrampa.desktop.in.in +++ b/data/engrampa.desktop.in.in @@ -1,15 +1,18 @@ [Desktop Entry] -_Name=Engrampa Archive Manager -_GenericName=Archive Manager -_Comment=Create and modify an archive +Name=Engrampa Archive Manager +GenericName=Archive Manager +Comment=Create and modify an archive TryExec=engrampa Exec=engrampa %U StartupNotify=true Terminal=false Type=Application +# Translators: Do NOT translate or transliterate this text (this is an icon file name)! Icon=engrampa +# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! Categories=GTK;Utility;Archiving;Compression; MimeType=application/x-7z-compressed;application/x-7z-compressed-tar;application/x-ace;application/x-alz;application/x-arj;application/x-brotli;application/x-brotli-compressed-tar;application/x-bzip;application/x-bzip-compressed-tar;application/x-bzip1;application/x-bzip1-compressed-tar;application/x-cabinet;application/x-cbr;application/x-cbz;application/x-cd-image;application/x-compress;application/x-compressed-tar;application/x-cpio;application/vnd.debian.binary-package;application/x-ear;application/x-ms-dos-executable;application/x-gtar;application/x-gzip;application/x-gzpostscript;application/x-java-archive;application/x-lha;application/x-lzh-compressed;application/x-lrzip;application/x-lrzip-compressed-tar;application/x-lzip;application/x-lzip-compressed-tar;application/x-lzma;application/x-lzma-compressed-tar;application/x-lzop;application/x-lzop-compressed-tar;application/x-ms-wim;application/x-rar;application/x-rar-compressed;application/x-rpm;application/x-rzip;application/x-tar;application/x-tarz;application/x-stuffit;application/x-war;application/x-xz;application/x-xz-compressed-tar;application/x-zip;application/x-zip-compressed;application/x-zoo;application/x-zstd;application/x-zstd-compressed-tar;application/zip;application/x-archive;application/vnd.ms-cab-compressed; +# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! Keywords=MATE;archive;manager;compression; X-MATE-DocPath=engrampa/engrampa.xml X-MATE-Bugzilla-Bugzilla=MATE diff --git a/po/Makevars b/po/Makevars new file mode 100644 index 0000000..a04c35c --- /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 --keyword=Description --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 3c6427f..9ea5328 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,6 +1,5 @@ # DO NOT EDIT. This file is automatically generated. # List of source files which contain translatable strings. -[encoding: UTF-8] copy-n-paste/eggdesktopfile.c copy-n-paste/eggdesktopfile.h copy-n-paste/eggsmclient.c @@ -9,11 +8,11 @@ copy-n-paste/eggsmclient-private.h copy-n-paste/eggsmclient-xsmp.c data/engrampa.appdata.xml.in data/engrampa.desktop.in.in -[type: gettext/gsettings]data/org.mate.engrampa.gschema.xml.in +data/org.mate.engrampa.gschema.xml.in caja/engrampa-module.c caja/caja-engrampa.c caja/caja-engrampa.h -[type: gettext/ini]caja/libcaja-engrampa.caja-extension.in.in +caja/libcaja-engrampa.caja-extension.desktop.in.in src/actions.c src/actions.h src/commands/rpm2cpio.c @@ -122,15 +121,15 @@ src/rar-utils.h src/server.c src/test-server.c src/typedefs.h -[type: gettext/glade]src/ui/add-options.ui -[type: gettext/glade]src/ui/app-menu.ui -[type: gettext/glade]src/ui/batch-add-files.ui -[type: gettext/glade]src/ui/batch-password.ui -[type: gettext/glade]src/ui/delete.ui -[type: gettext/glade]src/ui/extract-dialog-options.ui +src/ui/add-options.ui +src/ui/app-menu.ui +src/ui/batch-add-files.ui +src/ui/batch-password.ui +src/ui/delete.ui +src/ui/extract-dialog-options.ui src/ui.h -[type: gettext/glade]src/ui/menus-toolbars.ui -[type: gettext/glade]src/ui/new.ui -[type: gettext/glade]src/ui/password.ui -[type: gettext/glade]src/ui/properties.ui -[type: gettext/glade]src/ui/update.ui +src/ui/menus-toolbars.ui +src/ui/new.ui +src/ui/password.ui +src/ui/properties.ui +src/ui/update.ui |