From 51ec942b81724f152770493e76c4edafa00d5543 Mon Sep 17 00:00:00 2001 From: Ales Hvezda Date: Sun, 3 Dec 2006 01:40:19 +0000 Subject: [PATCH] Ran gettextize 0.15 to update gettext infrastructure to hopefully fix the MKINSTALLDIR problems. --- gschem/ChangeLog | 12 ++++++++++++ gschem/Makefile.am | 2 +- gschem/configure.ac | 2 +- gschem/m4/ChangeLog | 34 ++++++++++++++++++++++++++++++++++ gschem/m4/Makefile.am | 2 +- gschem/po/Makevars | 18 +++++++++++++++++- 6 files changed, 66 insertions(+), 4 deletions(-) diff --git a/gschem/ChangeLog b/gschem/ChangeLog index 9cafd0b0c..38ec3d163 100644 --- a/gschem/ChangeLog +++ b/gschem/ChangeLog @@ -1,3 +1,15 @@ +2006-12-02 Ales Hvezda + + The running of gettextize changed: ChangeLog, Makefile.am, + configure.ac, m4/ChangeLog, m4/Makefile.am, po/Makevars. + +2006-12-02 gettextize + + * Makefile.am (SUBDIRS): Remove intl. + (EXTRA_DIST): Add config.rpath. + * configure.ac (AC_CONFIG_FILES): Add po/Makefile.in. + (AM_GNU_GETTEXT_VERSION): Bump to 0.15. + 2006-11-21 Ales Hvezda * configure.ac: Fixed libgeda detection/find error message when diff --git a/gschem/Makefile.am b/gschem/Makefile.am index 4d253fd31..3149e2cf5 100644 --- a/gschem/Makefile.am +++ b/gschem/Makefile.am @@ -1,7 +1,7 @@ SUBDIRS = include lib intl src m4 po scheme bitmap scripts examples \ tests docs -EXTRA_DIST = VOCABULARY BUGS autogen.sh +EXTRA_DIST = VOCABULARY BUGS autogen.sh config.rpath #proto: # (cd src ; ./create_proto) diff --git a/gschem/configure.ac b/gschem/configure.ac index 308129515..63ba20217 100644 --- a/gschem/configure.ac +++ b/gschem/configure.ac @@ -509,7 +509,7 @@ AC_DEFINE_UNQUOTED(VERSION, "$VERSION", [Currently running version of gEDA/gaf]) # Initialized gettext AM_GNU_GETTEXT -AM_GNU_GETTEXT_VERSION(0.12.1) +AM_GNU_GETTEXT_VERSION([0.15]) # Finally create the final CFLAGS and LDFLAGS for use in the makefiles GSCHEM_CFLAGS="$LIBSTROKE_CFLAGS $LIBGEDA_CFLAGS" diff --git a/gschem/m4/ChangeLog b/gschem/m4/ChangeLog index 8b346b41c..53f5c8e01 100644 --- a/gschem/m4/ChangeLog +++ b/gschem/m4/ChangeLog @@ -1,3 +1,37 @@ +2006-12-02 gettextize + + * codeset.m4: New file, from gettext-0.15. + * gettext.m4: New file, from gettext-0.15. + * glibc2.m4: New file, from gettext-0.15. + * glibc21.m4: New file, from gettext-0.15. + * iconv.m4: New file, from gettext-0.15. + * intdiv0.m4: New file, from gettext-0.15. + * intmax.m4: New file, from gettext-0.15. + * inttypes_h.m4: New file, from gettext-0.15. + * inttypes-h.m4: New file, from gettext-0.15. + * inttypes-pri.m4: New file, from gettext-0.15. + * lcmessage.m4: New file, from gettext-0.15. + * lib-ld.m4: New file, from gettext-0.15. + * lib-link.m4: New file, from gettext-0.15. + * lib-prefix.m4: New file, from gettext-0.15. + * lock.m4: New file, from gettext-0.15. + * longdouble.m4: New file, from gettext-0.15. + * longlong.m4: New file, from gettext-0.15. + * nls.m4: New file, from gettext-0.15. + * po.m4: New file, from gettext-0.15. + * printf-posix.m4: New file, from gettext-0.15. + * progtest.m4: New file, from gettext-0.15. + * signed.m4: New file, from gettext-0.15. + * size_max.m4: New file, from gettext-0.15. + * stdint_h.m4: New file, from gettext-0.15. + * uintmax_t.m4: New file, from gettext-0.15. + * ulonglong.m4: New file, from gettext-0.15. + * visibility.m4: New file, from gettext-0.15. + * wchar_t.m4: New file, from gettext-0.15. + * wint_t.m4: New file, from gettext-0.15. + * xsize.m4: New file, from gettext-0.15. + * Makefile.am (EXTRA_DIST): Add the new files. + 2002-06-12 gettextize * codeset.m4: New file, from gettext-0.11.2. diff --git a/gschem/m4/Makefile.am b/gschem/m4/Makefile.am index cd825fec8..02dfac96e 100644 --- a/gschem/m4/Makefile.am +++ b/gschem/m4/Makefile.am @@ -1,4 +1,4 @@ -EXTRA_DIST = ChangeLog codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes-pri.m4 inttypes.m4 inttypes_h.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 +EXTRA_DIST = codeset.m4 gettext.m4 glibc2.m4 glibc21.m4 iconv.m4 intdiv0.m4 intmax.m4 inttypes_h.m4 inttypes-h.m4 inttypes-pri.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 lock.m4 longdouble.m4 longlong.m4 nls.m4 po.m4 printf-posix.m4 progtest.m4 signed.m4 size_max.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 visibility.m4 wchar_t.m4 wint_t.m4 xsize.m4 ChangeLog codeset.m4 gettext.m4 glibc21.m4 iconv.m4 intdiv0.m4 inttypes-pri.m4 inttypes.m4 inttypes_h.m4 isc-posix.m4 lcmessage.m4 lib-ld.m4 lib-link.m4 lib-prefix.m4 nls.m4 po.m4 progtest.m4 stdint_h.m4 uintmax_t.m4 ulonglong.m4 MOSTLYCLEANFILES = *.log core FILE *~ prototype.bak CLEANFILES = *.log core FILE *~ prototype.bak diff --git a/gschem/po/Makevars b/gschem/po/Makevars index 8792fb0da..32692ab4b 100644 --- a/gschem/po/Makevars +++ b/gschem/po/Makevars @@ -18,7 +18,23 @@ XGETTEXT_OPTIONS = --keyword=_ --keyword=N_ # 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 = Alexandre Pereira Nunes +COPYRIGHT_HOLDER = Free Software Foundation, Inc. + +# 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. -- 2.11.4.GIT