[five-or-more] Revert "Migrate to Gettext"
- From: Robert Roth <robertroth src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [five-or-more] Revert "Migrate to Gettext"
- Date: Mon, 26 Feb 2018 17:07:48 +0000 (UTC)
commit 8909125aa1c03eb80924a561dfaf1570851c1291
Author: Robert Roth <robert roth off gmail com>
Date: Mon Feb 26 19:07:29 2018 +0200
Revert "Migrate to Gettext"
This reverts commit 032961ffa3be3523e8f525d1648ed8140430e2eb.
autogen.sh | 1 +
configure.ac | 3 +-
data/Makefile.am | 6 +-
data/five-or-more.appdata.xml.in | 14 ++--
data/five-or-more.desktop.in | 8 +--
git.mk | 135 +++++--------------------------------
po/Makevars | 78 ----------------------
po/POTFILES.in | 7 +-
8 files changed, 37 insertions(+), 215 deletions(-)
---
diff --git a/autogen.sh b/autogen.sh
index ace9e51..941dd06 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -32,6 +32,7 @@ if [ "$#" = 0 -a "x$NOCONFIGURE" = "x" ]; then
fi
aclocal --install || exit 1
+intltoolize --force --copy --automake || exit 1
autoreconf --verbose --force --install -Wno-portability || exit 1
cd $olddir
diff --git a/configure.ac b/configure.ac
index 584d740..fd83970 100644
--- a/configure.ac
+++ b/configure.ac
@@ -36,8 +36,7 @@ dnl ###########################################################################
dnl Internationalization
dnl ###########################################################################
-AM_GNU_GETTEXT_VERSION([0.19.8])
-AM_GNU_GETTEXT([external])
+IT_PROG_INTLTOOL([0.50])
AC_SUBST(GETTEXT_PACKAGE, five-or-more)
AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [The gettext package name])
diff --git a/data/Makefile.am b/data/Makefile.am
index 2b2d31f..caf95bc 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -21,14 +21,12 @@ man_MANS = five-or-more.6
desktop_in_files = five-or-more.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_DESKTOP_RULE@
appstream_in_files = five-or-more.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 $@
+@INTLTOOL_XML_RULE@
EXTRA_DIST = \
$(theme_DATA) \
diff --git a/data/five-or-more.appdata.xml.in b/data/five-or-more.appdata.xml.in
index 74a315b..3e2f0d9 100644
--- a/data/five-or-more.appdata.xml.in
+++ b/data/five-or-more.appdata.xml.in
@@ -4,19 +4,19 @@
<id>five-or-more.desktop</id>
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-3.0+</project_license>
- <name>Five or More</name>
- <summary>Remove colored balls from the board by forming lines</summary>
+ <_name>Five or More</_name>
+ <_summary>Remove colored balls from the board by forming lines</_summary>
<description>
- <p>
+ <_p>
Five or More is the GNOME port of a once-popular computer game. Align five or
more objects of the same color into a line to cause them to disappear and
score points. Earn many more points by lining up as many objects as possible
before clearing them.
- </p>
- <p>
+ </_p>
+ <_p>
More objects appear after every turn. Play for as long as possible, until the
board is completely full!
- </p>
+ </_p>
</description>
<screenshots>
<screenshot height="524" width="972" type="default">
@@ -37,7 +37,7 @@
<kudo>UserDocs</kudo>
</kudos>
<translation type="gettext">five-or-more</translation>
- <developer_name>The GNOME Project</developer_name>
+ <_developer_name>The GNOME Project</_developer_name>
<!-- Generated by http://apps-xdgapp.rhcloud.com/oars -->
<content_rating type="oars-1.0">
<content_attribute id="violence-cartoon">none</content_attribute>
diff --git a/data/five-or-more.desktop.in b/data/five-or-more.desktop.in
index f3fcc44..bb53905 100644
--- a/data/five-or-more.desktop.in
+++ b/data/five-or-more.desktop.in
@@ -1,10 +1,8 @@
[Desktop Entry]
-Name=Five or More
-Comment=Remove colored balls from the board by forming lines
-# Translators: Search terms to find this application. Do NOT translate or localize the semicolons! The list
MUST also end with a semicolon!
-Keywords=game;strategy;logic;
+_Name=Five or More
+_Comment=Remove colored balls from the board by forming lines
+_Keywords=game;strategy;logic;
Exec=five-or-more
-# Translators: Do NOT translate or transliterate this text (this is an icon file name)!
Icon=five-or-more
Terminal=false
Type=Application
diff --git a/git.mk b/git.mk
index 90de80f..5467b86 100644
--- a/git.mk
+++ b/git.mk
@@ -1,5 +1,4 @@
-# git.mk, a small Makefile to autogenerate .gitignore files
-# for autotools-based projects.
+# git.mk
#
# Copyright 2009, Red Hat, Inc.
# Copyright 2010,2011,2012,2013 Behdad Esfahbod
@@ -10,8 +9,7 @@
# notice and this notice are preserved.
#
# The latest version of this file can be downloaded from:
-GIT_MK_URL = https://raw.githubusercontent.com/behdad/git.mk/master/git.mk
-#
+# https://raw.github.com/behdad/git.mk/master/git.mk
# Bugs, etc, should be reported upstream at:
# https://github.com/behdad/git.mk
#
@@ -47,8 +45,7 @@ GIT_MK_URL = https://raw.githubusercontent.com/behdad/git.mk/master/git.mk
# build dir.
#
# This file knows how to handle autoconf, automake, libtool, gtk-doc,
-# gnome-doc-utils, yelp.m4, mallard, intltool, gsettings, dejagnu, appdata,
-# appstream, hotdoc.
+# gnome-doc-utils, yelp.m4, mallard, intltool, gsettings, dejagnu.
#
# This makefile provides the following targets:
#
@@ -80,88 +77,39 @@ GITIGNORE_MAINTAINERCLEANFILES_TOPLEVEL = \
$(srcdir)/aclocal.m4 \
$(srcdir)/autoscan.log \
$(srcdir)/configure.scan \
- `AUX_DIR=$(srcdir)/$$(cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_AUX_DIR:$$1' ./configure.ac); \
+ `AUX_DIR=$(srcdir)/$$($(AUTOCONF) --trace 'AC_CONFIG_AUX_DIR:$$1' $(srcdir)/configure.ac); \
test "x$$AUX_DIR" = "x$(srcdir)/" && AUX_DIR=$(srcdir); \
for x in \
ar-lib \
compile \
config.guess \
- config.rpath \
config.sub \
depcomp \
install-sh \
ltmain.sh \
missing \
mkinstalldirs \
- test-driver \
- ylwrap \
; do echo "$$AUX_DIR/$$x"; done` \
- `cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_HEADERS:$$1' ./configure.ac | \
+ `$(AUTOCONF) --trace 'AC_CONFIG_HEADERS:$$1' $(srcdir)/configure.ac | \
head -n 1 | while read f; do echo "$(srcdir)/$$f.in"; done`
#
# All modules should also be fine including the following variable, which
# removes automake-generated Makefile.in files:
GITIGNORE_MAINTAINERCLEANFILES_MAKEFILE_IN = \
- `cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_FILES:$$1' ./configure.ac | \
+ `$(AUTOCONF) --trace 'AC_CONFIG_FILES:$$1' $(srcdir)/configure.ac | \
while read f; do \
case $$f in Makefile|*/Makefile) \
test -f "$(srcdir)/$$f.am" && echo "$(srcdir)/$$f.in";; esac; \
done`
#
-# Modules that use libtool and use AC_CONFIG_MACRO_DIR() may also include this,
-# though it's harmless to include regardless.
+# Modules that use libtool /and/ use AC_CONFIG_MACRO_DIR([m4]) may also
+# include this:
GITIGNORE_MAINTAINERCLEANFILES_M4_LIBTOOL = \
- `MACRO_DIR=$(srcdir)/$$(cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_MACRO_DIR:$$1'
./configure.ac); \
- if test "x$$MACRO_DIR" != "x$(srcdir)/"; then \
- for x in \
- libtool.m4 \
- ltoptions.m4 \
- ltsugar.m4 \
- ltversion.m4 \
- lt~obsolete.m4 \
- ; do echo "$$MACRO_DIR/$$x"; done; \
- fi`
-#
-# Modules that use gettext and use AC_CONFIG_MACRO_DIR() may also include this,
-# though it's harmless to include regardless.
-GITIGNORE_MAINTAINERCLEANFILES_M4_GETTEXT = \
- `MACRO_DIR=$(srcdir)/$$(cd $(top_srcdir); $(AUTOCONF) --trace 'AC_CONFIG_MACRO_DIR:$$1'
./configure.ac); \
- if test "x$$MACRO_DIR" != "x$(srcdir)/"; then \
- for x in \
- codeset.m4 \
- extern-inline.m4 \
- fcntl-o.m4 \
- gettext.m4 \
- glibc2.m4 \
- glibc21.m4 \
- iconv.m4 \
- intdiv0.m4 \
- intl.m4 \
- intldir.m4 \
- intlmacosx.m4 \
- intmax.m4 \
- inttypes-pri.m4 \
- inttypes_h.m4 \
- lcmessage.m4 \
- lib-ld.m4 \
- lib-link.m4 \
- lib-prefix.m4 \
- lock.m4 \
- longlong.m4 \
- nls.m4 \
- po.m4 \
- printf-posix.m4 \
- progtest.m4 \
- size_max.m4 \
- stdint_h.m4 \
- threadlib.m4 \
- uintmax_t.m4 \
- visibility.m4 \
- wchar_t.m4 \
- wint_t.m4 \
- xsize.m4 \
- ; do echo "$$MACRO_DIR/$$x"; done; \
- fi`
+ $(srcdir)/m4/libtool.m4 \
+ $(srcdir)/m4/ltoptions.m4 \
+ $(srcdir)/m4/ltsugar.m4 \
+ $(srcdir)/m4/ltversion.m4 \
+ $(srcdir)/m4/lt~obsolete.m4
@@ -193,10 +141,7 @@ git-mk-install:
fi; \
fi; done; test -z "$$any_failed"
-git-mk-update:
- wget $(GIT_MK_URL) -O $(top_srcdir)/git.mk
-
-.PHONY: git-all git-mk-install git-mk-update
+.PHONY: git-all git-mk-install
@@ -204,7 +149,7 @@ git-mk-update:
# Actual .gitignore generation:
###############################################################################
-$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk $(top_srcdir)/configure.ac
+$(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk
@echo "git.mk: Generating $@"
@{ \
if test "x$(DOC_MODULE)" = x -o "x$(DOC_MAIN_SGML_FILE)" = x; then :; else \
@@ -213,24 +158,8 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk $(top_srcdir)/configure.a
$(DOC_MODULE)-decl.txt \
tmpl/$(DOC_MODULE)-unused.sgml \
"tmpl/*.bak" \
- $(REPORT_FILES) \
- $(DOC_MODULE).pdf \
xml html \
; do echo "/$$x"; done; \
- FLAVOR=$$(cd $(top_srcdir); $(AUTOCONF) --trace 'GTK_DOC_CHECK:$$2' ./configure.ac); \
- case $$FLAVOR in *no-tmpl*) echo /tmpl;; esac; \
- if echo "$(SCAN_OPTIONS)" | grep -q "\-\-rebuild-types"; then \
- echo "/$(DOC_MODULE).types"; \
- fi; \
- if echo "$(SCAN_OPTIONS)" | grep -q "\-\-rebuild-sections"; then \
- echo "/$(DOC_MODULE)-sections.txt"; \
- fi; \
- if test "$(abs_srcdir)" != "$(abs_builddir)" ; then \
- for x in \
- $(SETUP_FILES) \
- $(DOC_MODULE).types \
- ; do echo "/$$x"; done; \
- fi; \
fi; \
if test "x$(DOC_MODULE)$(DOC_ID)" = x -o "x$(DOC_LINGUAS)" = x; then :; else \
for lc in $(DOC_LINGUAS); do \
@@ -250,15 +179,6 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk $(top_srcdir)/configure.a
"*/*.omf.out" \
; do echo /$$x; done; \
fi; \
- if test "x$(HOTDOC)" = x; then :; else \
- $(foreach project, $(HOTDOC_PROJECTS),echo "/$(call HOTDOC_TARGET,$(project))"; \
- echo "/$(shell $(call HOTDOC_PROJECT_COMMAND,$(project)) --get-conf-path
output)" ; \
- echo "/$(shell $(call HOTDOC_PROJECT_COMMAND,$(project))
--get-private-folder)" ; \
- ) \
- for x in \
- .hotdoc.d \
- ; do echo "/$$x"; done; \
- fi; \
if test "x$(HELP_ID)" = x -o "x$(HELP_LINGUAS)" = x; then :; else \
for lc in $(HELP_LINGUAS); do \
for x in \
@@ -274,19 +194,8 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk $(top_srcdir)/configure.a
$(gsettings__enum_file) \
; do echo "/$$x"; done; \
fi; \
- if test "x$(appdata_XML)" = x; then :; else \
- for x in \
- $(appdata_XML:.xml=.valid) \
- ; do echo "/$$x"; done; \
- fi; \
- if test "x$(appstream_XML)" = x; then :; else \
- for x in \
- $(appstream_XML:.xml=.valid) \
- ; do echo "/$$x"; done; \
- fi; \
if test -f $(srcdir)/po/Makefile.in.in; then \
for x in \
- ABOUT-NLS \
po/Makefile.in.in \
po/Makefile.in.in~ \
po/Makefile.in \
@@ -295,7 +204,6 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk $(top_srcdir)/configure.a
po/POTFILES \
po/Rules-quot \
po/stamp-it \
- po/stamp-po \
po/.intltool-merge-cache \
"po/*.gmo" \
"po/*.header" \
@@ -327,7 +235,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk $(top_srcdir)/configure.a
if test "x$(am__dirstamp)" = x; then :; else \
echo "$(am__dirstamp)"; \
fi; \
- if test "x$(findstring libtool,$(LTCOMPILE))" = x -a "x$(findstring libtool,$(LTCXXCOMPILE))"
= x -a "x$(GTKDOC_RUN)" = x; then :; else \
+ if test "x$(LTCOMPILE)" = x; then :; else \
for x in \
"*.lo" \
".libs" "_libs" \
@@ -345,9 +253,7 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk $(top_srcdir)/configure.a
$(TEST_LOGS) \
$(TEST_LOGS:.log=.trs) \
$(TEST_SUITE_LOG) \
- $(TESTS:=.test) \
- "*.gcda" \
- "*.gcno" \
+ "*.$(OBJEXT)" \
$(DISTCLEANFILES) \
$(am__CONFIG_DISTCLEAN_FILES) \
$(CONFIG_CLEAN_FILES) \
@@ -355,10 +261,11 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk $(top_srcdir)/configure.a
"*.tab.c" \
$(MAINTAINERCLEANFILES) \
$(BUILT_SOURCES) \
+ $(DEPDIR) \
$(patsubst %.vala,%.c,$(filter %.vala,$(SOURCES))) \
$(filter %_vala.stamp,$(DIST_COMMON)) \
$(filter %.vapi,$(DIST_COMMON)) \
- $(filter $(addprefix %,$(notdir $(patsubst %.vapi,%.h,$(filter
%.vapi,$(DIST_COMMON))))),$(DIST_COMMON)) \
+ $(patsubst %.vapi,%.h,$(filter %.vapi,$(DIST_COMMON))) \
Makefile \
Makefile.in \
"*.orig" \
@@ -368,10 +275,6 @@ $(srcdir)/.gitignore: Makefile.am $(top_srcdir)/git.mk $(top_srcdir)/configure.a
".*.sw[nop]" \
".dirstamp" \
; do echo "/$$x"; done; \
- for x in \
- "*.$(OBJEXT)" \
- $(DEPDIR) \
- ; do echo "$$x"; done; \
} | \
sed "s@^/`echo "$(srcdir)" | sed 's/\(.\)/[\1]/g'`/@/@" | \
sed 's@/[.]/@/@g' | \
diff --git a/po/POTFILES.in b/po/POTFILES.in
index faa06d8..9edc91f 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -1,10 +1,11 @@
# List of source files containing translatable strings.
# Please keep this file in alphabetical order.
+[encoding: UTF-8]
data/five-or-more.appdata.xml.in
data/five-or-more.desktop.in
-data/five-or-more-preferences.ui
-data/five-or-more.ui
-data/menu.ui
+[type: gettext/glade]data/five-or-more-preferences.ui
+[type: gettext/glade]data/five-or-more.ui
+[type: gettext/glade]data/menu.ui
data/org.gnome.five-or-more.gschema.xml
src/five-or-more.c
src/games-scores-dialog.c
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
