[Lemon-commits] [lemon_svn] ladanyi: r2682 - in hugo/trunk: . gui gui/build-aux gui/m4 gui/po po

[Lemon SVN]

Author: ladanyi
Date: Wed Apr 12 22:38:22 2006
New Revision: 2682

Added:
   hugo/trunk/po/
   hugo/trunk/po/LINGUAS
   hugo/trunk/po/Makevars
   hugo/trunk/po/POTFILES.in
   hugo/trunk/po/hu.po
   hugo/trunk/po/lemon.pot
Removed:
   hugo/trunk/gui/ABOUT-NLS
   hugo/trunk/gui/bootstrap
   hugo/trunk/gui/build-aux/
   hugo/trunk/gui/configure.ac
   hugo/trunk/gui/m4/
   hugo/trunk/gui/po/
Modified:
   hugo/trunk/Makefile.am
   hugo/trunk/bootstrap
   hugo/trunk/configure.ac
   hugo/trunk/gui/Makefile.am

Log:
revert to single configure scheme

Modified: hugo/trunk/Makefile.am
==============================================================================
--- hugo/trunk/Makefile.am	(original)
+++ hugo/trunk/Makefile.am	Wed Apr 12 22:38:22 2006
@@ -20,7 +20,7 @@
   MAYBE_BENCHMARK = benchmark
 endif
 
-SUBDIRS = lemon $(MAYBE_BENCHMARK) $(MAYBE_DEMO) $(MAYBE_GUI) $(MAYBE_DOC) test
+SUBDIRS = lemon po $(MAYBE_BENCHMARK) $(MAYBE_DEMO) $(MAYBE_GUI) $(MAYBE_DOC) test
 
 MRPROPERFILES = \
 	aclocal.m4 \
@@ -35,6 +35,7 @@
 	build-aux/ltmain.sh \
 	build-aux/missing \
 	build-aux/mkinstalldirs \
+	build-aux/config.rpath \
 	doc/Makefile.in \
 	doc/doxygen.log \
 	Makefile.in \
@@ -43,7 +44,46 @@
 	benchmark/Makefile.in \
 	demo/Makefile.in \
 	gui/icons/Makefile.in \
-	gui/Makefile.in
+	gui/Makefile.in \
+	ABOUT-NLS \
+	m4/lib-link.m4 \
+	m4/printf-posix.m4 \
+	m4/uintmax_t.m4 \
+	m4/signed.m4 \
+	m4/iconv.m4 \
+	m4/inttypes.m4 \
+	m4/longlong.m4 \
+	m4/glibc21.m4 \
+	m4/inttypes_h.m4 \
+	m4/codeset.m4 \
+	m4/longdouble.m4 \
+	m4/nls.m4 \
+	m4/intmax.m4 \
+	m4/lib-prefix.m4 \
+	m4/glibc2.m4 \
+	m4/xsize.m4 \
+	m4/lcmessage.m4 \
+	m4/lib-ld.m4 \
+	m4/ulonglong.m4 \
+	m4/wint_t.m4 \
+	m4/progtest.m4 \
+	m4/inttypes-pri.m4 \
+	m4/stdint_h.m4 \
+	m4/intdiv0.m4 \
+	m4/isc-posix.m4 \
+	m4/po.m4 \
+	m4/size_max.m4 \
+	m4/gettext.m4 \
+	m4/wchar_t.m4 \
+	po/Rules-quot \
+	po/en at quot.header \
+	po/insert-header.sin \
+	po/quot.sed \
+	po/en at boldquot.header \
+	po/boldquot.sed \
+	po/Makevars.template \
+	po/remove-potcdate.sin \
+	po/Makefile.in.in
 
 doc-clean:
 	$(MAKE) -C doc $(AM_MAKEFLAGS) clean html

Modified: hugo/trunk/bootstrap
==============================================================================
--- hugo/trunk/bootstrap	(original)
+++ hugo/trunk/bootstrap	Wed Apr 12 22:38:22 2006
@@ -80,6 +80,7 @@
 set -e
 quiet || set -x
 
+autopoint
 $aclocal -I m4
 (quiet && exec > /dev/null; libtoolize --force --copy)
 $autoconf

