Commit d14c3002 authored by Michael Catanzaro's avatar Michael Catanzaro

Revert "Stop using intltool"

This reverts commit b74f5c61.
parent 4b2f01ae
......@@ -25,7 +25,8 @@ fi
git submodule update --init --recursive
aclocal --install || exit 1
autoreconf --verbose --force --install || exit 1
intltoolize --force --copy --automake || exit 1
autoreconf --verbose --force --install -Wno-portability || exit 1
cd "$olddir"
if [ "$NOCONFIGURE" = "" ]; then
......
......@@ -183,8 +183,7 @@ else
AC_MSG_ERROR([iso-codes is required])
fi
AM_GNU_GETTEXT([external])
AM_GNU_GETTEXT_VERSION([0.19.8])
IT_PROG_INTLTOOL([0.50.0])
AC_SUBST([GETTEXT_PACKAGE], [epiphany])
# ****************
......
......@@ -4,8 +4,9 @@ desktop_in_files = org.gnome.Epiphany.desktop.in
desktopdir = $(datadir)/applications
desktop_DATA = $(desktop_in_files:.desktop.in=.desktop)
$(desktop_DATA): $(desktop_in_files)
$(AM_V_GEN) $(MSGFMT) --desktop --template $< -d $(top_srcdir)/po -o $@
@INTLTOOL_SERVER_RULE@
@INTLTOOL_DESKTOP_RULE@
@INTLTOOL_XML_RULE@
gsettings_ENUM_NAMESPACE = org.gnome.Epiphany
gsettings_ENUM_FILES = $(top_srcdir)/lib/ephy-prefs.h
......@@ -17,9 +18,6 @@ appstream_in_files = org.gnome.Epiphany.appdata.xml.in
appstream_XML = $(appstream_in_files:.xml.in=.xml)
@APPSTREAM_XML_RULES@
$(appstream_XML): $(appstream_in_files)
$(AM_V_GEN) $(MSGFMT) --xml --template $< -d $(top_srcdir)/po -o $@
# Dbus service file
servicedir = $(datadir)/dbus-1/services
service_in_files = org.gnome.EpiphanySearchProvider.service.in
......@@ -30,11 +28,16 @@ $(service_DATA): $(service_in_files) Makefile
$(AM_V_GEN) sed -e "s|\@libexecdir[@]|$(libexecdir)|g" $< > $@
# Default bookmarks
# We don't put translations in the resulting rdf since the code can get
# the translations via gettext (although it can also get translations
# from the rdf if they are there and not available via gettext)
default_bookmarksdir = $(pkgdatadir)
default_bookmarks_in_files = default-bookmarks.rdf.in
default_bookmarks_DATA = $(default_bookmarks_in_files:.rdf.in=.rdf)
$(default_bookmarks_DATA): $(default_bookmarks_in_files) Makefile
$(AM_V_GEN) sed -e "s|\@pkgdatadir[@]|$(pkgdatadir)|g" $< > $@
$(default_bookmarks_DATA): $(default_bookmarks_in_files) Makefile $(INTLTOOL_MERGE)
LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@.tmp
sed -e "s|\@pkgdatadir\@|$(pkgdatadir)|g" $@.tmp > $@ || rm -f $@.tmp
rm -f $@.tmp
searchproviderdir = $(datadir)/gnome-shell/search-providers
dist_searchprovider_DATA = epiphany-search-provider.ini
......
......@@ -3,23 +3,23 @@
<component type="desktop">
<id>org.gnome.Epiphany.desktop</id>
<metadata_license>CC0-1.0</metadata_license>
<name>GNOME Web</name>
<summary>Web browser for GNOME</summary>
<_name>GNOME Web</_name>
<_summary>Web browser for GNOME</_summary>
<description>
<p>
<_p>
The web browser for GNOME, featuring tight integration with the desktop
and a simple and intuitive user interface that allows you to focus on your
web pages. If you’re looking for a simple, clean, beautiful view of the
web, this is the browser for you.
</p>
<p>
</_p>
<_p>
GNOME Web is often referred to by its code name, Epiphany.
</p>
</_p>
</description>
<screenshots>
<screenshot type="default">
<image>https://git.gnome.org/browse/epiphany/plain/data/screenshot.png</image>
<caption>The GNOME web site displayed in GNOME Web</caption>
<_caption>The GNOME web site displayed in GNOME Web</_caption>
</screenshot>
</screenshots>
<url type="homepage">https://wiki.gnome.org/Apps/Web</url>
......@@ -34,7 +34,7 @@
<project_group>GNOME</project_group>
<compulsory_for_desktop>GNOME</compulsory_for_desktop>
<project_license>GPL-2.0+</project_license>
<developer_name>The GNOME Project</developer_name>
<_developer_name>The GNOME Project</_developer_name>
<url type="bugtracker">https://bugzilla.gnome.org/enter_bug.cgi?product=epiphany</url>
<url type="donation">http://www.gnome.org/friends/</url>
<url type="help">https://help.gnome.org/users/epiphany/stable/</url>
......
[Desktop Entry]
Name=Web
GenericName=Web Browser
Comment=Browse the web
# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list MUST also end with a semicolon!
Keywords=web;browser;internet;
_Name=Web
_GenericName=Web Browser
_X-GNOME-FullName=Epiphany Web Browser
_Comment=Browse the web
_Keywords=web;browser;internet;
Exec=epiphany %U
StartupNotify=true
Terminal=false
......@@ -15,5 +15,5 @@ MimeType=text/html;text/xml;application/xhtml+xml;x-scheme-handler/http;x-scheme
Actions=Incognito;
[Desktop Action Incognito]
Name=New Incognito Window
_Name=New Incognito Window
Exec=epiphany --incognito-mode
# 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 = Free Software Foundation, Inc.
# 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 =
# 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
[encoding: UTF-8]
# List of source files containing translatable strings.
# Please keep this file sorted alphabetically.
data/org.gnome.Epiphany.appdata.xml.in
......@@ -45,20 +46,20 @@ src/passwords-dialog.c
src/popup-commands.c
src/prefs-dialog.c
src/profile-migrator/ephy-profile-migrator.c
src/resources/gtk/application-menu.ui
src/resources/gtk/bookmark-properties-grid.ui
src/resources/gtk/bookmarks-popover.ui
src/resources/gtk/clear-data-dialog.ui
src/resources/gtk/cookies-dialog.ui
src/resources/gtk/encoding-dialog.ui
src/resources/gtk/history-dialog.ui
src/resources/gtk/menus.ui
src/resources/gtk/page-menu-popover.ui
src/resources/gtk/passwords-dialog.ui
src/resources/gtk/prefs-dialog.ui
src/resources/gtk/prefs-lang-dialog.ui
src/resources/gtk/search-engine-dialog.ui
src/resources/gtk/shortcuts-dialog.ui
[type: gettext/glade]src/resources/gtk/application-menu.ui
[type: gettext/glade]src/resources/gtk/bookmark-properties-grid.ui
[type: gettext/glade]src/resources/gtk/bookmarks-popover.ui
[type: gettext/glade]src/resources/gtk/clear-data-dialog.ui
[type: gettext/glade]src/resources/gtk/cookies-dialog.ui
[type: gettext/glade]src/resources/gtk/encoding-dialog.ui
[type: gettext/glade]src/resources/gtk/history-dialog.ui
[type: gettext/glade]src/resources/gtk/menus.ui
[type: gettext/glade]src/resources/gtk/page-menu-popover.ui
[type: gettext/glade]src/resources/gtk/passwords-dialog.ui
[type: gettext/glade]src/resources/gtk/prefs-dialog.ui
[type: gettext/glade]src/resources/gtk/prefs-lang-dialog.ui
[type: gettext/glade]src/resources/gtk/search-engine-dialog.ui
[type: gettext/glade]src/resources/gtk/shortcuts-dialog.ui
src/search-provider/ephy-search-provider.c
src/sync/ephy-sync-secret.c
src/sync/ephy-sync-service.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