From 26b2e261d06b16e602e42bd4ae1821494f019121 Mon Sep 17 00:00:00 2001
From: Wu Xiaotian <yetist@gmail.com>
Date: Tue, 24 Dec 2019 12:32:11 +0800
Subject: migrate from intltool to gettext

---
 open-terminal/Makefile.am                               | 17 +++++++++--------
 .../libcaja-open-terminal.caja-extension.desktop.in.in  |  9 +++++++++
 .../libcaja-open-terminal.caja-extension.in.in          |  8 --------
 .../org.mate.caja-open-terminal.gschema.xml.in          |  4 ++--
 4 files changed, 20 insertions(+), 18 deletions(-)
 create mode 100644 open-terminal/libcaja-open-terminal.caja-extension.desktop.in.in
 delete mode 100644 open-terminal/libcaja-open-terminal.caja-extension.in.in

(limited to 'open-terminal')

diff --git a/open-terminal/Makefile.am b/open-terminal/Makefile.am
index ff0a524..ea3e070 100644
--- a/open-terminal/Makefile.am
+++ b/open-terminal/Makefile.am
@@ -22,21 +22,22 @@ libcaja_open_terminal_la_LDFLAGS = -module -avoid-version
 libcaja_open_terminal_la_LIBADD  = $(CAJA_LIBS) $(OPENTERMINAL_LIBS)
 
 gsettings_schemas_in_files = org.mate.caja-open-terminal.gschema.xml.in
-gsettings_SCHEMAS = $(gsettings_schemas_in_files:.gschema.xml.in=.gschema.xml)
-
-@INTLTOOL_XML_NOMERGE_RULE@
-
+gsettings_SCHEMAS = $(gsettings_schemas_in_files:.xml.in=.xml)
 @GSETTINGS_RULES@
 
 extensiondir = $(datadir)/caja/extensions
-extension_in_files = libcaja-open-terminal.caja-extension.in
-extension_DATA = $(extension_in_files:.caja-extension.in=.caja-extension)
-%.caja-extension: %.caja-extension.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; $(AM_V_GEN) LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< $@
+extension_in_files = libcaja-open-terminal.caja-extension.desktop.in
+extension_DATA = $(extension_in_files:.caja-extension.desktop.in=.caja-extension)
+$(extension_DATA): $(extension_in_files)
+	$(AM_V_GEN) $(MSGFMT) --desktop --keyword=Copyright --keyword=Name --keyword=Description --template $< -d $(top_srcdir)/po -o $@
 
 DISTCLEANFILES = \
 	org.mate.caja-open-terminal.gschema.xml
 
-CLEANFILES = $(extension_DATA)
+CLEANFILES = \
+	$(extension_DATA) \
+	$(gsettings_SCHEMAS) \
+	*.gschema.valid
 
 EXTRA_DIST = \
 	$(gsettings_schemas_in_files)
diff --git a/open-terminal/libcaja-open-terminal.caja-extension.desktop.in.in b/open-terminal/libcaja-open-terminal.caja-extension.desktop.in.in
new file mode 100644
index 0000000..6ac32b2
--- /dev/null
+++ b/open-terminal/libcaja-open-terminal.caja-extension.desktop.in.in
@@ -0,0 +1,9 @@
+[Caja Extension]
+# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
+Icon=terminal
+Name=Open terminal
+Description=Open terminals from folders
+Author=Christian Neumair <chris@gnome-de.org>
+Copyright=Copyright (C) 2004, 2005 Free Software Foundation, Inc.
+Version=@VERSION@
+Website=https://mate-desktop.org/
diff --git a/open-terminal/libcaja-open-terminal.caja-extension.in.in b/open-terminal/libcaja-open-terminal.caja-extension.in.in
deleted file mode 100644
index 729dfa7..0000000
--- a/open-terminal/libcaja-open-terminal.caja-extension.in.in
+++ /dev/null
@@ -1,8 +0,0 @@
-[Caja Extension]
-Icon=terminal
-_Name=Open terminal
-_Description=Open terminals from folders
-Author=Christian Neumair <chris@gnome-de.org>
-_Copyright=Copyright (C) 2004, 2005 Free Software Foundation, Inc.
-Version=@VERSION@
-Website=https://mate-desktop.org/
diff --git a/open-terminal/org.mate.caja-open-terminal.gschema.xml.in b/open-terminal/org.mate.caja-open-terminal.gschema.xml.in
index 32f55ef..56b70ef 100644
--- a/open-terminal/org.mate.caja-open-terminal.gschema.xml.in
+++ b/open-terminal/org.mate.caja-open-terminal.gschema.xml.in
@@ -2,8 +2,8 @@
   <schema id="org.mate.caja-open-terminal" path="/org/mate/caja-open-terminal/">
     <key name="desktop-opens-home-dir" type="b">
       <default>false</default>
-      <_summary>Whether opening a terminal on the desktop opens a terminal in the home directory</_summary>
-      <_description>If set to true, then opening a terminal on the desktop will open a terminal in the home directory. Otherwise, it will be opened in the desktop directory. Note that this key is irrelevant if the desktop directory is identical to the home directory.</_description>
+      <summary>Whether opening a terminal on the desktop opens a terminal in the home directory</summary>
+      <description>If set to true, then opening a terminal on the desktop will open a terminal in the home directory. Otherwise, it will be opened in the desktop directory. Note that this key is irrelevant if the desktop directory is identical to the home directory.</description>
     </key>
   </schema>
 </schemalist>
-- 
cgit v1.2.1