Modified: hugo/trunk/configure.ac
==============================================================================
--- hugo/trunk/configure.ac	(original)
+++ hugo/trunk/configure.ac	Wed Apr 12 22:38:22 2006
@@ -17,6 +17,10 @@
 AC_DISABLE_SHARED
 AC_PROG_LIBTOOL
 
+dnl i18n
+AM_GNU_GETTEXT_VERSION([0.14.5])
+AM_GNU_GETTEXT([external])
+
 if test x"$lx_cmdline_cxxflags_set" != x"set" -a "$GXX" = yes; then
   CXXFLAGS="$CXXFLAGS -Wall -W"
 fi
@@ -66,7 +70,7 @@
   AC_MSG_RESULT([no])
 fi
 if test x"$enable_gui" != x"no"; then
-  AC_CONFIG_SUBDIRS([gui])
+  PKG_CHECK_MODULES([GTK], [libgnomecanvasmm-2.6 >= 2.6.0])
 fi
 AM_CONDITIONAL([WANT_GUI], [test x"$enable_gui" != x"no"])
 
@@ -99,9 +103,6 @@
 dnl Checks for header files.
 AC_CHECK_HEADERS(limits.h sys/time.h sys/times.h unistd.h)
 
-dnl Checks for header files.
-AC_CHECK_HEADERS(limits.h sys/time.h sys/times.h unistd.h)
-
 dnl Checks for typedefs, structures, and compiler characteristics.
 AC_C_CONST
 AC_C_INLINE
@@ -124,6 +125,8 @@
 benchmark/Makefile
 demo/Makefile
 test/Makefile
+gui/Makefile
+po/Makefile.in
 ])
 
 AC_OUTPUT

Modified: hugo/trunk/gui/Makefile.am
==============================================================================
--- hugo/trunk/gui/Makefile.am	(original)
+++ hugo/trunk/gui/Makefile.am	Wed Apr 12 22:38:22 2006
@@ -1,12 +1,5 @@
 AM_CPPFLAGS = -I$(top_srcdir) -DLOCALEDIR=\""$(datadir)/locale"\"
-LDADD = ../lemon/libemon.la
-
-ACLOCAL_AMFLAGS = -I m4
-
-EXTRA_DIST = \
-	build-aux/config.rpath
-
-SUBDIRS = po
+LDADD = $(top_builddir)/lemon/libemon.la
 
 bin_PROGRAMS = glemon
 BUILT_SOURCES = guipixbufs.h
@@ -51,7 +44,7 @@
 
 glemon_CXXFLAGS = $(GTK_CFLAGS)
 glemon_LDFLAGS = $(GTK_LIBS)
-#glemon_LDADD = $(LIBINTL)
+glemon_LDADD = $(LIBINTL)
 
 IMAGES = \
 	icons/addlink.png \
@@ -76,64 +69,4 @@
 	--raw --build-list $(VARIABLES) > guipixbufs.h ||  \
 	( rm -f guipixbufs.h && false )
 
-EXTRA_DIST += $(IMAGES) guipixbufs.h
-
-MRPROPERFILES = \
-	aclocal.m4 \
-	config.h.in \
-	config.h.in~ \
-	configure \
-	Makefile.in \
-	build-aux/config.guess \
-	build-aux/config.rpath \
-	build-aux/config.sub \
-	build-aux/depcomp \
-	build-aux/install-sh \
-	build-aux/ltmain.sh \
-	build-aux/missing \
-	build-aux/mkinstalldirs \
-	Makefile.in \
-	m4/intmax.m4 \
-	m4/lib-link.m4 \
-	m4/lib-prefix.m4 \
-	m4/printf-posix.m4 \
-	m4/xsize.m4 \
-	m4/glibc2.m4 \
-	m4/lib-ld.m4 \
-	m4/lcmessage.m4 \
-	m4/wint_t.m4 \
-	m4/ulonglong.m4 \
-	m4/inttypes-pri.m4 \
-	m4/progtest.m4 \
-	m4/uintmax_t.m4 \
-	m4/signed.m4 \
-	m4/stdint_h.m4 \
-	m4/intdiv0.m4 \
-	m4/iconv.m4 \
-	m4/po.m4 \
-	m4/isc-posix.m4 \
-	m4/longlong.m4 \
-	m4/inttypes.m4 \
-	m4/size_max.m4 \
-	m4/glibc21.m4 \
-	m4/gettext.m4 \
-	m4/codeset.m4 \
-	m4/inttypes_h.m4 \
-	m4/wchar_t.m4 \
-	m4/longdouble.m4 \
-	m4/nls.m4 \
-	po/Rules-quot \
-	po/en at quot.header \
-	po/insert-header.sin \
-	po/quot.sed \
-	po/en at boldquot.header \
-	po/boldquot.sed \
-	po/Makevars.template \
-	po/remove-potcdate.sin \
-	po/Makefile.in.in
-
-mrproper:
-	$(MAKE) $(AM_MAKEFLAGS) maintainer-clean
-	-rm -f $(MRPROPERFILES)
-
-.PHONY: mrproper
+EXTRA_DIST = $(IMAGES) guipixbufs.h

