From 9ee7e00057ce3d7b4dc6cf22074fc54bf8f48b3e Mon Sep 17 00:00:00 2001
From: Wu Xiaotian <yetist@gmail.com>
Date: Tue, 21 May 2019 14:47:33 +0800
Subject: Migrate from intltools into gettext

---
 data/Makefile.am                  |  8 ++--
 data/mate-calc.appdata.xml.in     |  6 +--
 data/mate-calc.desktop.in         |  6 +--
 data/org.mate.calc.gschema.xml    | 86 +++++++++++++++++++++++++++++++++++++++
 data/org.mate.calc.gschema.xml.in | 86 ---------------------------------------
 5 files changed, 97 insertions(+), 95 deletions(-)
 create mode 100644 data/org.mate.calc.gschema.xml
 delete mode 100644 data/org.mate.calc.gschema.xml.in

(limited to 'data')

diff --git a/data/Makefile.am b/data/Makefile.am
index 1a8150b..3b68c3a 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,7 +1,8 @@
-@INTLTOOL_XML_RULE@
 appdatadir = $(datadir)/metainfo
 appdata_in_files = mate-calc.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.calc.gschema.xml
 @GSETTINGS_RULES@
@@ -9,12 +10,13 @@ gsettings_SCHEMAS = org.mate.calc.gschema.xml
 Utilitiesdir = $(datadir)/applications
 Utilities_in_files = mate-calc.desktop.in
 Utilities_DATA = $(Utilities_in_files:.desktop.in=.desktop)
