From 5cf68885243c049336a0fa0aeb77bbf4217a7cf4 Mon Sep 17 00:00:00 2001 From: Jordi Albornoz Date: Mon, 6 Jan 2003 22:21:13 +0000 Subject: [PATCH] Added intltool support, and upgrade to gettext 0.11.5. --- .cvsignore | 7 + ChangeLog | 9 ++ Makefile.am | 7 +- configure.in | 2 + gtetrinet.desktop | 9 -- gtetrinet.desktop.in | 7 + po/Makefile.in.in | 351 +++++++++++++++++++++++++------------------ po/POTFILES.in | 2 + po/ca.po | 88 ++++++----- po/de.po | 312 +++++++++++++++++++++++++++++--------- 10 files changed, 524 insertions(+), 270 deletions(-) delete mode 100644 gtetrinet.desktop create mode 100644 gtetrinet.desktop.in diff --git a/.cvsignore b/.cvsignore index b287763..ce3f79d 100644 --- a/.cvsignore +++ b/.cvsignore @@ -14,7 +14,14 @@ config.sub configure configure.lineno depcomp +gtetrinet.desktop install-sh +intltool-extract.in +intltool-merge.in +intltool-update.in +intltool-extract +intltool-merge +intltool-update missing mkinstalldirs stamp-h1 diff --git a/ChangeLog b/ChangeLog index 9f6e74e..b5bc68f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2003-01-06 Jordi Mallach + + * Makefile.am: add intltool support. + * configure.in: likewise. + * gtetrinet.desktop.in: new, generated from gtetrinet.desktop. + + * ABOUT-NLS: upgraded to gettext 0.11.5. + * config.rpath: likewise. + 2003-01-06 Dani Carbonell * src/dialogs.c (prefdialog_ok): new function. diff --git a/Makefile.am b/Makefile.am index 4a91def..cc9e4e9 100644 --- a/Makefile.am +++ b/Makefile.am @@ -3,12 +3,17 @@ SUBDIRS= doc po src themes icon_DATA = gtetrinet.png icondir = $(datadir)/pixmaps -util_DATA = gtetrinet.desktop utildir = $(datadir)/gnome/apps/Games +util_in_files = gtetrinet.desktop.in +util_DATA = $(util_in_files:.desktop.in=.desktop) +@INTLTOOL_DESKTOP_RULE@ EXTRA_DIST = ABOUT-NLS AUTHORS COPYING ChangeLog INSTALL NEWS README \ TODO config.guess config.sub config.rpath install-sh \ + intltool-extract.in intltool-merge.in intltool-update.in \ missing mkinstalldirs $(icon_DATA) $(util_DATA) changelog: cvs2cl -b --utc -S --no-wrap -f ChangeLog.CVS + +ACLOCAL_AMFLAGS = -I m4 diff --git a/configure.in b/configure.in index 0b84e38..bb457e4 100644 --- a/configure.in +++ b/configure.in @@ -11,7 +11,9 @@ AC_SUBST(GETTEXT_PACKAGE) AC_PROG_CC +AC_PROG_INTLTOOL([0.23]) ALL_LINGUAS="ca de" +AM_GNU_GETTEXT_VERSION([0.11.5]) AM_GLIB_GNU_GETTEXT dnl ***************************************** diff --git a/gtetrinet.desktop b/gtetrinet.desktop deleted file mode 100644 index ccbe5d7..0000000 --- a/gtetrinet.desktop +++ /dev/null @@ -1,9 +0,0 @@ -[Desktop Entry] -Name=GTetrinet -Name[ca]=GTetrinet -Comment=Tetrinet client for GNOME -Comment[ca]=Client de Tetrinet per a GNOME -Exec=gtetrinet -Icon=gtetrinet.png -Terminal=0 -Type=Application diff --git a/gtetrinet.desktop.in b/gtetrinet.desktop.in new file mode 100644 index 0000000..0e42378 --- /dev/null +++ b/gtetrinet.desktop.in @@ -0,0 +1,7 @@ +[Desktop Entry] +_Name=GTetrinet +_Comment=Tetrinet client for GNOME +Exec=gtetrinet +Icon=gtetrinet.png +Terminal=0 +Type=Application diff --git a/po/Makefile.in.in b/po/Makefile.in.in index 20ccd41..8952856 100644 --- a/po/Makefile.in.in +++ b/po/Makefile.in.in @@ -1,18 +1,17 @@ -# Makefile for program source directory in GNU NLS utilities package. -# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper +# Makefile for PO directory in any package using GNU gettext. +# Copyright (C) 1995-1997, 2000-2002 by Ulrich Drepper # -# This file file be copied and used freely without restrictions. It can -# be used in projects which are not available under the GNU Public License -# but which still want to provide support for the GNU gettext functionality. -# Please note that the actual code is *not* freely available. +# This file can be copied and used freely without restrictions. It can +# be used in projects which are not available under the GNU General Public +# License but which still want to provide support for the GNU gettext +# functionality. +# Please note that the actual code of GNU gettext is covered by the GNU +# General Public License and is *not* in the public domain. +# +# - Modified by Intltool to use intltool instead of gettext directly. # -# - Modified by Owen Taylor to use GETTEXT_PACKAGE -# instead of PACKAGE and to look for po2tbl in ./ not in intl/ -# -# - Modified by jacob berkman to install -# Makefile.in.in and po2tbl.sed.in for use with glib-gettextize +# GENPOT -GETTEXT_PACKAGE = @GETTEXT_PACKAGE@ PACKAGE = @PACKAGE@ VERSION = @VERSION@ @@ -21,67 +20,63 @@ SHELL = /bin/sh srcdir = @srcdir@ top_srcdir = @top_srcdir@ +top_builddir = .. VPATH = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ -datadir = $(prefix)/@DATADIRNAME@ +datadir = @datadir@ localedir = $(datadir)/locale -gnulocaledir = $(prefix)/share/locale -gettextsrcdir = $(prefix)/share/glib-2.0/gettext/po -subdir = po +gettextsrcdir = $(datadir)/gettext/po INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ -MKINSTALLDIRS = $(top_srcdir)/@MKINSTALLDIRS@ +MKINSTALLDIRS = @MKINSTALLDIRS@ +mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac` -CC = @CC@ -GENCAT = @GENCAT@ -GMSGFMT = PATH=../src:$$PATH @GMSGFMT@ +DOMAIN = $(GETTEXT_PACKAGE) +GMSGFMT = @GMSGFMT@ MSGFMT = @MSGFMT@ -XGETTEXT = PATH=../src:$$PATH @XGETTEXT@ -MSGMERGE = PATH=../src:$$PATH msgmerge - -DEFS = @DEFS@ -CFLAGS = @CFLAGS@ -CPPFLAGS = @CPPFLAGS@ - -INCLUDES = -I.. -I$(top_srcdir)/intl +XGETTEXT = @XGETTEXT@ +INTLTOOL_UPDATE = @INTLTOOL_UPDATE@ +INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@ +INTLTOOL_MERGE = INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT) $(INTLTOOL_UPDATE) --dist --gettext-package $(DOMAIN) +MSGINIT = msginit +MSGCONV = msgconv +MSGFILTER = msgfilter -COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) - -SOURCES = POFILES = @POFILES@ GMOFILES = @GMOFILES@ -DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(GETTEXT_PACKAGE).pot \ -$(POFILES) $(GMOFILES) $(SOURCES) +UPDATEPOFILES = @UPDATEPOFILES@ +DUMMYPOFILES = @DUMMYPOFILES@ +DISTFILES.common = Makefile.in.in Makevars remove-potcdate.sin \ +$(DISTFILES.common.extra1) $(DISTFILES.common.extra2) $(DISTFILES.common.extra3) +DISTFILES = $(DISTFILES.common) POTFILES.in $(DOMAIN).pot \ +$(POFILES) $(GMOFILES) \ +$(DISTFILES.extra1) $(DISTFILES.extra2) $(DISTFILES.extra3) POTFILES = \ CATALOGS = @CATALOGS@ -CATOBJEXT = @CATOBJEXT@ -INSTOBJEXT = @INSTOBJEXT@ - -.SUFFIXES: -.SUFFIXES: .c .o .po .pox .gmo .mo .msg .cat -.c.o: - $(COMPILE) $< +# Makevars gets inserted here. (Don't remove this line!) -.po.pox: - $(MAKE) $(GETTEXT_PACKAGE).pot - $(MSGMERGE) $< $(srcdir)/$(GETTEXT_PACKAGE).pot -o $*.pox +.SUFFIXES: +.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-update .po.mo: - $(MSGFMT) -o $@ $< + @echo "$(MSGFMT) -c -o $@ $<"; \ + $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@ .po.gmo: - file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \ - && rm -f $$file && $(GMSGFMT) -o $$file $< + @lang=`echo $* | sed -e 's,.*/,,'`; \ + test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ + echo "$${cdcmd}rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o $${lang}.gmo $${lang}.po"; \ + cd $(srcdir) && rm -f $${lang}.gmo && $(GMSGFMT) -c --statistics -o t-$${lang}.gmo $${lang}.po && mv t-$${lang}.gmo $${lang}.gmo -.po.cat: - sed -f ../intl/po2msg.sed < $< > $*.msg \ - && rm -f $@ && $(GENCAT) $@ $*.msg +.sin.sed: + sed -e '/^#/d' $< > t-$@ + mv t-$@ $@ all: all-@USE_NLS@ @@ -89,155 +84,213 @@ all: all-@USE_NLS@ all-yes: $(CATALOGS) all-no: -$(srcdir)/$(GETTEXT_PACKAGE).pot: $(POTFILES) - $(XGETTEXT) --default-domain=$(GETTEXT_PACKAGE) --directory=$(top_srcdir) \ - --add-comments --keyword=_ --keyword=N_ \ - --files-from=$(srcdir)/POTFILES.in \ - && test ! -f $(GETTEXT_PACKAGE).po \ - || ( rm -f $(srcdir)/$(GETTEXT_PACKAGE).pot \ - && mv $(GETTEXT_PACKAGE).po $(srcdir)/$(GETTEXT_PACKAGE).pot ) +# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update', +# otherwise packages like GCC can not be built if only parts of the source +# have been downloaded. + +$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in + INTLTOOL_EXTRACT=$(INTLTOOL_EXTRACT); \ + $(INTLTOOL_UPDATE) --pot --gettext-package $(DOMAIN) + +$(srcdir)/$(DOMAIN).pot: + $(MAKE) $(DOMAIN).pot-update + +$(POFILES): $(srcdir)/$(DOMAIN).pot + @lang=`echo $@ | sed -e 's,.*/,,' -e 's/\.po$$//'`; \ + test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ + echo "$${cdcmd}$(INTLTOOL_UPDATE) $${lang}.po"; \ + cd $(srcdir) && $(INTLTOOL_UPDATE) $${lang}; install: install-exec install-data install-exec: install-data: install-data-@USE_NLS@ -install-data-no: all -install-data-yes: all - if test -r "$(MKINSTALLDIRS)"; then \ - $(MKINSTALLDIRS) $(DESTDIR)$(datadir); \ + if test "$(PACKAGE)" = "gettext"; then \ + $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ + for file in $(DISTFILES.common); do \ + $(INSTALL_DATA) $(srcdir)/$$file \ + $(DESTDIR)$(gettextsrcdir)/$$file; \ + done; \ else \ - $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(datadir); \ + : ; \ fi +install-data-no: all +install-data-yes: all + $(mkinstalldirs) $(DESTDIR)$(datadir) @catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ - case "$$cat" in \ - *.gmo) destdir=$(gnulocaledir);; \ - *) destdir=$(localedir);; \ - esac; \ - lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ - dir=$(DESTDIR)$$destdir/$$lang/LC_MESSAGES; \ - if test -r "$(MKINSTALLDIRS)"; then \ - $(MKINSTALLDIRS) $$dir; \ - else \ - $(SHELL) $(top_srcdir)/mkinstalldirs $$dir; \ - fi; \ - if test -r $$cat; then \ - $(INSTALL_DATA) $$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ - echo "installing $$cat as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \ - else \ - $(INSTALL_DATA) $(srcdir)/$$cat $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ - echo "installing $(srcdir)/$$cat as" \ - "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT)"; \ - fi; \ - if test -r $$cat.m; then \ - $(INSTALL_DATA) $$cat.m $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ - echo "installing $$cat.m as $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \ - else \ - if test -r $(srcdir)/$$cat.m ; then \ - $(INSTALL_DATA) $(srcdir)/$$cat.m \ - $$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ - echo "installing $(srcdir)/$$cat as" \ - "$$dir/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m"; \ - else \ - true; \ + lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ + $(mkinstalldirs) $(DESTDIR)$$dir; \ + if test -r $$cat; then realcat=$$cat; else realcat=$(srcdir)/$$cat; fi; \ + $(INSTALL_DATA) $$realcat $(DESTDIR)$$dir/$(DOMAIN).mo; \ + echo "installing $$realcat as $(DESTDIR)$$dir/$(DOMAIN).mo"; \ + for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ + if test -n "$$lc"; then \ + if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ + link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \ + mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ + mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ + (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \ + for file in *; do \ + if test -f $$file; then \ + ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \ + fi; \ + done); \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ + else \ + if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \ + :; \ + else \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \ + mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ + fi; \ + fi; \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ + ln -s ../LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \ + ln $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo 2>/dev/null || \ + cp -p $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(DOMAIN).mo $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ + echo "installing $$realcat link as $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo"; \ fi; \ - fi; \ + done; \ done - if test "$(PACKAGE)" = "glib"; then \ - if test -r "$(MKINSTALLDIRS)"; then \ - $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \ - else \ - $(SHELL) $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \ - fi; \ - $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ - $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ + +install-strip: install + +installdirs: installdirs-exec installdirs-data +installdirs-exec: +installdirs-data: installdirs-data-@USE_NLS@ + if test "$(PACKAGE)" = "gettext"; then \ + $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ else \ : ; \ fi +installdirs-data-no: +installdirs-data-yes: + $(mkinstalldirs) $(DESTDIR)$(datadir) + @catalogs='$(CATALOGS)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ + dir=$(localedir)/$$lang/LC_MESSAGES; \ + $(mkinstalldirs) $(DESTDIR)$$dir; \ + for lc in '' $(EXTRA_LOCALE_CATEGORIES); do \ + if test -n "$$lc"; then \ + if (cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc 2>/dev/null) | grep ' -> ' >/dev/null; then \ + link=`cd $(DESTDIR)$(localedir)/$$lang && LC_ALL=C ls -l -d $$lc | sed -e 's/^.* -> //'`; \ + mv $(DESTDIR)$(localedir)/$$lang/$$lc $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ + mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ + (cd $(DESTDIR)$(localedir)/$$lang/$$lc.old && \ + for file in *; do \ + if test -f $$file; then \ + ln -s ../$$link/$$file $(DESTDIR)$(localedir)/$$lang/$$lc/$$file; \ + fi; \ + done); \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc.old; \ + else \ + if test -d $(DESTDIR)$(localedir)/$$lang/$$lc; then \ + :; \ + else \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc; \ + mkdir $(DESTDIR)$(localedir)/$$lang/$$lc; \ + fi; \ + fi; \ + fi; \ + done; \ + done # Define this as empty until I found a useful application. installcheck: -uninstall: +uninstall: uninstall-exec uninstall-data +uninstall-exec: +uninstall-data: uninstall-data-@USE_NLS@ + if test "$(PACKAGE)" = "gettext"; then \ + for file in $(DISTFILES.common); do \ + rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ + done; \ + else \ + : ; \ + fi +uninstall-data-no: +uninstall-data-yes: catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ - lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ - rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ - rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ - rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT); \ - rm -f $(DESTDIR)$(gnulocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE)$(INSTOBJEXT).m; \ + lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ + for lc in LC_MESSAGES $(EXTRA_LOCALE_CATEGORIES); do \ + rm -f $(DESTDIR)$(localedir)/$$lang/$$lc/$(DOMAIN).mo; \ + done; \ done - rm -f $(DESTDIR)$(gettextsrcdir)/po-Makefile.in.in check: all dvi info tags TAGS ID: mostlyclean: - rm -f core core.* *.pox $(GETTEXT_PACKAGE).po *.old.po cat-id-tbl.tmp + rm -f remove-potcdate.sed + rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po rm -fr *.o clean: mostlyclean distclean: clean - rm -f Makefile Makefile.in POTFILES *.mo *.msg *.cat *.cat.m + rm -f Makefile Makefile.in POTFILES *.mo maintainer-clean: distclean @echo "This command is intended for maintainers to use;" @echo "it deletes files that may require special tools to rebuild." rm -f $(GMOFILES) -distdir = ../$(GETTEXT_PACKAGE)-$(VERSION)/$(subdir) -dist distdir: update-po $(DISTFILES) +distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) +dist distdir: + $(MAKE) update-po + @$(MAKE) dist2 +# This is a separate target because 'update-po' must be executed before. +dist2: $(DISTFILES) dists="$(DISTFILES)"; \ + if test -f $(srcdir)/ChangeLog; then dists="$$dists ChangeLog"; fi; \ + if test -f $(srcdir)/LINGUAS; then dists="$$dists LINGUAS"; fi; \ for file in $$dists; do \ - ln $(srcdir)/$$file $(distdir) 2> /dev/null \ - || cp -p $(srcdir)/$$file $(distdir); \ + if test -f $$file; then \ + cp -p $$file $(distdir); \ + else \ + cp -p $(srcdir)/$$file $(distdir); \ + fi; \ done update-po: Makefile - $(MAKE) $(GETTEXT_PACKAGE).pot - PATH=`pwd`/../src:$$PATH; \ + $(MAKE) $(DOMAIN).pot-update + $(MAKE) $(UPDATEPOFILES) + $(MAKE) update-gmo + +# General rule for updating PO files. + +.nop.po-update: + @lang=`echo $@ | sed -e 's/\.po-update$$//'`; \ + if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; fi; \ + tmpdir=`pwd`; \ + echo "$$lang:"; \ + test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ + echo "$${cdcmd}$(INTLTOOL_MERGE) $(DOMAIN) $$lang.po"; \ cd $(srcdir); \ - catalogs='$(CATALOGS)'; \ - for cat in $$catalogs; do \ - cat=`basename $$cat`; \ - lang=`echo $$cat | sed 's/\$(CATOBJEXT)$$//'`; \ - mv $$lang.po $$lang.old.po; \ - echo "$$lang:"; \ - if $(MSGMERGE) $$lang.old.po $(GETTEXT_PACKAGE).pot -o $$lang.po; then \ - rm -f $$lang.old.po; \ - else \ - echo "msgmerge for $$cat failed!"; \ - rm -f $$lang.po; \ - mv $$lang.old.po $$lang.po; \ - fi; \ - done + if !$(INTLTOOL_MERGE) $(DOMAIN) $$lang.po; then \ + echo "intltool-update for $$lang.po failed!" 1>&2; \ + cp $$lang.old.po $$lang.po; \ + fi -# POTFILES is created from POTFILES.in by stripping comments, empty lines -# and Intltool tags (enclosed in square brackets), and appending a full -# relative path to them -POTFILES: POTFILES.in - ( if test 'x$(srcdir)' != 'x.'; then \ - posrcprefix='$(top_srcdir)/'; \ - else \ - posrcprefix="../"; \ - fi; \ - rm -f $@-t $@ \ - && (sed -e '/^#/d' \ - -e "s/^\[.*\] +//" \ - -e '/^[ ]*$$/d' \ - -e "s@.*@ $$posrcprefix& \\\\@" < $(srcdir)/$@.in \ - | sed -e '$$s/\\$$//') > $@-t \ - && chmod a-w $@-t \ - && mv $@-t $@ ) - -Makefile: Makefile.in.in ../config.status POTFILES - cd .. \ +$(DUMMYPOFILES): + +update-gmo: Makefile $(GMOFILES) + @: + +Makefile: Makefile.in.in $(top_builddir)/config.status POTFILES.in + cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@.in CONFIG_HEADERS= \ $(SHELL) ./config.status +force: + # Tell versions [3.59,3.63) of GNU make not to export all variables. # Otherwise a system limit (for SysV at least) may be exceeded. .NOEXPORT: diff --git a/po/POTFILES.in b/po/POTFILES.in index 580feab..f21be6a 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -6,3 +6,5 @@ src/gtetrinet.c src/partyline.c src/tetrinet.c src/winlist.c +# files added by intltool-prepare +gtetrinet.desktop.in diff --git a/po/ca.po b/po/ca.po index 8e51a07..eb02f74 100644 --- a/po/ca.po +++ b/po/ca.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gtetrinet 0.5.0\n" -"POT-Creation-Date: 2003-01-05 22:19+0100\n" +"POT-Creation-Date: 2003-01-06 18:43+0100\n" "PO-Revision-Date: 2003-01-05 22:21+0100\n" "Last-Translator: Jordi Mallach \n" "Language-Team: Catalan \n" @@ -82,7 +82,7 @@ msgstr "Finalitza" msgid "End the current game" msgstr "Finalitza el joc actual" -#: src/commands.c:82 src/dialogs.c:141 +#: src/commands.c:82 src/dialogs.c:148 msgid "Change team" msgstr "Equip" @@ -148,93 +148,93 @@ msgid "Warning: theme does not have a name" msgstr "Avís: el tema no te un nom" #. make dialog that asks for address/nickname -#: src/dialogs.c:82 src/dialogs.c:255 src/gtetrinet.c:65 +#: src/dialogs.c:84 src/dialogs.c:266 src/gtetrinet.c:65 msgid "Connect to server" msgstr "Connecta al servidor" -#: src/dialogs.c:148 src/dialogs.c:351 +#: src/dialogs.c:156 src/dialogs.c:362 msgid "Team name:" msgstr "Nom de l'equip:" #. game type radio buttons -#: src/dialogs.c:279 +#: src/dialogs.c:290 msgid "Original" msgstr "Original" -#: src/dialogs.c:281 +#: src/dialogs.c:292 msgid "TetriFast" msgstr "TetriFast" -#: src/dialogs.c:303 +#: src/dialogs.c:314 msgid "Server address" msgstr "Adreça del servidor" -#: src/dialogs.c:312 src/gtetrinet.c:68 +#: src/dialogs.c:323 src/gtetrinet.c:68 msgid "Connect as a spectator" msgstr "Connecta com espectador" -#: src/dialogs.c:316 +#: src/dialogs.c:327 msgid "Password:" msgstr "Contrasenya:" -#: src/dialogs.c:330 +#: src/dialogs.c:341 msgid "Spectate game" msgstr "Espectar el joc" -#: src/dialogs.c:339 +#: src/dialogs.c:350 msgid "Nick name:" msgstr "Nom d'usuari:" -#: src/dialogs.c:368 +#: src/dialogs.c:379 msgid "Player information" msgstr "Informació del jugador" -#: src/dialogs.c:407 +#: src/dialogs.c:418 msgid "Change Key" msgstr "Canvia la tecla" -#: src/dialogs.c:463 +#: src/dialogs.c:476 msgid "Move right" msgstr "Mou a la dreta" -#: src/dialogs.c:464 +#: src/dialogs.c:477 msgid "Move left" msgstr "Mou a l'esquerra" -#: src/dialogs.c:465 +#: src/dialogs.c:478 msgid "Move down" msgstr "Mou avall" -#: src/dialogs.c:466 +#: src/dialogs.c:479 msgid "Rotate right" msgstr "Rota a la dreta" -#: src/dialogs.c:467 +#: src/dialogs.c:480 msgid "Rotate left" msgstr "Rota a l'esquerra" -#: src/dialogs.c:468 +#: src/dialogs.c:481 msgid "Drop piece" msgstr "Solta la peça" -#: src/dialogs.c:469 +#: src/dialogs.c:482 msgid "Discard special" msgstr "Descarta especial" -#: src/dialogs.c:470 +#: src/dialogs.c:483 msgid "Send message" msgstr "Envia missatge" -#: src/dialogs.c:520 +#: src/dialogs.c:533 #, c-format msgid "Press new key for \"%s\"" msgstr "Premeu una nova tecla per a «%s»" -#: src/dialogs.c:746 +#: src/dialogs.c:762 msgid "GTetrinet Preferences" msgstr "Preferències de GTetrinet" -#: src/dialogs.c:757 +#: src/dialogs.c:773 msgid "" "Select a theme from the list.\n" "Install new themes in ~/.gtetrinet/themes/" @@ -242,35 +242,35 @@ msgstr "" "Seleccioneu un tema de la llista.\n" "Instal·leu temes nous en ~/.gtetrinet/themes/" -#: src/dialogs.c:765 +#: src/dialogs.c:781 msgid "Name:" msgstr "Nom:" -#: src/dialogs.c:769 +#: src/dialogs.c:785 msgid "Author:" msgstr "Autor:" -#: src/dialogs.c:773 +#: src/dialogs.c:789 msgid "Description:" msgstr "Descripció:" -#: src/dialogs.c:791 +#: src/dialogs.c:807 msgid "Selected Theme" msgstr "Tema seleccionat" -#: src/dialogs.c:814 +#: src/dialogs.c:830 msgid "Themes" msgstr "Temes" -#: src/dialogs.c:821 +#: src/dialogs.c:837 msgid "Action" msgstr "Acció" -#: src/dialogs.c:823 +#: src/dialogs.c:839 msgid "Key" msgstr "Tecla" -#: src/dialogs.c:829 +#: src/dialogs.c:845 msgid "" "Select an action from the list and press Change Key to change the key " "associated with the action." @@ -278,32 +278,32 @@ msgstr "" "Seleccioneu una acció de la llista i premeu «Canvia la tecla» per a canviar " "la tecla associada amb l'acció." -#: src/dialogs.c:835 +#: src/dialogs.c:851 msgid "Change key..." msgstr "Canvia la tecla..." -#: src/dialogs.c:840 src/dialogs.c:898 +#: src/dialogs.c:856 src/dialogs.c:914 msgid "Restore defaults" msgstr "Restaura els valors per defecte" -#: src/dialogs.c:865 +#: src/dialogs.c:881 msgid "Keyboard" msgstr "Teclat" #. sound -#: src/dialogs.c:871 +#: src/dialogs.c:887 msgid "Enable Sound" msgstr "Habilita el só" -#: src/dialogs.c:874 +#: src/dialogs.c:890 msgid "Enable MIDI" msgstr "Habilita el MIDI" -#: src/dialogs.c:888 +#: src/dialogs.c:904 msgid "Enter command to play a midi file:" msgstr "Introduïu l'ordre per a reproduir un fitxer de midi:" -#: src/dialogs.c:891 +#: src/dialogs.c:907 msgid "" "The above command is run when a midi file is to be played. The name of the " "midi file is placed in the environment variable MIDIFILE." @@ -311,7 +311,7 @@ msgstr "" "L'ordre de dalt s'executa quan s'ha de reproduir un fitxer de midi. El nom " "del fitxer de midi s'ha de ficar en la variable d'entorn «MIDIFILE»." -#: src/dialogs.c:932 +#: src/dialogs.c:948 msgid "Sound" msgstr "Só" @@ -580,3 +580,11 @@ msgstr "E" #: src/winlist.c:48 msgid "Score" msgstr "Puntuació" + +#: gtetrinet.desktop.in:3 +msgid "GTetrinet" +msgstr "GTetrinet" + +#: gtetrinet.desktop.in:4 +msgid "Tetrinet client for GNOME" +msgstr "Client de Tetrinet per al GNOME" diff --git a/po/de.po b/po/de.po index 968f441..585873b 100644 --- a/po/de.po +++ b/po/de.po @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: gtetrinet 0.5.0pre1\n" -"POT-Creation-Date: 2002-11-18 16:56+0100\n" +"POT-Creation-Date: 2003-01-06 18:43+0100\n" "PO-Revision-Date: 2002-11-18 17:05+0100\n" "Last-Translator: Gerfried Fuchs \n" "Language-Team: German \n" @@ -46,30 +46,62 @@ msgstr "Seite los_lösen..." msgid "Connect" msgstr "Verbinden" +#: src/commands.c:75 +#, fuzzy +msgid "Connect to a server" +msgstr "Zum Server verbinden" + #: src/commands.c:76 msgid "Disconnect" msgstr "Verbindung trennen" +#: src/commands.c:76 +#, fuzzy +msgid "Disconnect from the current server" +msgstr "Verbindung zum Server _trennen..." + #: src/commands.c:78 msgid "Start game" msgstr "Spiel starten" +#: src/commands.c:78 +#, fuzzy +msgid "Start a new game" +msgstr "Spiel starten" + #: src/commands.c:79 msgid "Pause game" msgstr "Spiel unterbrechen" +#: src/commands.c:79 +#, fuzzy +msgid "Pause the game" +msgstr "Spiel unterbrechen" + #: src/commands.c:80 msgid "End game" msgstr "Spiel beenden" -#: src/commands.c:82 src/dialogs.c:126 +#: src/commands.c:80 +msgid "End the current game" +msgstr "" + +#: src/commands.c:82 src/dialogs.c:148 msgid "Change team" msgstr "Team wechseln" +#: src/commands.c:82 +msgid "Change your current team name" +msgstr "" + #: src/commands.c:85 msgid "Detach page" msgstr "Seite loslösen" +#: src/commands.c:85 +msgid "Detach the current notebook page" +msgstr "" + #: src/commands.c:207 msgid "Game in progress" msgstr "Spiel im Gange" @@ -82,131 +114,132 @@ msgstr "Verbinden zu\n" msgid "Not connected" msgstr "Nicht vebunden" -#: src/commands.c:225 src/commands.c:228 +#: src/commands.c:228 msgid "Ka-shu Wong " msgstr "Ka-shu Wong " -#: src/commands.c:226 +#: src/commands.c:229 msgid "James Antill " msgstr "James Antill " -#: src/commands.c:229 +#: src/commands.c:230 src/commands.c:233 msgid "Jordi Mallach " msgstr "Jordi Mallach " +#: src/commands.c:231 +msgid "Dani Carbonell " +msgstr "" + #. Translators: translate as your names & emails -#: src/commands.c:232 +#: src/commands.c:236 msgid "translator_credits" msgstr "Gerfried Fuchs " -#: src/commands.c:237 -msgid "(C) 1999, 2000, 2001, 2002 Ka-shu Wong" +#: src/commands.c:241 +#, fuzzy +msgid "(C) 1999, 2000, 2001, 2002, 2003 Ka-shu Wong" msgstr "(C) 1999, 2000, 2001, 2002 Ka-shu Wong" -#: src/commands.c:238 +#: src/commands.c:242 msgid "A Tetrinet client for GNOME.\n" msgstr "Ein Tetrinet-Client für GNOME.\n" -#: src/commands.c:250 +#: src/commands.c:254 msgid "GTetrinet Home Page" msgstr "GTetrinet-Homepage" -#: src/config.c:82 +#: src/config.c:83 msgid "Warning: theme does not have a name" msgstr "Warnung: Theme hat keinen Namen" #. make dialog that asks for address/nickname -#: src/dialogs.c:78 src/dialogs.c:229 src/gtetrinet.c:65 +#: src/dialogs.c:84 src/dialogs.c:266 src/gtetrinet.c:65 msgid "Connect to server" msgstr "Zum Server verbinden" -#: src/dialogs.c:133 src/dialogs.c:323 +#: src/dialogs.c:156 src/dialogs.c:362 msgid "Team name:" msgstr "Team-Name:" #. game type radio buttons -#: src/dialogs.c:253 +#: src/dialogs.c:290 msgid "Original" msgstr "Original" -#: src/dialogs.c:255 +#: src/dialogs.c:292 msgid "TetriFast" msgstr "TetriFast" -#: src/dialogs.c:277 +#: src/dialogs.c:314 msgid "Server address" msgstr "Server-Adresse" -#: src/dialogs.c:286 src/gtetrinet.c:68 +#: src/dialogs.c:323 src/gtetrinet.c:68 msgid "Connect as a spectator" msgstr "Als Zuschauer verbinden" -#: src/dialogs.c:290 +#: src/dialogs.c:327 msgid "Password:" msgstr "Passwort:" -#: src/dialogs.c:304 +#: src/dialogs.c:341 msgid "Spectate game" msgstr "Spiel beobachten" -#: src/dialogs.c:313 +#: src/dialogs.c:350 msgid "Nick name:" msgstr "Spitzname:" -#: src/dialogs.c:338 +#: src/dialogs.c:379 msgid "Player information" msgstr "Spieler-Informationen" -#: src/dialogs.c:377 +#: src/dialogs.c:418 msgid "Change Key" msgstr "Taste ändern" -#: src/dialogs.c:431 +#: src/dialogs.c:476 msgid "Move right" msgstr "Nach links" -#: src/dialogs.c:432 +#: src/dialogs.c:477 msgid "Move left" msgstr "Nach rechts" -#: src/dialogs.c:433 +#: src/dialogs.c:478 msgid "Move down" msgstr "Nach unten" -#: src/dialogs.c:434 +#: src/dialogs.c:479 msgid "Rotate right" msgstr "Rechts drehen" -#: src/dialogs.c:435 +#: src/dialogs.c:480 msgid "Rotate left" msgstr "Links drehen" -#: src/dialogs.c:436 +#: src/dialogs.c:481 msgid "Drop piece" msgstr "Stein fallen lassen" -#: src/dialogs.c:437 +#: src/dialogs.c:482 +msgid "Discard special" +msgstr "" + +#: src/dialogs.c:483 msgid "Send message" msgstr "Nachricht schicken" -#: src/dialogs.c:479 +#: src/dialogs.c:533 #, c-format msgid "Press new key for \"%s\"" msgstr "Drücken Sie die neue Taste für \"%s\"" -#: src/dialogs.c:678 -msgid "Action" -msgstr "Aktion" - -#: src/dialogs.c:679 -msgid "Key" -msgstr "Taste" - -#: src/dialogs.c:683 +#: src/dialogs.c:762 msgid "GTetrinet Preferences" msgstr "GTetrinet-Einstellungen" -#: src/dialogs.c:691 +#: src/dialogs.c:773 msgid "" "Select a theme from the list.\n" "Install new themes in ~/.gtetrinet/themes/" @@ -214,27 +247,35 @@ msgstr "" "Wählen Sie ein Theme aus der Liste.\n" "Installieren Sie neue Themes nach ~/.gtetrinet/themes/" -#: src/dialogs.c:699 +#: src/dialogs.c:781 msgid "Name:" msgstr "Name:" -#: src/dialogs.c:703 +#: src/dialogs.c:785 msgid "Author:" msgstr "Autor:" -#: src/dialogs.c:707 +#: src/dialogs.c:789 msgid "Description:" msgstr "Beschreibung:" -#: src/dialogs.c:725 +#: src/dialogs.c:807 msgid "Selected Theme" msgstr "Gewähltes Theme" -#: src/dialogs.c:748 +#: src/dialogs.c:830 msgid "Themes" msgstr "Themes" -#: src/dialogs.c:765 +#: src/dialogs.c:837 +msgid "Action" +msgstr "Aktion" + +#: src/dialogs.c:839 +msgid "Key" +msgstr "Taste" + +#: src/dialogs.c:845 msgid "" "Select an action from the list and press Change Key to change the key " "associated with the action." @@ -242,32 +283,32 @@ msgstr "" "Wählen Sie eine Aktion aus der Liste und drücken Sie Taste ändern um die mit " "der Aktion verknüpfte Taste zu ändern." -#: src/dialogs.c:771 +#: src/dialogs.c:851 msgid "Change key..." msgstr "Taste ändern..." -#: src/dialogs.c:776 src/dialogs.c:834 +#: src/dialogs.c:856 src/dialogs.c:914 msgid "Restore defaults" msgstr "Vorgaben wiederherstellen" -#: src/dialogs.c:801 +#: src/dialogs.c:881 msgid "Keyboard" msgstr "Tastatur" #. sound -#: src/dialogs.c:807 +#: src/dialogs.c:887 msgid "Enable Sound" msgstr "Musik aktivieren" -#: src/dialogs.c:810 +#: src/dialogs.c:890 msgid "Enable MIDI" msgstr "MIDI aktivieren" -#: src/dialogs.c:824 +#: src/dialogs.c:904 msgid "Enter command to play a midi file:" msgstr "Geben Sie den Befehl zum Abzuspielen einer Midi-Datei ein:" -#: src/dialogs.c:827 +#: src/dialogs.c:907 msgid "" "The above command is run when a midi file is to be played. The name of the " "midi file is placed in the environment variable MIDIFILE." @@ -276,7 +317,7 @@ msgstr "" "wird. Der Name der Midi-Datei ist in der Umgebungsvariable MIDIFILE " "vorhanden." -#: src/dialogs.c:868 +#: src/dialogs.c:948 msgid "Sound" msgstr "Musik" @@ -317,11 +358,11 @@ msgstr "Aktive Ebene:" msgid "Attacks and defenses:" msgstr "Angriffe und Verteidungungen:" -#: src/fields.c:409 +#: src/fields.c:410 msgid "Not playing" msgstr "Spielt nicht" -#: src/fields.c:436 +#: src/fields.c:441 msgid "Specials:" msgstr "Specials:" @@ -354,66 +395,195 @@ msgid "PASSWORD" msgstr "PASSWORT" #. FIXME -#: src/gtetrinet.c:182 +#: src/gtetrinet.c:192 src/gtetrinet.c:329 src/gtetrinet.c:373 msgid "Playing Fields" msgstr "Spielfelder" #. FIXME -#: src/gtetrinet.c:193 +#: src/gtetrinet.c:203 msgid "Partyline" msgstr "Partyraum" #. FIXME -#: src/gtetrinet.c:204 +#: src/gtetrinet.c:214 msgid "Winlist" msgstr "Siegerliste" -#: src/partyline.c:58 src/winlist.c:42 +#: src/partyline.c:89 src/winlist.c:46 msgid "Name" msgstr "Name" -#: src/partyline.c:59 +#: src/partyline.c:91 msgid "Team" msgstr "Team" -#: src/partyline.c:99 +#: src/partyline.c:105 msgid "Your name:" msgstr "Ihr Name:" -#: src/partyline.c:108 +#: src/partyline.c:114 msgid "Your team:" msgstr "Ihr Team:" -#: src/tetrinet.c:208 +#: src/tetrinet.c:201 +#, fuzzy, c-format +msgid "%c%c*** Disconnected from server" +msgstr "Verbindung zum Server _trennen..." + +#: src/tetrinet.c:210 msgid "Error connecting: " msgstr "Fehler beim Verbinden: " -#: src/tetrinet.c:834 +#: src/tetrinet.c:239 +#, fuzzy, c-format +msgid "%c%c*** Connected to server" +msgstr "Zum Server verbinden" + +#: src/tetrinet.c:336 +#, c-format +msgid "%c%c*** You have been kicked from the game" +msgstr "" + +#: src/tetrinet.c:340 +#, c-format +msgid "%c*** %c%s%c%c has been kicked from the game" +msgstr "" + +#: src/tetrinet.c:431 +#, c-format +msgid "%c*** Team %c%s%c%c has won the game" +msgstr "" + +#: src/tetrinet.c:437 +#, fuzzy, c-format +msgid "%c*** %c%s%c%c has won the game" +msgstr " ist dem Spiel beigetreten" + +#: src/tetrinet.c:497 +#, c-format +msgid "%c*** The game has %cstarted" +msgstr "" + +#: src/tetrinet.c:522 +#, fuzzy, c-format +msgid "%c*** The game is %cin progress" +msgstr "Spiel im Gange" + +#: src/tetrinet.c:533 +#, c-format +msgid "%c*** The game has %cpaused" +msgstr "" + +#: src/tetrinet.c:535 +#, c-format +msgid "The game has %c%cpaused" +msgstr "" + +#: src/tetrinet.c:540 +#, c-format +msgid "%c*** The game has %cresumed" +msgstr "" + +#: src/tetrinet.c:542 +#, c-format +msgid "The game has %c%cresumed" +msgstr "" + +#: src/tetrinet.c:551 +#, c-format +msgid "%c*** The game has %cended" +msgstr "" + +#: src/tetrinet.c:661 +#, c-format +msgid "%c*** You have joined %c%s%c%c" +msgstr "" + +#: src/tetrinet.c:678 +#, c-format +msgid "%c*** %c%s%c%c has joined the spectators %c%c(%c%s%c%c%c)" +msgstr "" + +#: src/tetrinet.c:699 +#, c-format +msgid "%c*** %c%s%c%c has left the spectators %c%c(%c%s%c%c%c)" +msgstr "" + +#: src/tetrinet.c:856 msgid "No special blocks" msgstr "Keine Spezial-Blöcke" +#: src/tetrinet.c:1015 src/tetrinet.c:1022 +#, c-format +msgid " on %c%c%s%c%c" +msgstr "" + +#: src/tetrinet.c:1032 +msgid " to All" +msgstr "" + +#: src/tetrinet.c:1038 src/tetrinet.c:1045 +#, c-format +msgid " by %c%c%s%c%c" +msgstr "" + +#: src/tetrinet.c:1678 +#, c-format +msgid "%c*** %c%s%c%c is the moderator" +msgstr "" + #. remove ", " from end of string -#: src/tetrinet.c:1699 +#: src/tetrinet.c:1727 msgid " has left the game" msgstr " hat das Spiel verlassen" -#: src/tetrinet.c:1700 +#: src/tetrinet.c:1728 msgid " have left the game" msgstr " haben das Spiel verlassen" -#: src/tetrinet.c:1713 +#: src/tetrinet.c:1741 msgid " has joined the game" msgstr " ist dem Spiel beigetreten" -#: src/tetrinet.c:1714 +#: src/tetrinet.c:1742 msgid " have joined the game" msgstr " sind dem Spiel beigetreten" -#: src/winlist.c:41 +#: src/tetrinet.c:1765 +#, c-format +msgid "%s is on team %c%s" +msgstr "" + +#: src/tetrinet.c:1768 +#, c-format +msgid "%s is alone" +msgstr "" + +#: src/tetrinet.c:1770 +#, c-format +msgid "%s are on team %c%s" +msgstr "" + +#: src/tetrinet.c:1773 +#, c-format +msgid "%s are alone" +msgstr "" + +#: src/tetrinet.c:1814 +#, c-format +msgid "%c*** %c%s%c%c is now on team %c%s" +msgstr "" + +#: src/tetrinet.c:1821 +#, c-format +msgid "%c*** %c%s%c%c is now alone" +msgstr "" + +#: src/winlist.c:44 msgid "T" msgstr "T" -#: src/winlist.c:43 +#: src/winlist.c:48 msgid "Score" msgstr "Punkte" -- 2.50.1