Commit 8818e939 authored by Niels De Graef's avatar Niels De Graef

Migrate from intltool to gettext.

Removes `daemon/org.gnome.keyring.service.in` from POTFILES.in, as it
doesn't contain any translatable strings.
parent 7b2f96bf
......@@ -55,6 +55,7 @@ config.guess
config.h
config.h.in
config.log
config.rpath
config.status
config.status.lineno
config.sub
......
......@@ -17,10 +17,7 @@ DISTCHECK_CONFIGURE_FLAGS = \
--with-pkcs11-config=$(abs_srcdir)/$(top_distdir)/_inst/etc/pkcs11 \
$(NULL)
DISTCLEANFILES = \
intltool-extract \
intltool-merge \
intltool-update
DISTCLEANFILES =
CHANGELOG_START = \
efb922c92fae5929ecc8c702770ebb6c390d38a4
......@@ -144,8 +141,6 @@ SUFFIXES = .desktop.in .desktop.in.in .service .service.in
.desktop.in.in.desktop.in:
$(V_SED) ( $(SED_SUBST) $< > $@.tmp ) && mv $@.tmp $@
@INTLTOOL_DESKTOP_RULE@
all-local:
$(MKDIR_P) $(builddir)/daemon
$(MKDIR_P) $(builddir)/schema
......@@ -182,9 +177,6 @@ CLEANFILES = \
*.gcda
EXTRA_DIST = \
intltool-extract.in \
intltool-merge.in \
intltool-update.in \
ChangeLog.old \
HACKING \
$(ASN1_FILES) \
......
......@@ -45,7 +45,6 @@ AC_PROG_LN_S
AC_PROG_MAKE_SET
AM_DISABLE_STATIC
AM_PROG_LIBTOOL
IT_PROG_INTLTOOL([0.35.0])
PKG_PROG_PKG_CONFIG
AC_TYPE_PID_T
......@@ -77,12 +76,12 @@ AC_SUBST(GIO_LIBS)
DAEMON_CFLAGS="$DAEMON_CFLAGS $GLIB_CFLAGS $GTHREAD_CFLAGS $GOBJECT_CFLAGS $GIO_CFLAGS"
DAEMON_LIBS="$DAEMON_LIBS $GLIB_LIBS $GTHREAD_LIBS $GOBJECT_LIBS $GIO_LIBS"
AM_GNU_GETTEXT([external])
AM_GNU_GETTEXT_VERSION([0.19.8])
GETTEXT_PACKAGE=gnome-keyring
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The gettext domain name])
AC_SUBST(GETTEXT_PACKAGE)
AM_GLIB_GNU_GETTEXT
AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
GLIB_GSETTINGS
......
......@@ -44,6 +44,8 @@ desktop_in_in_files = \
$(NULL)
desktop_in_files = $(desktop_in_in_files:.desktop.in.in=.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 $@
EXTRA_DIST += \
$(service_in_files) \
......
[Desktop Entry]
Type=Application
_Name=Certificate and Key Storage
_Comment=GNOME Keyring: PKCS#11 Component
Name=Certificate and Key Storage
Comment=GNOME Keyring: PKCS#11 Component
Exec=@bindir@/gnome-keyring-daemon --start --components=pkcs11
OnlyShowIn=GNOME;Unity;MATE;
X-GNOME-Autostart-Phase=PreDisplayServer
......
[Desktop Entry]
Type=Application
_Name=Secret Storage Service
_Comment=GNOME Keyring: Secret Service
Name=Secret Storage Service
Comment=GNOME Keyring: Secret Service
Exec=@bindir@/gnome-keyring-daemon --start --components=secrets
OnlyShowIn=GNOME;Unity;MATE;
X-GNOME-Autostart-Phase=PreDisplayServer
......
[Desktop Entry]
Type=Application
_Name=SSH Key Agent
_Comment=GNOME Keyring: SSH Agent
Name=SSH Key Agent
Comment=GNOME Keyring: SSH Agent
Exec=@bindir@/gnome-keyring-daemon --start --components=ssh
OnlyShowIn=GNOME;Unity;MATE;
X-GNOME-Autostart-Phase=PreDisplayServer
......
/*.gmo
/*.mo
/*.pot
/.intltool-merge-cache
/Makefile.in.in
/Makevars.template
/POTFILES
/Rules-quot
/boldquot.sed
/cat-id-tbl.c
/en@boldquot.header
/en@quot.header
/insert-header.sin
/messages
/missing
/po2tbl.sed
/po2tbl.sed.in
/cat-id-tbl.c
/quot.sed
/remove-potcdate.sin
/stamp-cat-id
/stamp-it
/messages
/missing
/.intltool-merge-cache
# Makefile variables for PO directory in any package using GNU gettext.
# Usually the message domain is the same as the package name.
DOMAIN = $(PACKAGE)
# These two variables depend on the location of this directory.
subdir = po
top_builddir = ..
# These options get passed to xgettext.
XGETTEXT_OPTIONS = --from-code=UTF-8 --keyword=_ --keyword=N_ --keyword=C_:1c,2 --keyword=NC_:1c,2 --keyword=g_dngettext:2,3 --add-comments
# 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
# package. (Note that the msgstr strings, extracted from the package's
# sources, belong to the copyright holder of the package.) Translators are
# expected to transfer the copyright for their translations to this person
# or entity, or to disclaim their copyright. The empty string stands for
# the public domain; in this case the translators are expected to disclaim
# their copyright.
COPYRIGHT_HOLDER = gnome-keyring contributors
# This tells whether or not to prepend "GNU " prefix to the package
# name that gets inserted into the header of the $(DOMAIN).pot file.
# Possible values are "yes", "no", or empty. If it is empty, try to
# detect it automatically by scanning the files in $(top_srcdir) for
# "GNU packagename" string.
PACKAGE_GNU = no
# This is the email address or URL to which the translators shall report
# bugs in the untranslated strings:
# - Strings which are not entire sentences, see the maintainer guidelines
# in the GNU gettext documentation, section 'Preparing Strings'.
# - Strings which use unclear terms or require additional context to be
# understood.
# - Strings which make invalid assumptions about notation of date, time or
# money.
# - Pluralisation problems.
# - Incorrect English spelling.
# - Incorrect formatting.
# It can be your email address, or a mailing list address where translators
# can write to without being subscribed, or the URL of a web page through
# which the translators can contact you.
MSGID_BUGS_ADDRESS = https://bugzilla.gnome.org/enter_bug.cgi?product=gnome-keyring&keywords=I18N+L10N&component=general
# This is the list of locale categories, beyond LC_MESSAGES, for which the
# message catalogs shall be used. It is usually empty.
EXTRA_LOCALE_CATEGORIES =
# This tells whether the $(DOMAIN).pot file contains messages with an 'msgctxt'
# context. Possible values are "yes" and "no". Set this to yes if the
# package uses functions taking also a message context, like pgettext(), or
# if in $(XGETTEXT_OPTIONS) you define keywords with a context argument.
USE_MSGCTXT = yes
# These options get passed to msgmerge.
# Useful options are in particular:
# --previous to keep previous msgids of translated messages,
# --quiet to reduce the verbosity.
MSGMERGE_OPTIONS =
# These options get passed to msginit.
# If you want to disable line wrapping when writing PO files, add
# --no-wrap to MSGMERGE_OPTIONS, XGETTEXT_OPTIONS, and
# MSGINIT_OPTIONS.
MSGINIT_OPTIONS =
# This tells whether or not to regenerate a PO file when $(DOMAIN).pot
# 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 = 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 = no
......@@ -7,7 +7,6 @@ daemon/gnome-keyring-pkcs11.desktop.in.in
daemon/gnome-keyring-secrets.desktop.in.in
daemon/gnome-keyring-ssh.desktop.in.in
daemon/login/gkd-login.c
daemon/org.gnome.keyring.service.in
egg/dotlock.c
egg/egg-oid.c
pkcs11/gkm/gkm-certificate.c
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment