calculate
/
calculate-plymouth
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

po: drop intltool usage

Browse Source 
gettext can do most everything intltool can do anyway, so just
drop intltool.
calculate-0.9.5
Ray Strode 4 years ago
parent 1e36e303e0
commit 6114e48404
10 changed files with 50 additions and 40 deletions
Show Stats Download Patch File Download Diff File

2
Makefile.am
Unescape View File

@ -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

4
configure.ac
Unescape View File

@ -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])

6
po/Makevars
Unescape View File

@ -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

5
po/POTFILES.in
Unescape View File

@ -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

5
po/Rules-themes
Unescape View File

@ -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 $<

27
po/plymouth.pot
Unescape View File

@ -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 ""

8
themes/bgrt/Makefile.am
Unescape View File

@ -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

12
themes/bgrt/bgrt.plymouth.in → themes/bgrt/bgrt.plymouth.desktop
Unescape View File

@ -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

9
themes/spinner/Makefile.am
Unescape View File

@ -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

12
themes/spinner/spinner.plymouth.in → themes/spinner/spinner.plymouth.desktop
Unescape View File

@ -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
Write Preview
Loading…
Cancel
Save