From b91dbe12e8f334e7fbaf9a36814d36d63c94dfd4 Mon Sep 17 00:00:00 2001 From: Wu Xiaotian Date: Wed, 25 Dec 2019 17:58:28 +0800 Subject: migrate from intltools to gettext --- battstat/Makefile.am | 12 ++++++------ ...plets.BattstatApplet.mate-panel-applet.desktop.in.in | 17 +++++++++++++++++ ....mate.applets.BattstatApplet.mate-panel-applet.in.in | 16 ---------------- battstat/sounds/Makefile.am | 7 ++++--- .../sounds/mate-battstat_applet.soundlist.desktop.in | 10 ++++++++++ battstat/sounds/mate-battstat_applet.soundlist.in | 10 ---------- 6 files changed, 37 insertions(+), 35 deletions(-) create mode 100644 battstat/org.mate.applets.BattstatApplet.mate-panel-applet.desktop.in.in delete mode 100644 battstat/org.mate.applets.BattstatApplet.mate-panel-applet.in.in create mode 100644 battstat/sounds/mate-battstat_applet.soundlist.desktop.in delete mode 100644 battstat/sounds/mate-battstat_applet.soundlist.in (limited to 'battstat') diff --git a/battstat/Makefile.am b/battstat/Makefile.am index cc3e09c3..884252e3 100644 --- a/battstat/Makefile.am +++ b/battstat/Makefile.am @@ -58,14 +58,13 @@ battstat_applet_LDADD = \ $(UPOWER_LIBS) \ -lm -@INTLTOOL_XML_NOMERGE_RULE@ batstat_gschema_in_files = org.mate.panel.applet.battstat.gschema.xml.in gsettings_SCHEMAS = $(batstat_gschema_in_files:.xml.in=.xml) @GSETTINGS_RULES@ appletdir = $(datadir)/mate-panel/applets -applet_in_files = org.mate.applets.BattstatApplet.mate-panel-applet.in -applet_DATA = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet) +applet_in_files = org.mate.applets.BattstatApplet.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 \ @@ -73,7 +72,8 @@ $(applet_in_files): $(applet_in_files).in Makefile -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \ $< > $@ -%.mate-panel-applet: %.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 $@ servicedir = $(datadir)/dbus-1/services service_in_files = org.mate.panel.applet.BattstatAppletFactory.service.in @@ -84,7 +84,7 @@ org.mate.panel.applet.BattstatAppletFactory.service: $(service_in_files) -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ $< > $@ -CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid +CLEANFILES = $(applet_DATA) $(applet_in_files) $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid uidir = $(datadir)/mate/ui ui_DATA = battstat-applet-menu.xml @@ -92,7 +92,7 @@ ui_DATA = battstat-applet-menu.xml EXTRA_DIST = \ $(builder_DATA) \ $(ui_DATA) \ - org.mate.applets.BattstatApplet.mate-panel-applet.in.in \ + $(applet_in_files).in \ $(service_in_files) \ $(batstat_gschema_in_files) diff --git a/battstat/org.mate.applets.BattstatApplet.mate-panel-applet.desktop.in.in b/battstat/org.mate.applets.BattstatApplet.mate-panel-applet.desktop.in.in new file mode 100644 index 00000000..39103f79 --- /dev/null +++ b/battstat/org.mate.applets.BattstatApplet.mate-panel-applet.desktop.in.in @@ -0,0 +1,17 @@ +[Applet Factory] +Id=BattstatAppletFactory +Location=@LIBEXECDIR@/battstat-applet +Name=Battstat Factory +Description=Battstat Factory + +[BattstatApplet] +Name=Battery Charge Monitor +Description=Monitor a laptop's remaining power +# Translators: Do NOT translate or transliterate this text (this is an icon file name)! +Icon=battery +MateComponentId=OAFIID:MATE_BattstatApplet +X-MATE-Bugzilla-Bugzilla=MATE +X-MATE-Bugzilla-Product=mate-applets +X-MATE-Bugzilla-Component=battery +X-MATE-Bugzilla-Version=@VERSION@ +X-MATE-Bugzilla-OtherBinaries=battstat-applet-2 diff --git a/battstat/org.mate.applets.BattstatApplet.mate-panel-applet.in.in b/battstat/org.mate.applets.BattstatApplet.mate-panel-applet.in.in deleted file mode 100644 index 9600dfc7..00000000 --- a/battstat/org.mate.applets.BattstatApplet.mate-panel-applet.in.in +++ /dev/null @@ -1,16 +0,0 @@ -[Applet Factory] -Id=BattstatAppletFactory -Location=@LIBEXECDIR@/battstat-applet -_Name=Battstat Factory -_Description=Battstat Factory - -[BattstatApplet] -_Name=Battery Charge Monitor -_Description=Monitor a laptop's remaining power -Icon=battery -MateComponentId=OAFIID:MATE_BattstatApplet -X-MATE-Bugzilla-Bugzilla=MATE -X-MATE-Bugzilla-Product=mate-applets -X-MATE-Bugzilla-Component=battery -X-MATE-Bugzilla-Version=@VERSION@ -X-MATE-Bugzilla-OtherBinaries=battstat-applet-2 diff --git a/battstat/sounds/Makefile.am b/battstat/sounds/Makefile.am index df677219..5b591d0c 100644 --- a/battstat/sounds/Makefile.am +++ b/battstat/sounds/Makefile.am @@ -1,9 +1,10 @@ soundlistdir = $(sysconfdir)/sound/events -soundlist_in_files = mate-battstat_applet.soundlist.in -soundlist_DATA = $(soundlist_in_files:.soundlist.in=.soundlist) +soundlist_in_files = mate-battstat_applet.soundlist.desktop.in +soundlist_DATA = $(soundlist_in_files:.soundlist.desktop.in=.soundlist) -@INTLTOOL_SOUNDLIST_RULE@ +$(soundlist_DATA): $(soundlist_in_files) Makefile + $(AM_V_GEN) $(MSGFMT) --desktop --keyword=description --template $< -d $(top_srcdir)/po -o $@ EXTRA_DIST = $(soundlist_DATA) $(soundlist_in_files) diff --git a/battstat/sounds/mate-battstat_applet.soundlist.desktop.in b/battstat/sounds/mate-battstat_applet.soundlist.desktop.in new file mode 100644 index 00000000..891fd6ac --- /dev/null +++ b/battstat/sounds/mate-battstat_applet.soundlist.desktop.in @@ -0,0 +1,10 @@ +[__section_info__] +description=Battery Status Utility + +[LowBattery] +file= +description=Battery power low + +[BatteryFull] +file= +description=Battery fully re-charged diff --git a/battstat/sounds/mate-battstat_applet.soundlist.in b/battstat/sounds/mate-battstat_applet.soundlist.in deleted file mode 100644 index a5387709..00000000 --- a/battstat/sounds/mate-battstat_applet.soundlist.in +++ /dev/null @@ -1,10 +0,0 @@ -[__section_info__] -_description=Battery Status Utility - -[LowBattery] -file= -_description=Battery power low - -[BatteryFull] -file= -_description=Battery fully re-charged -- cgit v1.2.1