Commit 7e59dc99 authored by Ray Strode's avatar Ray Strode

Merge branch 'wip/nielsdg/intltool2gettext' into 'master'

Migrate from intltool to gettext.

See merge request GNOME/gdm!5
parents ca814e55 624a22f0
......@@ -13,15 +13,8 @@ if test -z $AUTORECONF; then
exit 1
fi
INTLTOOLIZE=`which intltoolize`
if test -z $INTLTOOLIZE; then
echo "*** No intltoolize found, please install the intltool package ***"
exit 1
fi
set -e
intltoolize --force --copy --automake
autoreconf --force --install --verbose
cd $olddir
......
......@@ -50,7 +50,8 @@ enable_documentation=yes
AM_CONDITIONAL(ENABLE_DOCUMENTATION, test x$enable_documentation = xyes)
# i18n stuff
IT_PROG_INTLTOOL([0.40.0])
AM_GNU_GETTEXT([external])
AM_GNU_GETTEXT_VERSION([0.19.8])
GETTEXT_PACKAGE=gdm
AC_SUBST(GETTEXT_PACKAGE)
......
......@@ -35,9 +35,6 @@ dbusconfdir = $(DBUS_SYS_DIR)
dbusconf_in_files = gdm.conf.in
dbusconf_DATA = $(dbusconf_in_files:.conf.in=.conf)
@INTLTOOL_SCHEMAS_RULE@
@INTLTOOL_XML_NOMERGE_RULE@
# dconf database and profile
dconf_db_files = \
dconf/defaults/00-upstream-settings \
......@@ -57,8 +54,7 @@ gsettings_SCHEMAS = org.gnome.login-screen.gschema.xml
schemasdir = $(pkgdatadir)
schemas_in_files = gdm.schemas.in
schemas_DATA = $(schemas_in_files:.schemas.in=.schemas)
gdm.schemas.in: $(srcdir)/gdm.schemas.in.in
$(schemas_DATA): $(schemas_in_files)
sed -e 's,[@]GDMPREFETCHCMD[@],$(GDMPREFETCHCMD),g' \
-e 's,[@]GDM_CUSTOM_CONF[@],$(GDM_CUSTOM_CONF),g' \
-e 's,[@]GDM_USER_PATH[@],$(GDM_USER_PATH),g' \
......@@ -81,7 +77,7 @@ gdm.schemas.in: $(srcdir)/gdm.schemas.in.in
-e 's,[@]logdir[@],$(logdir),g' \
-e 's,[@]pixmapdir[@],$(pixmapdir),g' \
-e 's,[@]sbindir[@],$(sbindir),g' \
<$(srcdir)/gdm.schemas.in.in >gdm.schemas.in
<$(srcdir)/gdm.schemas.in >gdm.schemas
EXTRA_DIST += gnome-login.session.in
......@@ -168,19 +164,18 @@ EXTRA_DIST += $(srcdir)/61-gdm.rules.in
EXTRA_DIST += \
$(dconf_db_files) \
$(gsettings_SCHEMAS) \
$(schemas_in_files) \
$(schemas_DATA) \
$(dbusconf_in_files) \
$(localealias_DATA) \
$(udevrules_DATA) \
gdm.schemas.in.in \
gdm.conf-custom.in \
Xsession.in \
Init.in \
PreSession.in \
PostSession.in \
PostLogin \
org.gnome.login-screen.gschema.xml.in \
$(NULL)
CLEANFILES = \
......@@ -189,7 +184,6 @@ CLEANFILES = \
Init \
PreSession \
PostSession \
$(gsettings_SCHEMAS) \
greeter-dconf-defaults \
$(NULL)
......
......@@ -10,11 +10,14 @@ edit = sed \
%.desktop.in: %.desktop.in.in Makefile
$(edit) $< >$@
@INTLTOOL_DESKTOP_RULE@
desktopdir = $(pkgdatadir)/greeter/applications
desktop_DATA = mime-dummy-handler.desktop \
desktop_in_files = mime-dummy-handler.desktop \
mimeapps.list \
$(NULL)
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 = \
$(desktop_DATA) \
......
<gdmschemafile>
<schemalist>
<schema>
<key>chooser/Multicast</key>
<signature>b</signature>
<default>false</default>
</schema>
<schema>
<key>chooser/MulticastAddr</key>
<signature>s</signature>
<default>ff02::1</default>
</schema>
<schema>
<key>daemon/User</key>
<signature>s</signature>
<default>@GDM_USERNAME@</default>
</schema>
<schema>
<key>daemon/Group</key>
<signature>s</signature>
<default>@GDM_GROUPNAME@</default>
</schema>
<schema>
<key>daemon/AutomaticLoginEnable</key>
<signature>b</signature>
<default>false</default>
</schema>
<schema>
<key>daemon/AutomaticLogin</key>
<signature>s</signature>
<default></default>
</schema>
<schema>
<key>daemon/TimedLoginEnable</key>
<signature>b</signature>
<default>false</default>
</schema>
<schema>
<key>daemon/TimedLogin</key>
<signature>s</signature>
<default></default>
</schema>
<schema>
<key>daemon/TimedLoginDelay</key>
<signature>i</signature>
<default>30</default>
</schema>
<schema>
<key>daemon/InitialSetupEnable</key>
<signature>b</signature>
<default>true</default>
</schema>
<schema>
<key>daemon/WaylandEnable</key>
<signature>b</signature>
<default>true</default>
</schema>
<schema>
<key>security/AllowRemoteAutoLogin</key>
<signature>b</signature>
<default>false</default>
</schema>
<schema>
<key>debug/Enable</key>
<signature>b</signature>
<default>false</default>
</schema>
<schema>
<key>security/DisallowTCP</key>
<signature>b</signature>
<default>true</default>
</schema>
<schema>
<key>xdmcp/Enable</key>
<signature>b</signature>
<default>false</default>
</schema>
<schema>
<key>xdmcp/ShowLocalGreeter</key>
<signature>b</signature>
<default>true</default>
</schema>
<schema>
<key>xdmcp/MaxPending</key>
<signature>i</signature>
<default>4</default>
</schema>
<schema>
<key>xdmcp/MaxSessions</key>
<signature>i</signature>
<default>16</default>
</schema>
<schema>
<key>xdmcp/MaxWait</key>
<signature>i</signature>
<default>30</default>
</schema>
<schema>
<key>xdmcp/DisplaysPerHost</key>
<signature>i</signature>
<default>1</default>
</schema>
<schema>
<key>xdmcp/Port</key>
<signature>i</signature>
<default>177</default>
</schema>
<schema>
<key>xdmcp/HonorIndirect</key>
<signature>b</signature>
<default>true</default>
</schema>
<schema>
<key>xdmcp/MaxWaitIndirect</key>
<signature>i</signature>
<default>30</default>
</schema>
<schema>
<key>xdmcp/PingIntervalSeconds</key>
<signature>i</signature>
<default>0</default>
</schema>
<schema>
<key>xdmcp/Willing</key>
<signature>s</signature>
<default>@gdmconfdir@/Xwilling</default>
</schema>
</schemalist>
</gdmschemafile>
......@@ -3,100 +3,100 @@
<schema id="org.gnome.login-screen" path="/org/gnome/login-screen/">
<key name="enable-fingerprint-authentication" type="b">
<default>true</default>
<_summary>
<summary>
Whether or not to allow fingerprint readers for login
</_summary>
<_description>
</summary>
<description>
The login screen can optionally allow users who have enrolled
their fingerprints to log in using those prints.
</_description>
</description>
</key>
<key name="enable-smartcard-authentication" type="b">
<default>true</default>
<_summary>
<summary>
Whether or not to allow smartcard readers for login
</_summary>
<_description>
</summary>
<description>
The login screen can optionally allow users who have smartcards
to log in using those smartcards.
</_description>
</description>
</key>
<key name="enable-password-authentication" type="b">
<default>true</default>
<_summary>
<summary>
Whether or not to allow passwords for login
</_summary>
<_description>
</summary>
<description>
The login screen can be configured to disallow password authentication,
forcing the user to use smartcard or fingerprint authentication.
</_description>
</description>
</key>
<key name="logo" type="s">
<default>''</default>
<_summary>
<summary>
Path to small image at top of user list
</_summary>
<_description>
</summary>
<description>
The login screen can optionally show a small image to provide site
administrators and distributions a way to display branding.
</_description>
</description>
</key>
<key name="fallback-logo" type="s">
<default>''</default>
<_summary>
<summary>
Path to small image at top of user list
</_summary>
<_description>
</summary>
<description>
The fallback login screen can optionally show a small image to provide
site administrators and distributions a way to display branding.
</_description>
</description>
</key>
<key name="disable-user-list" type="b">
<default>false</default>
<_summary>
<summary>
Avoid showing user list
</_summary>
<_description>
</summary>
<description>
The login screen normally shows a list of available users to log in
as. This setting can be toggled to disable showing the user list.
</_description>
</description>
</key>
<key name="banner-message-enable" type="b">
<default>false</default>
<_summary>
<summary>
Enable showing the banner message
</_summary>
<_description>
</summary>
<description>
Set to true to show the banner message text.
</_description>
</description>
</key>
<key name="banner-message-text" type="s">
<default>''</default>
<_summary>
<summary>
Banner message text
</_summary>
<_description>
</summary>
<description>
Text banner message to show in the login window.
</_description>
</description>
</key>
<key name="disable-restart-buttons" type="b">
<default>false</default>
<_summary>
<summary>
Disable showing the restart buttons
</_summary>
<_description>
</summary>
<description>
Set to true to disable showing the restart buttons in the login window.
</_description>
</description>
</key>
<key name="allowed-failures" type="i">
<default>3</default>
<_summary>
<summary>
Number of allowed authentication failures
</_summary>
<_description>
</summary>
<description>
The number of times a user is allowed to attempt authentication, before
giving up and going back to user selection.
</_description>
</description>
</key>
</schema>
</schemalist>
# 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 = GDM 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://gitlab.gnome.org/GNOME/gdm/issues
# 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
......@@ -38,8 +38,7 @@ daemon/gdm-x-session.c
daemon/main.c
daemon/session-worker-main.c
daemon/test-session-client.c
data/gdm.schemas.in.in
data/org.gnome.login-screen.gschema.xml.in
data/org.gnome.login-screen.gschema.xml
libgdm/gdm-user-switching.c
utils/gdmflexiserver.c
utils/gdm-screenshot.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