From 5a0d1fa2dcf6dc972f17b4c443d321c25e39c68a Mon Sep 17 00:00:00 2001 From: Wu Xiaotian Date: Wed, 25 Dec 2019 13:30:24 +0800 Subject: migrate from intltools to gettext --- mate-window-picker-applet/Makefile.am | 12 ++++++------ ...te.panel.MateWindowPicker.mate-panel-applet.desktop.in.in | 12 ++++++++++++ .../org.mate.panel.MateWindowPicker.mate-panel-applet.in.in | 11 ----------- 3 files changed, 18 insertions(+), 17 deletions(-) create mode 100644 mate-window-picker-applet/org.mate.panel.MateWindowPicker.mate-panel-applet.desktop.in.in delete mode 100644 mate-window-picker-applet/org.mate.panel.MateWindowPicker.mate-panel-applet.in.in (limited to 'mate-window-picker-applet') diff --git a/mate-window-picker-applet/Makefile.am b/mate-window-picker-applet/Makefile.am index 71bfd50..78dd600 100644 --- a/mate-window-picker-applet/Makefile.am +++ b/mate-window-picker-applet/Makefile.am @@ -25,15 +25,16 @@ mate_window_picker_applet_SOURCES = \ task-title.h appletdir = $(datadir)/mate-panel/applets -applet_in_files = org.mate.panel.MateWindowPicker.mate-panel-applet.in -applet_DATA = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet) +applet_in_files = org.mate.panel.MateWindowPicker.mate-panel-applet.desktop.in +applet_DATA = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet) $(applet_in_files): $(applet_in_files).in Makefile $(AM_V_GEN)sed \ -e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \ $< > $@ -org.mate.panel.MateWindowPicker.mate-panel-applet: org.mate.panel.MateWindowPicker.mate-panel-applet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache +$(applet_DATA): $(applet_in_files) Makefile + $(AM_V_GEN) $(MSGFMT) --desktop --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@ APPLET_LOCATION=$(libexecdir)/mate-window-picker-applet @@ -46,7 +47,6 @@ org.mate.panel.applet.MateWindowPickerFactory.service: $(service_in_files) -e "s|\@LOCATION\@|$(APPLET_LOCATION)|" \ $< > $@ -@INTLTOOL_XML_NOMERGE_RULE@ gsettingsschema_in_files = org.mate.panel.applet.mate-window-picker-applet.gschema.xml.in gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml) @@ -56,7 +56,7 @@ xmluidir = $(datadir)/mate-panel/ui xmlui_DATA = mate-window-picker-applet-menu.xml EXTRA_DIST = \ - org.mate.panel.MateWindowPicker.mate-panel-applet.in.in \ + $(applet_in_files).in \ $(service_in_files) \ $(ui_DATA) \ $(convert_DATA) \ @@ -65,7 +65,7 @@ EXTRA_DIST = \ CLEANFILES = \ $(applet_DATA) \ - $(applet_DATA).in \ + $(applet_in_files) \ $(gsettings_SCHEMAS) \ *.gschema.valid \ $(service_DATA) diff --git a/mate-window-picker-applet/org.mate.panel.MateWindowPicker.mate-panel-applet.desktop.in.in b/mate-window-picker-applet/org.mate.panel.MateWindowPicker.mate-panel-applet.desktop.in.in new file mode 100644 index 0000000..f0ac6ff --- /dev/null +++ b/mate-window-picker-applet/org.mate.panel.MateWindowPicker.mate-panel-applet.desktop.in.in @@ -0,0 +1,12 @@ +[Applet Factory] +Id=MateWindowPickerFactory +Location=@LOCATION@ +Name=Window Picker Applet Factory +Description=Window Picker + +[MateWindowPicker] +Name=Window Picker +Description=Window Picker +# Translators: Do NOT translate or transliterate this text (this is an icon file name)! +Icon=preferences-system-windows +BonoboId=OAFIID:MATE_WindowPicker diff --git a/mate-window-picker-applet/org.mate.panel.MateWindowPicker.mate-panel-applet.in.in b/mate-window-picker-applet/org.mate.panel.MateWindowPicker.mate-panel-applet.in.in deleted file mode 100644 index ffc4b98..0000000 --- a/mate-window-picker-applet/org.mate.panel.MateWindowPicker.mate-panel-applet.in.in +++ /dev/null @@ -1,11 +0,0 @@ -[Applet Factory] -Id=MateWindowPickerFactory -Location=@LOCATION@ -_Name=Window Picker Applet Factory -_Description=Window Picker - -[MateWindowPicker] -_Name=Window Picker -_Description=Window Picker -Icon=preferences-system-windows -BonoboId=OAFIID:MATE_WindowPicker -- cgit v1.2.1