diff options
| author | Arun Raghavan <arun@asymptotic.io> | 2022-01-14 18:35:50 -0500 |
|---|---|---|
| committer | Arun Raghavan <arun@asymptotic.io> | 2022-01-14 18:39:01 -0500 |
| commit | 327288055b3ec5ce3ba61a5a7a9571c49a7c5259 (patch) | |
| tree | 9ab5ccaf34adec992ac51be5b882521cd1c7ba19 | |
| parent | 8b3a5999a6aff7f6088be90c92198f9efc06f955 (diff) | |
i18n: Migrate to upstream gettext over intltool
Newer gettext has feature parity, rendering intltool obsolete. Details
at:
https://wiki.gnome.org/MigratingFromIntltoolToGettext
| -rw-r--r-- | .gitignore | 3 | ||||
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rwxr-xr-x | bootstrap.sh | 1 | ||||
| -rw-r--r-- | configure.ac | 4 | ||||
| -rw-r--r-- | po/POTFILES.in | 1 | ||||
| -rw-r--r-- | src/Makefile.am | 5 | ||||
| -rw-r--r-- | src/pavucontrol.desktop.in | 6 |
7 files changed, 8 insertions, 15 deletions
@@ -4,9 +4,6 @@ ChangeLog config.guess config.rpath config.sub -intltool-extract.in -intltool-merge.in -intltool-update.in aclocal.m4 *.cache compile diff --git a/Makefile.am b/Makefile.am index 175caa7..01d7d4d 100644 --- a/Makefile.am +++ b/Makefile.am @@ -18,9 +18,6 @@ EXTRA_DIST = \ bootstrap.sh \ LICENSE \ - intltool-merge.in \ - intltool-update.in \ - intltool-extract.in \ po/pavucontrol.pot SUBDIRS=src doc po diff --git a/bootstrap.sh b/bootstrap.sh index 4719e9c..133b70f 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -23,7 +23,6 @@ if [ -f .git/hooks/pre-commit.sample -a ! -f .git/hooks/pre-commit ] ; then echo "Activated pre-commit hook." fi -intltoolize --force --automake autoreconf --force --install --symlink if test "x$NOCONFIGURE" = "x"; then diff --git a/configure.ac b/configure.ac index 45f825e..156730a 100644 --- a/configure.ac +++ b/configure.ac @@ -67,11 +67,11 @@ fi ZP_LYNX_DOC -IT_PROG_INTLTOOL([0.35.0]) GETTEXT_PACKAGE=pavucontrol AC_SUBST([GETTEXT_PACKAGE]) AC_DEFINE_UNQUOTED([GETTEXT_PACKAGE],["$GETTEXT_PACKAGE"],[Gettext package]) -AM_GLIB_GNU_GETTEXT +AM_GNU_GETTEXT([external]) +AM_GNU_GETTEXT_VERSION([0.19.8]) AC_CONFIG_FILES([ po/Makefile.in diff --git a/po/POTFILES.in b/po/POTFILES.in index e9d0f55..931f312 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,4 +1,3 @@ -[encoding: UTF-8] src/pavucontrol.desktop.in src/pavucontrol.glade src/pavucontrol.cc diff --git a/src/Makefile.am b/src/Makefile.am index b5c0314..adec68e 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -21,8 +21,11 @@ localedir = $(datadir)/locale bin_PROGRAMS=pavucontrol glade_DATA=pavucontrol.glade + desktop_in_files=pavucontrol.desktop.in desktop_DATA=$(desktop_in_files:.desktop.in=.desktop) +$(desktop_DATA): $(desktop_in_files) + $(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@ pavucontrol_SOURCES= \ minimalstreamwidget.h minimalstreamwidget.cc \ @@ -48,5 +51,3 @@ pavucontrol_CXXFLAGS+=-DGLADE_FILE=\"$(gladedir)/pavucontrol.glade\" EXTRA_DIST = $(glade_DATA) $(desktop_in_files) CLEANFILES = $(desktop_DATA) - -@INTLTOOL_DESKTOP_RULE@ diff --git a/src/pavucontrol.desktop.in b/src/pavucontrol.desktop.in index 06f55e7..7499e2e 100644 --- a/src/pavucontrol.desktop.in +++ b/src/pavucontrol.desktop.in @@ -1,8 +1,8 @@ [Desktop Entry] Version=1.0 -_Name=PulseAudio Volume Control -_GenericName=Volume Control -_Comment=Adjust the volume level +Name=PulseAudio Volume Control +GenericName=Volume Control +Comment=Adjust the volume level Exec=pavucontrol Icon=multimedia-volume-control StartupNotify=true |