-@INTLTOOL_DESKTOP_RULE@
+$(Utilities_DATA): $(Utilities_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
 
 man1_MANS = mate-calc.1 mate-calc-cmd.1
 
 EXTRA_DIST = \
-	org.mate.calc.gschema.xml.in \
+	org.mate.calc.gschema.xml \
 	mate-calc.desktop.in \
 	$(appdata_in_files) \
 	$(man1_MANS)
diff --git a/data/mate-calc.appdata.xml.in b/data/mate-calc.appdata.xml.in
index 80cbad1..13c634f 100644
--- a/data/mate-calc.appdata.xml.in
+++ b/data/mate-calc.appdata.xml.in
@@ -5,8 +5,8 @@
  <metadata_license>CC0-1.0</metadata_license>
  <project_license>GPL-2.0+</project_license>
  <name>MATE Calc</name>
- <_summary>MATE Desktop calculator</_summary>
- <_description>
+ <summary>MATE Desktop calculator</summary>
+ <description>
   <p>
    MATE Calc is a powerful graphical calculator with financial,
    logical and scientific modes. It uses a multiple precision package
@@ -17,7 +17,7 @@
    If you would like to know more about MATE and MATE Calc, please visit the
    project's home page.
   </p>
- </_description>
+ </description>
  <screenshots>
   <screenshot type="default">
    <image width="314" height="247">
diff --git a/data/mate-calc.desktop.in b/data/mate-calc.desktop.in
index 2e61e3c..d51b4a2 100644
--- a/data/mate-calc.desktop.in
+++ b/data/mate-calc.desktop.in
@@ -1,7 +1,7 @@
 [Desktop Entry]
-_Name=MATE Calculator
-_GenericName=Calculator
-_Comment=Perform arithmetic, scientific or financial calculations
+Name=MATE Calculator
+GenericName=Calculator
+Comment=Perform arithmetic, scientific or financial calculations
 Exec=mate-calc
 Icon=accessories-calculator
 Terminal=false
diff --git a/data/org.mate.calc.gschema.xml b/data/org.mate.calc.gschema.xml
new file mode 100644
index 0000000..37295c1
--- /dev/null
+++ b/data/org.mate.calc.gschema.xml
@@ -0,0 +1,86 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<schemalist>
+  <enum id="org.mate.calc.NumberFormat">
+    <value value="0" nick="automatic"/>
+    <value value="1" nick="fixed"/>
+    <value value="2" nick="scientific"/>
+    <value value="3" nick="engineering"/>
+  </enum>
+  <enum id="org.mate.calc.ButtonMode">
+    <value value="0" nick="basic"/>
+    <value value="1" nick="advanced"/>
+    <value value="2" nick="financial"/>
+    <value value="3" nick="programming"/>
+  </enum>
+  <enum id="org.mate.calc.AngleUnit">
+    <value value="0" nick="radians"/>
+    <value value="1" nick="degrees"/>
+    <value value="2" nick="gradians"/>
+  </enum>
+
+  <schema path="/org/mate/calc/" id="org.mate.calc" gettext-domain="mate-calc">
+    <key type="i" name="accuracy">
+      <default>9</default>
+      <range min="0" max="15"/>
+      <summary>Accuracy value</summary>
+      <description>The number of digits displayed after the numeric point</description>
+    </key>
+    <key type="i" name="word-size">
+      <default>64</default>
+      <range min="8" max="64"/>
+      <summary>Word size</summary>
+      <description>The size of the words used in bitwise operations</description>
+    </key>
+    <key type="i" name="base">
+      <default>10</default>
+      <range min="2" max="16"/>
+      <summary>Numeric Base</summary>
+      <description>The numeric base</description>
+    </key>
+    <key type="b" name="show-thousands">
+      <default>false</default>
+      <summary>Show Thousands Separators</summary>
+      <description>Indicates whether thousands separators are shown in large numbers.</description>
+    </key>
+    <key type="b" name="show-zeroes">
+      <default>false</default>
+      <summary>Show Trailing Zeroes</summary>
+      <description>Indicates whether any trailing zeroes after the  numeric point should be shown in the display value.</description>
+    </key>
+    <key name="number-format" enum="org.mate.calc.NumberFormat">
+      <default>'automatic'</default>
+      <summary>Number format</summary>
+      <description>The format to display numbers in</description>
+    </key>
+    <key name="angle-units" enum="org.mate.calc.AngleUnit">
+      <default>'degrees'</default>
+      <summary>Angle units</summary>
+      <description>The angle units to use</description>
+    </key>
+    <key name="button-mode" enum="org.mate.calc.ButtonMode">
+      <default>'basic'</default>
+      <summary>Button mode</summary>
+      <description>The button mode</description>
+    </key>
+    <key type="s" name="source-currency">
+      <default>''</default>
+      <summary>Source currency</summary>
+      <description>Currency of the current calculation</description>
+    </key>
+    <key type="s" name="target-currency">
+      <default>''</default>
+      <summary>Target currency</summary>
+      <description>Currency to convert the current calculation into</description>
+    </key>
+    <key type="s" name="source-units">
+      <default>'degree'</default>
+      <summary>Source units</summary>
+      <description>Units of the current calculation</description>
+    </key>
+    <key type="s" name="target-units">
+      <default>'radian'</default>
+      <summary>Target units</summary>
+      <description>Units to convert the current calculation into</description>
+    </key>
+  </schema>
+</schemalist>
diff --git a/data/org.mate.calc.gschema.xml.in b/data/org.mate.calc.gschema.xml.in
deleted file mode 100644
index 37295c1..0000000
--- a/data/org.mate.calc.gschema.xml.in
+++ /dev/null
@@ -1,86 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<schemalist>
-  <enum id="org.mate.calc.NumberFormat">
-    <value value="0" nick="automatic"/>
-    <value value="1" nick="fixed"/>
-    <value value="2" nick="scientific"/>
-    <value value="3" nick="engineering"/>
-  </enum>
-  <enum id="org.mate.calc.ButtonMode">
-    <value value="0" nick="basic"/>
-    <value value="1" nick="advanced"/>
-    <value value="2" nick="financial"/>
-    <value value="3" nick="programming"/>
-  </enum>
-  <enum id="org.mate.calc.AngleUnit">
-    <value value="0" nick="radians"/>
-    <value value="1" nick="degrees"/>
-    <value value="2" nick="gradians"/>
-  </enum>
-
-  <schema path="/org/mate/calc/" id="org.mate.calc" gettext-domain="mate-calc">
-    <key type="i" name="accuracy">
-      <default>9</default>
-      <range min="0" max="15"/>
-      <summary>Accuracy value</summary>
-      <description>The number of digits displayed after the numeric point</description>
-    </key>
-    <key type="i" name="word-size">
-      <default>64</default>
-      <range min="8" max="64"/>
-      <summary>Word size</summary>
-      <description>The size of the words used in bitwise operations</description>
-    </key>
-    <key type="i" name="base">
-      <default>10</default>
-      <range min="2" max="16"/>
-      <summary>Numeric Base</summary>
-      <description>The numeric base</description>
-    </key>
-    <key type="b" name="show-thousands">
-      <default>false</default>
-      <summary>Show Thousands Separators</summary>
-      <description>Indicates whether thousands separators are shown in large numbers.</description>
-    </key>
-    <key type="b" name="show-zeroes">
-      <default>false</default>
-      <summary>Show Trailing Zeroes</summary>
-      <description>Indicates whether any trailing zeroes after the  numeric point should be shown in the display value.</description>
-    </key>
-    <key name="number-format" enum="org.mate.calc.NumberFormat">
-      <default>'automatic'</default>
-      <summary>Number format</summary>
-      <description>The format to display numbers in</description>
-    </key>
-    <key name="angle-units" enum="org.mate.calc.AngleUnit">
-      <default>'degrees'</default>
-      <summary>Angle units</summary>
-      <description>The angle units to use</description>
-    </key>
-    <key name="button-mode" enum="org.mate.calc.ButtonMode">
-      <default>'basic'</default>
-      <summary>Button mode</summary>
-      <description>The button mode</description>
-    </key>
-    <key type="s" name="source-currency">
-      <default>''</default>
-      <summary>Source currency</summary>
-      <description>Currency of the current calculation</description>
-    </key>
-    <key type="s" name="target-currency">
-      <default>''</default>
-      <summary>Target currency</summary>
-      <description>Currency to convert the current calculation into</description>
-    </key>
-    <key type="s" name="source-units">
-      <default>'degree'</default>
-      <summary>Source units</summary>
-      <description>Units of the current calculation</description>
-    </key>
-    <key type="s" name="target-units">
-      <default>'radian'</default>
-      <summary>Target units</summary>
-      <description>Units to convert the current calculation into</description>
-    </key>
-  </schema>
-</schemalist>
-- 
cgit v1.2.1