Added: hugo/trunk/po/LINGUAS
==============================================================================
--- (empty file)
+++ hugo/trunk/po/LINGUAS	Wed Apr 12 22:38:22 2006
@@ -0,0 +1 @@
+hu

Added: hugo/trunk/po/Makevars
==============================================================================
--- (empty file)
+++ hugo/trunk/po/Makevars	Wed Apr 12 22:38:22 2006
@@ -0,0 +1,41 @@
+# 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 = --keyword=_ --keyword=N_
+
+# 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 = Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
+
+# 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 = $(PACKAGE_BUGREPORT)
+
+# 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 =

Added: hugo/trunk/po/POTFILES.in
==============================================================================
--- (empty file)
+++ hugo/trunk/po/POTFILES.in	Wed Apr 12 22:38:22 2006
@@ -0,0 +1,36 @@
+# List of source files which contain translatable strings.
+gui/algobox.cc
+gui/algobox.h
+gui/algowin.cc
+gui/algowin.h
+gui/all_include.h
+gui/gdc-broken_edge.cc
+gui/gettext.h
+gui/graph_displayer_canvas.cc
+gui/graph_displayer_canvas-edge.cc
+gui/graph_displayer_canvas-event.cc
+gui/graph_displayer_canvas.h
+gui/graph_displayer_canvas-node.cc
+gui/graph_displayer_canvas-zoom.cc
+gui/graph-displayer.cc
+gui/guipixbufs.h
+gui/gui_reader.cc
+gui/gui_reader.h
+gui/gui_writer.cc
+gui/gui_writer.h
+gui/kruskalbox.cc
+gui/kruskalbox.h
+gui/main_win.cc
+gui/main_win.h
+gui/mapselector.cc
+gui/mapselector.h
+gui/mapstorage.cc
+gui/mapstorage.h
+gui/map_win.cc
+gui/map_win.h
+gui/nbtab.cc
+gui/nbtab.h
+gui/new_map_win.cc
+gui/new_map_win.h
+gui/xml.h
+gui/xymap.h

