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 --- Makefile.am | 5 +- applets/clock/Makefile.am | 12 ++-- ...nel.ClockApplet.mate-panel-applet.desktop.in.in | 20 ++++++ ....mate.panel.ClockApplet.mate-panel-applet.in.in | 19 ------ applets/fish/Makefile.am | 12 ++-- ...anel.FishApplet.mate-panel-applet.desktop.in.in | 19 ++++++ ...g.mate.panel.FishApplet.mate-panel-applet.in.in | 18 ----- applets/notification_area/Makefile.am | 14 ++-- ...ationAreaApplet.mate-panel-applet.desktop.in.in | 19 ++++++ ....NotificationAreaApplet.mate-panel-applet.in.in | 18 ----- 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 --------------- configure.ac | 7 +- data/Makefile.am | 2 - libmate-panel-applet/Makefile.am | 10 +-- ...e.panel.TestApplet.mate-panel-applet.desktop.in | 11 +++ .../org.mate.panel.TestApplet.mate-panel-applet.in | 10 --- mate-panel/Makefile.am | 4 +- mate-panel/mate-panel.desktop.in | 6 +- po/Makevars | 79 ++++++++++++++++++++++ po/POTFILES.in | 45 ++++++------ 22 files changed, 269 insertions(+), 185 deletions(-) create mode 100644 applets/clock/org.mate.panel.ClockApplet.mate-panel-applet.desktop.in.in delete mode 100644 applets/clock/org.mate.panel.ClockApplet.mate-panel-applet.in.in create mode 100644 applets/fish/org.mate.panel.FishApplet.mate-panel-applet.desktop.in.in delete mode 100644 applets/fish/org.mate.panel.FishApplet.mate-panel-applet.in.in create mode 100644 applets/notification_area/org.mate.panel.NotificationAreaApplet.mate-panel-applet.desktop.in.in delete mode 100644 applets/notification_area/org.mate.panel.NotificationAreaApplet.mate-panel-applet.in.in 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 create mode 100644 libmate-panel-applet/org.mate.panel.TestApplet.mate-panel-applet.desktop.in delete mode 100644 libmate-panel-applet/org.mate.panel.TestApplet.mate-panel-applet.in create mode 100644 po/Makevars diff --git a/Makefile.am b/Makefile.am index eb6b0bfa..467040c3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,5 @@ SUBDIRS = \ + po \ mate-panel \ libmate-panel-applet \ applets \ @@ -6,8 +7,7 @@ SUBDIRS = \ help \ icons \ data \ - man \ - po + man ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} @@ -37,7 +37,6 @@ MAINTAINERCLEANFILES = \ $(srcdir)/configure \ $(srcdir)/gtk-doc.make \ $(srcdir)/m4/gtk-doc.m4 \ - $(srcdir)/m4/intltool.m4 \ $(srcdir)/m4/libtool.m4 \ $(srcdir)/m4/ltoptions.m4 \ $(srcdir)/m4/ltsugar.m4 \ diff --git a/applets/clock/Makefile.am b/applets/clock/Makefile.am index 3b390974..fb06adb1 100644 --- a/applets/clock/Makefile.am +++ b/applets/clock/Makefile.am @@ -125,8 +125,8 @@ BUILT_SOURCES = \ clock-typebuiltins.h appletdir = $(datadir)/mate-panel/applets -applet_in_files = org.mate.panel.ClockApplet.mate-panel-applet.in -applet_DATA = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet) +applet_in_files = org.mate.panel.ClockApplet.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 \ @@ -135,7 +135,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 !CLOCK_INPROCESS servicedir = $(datadir)/dbus-1/services @@ -161,11 +162,10 @@ clock-resources.h: clock.gresource.xml $(shell $(GLIB_COMPILE_RESOURCES) --sourc clock_gschemas_in = org.mate.panel.applet.clock.gschema.xml.in gsettings_SCHEMAS = $(clock_gschemas_in:.xml.in=.xml) -@INTLTOOL_XML_NOMERGE_RULE@ @GSETTINGS_RULES@ EXTRA_DIST = \ - org.mate.panel.ClockApplet.mate-panel-applet.in.in \ + org.mate.panel.ClockApplet.mate-panel-applet.desktop.in.in \ $(clock_gschemas_in) \ $(ui_FILES) \ clock.gresource.xml \ @@ -175,7 +175,7 @@ EXTRA_DIST = \ CLEANFILES = \ $(BUILT_SOURCES) \ $(applet_DATA) \ - $(applet_DATA).in \ + $(applet_in_files) \ $(service_DATA) \ $(polkit_DATA) \ $(dbus_services_DATA) \ diff --git a/applets/clock/org.mate.panel.ClockApplet.mate-panel-applet.desktop.in.in b/applets/clock/org.mate.panel.ClockApplet.mate-panel-applet.desktop.in.in new file mode 100644 index 00000000..cc8a191f --- /dev/null +++ b/applets/clock/org.mate.panel.ClockApplet.mate-panel-applet.desktop.in.in @@ -0,0 +1,20 @@ +[Applet Factory] +Id=ClockAppletFactory +InProcess=@IN_PROCESS@ +Location=@LOCATION@ +Name=Clock Applet Factory +Description=Factory for clock applet + +[ClockApplet] +Name=Clock +Description=Get the current time and date +# Translators: Do NOT translate or transliterate this text (this is an icon file name)! +Icon=mate-panel-clock +MateComponentId=OAFIID:MATE_ClockApplet; +Platforms=X11;Wayland; +X-MATE-Bugzilla-Bugzilla=MATE +X-MATE-Bugzilla-Product=mate-panel +X-MATE-Bugzilla-Component=clock +X-MATE-Bugzilla-Version=@VERSION@ +X-MATE-Bugzilla-OtherBinaries=clock-applet + diff --git a/applets/clock/org.mate.panel.ClockApplet.mate-panel-applet.in.in b/applets/clock/org.mate.panel.ClockApplet.mate-panel-applet.in.in deleted file mode 100644 index 5eaf19d1..00000000 --- a/applets/clock/org.mate.panel.ClockApplet.mate-panel-applet.in.in +++ /dev/null @@ -1,19 +0,0 @@ -[Applet Factory] -Id=ClockAppletFactory -InProcess=@IN_PROCESS@ -Location=@LOCATION@ -_Name=Clock Applet Factory -_Description=Factory for clock applet - -[ClockApplet] -_Name=Clock -_Description=Get the current time and date -Icon=mate-panel-clock -MateComponentId=OAFIID:MATE_ClockApplet; -Platforms=X11;Wayland; -X-MATE-Bugzilla-Bugzilla=MATE -X-MATE-Bugzilla-Product=mate-panel -X-MATE-Bugzilla-Component=clock -X-MATE-Bugzilla-Version=@VERSION@ -X-MATE-Bugzilla-OtherBinaries=clock-applet - diff --git a/applets/fish/Makefile.am b/applets/fish/Makefile.am index d9a894f5..6b823e09 100644 --- a/applets/fish/Makefile.am +++ b/applets/fish/Makefile.am @@ -40,8 +40,8 @@ fish_applet_CFLAGS = $(AM_CFLAGS) endif appletdir = $(datadir)/mate-panel/applets -applet_in_files = org.mate.panel.FishApplet.mate-panel-applet.in -applet_DATA = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet) +applet_in_files = org.mate.panel.FishApplet.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 \ @@ -50,7 +50,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 !FISH_INPROCESS servicedir = $(datadir)/dbus-1/services @@ -87,18 +88,17 @@ BUILT_SOURCES = \ fish_gschemas_in = org.mate.panel.applet.fish.gschema.xml.in gsettings_SCHEMAS = $(fish_gschemas_in:.xml.in=.xml) -@INTLTOOL_XML_NOMERGE_RULE@ @GSETTINGS_RULES@ EXTRA_DIST = \ wanda.svg \ $(fishbitmaps_DATA) \ - org.mate.panel.FishApplet.mate-panel-applet.in.in \ + org.mate.panel.FishApplet.mate-panel-applet.desktop.in.in \ $(service_in_files) \ $(ui_FILES) \ fish.gresource.xml \ $(fish_gschemas_in) -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/fish/org.mate.panel.FishApplet.mate-panel-applet.desktop.in.in b/applets/fish/org.mate.panel.FishApplet.mate-panel-applet.desktop.in.in new file mode 100644 index 00000000..1df3717e --- /dev/null +++ b/applets/fish/org.mate.panel.FishApplet.mate-panel-applet.desktop.in.in @@ -0,0 +1,19 @@ +[Applet Factory] +Id=FishAppletFactory +InProcess=@IN_PROCESS@ +Location=@LOCATION@ +Name=Wanda Factory +Description=From Whence That Stupid Fish Came + +[FishApplet] +Name=Fish +Description=Display a swimming fish or another animated creature +# Translators: Do NOT translate or transliterate this text (this is an icon file name)! +Icon=mate-panel-fish +MateComponentId=OAFIID:MATE_FishApplet; +Platforms=X11;Wayland; +X-MATE-Bugzilla-Bugzilla=MATE +X-MATE-Bugzilla-Product=mate-panel +X-MATE-Bugzilla-Component=fish +X-MATE-Bugzilla-Version=@VERSION@ +X-MATE-Bugzilla-OtherBinaries=fish-applet-2 diff --git a/applets/fish/org.mate.panel.FishApplet.mate-panel-applet.in.in b/applets/fish/org.mate.panel.FishApplet.mate-panel-applet.in.in deleted file mode 100644 index 92b07c69..00000000 --- a/applets/fish/org.mate.panel.FishApplet.mate-panel-applet.in.in +++ /dev/null @@ -1,18 +0,0 @@ -[Applet Factory] -Id=FishAppletFactory -InProcess=@IN_PROCESS@ -Location=@LOCATION@ -_Name=Wanda Factory -_Description=From Whence That Stupid Fish Came - -[FishApplet] -_Name=Fish -_Description=Display a swimming fish or another animated creature -Icon=mate-panel-fish -MateComponentId=OAFIID:MATE_FishApplet; -Platforms=X11;Wayland; -X-MATE-Bugzilla-Bugzilla=MATE -X-MATE-Bugzilla-Product=mate-panel -X-MATE-Bugzilla-Component=fish -X-MATE-Bugzilla-Version=@VERSION@ -X-MATE-Bugzilla-OtherBinaries=fish-applet-2 diff --git a/applets/notification_area/Makefile.am b/applets/notification_area/Makefile.am index 57ee0a3b..f7b68110 100644 --- a/applets/notification_area/Makefile.am +++ b/applets/notification_area/Makefile.am @@ -70,8 +70,11 @@ notification_area_applet_CFLAGS = $(AM_CFLAGS) endif appletdir = $(datadir)/mate-panel/applets -applet_in_files = org.mate.panel.NotificationAreaApplet.mate-panel-applet.in -applet_DATA = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet) +applet_in_files = org.mate.panel.NotificationAreaApplet.mate-panel-applet.desktop.in +applet_DATA = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet) + +$(applet_DATA): $(applet_in_files) + $(AM_V_GEN) $(MSGFMT) --desktop --keyword Name --keyword Description --template $< -d $(top_srcdir)/po -o $@ $(applet_in_files): $(applet_in_files).in Makefile $(AM_V_GEN)sed \ @@ -80,8 +83,6 @@ $(applet_in_files): $(applet_in_files).in Makefile -e "s|\@VERSION\@|$(PACKAGE_VERSION)|" \ $< > $@ -@PANEL_INTLTOOL_MATE_PANEL_APPLET_RULE@ - if !NOTIFICATION_AREA_INPROCESS servicedir = $(datadir)/dbus-1/services service_in_files = org.mate.panel.applet.NotificationAreaAppletFactory.service.in @@ -110,11 +111,10 @@ BUILT_SOURCES = \ na-resources.c \ na-resources.h -@INTLTOOL_XML_NOMERGE_RULE@ @GSETTINGS_RULES@ EXTRA_DIST = \ - org.mate.panel.NotificationAreaApplet.mate-panel-applet.in.in \ + org.mate.panel.NotificationAreaApplet.mate-panel-applet.desktop.in.in \ $(notification_area_gschemas_in) \ $(ui_FILES) \ na.gresource.xml \ @@ -122,7 +122,7 @@ EXTRA_DIST = \ CLEANFILES = \ $(applet_DATA) \ - $(applet_DATA).in \ + $(applet_in_files) \ $(service_DATA) \ $(gsettings_SCHEMAS) diff --git a/applets/notification_area/org.mate.panel.NotificationAreaApplet.mate-panel-applet.desktop.in.in b/applets/notification_area/org.mate.panel.NotificationAreaApplet.mate-panel-applet.desktop.in.in new file mode 100644 index 00000000..f7652db6 --- /dev/null +++ b/applets/notification_area/org.mate.panel.NotificationAreaApplet.mate-panel-applet.desktop.in.in @@ -0,0 +1,19 @@ +[Applet Factory] +Id=NotificationAreaAppletFactory +InProcess=@IN_PROCESS@ +Location=@LOCATION@ +Name=Notification Area Factory +Description=Factory for notification area + +[NotificationArea] +Name=Notification Area +Description=Area where notification icons appear +# Translators: Do NOT translate or transliterate this text (this is an icon file name)! +Icon=mate-panel-notification-area +MateComponentId=OAFIID:MATE_NotificationAreaApplet;OAFIID:MATE_SystemTrayApplet; +Platforms=X11; +X-MATE-Bugzilla-Bugzilla=MATE +X-MATE-Bugzilla-Product=mate-panel +X-MATE-Bugzilla-Component=notification area +X-MATE-Bugzilla-Version=@VERSION@ +X-MATE-Bugzilla-OtherBinaries=notification-area-applet diff --git a/applets/notification_area/org.mate.panel.NotificationAreaApplet.mate-panel-applet.in.in b/applets/notification_area/org.mate.panel.NotificationAreaApplet.mate-panel-applet.in.in deleted file mode 100644 index 9246ac9c..00000000 --- a/applets/notification_area/org.mate.panel.NotificationAreaApplet.mate-panel-applet.in.in +++ /dev/null @@ -1,18 +0,0 @@ -[Applet Factory] -Id=NotificationAreaAppletFactory -InProcess=@IN_PROCESS@ -Location=@LOCATION@ -_Name=Notification Area Factory -_Description=Factory for notification area - -[NotificationArea] -_Name=Notification Area -_Description=Area where notification icons appear -Icon=mate-panel-notification-area -MateComponentId=OAFIID:MATE_NotificationAreaApplet;OAFIID:MATE_SystemTrayApplet; -Platforms=X11; -X-MATE-Bugzilla-Bugzilla=MATE -X-MATE-Bugzilla-Product=mate-panel -X-MATE-Bugzilla-Component=notification area -X-MATE-Bugzilla-Version=@VERSION@ -X-MATE-Bugzilla-OtherBinaries=notification-area-applet 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 diff --git a/configure.ac b/configure.ac index 1a82dcfe..f26a435f 100644 --- a/configure.ac +++ b/configure.ac @@ -22,8 +22,6 @@ AM_MAINTAINER_MODE MATE_MAINTAINER_MODE_DEFINES MATE_DEBUG_CHECK([no]) -IT_PROG_INTLTOOL([0.50.1]) - AC_PROG_CC AC_STDC_HEADERS AC_PROG_LIBTOOL @@ -254,13 +252,14 @@ AC_SUBST([appletsdir],"\$(datadir)/mate-panel/applets") dnl Language Support +AM_GNU_GETTEXT_VERSION([0.19.8]) +AM_GNU_GETTEXT_REQUIRE_VERSION([0.19.8]) +AM_GNU_GETTEXT([external]) GETTEXT_PACKAGE=mate-panel AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Define the gettext package to be used]) AC_SUBST(GETTEXT_PACKAGE) -AM_GLIB_GNU_GETTEXT - dnl gtk-doc stuff GTK_DOC_CHECK([1.0]) diff --git a/data/Makefile.am b/data/Makefile.am index 78e3c887..07e2ec4d 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -10,8 +10,6 @@ layout_DATA = \ opensuse.layout \ ubuntu.layout -@INTLTOOL_XML_NOMERGE_RULE@ - gsettings_ENUM_NAMESPACE = org.mate.panel gsettings_ENUM_FILES = $(top_srcdir)/mate-panel/panel-enums-gsettings.h diff --git a/libmate-panel-applet/Makefile.am b/libmate-panel-applet/Makefile.am index b5f6e6c9..e7a2c22a 100644 --- a/libmate-panel-applet/Makefile.am +++ b/libmate-panel-applet/Makefile.am @@ -92,13 +92,13 @@ pkgconfigdir = $(libdir)/pkgconfig pkgconfig_DATA = libmatepanelapplet-4.0.pc appletdir = $(datadir)/mate-panel/applets -applet_in_files = org.mate.panel.TestApplet.mate-panel-applet.in -noinst_DATA = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet) - -@PANEL_INTLTOOL_MATE_PANEL_APPLET_RULE@ +applet_in_files = org.mate.panel.TestApplet.mate-panel-applet.desktop.in +noinst_DATA = $(applet_in_files:.mate-panel-applet.desktop.in=.mate-panel-applet) +$(noinst_DATA): $(applet_in_files) + $(AM_V_GEN) $(MSGFMT) --desktop --keyword Name --keyword Description --template $< -d $(top_srcdir)/po -o $@ EXTRA_DIST = \ - org.mate.panel.TestApplet.mate-panel-applet.in \ + org.mate.panel.TestApplet.mate-panel-applet.desktop.in \ mate-panel-applet-marshal.list \ libmatepanelapplet-4.0.pc.in \ libmatepanelapplet-4.0-uninstalled.pc.in diff --git a/libmate-panel-applet/org.mate.panel.TestApplet.mate-panel-applet.desktop.in b/libmate-panel-applet/org.mate.panel.TestApplet.mate-panel-applet.desktop.in new file mode 100644 index 00000000..aad90fdb --- /dev/null +++ b/libmate-panel-applet/org.mate.panel.TestApplet.mate-panel-applet.desktop.in @@ -0,0 +1,11 @@ +[Applet Factory] +Id=TestAppletFactory +Location=test-dbus-applet +Name=Test DBus Applet Factory +Description=Factory for Test DBus Applet + +[TestApplet] +Name=Test DBus Applet +Description=A simple applet for testing the MATE panel +# Translators: Do NOT translate or transliterate this text (this is an icon file name)! +Icon=mate-gegl diff --git a/libmate-panel-applet/org.mate.panel.TestApplet.mate-panel-applet.in b/libmate-panel-applet/org.mate.panel.TestApplet.mate-panel-applet.in deleted file mode 100644 index 10a9544f..00000000 --- a/libmate-panel-applet/org.mate.panel.TestApplet.mate-panel-applet.in +++ /dev/null @@ -1,10 +0,0 @@ -[Applet Factory] -Id=TestAppletFactory -Location=test-dbus-applet -_Name=Test DBus Applet Factory -_Description=Factory for Test DBus Applet - -[TestApplet] -_Name=Test DBus Applet -_Description=A simple applet for testing the MATE panel -Icon=mate-gegl diff --git a/mate-panel/Makefile.am b/mate-panel/Makefile.am index bd806487..f1a2ea7f 100644 --- a/mate-panel/Makefile.am +++ b/mate-panel/Makefile.am @@ -290,8 +290,8 @@ panel-test-applets-resources.h: panel-test-applets.gresource.xml $(shell $(GLIB_ desktopdir = $(datadir)/applications desktop_in_files = mate-panel.desktop.in desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) - -@INTLTOOL_DESKTOP_RULE@ +$(desktop_DATA): $(desktop_in_files) + $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ EXTRA_DIST = \ $(ui_FILES) \ diff --git a/mate-panel/mate-panel.desktop.in b/mate-panel/mate-panel.desktop.in index b686af43..461d5c03 100644 --- a/mate-panel/mate-panel.desktop.in +++ b/mate-panel/mate-panel.desktop.in @@ -1,11 +1,13 @@ [Desktop Entry] Type=Application -_Name=Panel -_Comment=Launch other applications and provide various utilities to manage windows, show the time, etc. +Name=Panel +Comment=Launch other applications and provide various utilities to manage windows, show the time, etc. +# Translators: Do NOT translate or transliterate this text (this is an icon file name)! Icon=mate-panel Exec=mate-panel StartupNotify=true Terminal=false +# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon! Categories=GTK;System;Core; OnlyShowIn=MATE; NoDisplay=true diff --git a/po/Makevars b/po/Makevars new file mode 100644 index 00000000..264ca52d --- /dev/null +++ b/po/Makevars @@ -0,0 +1,79 @@ +# 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=Name --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 +$(DOMAIN).pot-update: export GETTEXTDATADIRS = $(top_srcdir) diff --git a/po/POTFILES.in b/po/POTFILES.in index 8ef4859b..6a00d4ef 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,36 +1,35 @@ # List of source files containing translatable strings. # Please keep this file sorted alphabetically. -[encoding: UTF-8] applets/clock/calendar-window.c applets/clock/clock.c -[type: gettext/glade]applets/clock/clock.ui +applets/clock/clock.ui applets/clock/clock-location.c applets/clock/clock-location-tile.c applets/clock/clock-utils.c -[type: gettext/gsettings]applets/clock/org.mate.panel.applet.clock.gschema.xml.in -[type: gettext/ini]applets/clock/org.mate.panel.ClockApplet.mate-panel-applet.in.in +applets/clock/org.mate.panel.applet.clock.gschema.xml.in +applets/clock/org.mate.panel.ClockApplet.mate-panel-applet.desktop.in.in applets/fish/fish.c -[type: gettext/glade]applets/fish/fish.ui -[type: gettext/gsettings]applets/fish/org.mate.panel.applet.fish.gschema.xml.in -[type: gettext/ini]applets/fish/org.mate.panel.FishApplet.mate-panel-applet.in.in +applets/fish/fish.ui +applets/fish/org.mate.panel.applet.fish.gschema.xml.in +applets/fish/org.mate.panel.FishApplet.mate-panel-applet.desktop.in.in applets/notification_area/main.c -[type: gettext/glade]applets/notification_area/notification-area-preferences-dialog.ui -[type: gettext/gsettings]applets/notification_area/org.mate.panel.applet.notification-area.gschema.xml.in -[type: gettext/ini]applets/notification_area/org.mate.panel.NotificationAreaApplet.mate-panel-applet.in.in -[type: gettext/gsettings]applets/wncklet/org.mate.panel.applet.window-list.gschema.xml.in -[type: gettext/gsettings]applets/wncklet/org.mate.panel.applet.workspace-switcher.gschema.xml.in -[type: gettext/ini]applets/wncklet/org.mate.panel.Wncklet.mate-panel-applet.in.in +applets/notification_area/notification-area-preferences-dialog.ui +applets/notification_area/org.mate.panel.applet.notification-area.gschema.xml.in +applets/notification_area/org.mate.panel.NotificationAreaApplet.mate-panel-applet.desktop.in.in +applets/wncklet/org.mate.panel.applet.window-list.gschema.xml.in +applets/wncklet/org.mate.panel.applet.workspace-switcher.gschema.xml.in +applets/wncklet/org.mate.panel.Wncklet.mate-panel-applet.desktop.in.in applets/wncklet/showdesktop.c applets/wncklet/window-list.c -[type: gettext/glade]applets/wncklet/window-list.ui +applets/wncklet/window-list.ui applets/wncklet/window-menu.c applets/wncklet/wncklet.c applets/wncklet/workspace-switcher.c -[type: gettext/glade]applets/wncklet/workspace-switcher.ui -[type: gettext/gsettings]data/org.mate.panel.gschema.xml.in -[type: gettext/gsettings]data/org.mate.panel.menubar.gschema.xml.in -[type: gettext/gsettings]data/org.mate.panel.object.gschema.xml.in -[type: gettext/gsettings]data/org.mate.panel.toplevel.gschema.xml.in +applets/wncklet/workspace-switcher.ui +data/org.mate.panel.gschema.xml.in +data/org.mate.panel.menubar.gschema.xml.in +data/org.mate.panel.object.gschema.xml.in +data/org.mate.panel.toplevel.gschema.xml.in mate-panel/libegg/eggdesktopfile.c mate-panel/libegg/eggsmclient.c mate-panel/libpanel-util/panel-gtk.c @@ -59,17 +58,17 @@ mate-panel/panel-menu-button.c mate-panel/panel-menu-items.c mate-panel/panel-profile.c mate-panel/panel-properties-dialog.c -[type: gettext/glade]mate-panel/panel-properties-dialog.ui +mate-panel/panel-properties-dialog.ui mate-panel/panel-recent.c mate-panel/panel-run-dialog.c -[type: gettext/glade]mate-panel/panel-run-dialog.ui +mate-panel/panel-run-dialog.ui mate-panel/panel-separator.c mate-panel/panel-shell.c mate-panel/panel-stock-icons.c mate-panel/panel-test-applets.c -[type: gettext/glade]mate-panel/panel-test-applets.ui +mate-panel/panel-test-applets.ui mate-panel/panel-toplevel.c mate-panel/panel-util.c mate-panel/panel.c libmate-panel-applet/mate-panel-applet.c -libmate-panel-applet/org.mate.panel.TestApplet.mate-panel-applet.in +libmate-panel-applet/org.mate.panel.TestApplet.mate-panel-applet.desktop.in -- cgit v1.2.1