migrate from intltools to gettext

7 files changed, 33 insertions, 27 deletions

diff --git a/mate-dictionary/data/Makefile.am b/mate-dictionary/data/Makefile.am
index 8db2aa70..f7dee120 100644
--- a/mate-dictionary/data/Makefile.am
+++ b/mate-dictionary/data/Makefile.am
@@ -9,8 +9,6 @@ gdictapp_DATA = $(gdictapp_in_files:.desktop.in=.desktop)
 $(gdictapp_in_files): $(gdictapp_in_files:.desktop.in=.desktop.in.in)
 	$(AM_V_GEN)sed -e "s|\@VERSION\@|@VERSION@|" $< > $@
 
-@INTLTOOL_DESKTOP_RULE@
-
 # dictionary sources definitions
 dictsourcedir = $(datadir)/mate-dict/sources
 dictsource_in_files = \
@@ -18,7 +16,9 @@ dictsource_in_files = \
 	thai.desktop.in \
 	$(NULL)
 dictsource_DATA = $(dictsource_in_files:.desktop.in=.desktop)
-@INTLTOOL_DESKTOP_RULE@
+
+%.desktop: %.desktop.in
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 builderdir = $(datadir)/mate-dictionary
 builder_DATA = \
@@ -33,15 +33,16 @@ if BUILD_GDICT_APPLET
 
 # applet file, dbus service, and menu definition
 appletdir = $(datadir)/mate-panel/applets
-applet_in_files = org.mate.DictionaryApplet.mate-panel-applet.in
-applet_DATA = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet)
+applet_in_files = org.mate.DictionaryApplet.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|\@LIBEXECDIR\@|$(libexecdir)|" \
 		$< > $@
 
-%.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.DictionaryAppletFactory.service.in
@@ -56,18 +57,19 @@ ui_DATA += dictionary-applet-menu.xml
 
 endif # BUILD_GDICT_APPLET
 
-@INTLTOOL_XML_RULE@
 appdatadir = $(datadir)/metainfo
 appdata_in_files = mate-dictionary.appdata.xml.in
 appdata_DATA = $(appdata_in_files:.xml.in=.xml)