Added: hugo/trunk/po/hu.po
==============================================================================
--- (empty file)
+++ hugo/trunk/po/hu.po	Wed Apr 12 22:38:22 2006
@@ -0,0 +1,89 @@
+# Hungarian translations for LEMON package.
+# Copyright (C) 2006 Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
+# This file is distributed under the same license as the LEMON package.
+# Ladanyi Akos <ladanyi at tmit.bme.hu>, 2006.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: LEMON svn-head\n"
+"Report-Msgid-Bugs-To: etik-ol at cs.elte.hu\n"
+"POT-Creation-Date: 2006-03-23 18:50+0100\n"
+"PO-Revision-Date: 2006-03-22 15:55+0100\n"
+"Last-Translator: Ladanyi Akos <ladanyi at tmit.bme.hu>\n"
+"Language-Team: Hungarian <translation-team-hu at lists.sourceforge.net>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+#: gui/main_win.cc:81
+msgid "_File"
+msgstr "_Fájl"
+
+#: gui/main_win.cc:86
+msgid "Clear Tab"
+msgstr "Lap törlése"
+
+#: gui/main_win.cc:97
+msgid "_View"
+msgstr "_Nézet"
+
+#: gui/main_win.cc:107
+msgid "_Show"
+msgstr "_Mutat"
+
+#: gui/main_win.cc:108
+msgid "_Maps"
+msgstr "_Mapek"
+
+#: gui/main_win.cc:111
+msgid "_Algorithms"
+msgstr "_Algoritmusok"
+
+#: gui/main_win.cc:112
+msgid "_General"
+msgstr "_Általános"
+
+#: gui/main_win.cc:114
+msgid "_Kruskal"
+msgstr "_Kruskal"
+
+#: gui/main_win.cc:118
+msgid "Move"
+msgstr "Mozgat"
+
+#: gui/main_win.cc:120
+msgid "Create node"
+msgstr "Csúcs létrehozása"
+
+#: gui/main_win.cc:122
+msgid "Create edge"
+msgstr "Él létrehozása"
+
+#: gui/main_win.cc:124
+msgid "Delete"
+msgstr "Törlés"
+
+#: gui/main_win.cc:127
+msgid "Edit edge map"
+msgstr "Él map szerkesztése"
+
+#: gui/main_win.cc:129
+msgid "Edit node map"
+msgstr "Csúcs map szerkesztése"
+
+#: gui/main_win.cc:260
+msgid "unsaved file"
+msgstr "nem mentett fájl"
+
+#: gui/main_win.cc:270
+msgid "<b>Save changes before closing?</b>"
+msgstr "Menti a változásokat mielőtt bezárja?"
+
+#: gui/main_win.cc:272
+msgid "Close file _without Saving"
+msgstr "Bezárás mentés _nékül"
+
+#: gui/main_win.cc:459 gui/main_win.cc:488
+msgid "Create New Map - "
+msgstr "Új map létrehozása - "

Added: hugo/trunk/po/lemon.pot
==============================================================================
--- (empty file)
+++ hugo/trunk/po/lemon.pot	Wed Apr 12 22:38:22 2006
@@ -0,0 +1,89 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR Egervary Jeno Kombinatorikus Optimalizalasi Kutatocsoport
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL at ADDRESS>, YEAR.
+#
+#, fuzzy
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: etik-ol at cs.elte.hu\n"
+"POT-Creation-Date: 2006-03-23 18:50+0100\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL at ADDRESS>\n"
+"Language-Team: LANGUAGE <LL at li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: gui/main_win.cc:81
+msgid "_File"
+msgstr ""
+
+#: gui/main_win.cc:86
+msgid "Clear Tab"
+msgstr ""
+
+#: gui/main_win.cc:97
+msgid "_View"
+msgstr ""
+
+#: gui/main_win.cc:107
+msgid "_Show"
+msgstr ""
+
+#: gui/main_win.cc:108
+msgid "_Maps"
+msgstr ""
+
+#: gui/main_win.cc:111
+msgid "_Algorithms"
+msgstr ""
+
+#: gui/main_win.cc:112
+msgid "_General"
+msgstr ""
+
+#: gui/main_win.cc:114
+msgid "_Kruskal"
+msgstr ""
+
+#: gui/main_win.cc:118
+msgid "Move"
+msgstr ""
+
+#: gui/main_win.cc:120
+msgid "Create node"
+msgstr ""
+
+#: gui/main_win.cc:122
+msgid "Create edge"
+msgstr ""
+
+#: gui/main_win.cc:124
+msgid "Delete"
+msgstr ""
+
+#: gui/main_win.cc:127
+msgid "Edit edge map"
+msgstr ""
+
+#: gui/main_win.cc:129
+msgid "Edit node map"
+msgstr ""
+
+#: gui/main_win.cc:260
+msgid "unsaved file"
+msgstr ""
+
+#: gui/main_win.cc:270
+msgid "<b>Save changes before closing?</b>"
+msgstr ""
+
+#: gui/main_win.cc:272
+msgid "Close file _without Saving"
+msgstr ""
+
+#: gui/main_win.cc:459 gui/main_win.cc:488
+msgid "Create New Map - "
+msgstr ""