diff --git a/Makefile.am b/Makefile.am index 2d38de1..7c02c77 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,4 +1,4 @@ -SUBDIRS = po src themes images scripts systemd-units +SUBDIRS = src themes images scripts systemd-units po if BUILD_DOCUMENTATION SUBDIRS += docs diff --git a/configure.ac b/configure.ac index d34245a..3427b9e 100644 --- a/configure.ac +++ b/configure.ac @@ -17,10 +17,6 @@ AM_MAINTAINER_MODE([enable]) AM_GNU_GETTEXT_VERSION([0.19.8]) AM_GNU_GETTEXT([external]) -AC_PATH_PROG([INTLTOOL_EXTRACT], [intltool-extract]) -if test x$INTLTOOL_EXTRACT = x; then - AC_MSG_ERROR([intltool-extract is required to build plymouth]) -fi PKG_PROG_PKG_CONFIG LT_INIT([dlopen disable-static pic-only]) diff --git a/po/Makevars b/po/Makevars index 720c590..c571531 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 bbce0ef..d9f9d05 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 8c7cbc9..0000000 --- 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 7e3aa1e..c3a4b5f 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 \n" "Language-Team: LANGUAGE \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 "" diff --git a/themes/bgrt/Makefile.am b/themes/bgrt/Makefile.am index 5fd40dd..770c36f 100644 --- a/themes/bgrt/Makefile.am +++ b/themes/bgrt/Makefile.am @@ -4,8 +4,10 @@ nodist_theme_DATA = bgrt.plymouth MAINTAINERCLEANFILES = Makefile.in bgrt.plymouth CLEANFILES = bgrt.plymouth -bgrt.plymouth: $(srcdir)/bgrt.plymouth.in +bgrt.plymouth: $(srcdir)/bgrt.plymouth.desktop + $(AM_V_GEN) \ sed -e 's,[@]PLYMOUTH_THEME_PATH[@],$(PLYMOUTH_THEME_PATH),g' \ - $(srcdir)/bgrt.plymouth.in > bgrt.plymouth + $(srcdir)/bgrt.plymouth.desktop | \ + $(MSGFMT) --desktop --template /dev/stdin -d $(top_srcdir)/po -o $@ -EXTRA_DIST = bgrt.plymouth.in +EXTRA_DIST = bgrt.plymouth.desktop diff --git a/themes/bgrt/bgrt.plymouth.in b/themes/bgrt/bgrt.plymouth.desktop similarity index 84% rename from themes/bgrt/bgrt.plymouth.in rename to themes/bgrt/bgrt.plymouth.desktop index 5455eb7..eed7162 100644 --- a/themes/bgrt/bgrt.plymouth.in +++ b/themes/bgrt/bgrt.plymouth.desktop @@ -40,19 +40,19 @@ UseFirmwareBackground=true SuppressMessages=true ProgressBarShowPercentComplete=true UseProgressBar=true -_Title=Installing Updates... -_SubTitle=Do not turn off your computer +Title=Installing Updates... +SubTitle=Do not turn off your computer [system-upgrade] SuppressMessages=true ProgressBarShowPercentComplete=true UseProgressBar=true -_Title=Upgrading System... -_SubTitle=Do not turn off your computer +Title=Upgrading System... +SubTitle=Do not turn off your computer [firmware-upgrade] SuppressMessages=true ProgressBarShowPercentComplete=true UseProgressBar=true -_Title=Upgrading Firmware... -_SubTitle=Do not turn off your computer +Title=Upgrading Firmware... +SubTitle=Do not turn off your computer diff --git a/themes/spinner/Makefile.am b/themes/spinner/Makefile.am index ea28336..bb0e991 100644 --- a/themes/spinner/Makefile.am +++ b/themes/spinner/Makefile.am @@ -78,8 +78,11 @@ dist_theme_DATA = \ MAINTAINERCLEANFILES = Makefile.in spinner.plymouth CLEANFILES = spinner.plymouth -spinner.plymouth: $(srcdir)/spinner.plymouth.in +spinner.plymouth: $(srcdir)/spinner.plymouth.desktop + $(AM_V_GEN) \ sed -e 's,[@]PLYMOUTH_THEME_PATH[@],$(PLYMOUTH_THEME_PATH),g' \ - $(srcdir)/spinner.plymouth.in > spinner.plymouth + $(srcdir)/spinner.plymouth.desktop | \ + $(MSGFMT) --desktop --template /dev/stdin -d $(top_srcdir)/po -o $@ -EXTRA_DIST = spinner.plymouth.in + +EXTRA_DIST = spinner.plymouth.desktop diff --git a/themes/spinner/spinner.plymouth.in b/themes/spinner/spinner.plymouth.desktop similarity index 83% rename from themes/spinner/spinner.plymouth.in rename to themes/spinner/spinner.plymouth.desktop index 0687d12..ac3485d 100644 --- a/themes/spinner/spinner.plymouth.in +++ b/themes/spinner/spinner.plymouth.desktop @@ -36,19 +36,19 @@ UseEndAnimation=false SuppressMessages=true ProgressBarShowPercentComplete=true UseProgressBar=true -_Title=Installing Updates... -_SubTitle=Do not turn off your computer +Title=Installing Updates... +SubTitle=Do not turn off your computer [system-upgrade] SuppressMessages=true ProgressBarShowPercentComplete=true UseProgressBar=true -_Title=Upgrading System... -_SubTitle=Do not turn off your computer +Title=Upgrading System... +SubTitle=Do not turn off your computer [firmware-upgrade] SuppressMessages=true ProgressBarShowPercentComplete=true UseProgressBar=true -_Title=Upgrading Firmware... -_SubTitle=Do not turn off your computer +Title=Upgrading Firmware... +SubTitle=Do not turn off your computer