diff options
26 files changed, 205 insertions, 118 deletions
diff --git a/Makefile.am b/Makefile.am index 5224c9a..7ebbd48 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,17 +30,9 @@ if ENABLE_XATTR_TAGS SUBDIRS += xattr-tags endif -EXTRA_DIST = \ - autogen.sh \ - intltool-extract.in \ - intltool-update.in \ - intltool-merge.in - -DISTCLEANFILES = \ - intltool-extract \ - intltool-update \ - intltool-merge \ - po/.intltool-merge-cache +EXTRA_DIST = autogen.sh + +DISTCLEANFILES = DISTCHECK_CONFIGURE_FLAGS = \ --enable-gtk-doc \ diff --git a/configure.ac b/configure.ac index 0594115..78d4a84 100644 --- a/configure.ac +++ b/configure.ac @@ -306,22 +306,25 @@ fi AC_MSG_NOTICE([Installing caja plugins in ${ac_with_cajadir}]) AC_SUBST([CAJA_EXTENSION_DIR],[${ac_with_cajadir}]) -# intltool stuff -IT_PROG_INTLTOOL(0.18) +# gettext +AM_GNU_GETTEXT_VERSION([0.19.8]) +AM_GNU_GETTEXT([external]) + GETTEXT_PACKAGE=caja-extensions AC_SUBST(GETTEXT_PACKAGE) AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [gettext package]) -AM_GLIB_GNU_GETTEXT AC_OUTPUT([ Makefile - gksu/libcaja-gksu.caja-extension.in + sendto/org.mate.Caja.Sendto.gschema.xml + open-terminal/org.mate.caja-open-terminal.gschema.xml + gksu/libcaja-gksu.caja-extension.desktop.in gksu/Makefile - image-converter/libcaja-image-converter.caja-extension.in + image-converter/libcaja-image-converter.caja-extension.desktop.in image-converter/Makefile - open-terminal/libcaja-open-terminal.caja-extension.in + open-terminal/libcaja-open-terminal.caja-extension.desktop.in open-terminal/Makefile - sendto/libcaja-sendto.caja-extension.in + sendto/libcaja-sendto.caja-extension.desktop.in sendto/Makefile sendto/caja-sendto.pc sendto/docs/Makefile @@ -333,11 +336,11 @@ AC_OUTPUT([ sendto/plugins/pidgin/Makefile sendto/plugins/removable-devices/Makefile sendto/plugins/upnp/Makefile - share/libcaja-share.caja-extension.in + share/libcaja-share.caja-extension.desktop.in share/Makefile - wallpaper/libcaja-wallpaper.caja-extension.in + wallpaper/libcaja-wallpaper.caja-extension.desktop.in wallpaper/Makefile - xattr-tags/libcaja-xattr-tags.caja-extension.in + xattr-tags/libcaja-xattr-tags.caja-extension.desktop.in xattr-tags/Makefile po/Makefile.in ]) diff --git a/gksu/Makefile.am b/gksu/Makefile.am index da930bf..0ace449 100644 --- a/gksu/Makefile.am +++ b/gksu/Makefile.am @@ -8,8 +8,9 @@ libcaja_gksu_la_LDFLAGS = -module -avoid-version -no-undefined libcaja_gksu_la_LIBADD = $(CAJA_LIBS) extensiondir = $(datadir)/caja/extensions -extension_in_files = libcaja-gksu.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-gksu.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=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@ CLEANFILES = $(extension_DATA) diff --git a/gksu/libcaja-gksu.caja-extension.desktop.in.in b/gksu/libcaja-gksu.caja-extension.desktop.in.in new file mode 100644 index 0000000..4d7b242 --- /dev/null +++ b/gksu/libcaja-gksu.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=system +Name=Gksu +Description=Privilege granting extension +Author=Gustavo Noronha Silva +Copyright=Copyright (C) 2002-2005 Gustavo Noronha Silva +Version=@VERSION@ +Website=https://mate-desktop.org/ diff --git a/gksu/libcaja-gksu.caja-extension.in.in b/gksu/libcaja-gksu.caja-extension.in.in deleted file mode 100644 index b210202..0000000 --- a/gksu/libcaja-gksu.caja-extension.in.in +++ /dev/null @@ -1,8 +0,0 @@ -[Caja Extension] -Icon=system -_Name=Gksu -_Description=Privilege granting extension -Author=Gustavo Noronha Silva -_Copyright=Copyright (C) 2002-2005 Gustavo Noronha Silva -Version=@VERSION@ -Website=https://mate-desktop.org/ diff --git a/image-converter/Makefile.am b/image-converter/Makefile.am index 33a736d..1e56060 100644 --- a/image-converter/Makefile.am +++ b/image-converter/Makefile.am @@ -28,9 +28,10 @@ builder_DATA = \ caja-image-rotate.ui extensiondir = $(datadir)/caja/extensions -extension_in_files = libcaja-image-converter.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-image-converter.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=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@ EXTRA_DIST = $(builder_DATA) diff --git a/image-converter/libcaja-image-converter.caja-extension.desktop.in.in b/image-converter/libcaja-image-converter.caja-extension.desktop.in.in new file mode 100644 index 0000000..a2b5653 --- /dev/null +++ b/image-converter/libcaja-image-converter.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=image +Name=Image Converter +Description=Rotate and resize images +Author=Jürg Billeter <[email protected]> +Copyright=Copyright (C) 2004-2005 Jürg Billeter +Version=@VERSION@ +Website=https://mate-desktop.org/ diff --git a/image-converter/libcaja-image-converter.caja-extension.in.in b/image-converter/libcaja-image-converter.caja-extension.in.in deleted file mode 100644 index d2312d8..0000000 --- a/image-converter/libcaja-image-converter.caja-extension.in.in +++ /dev/null @@ -1,8 +0,0 @@ -[Caja Extension] -Icon=image -_Name=Image Converter -_Description=Rotate and resize images -Author=Jürg Billeter <[email protected]> -_Copyright=Copyright (C) 2004-2005 Jürg Billeter -Version=@VERSION@ -Website=https://mate-desktop.org/ diff --git a/open-terminal/Makefile.am b/open-terminal/Makefile.am index ff0a524..ea3e070 100644 --- a/open-terminal/Makefile.am +++ b/open-terminal/Makefile.am @@ -22,21 +22,22 @@ libcaja_open_terminal_la_LDFLAGS = -module -avoid-version libcaja_open_terminal_la_LIBADD = $(CAJA_LIBS) $(OPENTERMINAL_LIBS) gsettings_schemas_in_files = org.mate.caja-open-terminal.gschema.xml.in -gsettings_SCHEMAS = $(gsettings_schemas_in_files:.gschema.xml.in=.gschema.xml) - -@INTLTOOL_XML_NOMERGE_RULE@ - +gsettings_SCHEMAS = $(gsettings_schemas_in_files:.xml.in=.xml) @GSETTINGS_RULES@ extensiondir = $(datadir)/caja/extensions -extension_in_files = libcaja-open-terminal.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-open-terminal.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=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@ DISTCLEANFILES = \ org.mate.caja-open-terminal.gschema.xml -CLEANFILES = $(extension_DATA) +CLEANFILES = \ + $(extension_DATA) \ + $(gsettings_SCHEMAS) \ + *.gschema.valid EXTRA_DIST = \ $(gsettings_schemas_in_files) diff --git a/open-terminal/libcaja-open-terminal.caja-extension.desktop.in.in b/open-terminal/libcaja-open-terminal.caja-extension.desktop.in.in new file mode 100644 index 0000000..6ac32b2 --- /dev/null +++ b/open-terminal/libcaja-open-terminal.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=terminal +Name=Open terminal +Description=Open terminals from folders +Author=Christian Neumair <[email protected]> +Copyright=Copyright (C) 2004, 2005 Free Software Foundation, Inc. +Version=@VERSION@ +Website=https://mate-desktop.org/ diff --git a/open-terminal/libcaja-open-terminal.caja-extension.in.in b/open-terminal/libcaja-open-terminal.caja-extension.in.in deleted file mode 100644 index 729dfa7..0000000 --- a/open-terminal/libcaja-open-terminal.caja-extension.in.in +++ /dev/null @@ -1,8 +0,0 @@ -[Caja Extension] -Icon=terminal -_Name=Open terminal -_Description=Open terminals from folders -Author=Christian Neumair <[email protected]> -_Copyright=Copyright (C) 2004, 2005 Free Software Foundation, Inc. -Version=@VERSION@ -Website=https://mate-desktop.org/ diff --git a/open-terminal/org.mate.caja-open-terminal.gschema.xml.in b/open-terminal/org.mate.caja-open-terminal.gschema.xml.in index 32f55ef..56b70ef 100644 --- a/open-terminal/org.mate.caja-open-terminal.gschema.xml.in +++ b/open-terminal/org.mate.caja-open-terminal.gschema.xml.in @@ -2,8 +2,8 @@ <schema id="org.mate.caja-open-terminal" path="/org/mate/caja-open-terminal/"> <key name="desktop-opens-home-dir" type="b"> <default>false</default> - <_summary>Whether opening a terminal on the desktop opens a terminal in the home directory</_summary> - <_description>If set to true, then opening a terminal on the desktop will open a terminal in the home directory. Otherwise, it will be opened in the desktop directory. Note that this key is irrelevant if the desktop directory is identical to the home directory.</_description> + <summary>Whether opening a terminal on the desktop opens a terminal in the home directory</summary> + <description>If set to true, then opening a terminal on the desktop will open a terminal in the home directory. Otherwise, it will be opened in the desktop directory. Note that this key is irrelevant if the desktop directory is identical to the home directory.</description> </key> </schema> </schemalist> diff --git a/po/Makevars b/po/Makevars new file mode 100644 index 0000000..57ba938 --- /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=Copyright --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 70ffe26..a8a4e01 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,34 +1,34 @@ # List of source files containing translatable strings. # Please keep this list in alphabetic order. gksu/libcaja-gksu.c -[type: gettext/ini]gksu/libcaja-gksu.caja-extension.in.in +gksu/libcaja-gksu.caja-extension.desktop.in.in image-converter/caja-image-converter.c -[type: gettext/glade]image-converter/caja-image-resize.ui +image-converter/caja-image-resize.ui image-converter/caja-image-resizer.c -[type: gettext/glade]image-converter/caja-image-rotate.ui +image-converter/caja-image-rotate.ui image-converter/caja-image-rotator.c -[type: gettext/ini]image-converter/libcaja-image-converter.caja-extension.in.in +image-converter/libcaja-image-converter.caja-extension.desktop.in.in open-terminal/caja-open-terminal.c -[type: gettext/ini]open-terminal/libcaja-open-terminal.caja-extension.in.in +open-terminal/libcaja-open-terminal.caja-extension.desktop.in.in open-terminal/org.mate.caja-open-terminal.gschema.xml.in sendto/caja-nste.c sendto/caja-nste.h sendto/caja-sendto-command.c sendto/caja-sendto-module.c -[type: gettext/ini]sendto/libcaja-sendto.caja-extension.in.in +sendto/libcaja-sendto.caja-extension.desktop.in.in sendto/org.mate.Caja.Sendto.gschema.xml.in -[type: gettext/glade]sendto/caja-sendto.ui +sendto/caja-sendto.ui sendto/plugins/emailclient/emailclient.c sendto/plugins/gajim/gajim.c sendto/plugins/caja-burn/caja-burn.c sendto/plugins/pidgin/pidgin.c sendto/plugins/removable-devices/removable-devices.c sendto/plugins/upnp/upnp.c -[type: gettext/ini]share/libcaja-share.caja-extension.in.in +share/libcaja-share.caja-extension.desktop.in.in share/caja-share.c -[type: gettext/glade]share/share-dialog.ui +share/share-dialog.ui share/shares.c wallpaper/caja-wallpaper-extension.c -[type: gettext/ini]wallpaper/libcaja-wallpaper.caja-extension.in.in +wallpaper/libcaja-wallpaper.caja-extension.desktop.in.in xattr-tags/caja-xattr-tags-extension.c -[type: gettext/ini]xattr-tags/libcaja-xattr-tags.caja-extension.in.in +xattr-tags/libcaja-xattr-tags.caja-extension.desktop.in.in diff --git a/sendto/Makefile.am b/sendto/Makefile.am index cefa6ea..83adfc7 100644 --- a/sendto/Makefile.am +++ b/sendto/Makefile.am @@ -70,15 +70,15 @@ nst-enum-types.c: $(nst_headers_to_scan_for_enums) Makefile nst-enum-types.h gsettingsschema_in_files = org.mate.Caja.Sendto.gschema.xml.in gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml) -@INTLTOOL_XML_NOMERGE_RULE@ @GSETTINGS_RULES@ man_MANS = caja-sendto.1 extensiondir = $(datadir)/caja/extensions -extension_in_files = libcaja-sendto.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-sendto.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=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@ EXTRA_DIST = \ $(ui_DATA) \ @@ -90,4 +90,5 @@ CLEANFILES = \ $(nst_built_headers) \ $(nst_built_cfiles) \ $(gsettings_SCHEMAS) \ - $(extension_DATA) + $(extension_DATA) \ + *.gschema.valid diff --git a/sendto/libcaja-sendto.caja-extension.desktop.in.in b/sendto/libcaja-sendto.caja-extension.desktop.in.in new file mode 100644 index 0000000..d43bdab --- /dev/null +++ b/sendto/libcaja-sendto.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=mail-send +Name=Send To +Description=Integrates email clients and Pidgin +Author=Roberto Majadas <[email protected]> +Copyright=Copyright (C) 2004 Roberto Majadas +Version=@VERSION@ +Website=https://mate-desktop.org/ diff --git a/sendto/libcaja-sendto.caja-extension.in.in b/sendto/libcaja-sendto.caja-extension.in.in deleted file mode 100644 index 33d6cac..0000000 --- a/sendto/libcaja-sendto.caja-extension.in.in +++ /dev/null @@ -1,8 +0,0 @@ -[Caja Extension] -Icon=mail-send -_Name=Send To -_Description=Integrates email clients and Pidgin -Author=Roberto Majadas <[email protected]> -_Copyright=Copyright (C) 2004 Roberto Majadas -Version=@VERSION@ -Website=https://mate-desktop.org/ diff --git a/share/Makefile.am b/share/Makefile.am index 0bab361..b81d0f2 100644 --- a/share/Makefile.am +++ b/share/Makefile.am @@ -27,9 +27,10 @@ libcaja_share_la_LDFLAGS = -module -avoid-version libcaja_share_la_LIBADD = $(SHARE_LIBS) $(CAJA_LIBS) extensiondir = $(datadir)/caja/extensions -extension_in_files = libcaja-share.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-share.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=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@ EXTRA_DIST = share-dialog.ui diff --git a/share/libcaja-share.caja-extension.desktop.in.in b/share/libcaja-share.caja-extension.desktop.in.in new file mode 100644 index 0000000..cfeb155 --- /dev/null +++ b/share/libcaja-share.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=folder-remote +Name=Share +Description=Allows to quickly share a folder +Author=Sebastien Estienne <[email protected]> +Copyright=Copyright (C) 2005 Ethium, Inc. +Version=@VERSION@ +Website=https://mate-desktop.org/ diff --git a/share/libcaja-share.caja-extension.in.in b/share/libcaja-share.caja-extension.in.in deleted file mode 100644 index 1aa25ff..0000000 --- a/share/libcaja-share.caja-extension.in.in +++ /dev/null @@ -1,8 +0,0 @@ -[Caja Extension] -Icon=folder-remote -_Name=Share -_Description=Allows to quickly share a folder -Author=Sebastien Estienne <[email protected]> -_Copyright=Copyright (C) 2005 Ethium, Inc. -Version=@VERSION@ -Website=https://mate-desktop.org/ diff --git a/wallpaper/Makefile.am b/wallpaper/Makefile.am index 0796412..9b1dfb2 100644 --- a/wallpaper/Makefile.am +++ b/wallpaper/Makefile.am @@ -12,8 +12,9 @@ libcaja_wallpaper_la_LDFLAGS = -module -avoid-version libcaja_wallpaper_la_LIBADD = $(CAJA_LIBS) extensiondir = $(datadir)/caja/extensions -extension_in_files = libcaja-wallpaper.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-wallpaper.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=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@ CLEANFILES = $(extension_DATA) diff --git a/wallpaper/libcaja-wallpaper.caja-extension.desktop.in.in b/wallpaper/libcaja-wallpaper.caja-extension.desktop.in.in new file mode 100644 index 0000000..6394eeb --- /dev/null +++ b/wallpaper/libcaja-wallpaper.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=desktop +Name=Wallpaper +Description=Allows to quickly set wallpaper +Author=Stefano Karapetsas;Adam Israel +Copyright=Copyright (C) 2014 Stefano Karapetsas +Version=@VERSION@ +Website=https://mate-desktop.org/ diff --git a/wallpaper/libcaja-wallpaper.caja-extension.in.in b/wallpaper/libcaja-wallpaper.caja-extension.in.in deleted file mode 100644 index 22a9a44..0000000 --- a/wallpaper/libcaja-wallpaper.caja-extension.in.in +++ /dev/null @@ -1,8 +0,0 @@ -[Caja Extension] -Icon=desktop -_Name=Wallpaper -_Description=Allows to quickly set wallpaper -Author=Stefano Karapetsas;Adam Israel -_Copyright=Copyright (C) 2014 Stefano Karapetsas -Version=@VERSION@ -Website=https://mate-desktop.org/ diff --git a/xattr-tags/Makefile.am b/xattr-tags/Makefile.am index 06e931a..3069d07 100644 --- a/xattr-tags/Makefile.am +++ b/xattr-tags/Makefile.am @@ -11,8 +11,9 @@ libcaja_xattr_tags_la_LDFLAGS = -module -avoid-version libcaja_xattr_tags_la_LIBADD = $(CAJA_LIBS) extensiondir = $(datadir)/caja/extensions -extension_in_files = libcaja-xattr-tags.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-xattr-tags.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=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@ CLEANFILES = $(extension_DATA) diff --git a/xattr-tags/libcaja-xattr-tags.caja-extension.desktop.in.in b/xattr-tags/libcaja-xattr-tags.caja-extension.desktop.in.in new file mode 100644 index 0000000..5574263 --- /dev/null +++ b/xattr-tags/libcaja-xattr-tags.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=desktop +Name=xattr Tags +Description=View tags stored in extended attributes +Author=Felipe Barriga Richards +Copyright=Copyright (C) 2016 Felipe Barriga Richards +Version=@VERSION@ +Website=https://mate-desktop.org/ diff --git a/xattr-tags/libcaja-xattr-tags.caja-extension.in.in b/xattr-tags/libcaja-xattr-tags.caja-extension.in.in deleted file mode 100644 index 24fbc13..0000000 --- a/xattr-tags/libcaja-xattr-tags.caja-extension.in.in +++ /dev/null @@ -1,8 +0,0 @@ -[Caja Extension] -Icon=desktop -_Name=xattr Tags -_Description=View tags stored in extended attributes -Author=Felipe Barriga Richards -_Copyright=Copyright (C) 2016 Felipe Barriga Richards -Version=@VERSION@ -Website=https://mate-desktop.org/ |