From dffd0f18222b456e556e096010325b5b2bb98b92 Mon Sep 17 00:00:00 2001 From: Wu Xiaotian Date: Tue, 23 Jul 2019 10:54:56 +0800 Subject: Let xgettext recognize caja-extension.in as a desktop file --- configure.ac | 2 +- data/Makefile.am | 6 +++--- data/libcaja-user-share.caja-extension.in.in | 7 ------- data/libcaja-user-share.desktop.in.in | 7 +++++++ po/POTFILES.in | 2 +- 5 files changed, 12 insertions(+), 12 deletions(-) delete mode 100644 data/libcaja-user-share.caja-extension.in.in create mode 100644 data/libcaja-user-share.desktop.in.in diff --git a/configure.ac b/configure.ac index 162081c..50d2319 100644 --- a/configure.ac +++ b/configure.ac @@ -200,7 +200,7 @@ data/icons/16x16/Makefile data/icons/22x22/Makefile data/icons/32x32/Makefile data/icons/48x48/Makefile -data/libcaja-user-share.caja-extension.in +data/libcaja-user-share.desktop.in data/mate-user-share-webdav.desktop.in data/mate-user-share-obexftp.desktop.in data/mate-user-share-obexpush.desktop.in diff --git a/data/Makefile.am b/data/Makefile.am index 61d85c5..cad0433 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -18,9 +18,9 @@ gsettings_SCHEMAS = org.mate.FileSharing.gschema.xml @GSETTINGS_RULES@ extensiondir = $(datadir)/caja/extensions -extension_in_files = libcaja-user-share.caja-extension.in -extension_DATA = $(extension_in_files:.caja-extension.in=.caja-extension) -%.caja-extension: %.caja-extension.in +extension_in_file = libcaja-user-share.desktop.in +extension_DATA = $(extension_in_file:.desktop.in=.caja-extension) +$(extension_DATA): $(extension_in_file) $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@ EXTRA_DIST = $(gsettings_SCHEMAS) \ diff --git a/data/libcaja-user-share.caja-extension.in.in b/data/libcaja-user-share.caja-extension.in.in deleted file mode 100644 index a5942da..0000000 --- a/data/libcaja-user-share.caja-extension.in.in +++ /dev/null @@ -1,7 +0,0 @@ -[Caja Extension] -Icon=user-share -Name=User Share -Description=Integrates with user-share -Copyright=Copyright (C) 2005 William Jon McCann -Version=@VERSION@ -Website=https://mate-desktop.org/ diff --git a/data/libcaja-user-share.desktop.in.in b/data/libcaja-user-share.desktop.in.in new file mode 100644 index 0000000..a5942da --- /dev/null +++ b/data/libcaja-user-share.desktop.in.in @@ -0,0 +1,7 @@ +[Caja Extension] +Icon=user-share +Name=User Share +Description=Integrates with user-share +Copyright=Copyright (C) 2005 William Jon McCann +Version=@VERSION@ +Website=https://mate-desktop.org/ diff --git a/po/POTFILES.in b/po/POTFILES.in index 6fc2110..6112489 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,7 +1,7 @@ # List of source files containing translatable strings. # Please keep this file sorted alphabetically. data/file-share-properties.ui -data/libcaja-user-share.caja-extension.in.in +data/libcaja-user-share.desktop.in.in data/mate-user-share-properties.desktop.in data/mate-user-share-obexftp.desktop.in.in data/mate-user-share-obexpush.desktop.in.in -- cgit v1.2.1