From f5354df76377627dde56b079c9328b46865033d2 Mon Sep 17 00:00:00 2001 From: Wu Xiaotian Date: Wed, 30 Oct 2019 20:33:54 +0800 Subject: migrate from intltool to gettext --- applets/wncklet/Makefile.am | 12 ++--- ...e.panel.Wncklet.mate-panel-applet.desktop.in.in | 58 ++++++++++++++++++++++ .../org.mate.panel.Wncklet.mate-panel-applet.in.in | 54 -------------------- 3 files changed, 64 insertions(+), 60 deletions(-) create mode 100644 applets/wncklet/org.mate.panel.Wncklet.mate-panel-applet.desktop.in.in delete mode 100644 applets/wncklet/org.mate.panel.Wncklet.mate-panel-applet.in.in (limited to 'applets/wncklet') diff --git a/applets/wncklet/Makefile.am b/applets/wncklet/Makefile.am index dc23143f..d9dc7f51 100644 --- a/applets/wncklet/Makefile.am +++ b/applets/wncklet/Makefile.am @@ -49,8 +49,8 @@ wnck_applet_CFLAGS = $(AM_CFLAGS) endif appletdir = $(datadir)/mate-panel/applets -applet_in_files = org.mate.panel.Wncklet.mate-panel-applet.in -applet_DATA = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet) +applet_in_files = org.mate.panel.Wncklet.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 \ @@ -59,7 +59,8 @@ $(applet_in_files): $(applet_in_files).in Makefile -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \ $< > $@ -@PANEL_INTLTOOL_MATE_PANEL_APPLET_RULE@ +$(applet_DATA): $(applet_in_files) + $(AM_V_GEN) $(MSGFMT) --desktop --keyword Name --keyword Description --template $< -d $(top_srcdir)/po -o $@ if !WNCKLET_INPROCESS servicedir = $(datadir)/dbus-1/services @@ -102,16 +103,15 @@ wncklet_gschemas_in = \ endif gsettings_SCHEMAS = $(wncklet_gschemas_in:.xml.in=.xml) -@INTLTOOL_XML_NOMERGE_RULE@ @GSETTINGS_RULES@ EXTRA_DIST = \ - org.mate.panel.Wncklet.mate-panel-applet.in.in \ + org.mate.panel.Wncklet.mate-panel-applet.desktop.in.in \ $(service_in_files) \ $(wncklet_gschemas_in) \ $(ui_FILES) \ wncklet.gresource.xml -CLEANFILES = $(BUILT_SOURCES) $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS) +CLEANFILES = $(BUILT_SOURCES) $(applet_DATA) $(applet_in_files) $(service_DATA) $(gsettings_SCHEMAS) -include $(top_srcdir)/git.mk diff --git a/applets/wncklet/org.mate.panel.Wncklet.mate-panel-applet.desktop.in.in b/applets/wncklet/org.mate.panel.Wncklet.mate-panel-applet.desktop.in.in new file mode 100644 index 00000000..490edcc1 --- /dev/null +++ b/applets/wncklet/org.mate.panel.Wncklet.mate-panel-applet.desktop.in.in @@ -0,0 +1,58 @@ +[Applet Factory] +Id=WnckletFactory +InProcess=@IN_PROCESS@ +Location=@LOCATION@ +Name=Window Navigation Applet Factory +Description=Factory for the window navigation related applets + +[WindowMenuApplet] +Name=Window Selector +Description=Switch between open windows using a menu +# Translators: Do NOT translate or transliterate this text (this is an icon file name)! +Icon=mate-panel-window-menu +MateComponentId=OAFIID:MATE_WindowMenuApplet; +Platforms=X11; +X-MATE-Bugzilla-Bugzilla=MATE +X-MATE-Bugzilla-Product=mate-panel +X-MATE-Bugzilla-Component=window selector +X-MATE-Bugzilla-Version=@VERSION@ +X-MATE-Bugzilla-OtherBinaries=wnck-applet + +[WorkspaceSwitcherApplet] +Name=Workspace Switcher +Description=Switch between workspaces +# Translators: Do NOT translate or transliterate this text (this is an icon file name)! +Icon=mate-panel-workspace-switcher +MateComponentId=OAFIID:MATE_WorkspaceSwitcherApplet;OAFIID:MATE_PagerApplet; +Platforms=X11; +X-MATE-Bugzilla-Bugzilla=MATE +X-MATE-Bugzilla-Product=mate-panel +X-MATE-Bugzilla-Component=workspace switcher +X-MATE-Bugzilla-Version=@VERSION@ +X-MATE-Bugzilla-OtherBinaries=wnck-applet + +[WindowListApplet] +Name=Window List +Description=Switch between open windows using buttons +# Translators: Do NOT translate or transliterate this text (this is an icon file name)! +Icon=mate-panel-window-list +MateComponentId=OAFIID:MATE_TasklistApplet;OAFIID:MATE_WindowListApplet; +Platforms=X11; +X-MATE-Bugzilla-Bugzilla=MATE +X-MATE-Bugzilla-Product=mate-panel +X-MATE-Bugzilla-Component=window list +X-MATE-Bugzilla-Version=@VERSION@ +X-MATE-Bugzilla-OtherBinaries=wnck-applet + +[ShowDesktopApplet] +Name=Show Desktop +Description=Hide application windows and show the desktop +# Translators: Do NOT translate or transliterate this text (this is an icon file name)! +Icon=user-desktop +MateComponentId=OAFIID:MATE_ShowDesktopApplet; +Platforms=X11; +X-MATE-Bugzilla-Bugzilla=MATE +X-MATE-Bugzilla-Product=mate-panel +X-MATE-Bugzilla-Component=Show Desktop Button +X-MATE-Bugzilla-Version=@VERSION@ +X-MATE-Bugzilla-OtherBinaries=wnck-applet diff --git a/applets/wncklet/org.mate.panel.Wncklet.mate-panel-applet.in.in b/applets/wncklet/org.mate.panel.Wncklet.mate-panel-applet.in.in deleted file mode 100644 index b2ff20e7..00000000 --- a/applets/wncklet/org.mate.panel.Wncklet.mate-panel-applet.in.in +++ /dev/null @@ -1,54 +0,0 @@ -[Applet Factory] -Id=WnckletFactory -InProcess=@IN_PROCESS@ -Location=@LOCATION@ -_Name=Window Navigation Applet Factory -_Description=Factory for the window navigation related applets - -[WindowMenuApplet] -_Name=Window Selector -_Description=Switch between open windows using a menu -Icon=mate-panel-window-menu -MateComponentId=OAFIID:MATE_WindowMenuApplet; -Platforms=X11; -X-MATE-Bugzilla-Bugzilla=MATE -X-MATE-Bugzilla-Product=mate-panel -X-MATE-Bugzilla-Component=window selector -X-MATE-Bugzilla-Version=@VERSION@ -X-MATE-Bugzilla-OtherBinaries=wnck-applet - -[WorkspaceSwitcherApplet] -_Name=Workspace Switcher -_Description=Switch between workspaces -Icon=mate-panel-workspace-switcher -MateComponentId=OAFIID:MATE_WorkspaceSwitcherApplet;OAFIID:MATE_PagerApplet; -Platforms=X11; -X-MATE-Bugzilla-Bugzilla=MATE -X-MATE-Bugzilla-Product=mate-panel -X-MATE-Bugzilla-Component=workspace switcher -X-MATE-Bugzilla-Version=@VERSION@ -X-MATE-Bugzilla-OtherBinaries=wnck-applet - -[WindowListApplet] -_Name=Window List -_Description=Switch between open windows using buttons -Icon=mate-panel-window-list -MateComponentId=OAFIID:MATE_TasklistApplet;OAFIID:MATE_WindowListApplet; -Platforms=X11; -X-MATE-Bugzilla-Bugzilla=MATE -X-MATE-Bugzilla-Product=mate-panel -X-MATE-Bugzilla-Component=window list -X-MATE-Bugzilla-Version=@VERSION@ -X-MATE-Bugzilla-OtherBinaries=wnck-applet - -[ShowDesktopApplet] -_Name=Show Desktop -_Description=Hide application windows and show the desktop -Icon=user-desktop -MateComponentId=OAFIID:MATE_ShowDesktopApplet; -Platforms=X11; -X-MATE-Bugzilla-Bugzilla=MATE -X-MATE-Bugzilla-Product=mate-panel -X-MATE-Bugzilla-Component=Show Desktop Button -X-MATE-Bugzilla-Version=@VERSION@ -X-MATE-Bugzilla-OtherBinaries=wnck-applet -- cgit v1.2.1