+$(appdata_DATA): $(appdata_in_files)
+	$(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
 
 gsettings_SCHEMAS = org.mate.dictionary.gschema.xml
 @GSETTINGS_RULES@
 
 EXTRA_DIST = \
-	org.mate.DictionaryApplet.mate-panel-applet.in.in \
+	$(applet_in_files).in \
 	$(service_in_files) \
-	mate-dictionary.desktop.in.in \
+	$(gdictapp_in_files).in \
 	$(dictsource_in_files) \
 	$(man_MANS) \
 	$(appdata_in_files) \
@@ -78,6 +80,7 @@ EXTRA_DIST = \
 CLEANFILES = \
 	$(applet_DATA) \
 	$(applet_DATA).in \
+	$(applet_in_files) \
 	$(service_DATA) \
 	$(dictsource_DATA) \
 	$(gdictapp_in_files) \
diff --git a/mate-dictionary/data/default.desktop.in b/mate-dictionary/data/default.desktop.in
index 395433e8..50556ea6 100644
--- a/mate-dictionary/data/default.desktop.in
+++ b/mate-dictionary/data/default.desktop.in
@@ -1,6 +1,6 @@
 [Dictionary Source]
 Name=Default
-_Description=Default Dictionary Server
+Description=Default Dictionary Server
 Transport=dictd
 Hostname=dict.org
 Port=2628
diff --git a/mate-dictionary/data/mate-dictionary.appdata.xml.in b/mate-dictionary/data/mate-dictionary.appdata.xml.in
index b47dd2f2..fa776a36 100644
--- a/mate-dictionary/data/mate-dictionary.appdata.xml.in
+++ b/mate-dictionary/data/mate-dictionary.appdata.xml.in
@@ -5,15 +5,15 @@
  <metadata_license>CC0-1.0</metadata_license>
  <project_license>GPL-2.0+</project_license>
  <name>MATE Dictionary</name>
- <_summary>A dictionary for MATE Desktop</_summary>
- <_description>
+ <summary>A dictionary for MATE Desktop</summary>
+ <description>
   <p>
    MATE Dictionary allows you to look up words in on-line dictionaries.
    It comes preconfigured with a list of Dict servers (RFC 2229), to which
    you can add your own sources, while you can select specific servers
    for a specific query.
   </p>
- </_description>
+ </description>
  <screenshots>
   <screenshot type="default">
    <image width="960" height="540">
diff --git a/mate-dictionary/data/mate-dictionary.desktop.in.in b/mate-dictionary/data/mate-dictionary.desktop.in.in
index 84033f73..5179bab3 100644
--- a/mate-dictionary/data/mate-dictionary.desktop.in.in
+++ b/mate-dictionary/data/mate-dictionary.desktop.in.in
@@ -1,12 +1,14 @@
 [Desktop Entry]
-_Name=MATE Dictionary
-_Comment=Check word definitions and spellings in an online dictionary
+Name=MATE Dictionary
+Comment=Check word definitions and spellings in an online dictionary
 Exec=mate-dictionary
 Terminal=false
 Type=Application
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
 Icon=accessories-dictionary
 StartupNotify=true
 Categories=GTK;Office;Dictionary;
+# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
 Keywords=MATE;dictionary;applet;thesaurus;spelling;definitions;online;
 OnlyShowIn=MATE;
 X-MATE-DocPath=mate-dictionary/mate-dictionary.xml
diff --git a/mate-dictionary/data/org.mate.DictionaryApplet.mate-panel-applet.desktop.in.in b/mate-dictionary/data/org.mate.DictionaryApplet.mate-panel-applet.desktop.in.in
new file mode 100644
index 00000000..db553811
--- /dev/null
+++ b/mate-dictionary/data/org.mate.DictionaryApplet.mate-panel-applet.desktop.in.in
@@ -0,0 +1,12 @@
+[Applet Factory]
+Id=DictionaryAppletFactory
+Location=@LIBEXECDIR@/mate-dictionary-applet
+Name=Dictionary Applet Factory
+Description=Factory for the dictionary applet
+
+[DictionaryApplet]
+Name=Dictionary Look up
+Description=Look up words in a dictionary
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+Icon=accessories-dictionary
+MateComponentId=OAFIID:MATE_DictionaryApplet
diff --git a/mate-dictionary/data/org.mate.DictionaryApplet.mate-panel-applet.in.in b/mate-dictionary/data/org.mate.DictionaryApplet.mate-panel-applet.in.in
deleted file mode 100644
index ab8ecd82..00000000
--- a/mate-dictionary/data/org.mate.DictionaryApplet.mate-panel-applet.in.in
+++ /dev/null
@@ -1,11 +0,0 @@
-[Applet Factory]
-Id=DictionaryAppletFactory
-Location=@LIBEXECDIR@/mate-dictionary-applet
-_Name=Dictionary Applet Factory
-_Description=Factory for the dictionary applet
-
-[DictionaryApplet]
-_Name=Dictionary Look up
-_Description=Look up words in a dictionary
-Icon=accessories-dictionary
-MateComponentId=OAFIID:MATE_DictionaryApplet
diff --git a/mate-dictionary/data/thai.desktop.in b/mate-dictionary/data/thai.desktop.in
index 1922f280..ce0b0ab2 100644
--- a/mate-dictionary/data/thai.desktop.in
+++ b/mate-dictionary/data/thai.desktop.in
@@ -1,6 +1,6 @@
 [Dictionary Source]
 Name=Thai
-_Description=Longdo Thai-English Dictionaries
+Description=Longdo Thai-English Dictionaries
 Transport=dictd
 Hostname=dict.longdo.com
 Port=2628