po: drop intltool usage

gettext can do most everything intltool can do anyway, so just
drop intltool.

4 files changed, 26 insertions, 17 deletions

diff --git a/po/Makevars b/po/Makevars
index 720c590d..c5715318 100644
--- a/po/Makevars
+++ b/po/Makevars
@@ -8,7 +8,7 @@ subdir = po
 top_builddir = ..
 
 # These options get passed to xgettext.
-XGETTEXT_OPTIONS = --keyword=_ --keyword=N_
+XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ --keyword=Title --keyword=SubTitle --from-code=UTF-8
 
 # 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
@@ -69,10 +69,10 @@ MSGINIT_OPTIONS =
 # 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
+PO_DEPENDS_ON_POT = no
 
 # 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
+DIST_DEPENDS_ON_UPDATE_PO = no
diff --git a/po/POTFILES.in b/po/POTFILES.in
index bbce0ef7..d9f9d05f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -4,6 +4,5 @@
 # (the daemon and commandline utils output is untranslated for now)
 src/plugins/splash/two-step/plugin.c
 
-# Generated from the theme.in files by "intltool-extract --type=gettext/ini"
-themes/bgrt/bgrt.plymouth.in.h
-themes/spinner/spinner.plymouth.in.h
+themes/bgrt/bgrt.plymouth.desktop
+themes/spinner/spinner.plymouth.desktop
diff --git a/po/Rules-themes b/po/Rules-themes
deleted file mode 100644
index 8c7cbc9b..00000000
--- a/po/Rules-themes
+++ /dev/null
@@ -1,5 +0,0 @@
-../themes/bgrt/bgrt.plymouth.in.h: ../themes/bgrt/bgrt.plymouth.in
-	intltool-extract --type=gettext/ini $<
-
-../themes/spinner/spinner.plymouth.in.h: ../themes/spinner/spinner.plymouth.in
-	intltool-extract --type=gettext/ini $<
diff --git a/po/plymouth.pot b/po/plymouth.pot
index 7e3aa1e7..c3a4b5fc 100644
--- a/po/plymouth.pot
+++ b/po/plymouth.pot
@@ -9,7 +9,7 @@ msgstr ""
 "Project-Id-Version: plymouth 0.9.5\n"
 "Report-Msgid-Bugs-To: https://gitlab.freedesktop.org/plymouth/plymouth/"
 "issues\n"
-"POT-Creation-Date: 2019-06-12 11:54+0200\n"
+"POT-Creation-Date: 2020-07-08 14:59-0400\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -18,23 +18,38 @@ msgstr ""
 "Content-Type: text/plain; charset=CHARSET\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: src/plugins/splash/two-step/plugin.c:1885
+#: src/plugins/splash/two-step/plugin.c:1727
 #, c-format
 msgid "%d%% complete"
 msgstr ""
 
-#: themes/bgrt/bgrt.plymouth.in.h:1 themes/spinner/spinner.plymouth.in.h:1
+#: themes/bgrt/bgrt.plymouth.desktop:3
+msgid "BGRT"
+msgstr ""
+
+#: themes/bgrt/bgrt.plymouth.desktop:44
+#: themes/spinner/spinner.plymouth.desktop:40
 msgid "Installing Updates..."
 msgstr ""
 
-#: themes/bgrt/bgrt.plymouth.in.h:2 themes/spinner/spinner.plymouth.in.h:2
+#: themes/bgrt/bgrt.plymouth.desktop:45 themes/bgrt/bgrt.plymouth.desktop:52
+#: themes/bgrt/bgrt.plymouth.desktop:59
+#: themes/spinner/spinner.plymouth.desktop:41
+#: themes/spinner/spinner.plymouth.desktop:48
+#: themes/spinner/spinner.plymouth.desktop:55
 msgid "Do not turn off your computer"
 msgstr ""
 
-#: themes/bgrt/bgrt.plymouth.in.h:3 themes/spinner/spinner.plymouth.in.h:3
+#: themes/bgrt/bgrt.plymouth.desktop:51
+#: themes/spinner/spinner.plymouth.desktop:47
 msgid "Upgrading System..."
 msgstr ""
 
-#: themes/bgrt/bgrt.plymouth.in.h:4 themes/spinner/spinner.plymouth.in.h:4
+#: themes/bgrt/bgrt.plymouth.desktop:58
+#: themes/spinner/spinner.plymouth.desktop:54
 msgid "Upgrading Firmware..."
 msgstr ""
+
+#: themes/spinner/spinner.plymouth.desktop:3
+msgid "Spinner"
+msgstr ""