From f5964f89087a3541d6fcfdb506f5ddff3f8d4e73 Mon Sep 17 00:00:00 2001 From: Jim Evins Date: Fri, 28 Jun 2002 21:28:00 +0000 Subject: [PATCH] Fix broken build environment. git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@36 f5e0f49d-192f-0410-a22d-a8d8700d0965 --- glabels1/ABOUT-NLS | 302 ++---- glabels1/ChangeLog | 11 - glabels1/Makefile.am | 6 +- glabels1/aclocal.m4 | 1782 ++++++------------------------- glabels1/config.h.in | 59 +- glabels1/configure.in | 16 +- glabels1/intl/Makefile.in | 22 +- glabels1/macros/Makefile.in | 40 +- glabels1/po/ChangeLog | 11 +- glabels1/po/Makefile.in.in | 265 ++--- glabels1/po/Makevars | 25 - glabels1/po/Rules-quot | 42 - glabels1/po/boldquot.sed | 10 - glabels1/po/cat-id-tbl.c | 184 ---- glabels1/po/de.gmo | Bin 8290 -> 8214 bytes glabels1/po/de.po | 5 +- glabels1/po/en@boldquot.header | 25 - glabels1/po/en@quot.header | 22 - glabels1/po/es.gmo | Bin 8514 -> 8445 bytes glabels1/po/es.po | 5 +- glabels1/po/fr.gmo | Bin 9752 -> 9679 bytes glabels1/po/fr.po | 5 +- glabels1/po/glabels.pot | 6 +- glabels1/po/insert-header.sin | 23 - glabels1/po/ja.gmo | Bin 9869 -> 10293 bytes glabels1/po/ja.po | 370 +++---- glabels1/po/pt_BR.gmo | Bin 9301 -> 9231 bytes glabels1/po/pt_BR.po | 5 +- glabels1/po/quot.sed | 6 - glabels1/po/remove-potcdate.sin | 19 - 30 files changed, 759 insertions(+), 2507 deletions(-) delete mode 100644 glabels1/po/Makevars delete mode 100644 glabels1/po/Rules-quot delete mode 100644 glabels1/po/boldquot.sed delete mode 100644 glabels1/po/en@boldquot.header delete mode 100644 glabels1/po/en@quot.header delete mode 100644 glabels1/po/insert-header.sin delete mode 100644 glabels1/po/quot.sed delete mode 100644 glabels1/po/remove-potcdate.sin diff --git a/glabels1/ABOUT-NLS b/glabels1/ABOUT-NLS index 022965c6..7e6b3809 100644 --- a/glabels1/ABOUT-NLS +++ b/glabels1/ABOUT-NLS @@ -113,13 +113,6 @@ But in fact, some languages have dialects in different countries. For example, `de_AT' is used for Austria, and `pt_BR' for Brazil. The country code serves to distinguish the dialects. - The locale naming convention of `LL_CC', with `LL' denoting the -language and `CC' denoting the country, is the one use on systems based -on GNU libc. On other systems, some variations of this scheme are -used, such as `LL' or `LL_CC.ENCODING'. You can get the list of -locales supported by your system for your country by running the command -`locale -a | grep '^LL''. - Not all programs have translations for all languages. By default, an English message is shown in place of a nonexistent translation. If you understand other languages, you can set up a priority list of languages. @@ -171,193 +164,102 @@ Available Packages ================== Languages are not equally supported in all packages. The following -matrix shows the current state of internationalization, as of March -2002. The matrix shows, in regard of each package, for which languages -PO files have been submitted to translation coordination, with a +matrix shows the current state of internationalization, as of May 2001. +The matrix shows, in regard of each package, for which languages PO +files have been submitted to translation coordination, with a translation percentage of at least 50%. - Ready PO files bg ca cs da de el en eo es et fi fr - +-------------------------------------+ - a2ps | [] [] [] [] | - bash | [] [] [] [] | - bfd | [] [] | - binutils | [] [] | - bison | [] [] [] | - clisp | [] [] [] [] | - cpio | [] [] [] [] | - diffutils | [] [] [] [] [] [] | - enscript | [] [] | - error | [] [] | - fetchmail | () [] [] [] () | - fileutils | [] [] [] [] [] | - findutils | [] [] [] [] [] | - flex | [] [] [] [] | - gas | [] [] | - gawk | [] [] | - gcal | [] [] | - gcc | [] [] | - gettext | [] [] [] [] [] | - gnupg | [] [] [] [] [] [] | - gprof | [] [] | - grep | [] [] [] [] [] [] | - hello | [] [] [] [] [] [] [] [] | - id-utils | [] [] [] | - indent | [] [] [] [] [] | - jpilot | () [] [] [] | - jwhois | [] [] | - kbd | [] [] | - ld | [] [] | - libc | [] [] [] [] [] [] [] | - lilypond | [] [] | - lynx | [] [] [] [] | - m4 | [] [] [] [] [] | - make | [] [] [] [] | - mysecretdiary | [] [] | - nano | [] () [] [] [] [] | - nano_1_0 | [] () [] [] [] [] | - opcodes | [] [] [] | - parted | [] [] [] [] | - ptx | [] [] [] [] [] | - python | | - recode | [] [] [] [] [] [] | - sed | [] [] [] [] [] [] [] [] | - sh-utils | [] [] [] [] [] [] [] [] | - sharutils | [] [] [] [] [] [] | - sketch | () [] () | - soundtracker | [] [] [] | - sp | | - tar | [] [] [] [] [] [] | - texinfo | [] [] [] [] [] | - textutils | [] [] [] [] [] | - util-linux | [] [] [] [] | - vorbis-tools | | - wdiff | [] [] [] [] [] | - wget | [] [] [] [] [] [] [] [] | - +-------------------------------------+ - bg ca cs da de el en eo es et fi fr - 1 12 11 31 36 9 1 8 39 15 1 50 - - gl he hr hu id it ja ko lv nb nl nn - +-------------------------------------+ - a2ps | () () [] | - bash | | - bfd | [] | - binutils | [] | - bison | [] [] | - clisp | [] | - cpio | [] [] [] | - diffutils | [] [] [] | - enscript | [] | - error | [] | - fetchmail | | - fileutils | [] [] [] | - findutils | [] [] [] [] [] [] | - flex | [] | - gas | | - gawk | [] | - gcal | | - gcc | | - gettext | [] | - gnupg | [] [] [] | - gprof | | - grep | [] | - hello | [] [] [] [] [] [] [] [] [] [] | - id-utils | [] | - indent | [] [] [] | - jpilot | () () | - jwhois | | - kbd | | - ld | | - libc | [] [] [] [] | - lilypond | [] [] | - lynx | [] [] | - m4 | [] [] [] [] | - make | [] [] [] [] | - mysecretdiary | | - nano | [] [] [] () [] () [] | - nano_1_0 | [] [] [] () [] () [] | - opcodes | [] | - parted | [] [] [] | - ptx | [] [] [] [] | - python | | - recode | [] [] [] | - sed | [] [] [] [] [] [] [] | - sh-utils | [] [] [] [] [] | - sharutils | [] [] [] | - sketch | () | - soundtracker | [] | - sp | | - tar | [] [] [] | - texinfo | [] [] | - textutils | [] [] | - util-linux | () [] | - vorbis-tools | | - wdiff | | - wget | [] [] [] [] [] | - +-------------------------------------+ - gl he hr hu id it ja ko lv nb nl nn - 19 7 0 4 6 11 22 9 1 8 19 4 + Ready PO files bg cs da de el en eo es et fi fr gl hr id it + +----------------------------------------------+ + a2ps | [] [] | + bash | [] [] [] [] | + bison | [] [] [] [] | + clisp | [] [] [] [] | + cpio | [] [] [] [] | + diffutils | [] [] [] [] [] [] [] | + enscript | [] [] | + error | [] | + fileutils | [] [] [] [] [] [] [] | + findutils | [] [] [] [] [] [] [] [] | + flex | [] [] [] | + gawk | | + gcal | | + gcc | [] | + gettext | [] [] [] [] [] [] [] [] [] | + gnupg | [] [] [] [] [] | + grep | [] [] [] | + hello | [] [] [] [] [] [] [] [] [] | + id-utils | [] [] | + indent | [] [] [] [] [] | + libc | [] [] [] [] [] [] [] [] | + lilypond | | + lynx | [] [] [] | + m4 | [] [] [] [] [] [] [] | + make | [] [] [] [] | + parted | [] [] | + ptx | [] [] [] [] [] [] [] | + python | | + recode | [] [] [] [] [] [] [] [] | + sed | [] [] [] [] [] [] [] [] [] | + sh-utils | [] [] [] [] [] [] [] [] [] | + sharutils | [] [] [] [] [] [] [] | + soundtracker | | + sp | | + tar | [] [] [] [] [] [] [] [] | + texinfo | [] [] [] [] | + textutils | [] [] [] [] [] [] [] | + util-linux | [] | + wdiff | [] [] [] [] [] [] [] | + wget | [] [] [] [] [] [] [] [] [] | + +----------------------------------------------+ + bg cs da de el en eo es et fi fr gl hr id it + 0 14 21 27 10 1 8 20 13 1 28 17 0 9 11 - no pl pt pt_BR ru sk sl sv tr uk zh_TW - +----------------------------------------+ - a2ps | () () () [] [] [] () | 8 - bash | | 4 - bfd | [] [] | 5 - binutils | [] | 4 - bison | [] [] [] | 8 - clisp | | 5 - cpio | [] [] [] [] | 11 - diffutils | [] [] [] [] [] | 14 - enscript | [] [] [] | 6 - error | [] [] [] | 6 - fetchmail | () () [] | 4 - fileutils | [] [] [] [] | 12 - findutils | [] [] [] [] [] [] [] | 18 - flex | [] [] [] | 8 - gas | [] | 3 - gawk | [] [] | 5 - gcal | [] [] | 4 - gcc | [] | 3 - gettext | [] [] [] [] | 10 - gnupg | [] [] [] | 12 - gprof | [] [] | 4 - grep | [] [] [] | 10 - hello | [] [] [] [] [] [] [] | 25 - id-utils | [] [] | 6 - indent | [] [] [] [] | 12 - jpilot | () () | 3 - jwhois | () () [] | 3 - kbd | [] [] | 4 - ld | [] [] | 4 - libc | [] [] [] [] [] [] | 17 - lilypond | [] | 5 - lynx | [] [] [] | 9 - m4 | [] [] [] | 12 - make | [] [] [] [] | 12 - mysecretdiary | [] [] | 4 - nano | () [] [] [] [] | 14 - nano_1_0 | () [] [] [] | 13 - opcodes | [] [] | 6 - parted | [] [] [] | 10 - ptx | [] [] [] [] [] [] | 15 - python | | 0 - recode | [] [] [] [] | 13 - sed | [] [] [] [] [] [] | 21 - sh-utils | [] [] [] [] [] [] [] [] [] | 22 - sharutils | [] [] [] | 12 - sketch | [] () | 3 - soundtracker | [] | 5 - sp | | 0 - tar | [] [] [] [] [] [] [] | 16 - texinfo | [] [] [] | 10 - textutils | [] [] [] [] | 11 - util-linux | [] [] [] | 8 - vorbis-tools | [] | 1 - wdiff | [] [] [] [] | 9 - wget | [] [] [] [] [] [] [] | 20 - +----------------------------------------+ - 35 teams no pl pt pt_BR ru sk sl sv tr uk zh_TW - 55 domains 5 13 2 12 25 11 11 41 34 4 7 489 + ja ko lv nl no pl pt pt_BR ru sk sl sv tr zh + +----------------------------------------------+ + a2ps | [] [] [] | 5 + bash | | 4 + bison | [] [] [] | 7 + clisp | [] | 5 + cpio | [] [] [] [] [] | 9 + diffutils | [] [] [] | 10 + enscript | [] [] [] | 5 + error | | 1 + fileutils | [] [] [] [] [] [] [] [] [] | 16 + findutils | [] [] [] [] [] [] | 14 + flex | [] [] [] | 6 + gawk | | 0 + gcal | | 0 + gcc | [] | 2 + gettext | [] [] [] [] [] [] [] [] [] [] | 19 + gnupg | [] [] [] | 8 + grep | | 3 + hello | [] [] [] [] [] [] [] [] | 17 + id-utils | [] [] [] | 5 + indent | [] [] [] [] [] [] [] | 12 + libc | [] [] [] [] [] [] [] | 15 + lilypond | [] | 1 + lynx | [] [] [] [] [] | 8 + m4 | [] [] [] [] [] | 12 + make | [] [] [] [] [] | 9 + parted | [] [] [] | 5 + ptx | [] [] [] [] [] [] | 13 + python | | 0 + recode | [] [] [] | 11 + sed | [] [] [] [] [] [] [] | 16 + sh-utils | [] [] [] [] [] [] [] [] [] [] | 19 + sharutils | [] [] [] [] | 11 + soundtracker | | 0 + sp | | 0 + tar | [] [] [] [] [] [] [] [] | 16 + texinfo | [] [] | 6 + textutils | [] [] [] [] [] [] [] [] | 15 + util-linux | [] | 2 + wdiff | [] [] [] [] [] | 12 + wget | [] [] [] [] [] [] [] [] | 17 + +----------------------------------------------+ + 29 teams ja ko lv nl no pl pt pt_BR ru sk sl sv tr zh + 40 domains 18 8 0 23 6 16 1 15 26 9 9 20 2 3 336 Some counters in the preceding matrix are higher than the number of visible blocks let us expect. This is because a few extra PO files are @@ -370,7 +272,7 @@ distributed as such by its maintainer. There might be an observable lag between the mere existence a PO file and its wide availability in a distribution. - If March 2002 seems to be old, you may fetch a more recent copy of + If May 2001 seems to be old, you may fetch a more recent copy of this `ABOUT-NLS' file on most GNU archive sites. The most up-to-date matrix with full percentage details can be found at `http://www.iro.umontreal.ca/contrib/po/HTML/matrix.html'. @@ -380,15 +282,13 @@ Using `gettext' in new packages If you are writing a freely available program and want to internationalize it you are welcome to use GNU `gettext' in your -package. Of course you have to respect the GNU Library General Public -License which covers the use of the GNU `gettext' library. This means -in particular that even non-free programs can use `libintl' as a shared -library, whereas only free software can use `libintl' as a static -library or use modified versions of `libintl'. - - Once the sources are changed appropriately and the setup can handle -to use of `gettext' the only thing missing are the translations. The -Free Translation Project is also available for packages which are not +package. Of course the GNU Public License applies to your sources from +then if you include `gettext' directly in your distribution on but +since you are writing free software anyway this is no restriction. + + Once the sources are change appropriately and the setup can handle to +use of `gettext' the only thing missing are the translations. The Free +Translation Project is also available for packages which are not developed inside the GNU project. Therefore the information given above applies also for every other Free Software Project. Contact `translation@iro.umontreal.ca' to make the `.pot' files available to diff --git a/glabels1/ChangeLog b/glabels1/ChangeLog index a3c2dc1a..e69de29b 100644 --- a/glabels1/ChangeLog +++ b/glabels1/ChangeLog @@ -1,11 +0,0 @@ -2002-06-18 gettextize - - -2002-06-17 gettextize - - * Makefile.am (SUBDIRS): Add m4. - (SUBDIRS): Remove intl. - (ACLOCAL_AMFLAGS): New variable. - (EXTRA_DIST): Add config.rpath. - * configure.in (AC_OUTPUT): Add m4/Makefile. - diff --git a/glabels1/Makefile.am b/glabels1/Makefile.am index 56db8cff..1d991502 100644 --- a/glabels1/Makefile.am +++ b/glabels1/Makefile.am @@ -2,9 +2,9 @@ LIB_BARCODE_DIR = barcode-0.98 -SUBDIRS = m4 po macros src doc +SUBDIRS = intl po macros src doc -EXTRA_DIST = config.rpath \ +EXTRA_DIST = \ glabels.desktop glabels.spec.in glabels.spec autogen.sh Applicationsdir = $(datadir)/gnome/apps/Applications @@ -56,5 +56,3 @@ dist-hook: mkdir $(distdir)/$(LIB_BARCODE_DIR); \ cp -rp $(LIB_BARCODE_DIR)/* $(distdir)/$(LIB_BARCODE_DIR); \ fi - -ACLOCAL_AMFLAGS = -I m4 diff --git a/glabels1/aclocal.m4 b/glabels1/aclocal.m4 index 7fe09554..d10efeef 100644 --- a/glabels1/aclocal.m4 +++ b/glabels1/aclocal.m4 @@ -125,22 +125,25 @@ for am_file in <<$1>>; do done<<>>dnl>>) changequote([,]))]) -# aclocal-include.m4 -# -# This macro adds the name macrodir to the set of directories -# that `aclocal' searches for macros. +# Add --enable-maintainer-mode option to configure. +# From Jim Meyering # serial 1 -dnl AM_ACLOCAL_INCLUDE(macrodir) -AC_DEFUN([AM_ACLOCAL_INCLUDE], -[ - AM_CONDITIONAL(INSIDE_GNOME_COMMON, test x = y) - - test -n "$ACLOCAL_FLAGS" && ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" - - for k in $1 ; do ACLOCAL="$ACLOCAL -I $k" ; done -]) +AC_DEFUN([AM_MAINTAINER_MODE], +[AC_MSG_CHECKING([whether to enable maintainer-specific portions of Makefiles]) + dnl maintainer-mode is disabled by default + AC_ARG_ENABLE(maintainer-mode, +[ --enable-maintainer-mode enable make rules and dependencies not useful + (and sometimes confusing) to the casual installer], + USE_MAINTAINER_MODE=$enableval, + USE_MAINTAINER_MODE=no) + AC_MSG_RESULT($USE_MAINTAINER_MODE) + AM_CONDITIONAL(MAINTAINER_MODE, test $USE_MAINTAINER_MODE = yes) + MAINT=$MAINTAINER_MODE_TRUE + AC_SUBST(MAINT)dnl +] +) # Define a conditional. @@ -155,6 +158,23 @@ else $1_FALSE= fi]) +# aclocal-include.m4 +# +# This macro adds the name macrodir to the set of directories +# that `aclocal' searches for macros. + +# serial 1 + +dnl AM_ACLOCAL_INCLUDE(macrodir) +AC_DEFUN([AM_ACLOCAL_INCLUDE], +[ + AM_CONDITIONAL(INSIDE_GNOME_COMMON, test x = y) + + test -n "$ACLOCAL_FLAGS" && ACLOCAL="$ACLOCAL $ACLOCAL_FLAGS" + + for k in $1 ; do ACLOCAL="$ACLOCAL -I $k" ; done +]) + dnl dnl GNOME_INIT_HOOK (script-if-gnome-enabled, [failflag], [additional-inits]) dnl @@ -866,1413 +886,342 @@ AC_DEFUN([GNOME_PTHREAD_CHECK],[ AC_PROVIDE([GNOME_PTHREAD_CHECK]) ]) -# gettext.m4 serial 13 (gettext-0.11.1) -dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. -dnl -dnl This file can can be used in projects which are not available under -dnl the GNU General Public License or the GNU Library General Public -dnl License but which still want to provide support for the GNU gettext -dnl functionality. -dnl Please note that the actual code of the GNU gettext library is covered -dnl by the GNU Library General Public License, and the rest of the GNU -dnl gettext package package is covered by the GNU General Public License. -dnl They are *not* in the public domain. - -dnl Authors: -dnl Ulrich Drepper , 1995-2000. -dnl Bruno Haible , 2000-2002. - -dnl Macro to add for using GNU gettext. - -dnl Usage: AM_GNU_GETTEXT([INTLSYMBOL], [NEEDSYMBOL], [INTLDIR]). -dnl INTLSYMBOL can be one of 'external', 'no-libtool', 'use-libtool'. The -dnl default (if it is not specified or empty) is 'no-libtool'. -dnl INTLSYMBOL should be 'external' for packages with no intl directory, -dnl and 'no-libtool' or 'use-libtool' for packages with an intl directory. -dnl If INTLSYMBOL is 'use-libtool', then a libtool library -dnl $(top_builddir)/intl/libintl.la will be created (shared and/or static, -dnl depending on --{enable,disable}-{shared,static} and on the presence of -dnl AM-DISABLE-SHARED). If INTLSYMBOL is 'no-libtool', a static library -dnl $(top_builddir)/intl/libintl.a will be created. -dnl If NEEDSYMBOL is specified and is 'need-ngettext', then GNU gettext -dnl implementations (in libc or libintl) without the ngettext() function -dnl will be ignored. -dnl INTLDIR is used to find the intl libraries. If empty, -dnl the value `$(top_builddir)/intl/' is used. -dnl -dnl The result of the configuration is one of three cases: -dnl 1) GNU gettext, as included in the intl subdirectory, will be compiled -dnl and used. -dnl Catalog format: GNU --> install in $(datadir) -dnl Catalog extension: .mo after installation, .gmo in source tree -dnl 2) GNU gettext has been found in the system's C library. -dnl Catalog format: GNU --> install in $(datadir) -dnl Catalog extension: .mo after installation, .gmo in source tree -dnl 3) No internationalization, always use English msgid. -dnl Catalog format: none -dnl Catalog extension: none -dnl If INTLSYMBOL is 'external', only cases 2 and 3 can occur. -dnl The use of .gmo is historical (it was needed to avoid overwriting the -dnl GNU format catalogs when building on a platform with an X/Open gettext), -dnl but we keep it in order not to force irrelevant filename changes on the -dnl maintainers. -dnl -AC_DEFUN([AM_GNU_GETTEXT], -[ - dnl Argument checking. - ifelse([$1], [], , [ifelse([$1], [external], , [ifelse([$1], [no-libtool], , [ifelse([$1], [use-libtool], , - [errprint([ERROR: invalid first argument to AM_GNU_GETTEXT -])])])])]) - ifelse([$2], [], , [ifelse([$2], [need-ngettext], , - [errprint([ERROR: invalid second argument to AM_GNU_GETTEXT -])])]) - define(gt_included_intl, ifelse([$1], [external], [no], [yes])) - define(gt_libtool_suffix_prefix, ifelse([$1], [use-libtool], [l], [])) - - AC_REQUIRE([AM_PO_SUBDIRS])dnl - ifelse(gt_included_intl, yes, [ - AC_REQUIRE([AM_INTL_SUBDIR])dnl - ]) - - dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - - AC_MSG_CHECKING([whether NLS is requested]) - dnl Default is enabled NLS - AC_ARG_ENABLE(nls, - [ --disable-nls do not use Native Language Support], - USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT($USE_NLS) - AC_SUBST(USE_NLS) +# Macro to add for using GNU gettext. +# Ulrich Drepper , 1995. +# +# Modified to never use included libintl. +# Owen Taylor , 12/15/1998 +# +# +# This file can 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. + +# serial 5 + +AC_DEFUN(AM_GNOME_WITH_NLS, + [AC_MSG_CHECKING([whether NLS is requested]) + dnl Default is enabled NLS + AC_ARG_ENABLE(nls, + [ --disable-nls do not use Native Language Support], + USE_NLS=$enableval, USE_NLS=yes) + AC_MSG_RESULT($USE_NLS) + AC_SUBST(USE_NLS) - ifelse(gt_included_intl, yes, [ - BUILD_INCLUDED_LIBINTL=no USE_INCLUDED_LIBINTL=no - ]) - LIBINTL= - LTLIBINTL= - POSUB= - - dnl If we use NLS figure out what method - if test "$USE_NLS" = "yes"; then - gt_use_preinstalled_gnugettext=no - ifelse(gt_included_intl, yes, [ - AC_MSG_CHECKING([whether included gettext is requested]) - AC_ARG_WITH(included-gettext, - [ --with-included-gettext use the GNU gettext library included here], - nls_cv_force_use_gnu_gettext=$withval, - nls_cv_force_use_gnu_gettext=no) - AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) + + dnl If we use NLS figure out what method + if test "$USE_NLS" = "yes"; then + AC_DEFINE(ENABLE_NLS) +# AC_MSG_CHECKING([whether included gettext is requested]) +# AC_ARG_WITH(included-gettext, +# [ --with-included-gettext use the GNU gettext library included here], +# nls_cv_force_use_gnu_gettext=$withval, +# nls_cv_force_use_gnu_gettext=no) +# AC_MSG_RESULT($nls_cv_force_use_gnu_gettext) + nls_cv_force_use_gnu_gettext="no" nls_cv_use_gnu_gettext="$nls_cv_force_use_gnu_gettext" if test "$nls_cv_force_use_gnu_gettext" != "yes"; then - ]) dnl User does not insist on using GNU NLS library. Figure out what - dnl to use. If GNU gettext is available we use this. Else we have - dnl to fall back to GNU NLS library. - - dnl Add a version number to the cache macros. - define([gt_api_version], ifelse([$2], [need-ngettext], 2, 1)) - define([gt_cv_func_gnugettext_libc], [gt_cv_func_gnugettext]gt_api_version[_libc]) - define([gt_cv_func_gnugettext_libintl], [gt_cv_func_gnugettext]gt_api_version[_libintl]) - - AC_CACHE_CHECK([for GNU gettext in libc], gt_cv_func_gnugettext_libc, - [AC_TRY_LINK([#include -extern int _nl_msg_cat_cntr; -extern int *_nl_domain_bindings;], - [bindtextdomain ("", ""); -return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings], - gt_cv_func_gnugettext_libc=yes, - gt_cv_func_gnugettext_libc=no)]) - - if test "$gt_cv_func_gnugettext_libc" != "yes"; then - dnl Sometimes libintl requires libiconv, so first search for libiconv. - ifelse(gt_included_intl, yes, , [ - AM_ICONV_LINK - ]) - dnl Search for libintl and define LIBINTL, LTLIBINTL and INCINTL - dnl accordingly. Don't use AC_LIB_LINKFLAGS_BODY([intl],[iconv]) - dnl because that would add "-liconv" to LIBINTL and LTLIBINTL - dnl even if libiconv doesn't exist. - AC_LIB_LINKFLAGS_BODY([intl]) - AC_CACHE_CHECK([for GNU gettext in libintl], - gt_cv_func_gnugettext_libintl, - [gt_save_CPPFLAGS="$CPPFLAGS" - CPPFLAGS="$CPPFLAGS $INCINTL" - gt_save_LIBS="$LIBS" - LIBS="$LIBS $LIBINTL" - dnl Now see whether libintl exists and does not depend on libiconv. - AC_TRY_LINK([#include -extern int _nl_msg_cat_cntr; -extern int *_nl_domain_bindings; -extern -#ifdef __cplusplus -"C" -#endif -const char *_nl_expand_alias ();], - [bindtextdomain ("", ""); -return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)], - gt_cv_func_gnugettext_libintl=yes, - gt_cv_func_gnugettext_libintl=no) - dnl Now see whether libintl exists and depends on libiconv. - if test "$gt_cv_func_gnugettext_libintl" != yes && test -n "$LIBICONV"; then - LIBS="$LIBS $LIBICONV" - AC_TRY_LINK([#include -extern int _nl_msg_cat_cntr; -extern int *_nl_domain_bindings; -extern -#ifdef __cplusplus -"C" -#endif -const char *_nl_expand_alias ();], - [bindtextdomain ("", ""); -return (int) gettext ("")]ifelse([$2], [need-ngettext], [ + (int) ngettext ("", "", 0)], [])[ + _nl_msg_cat_cntr + *_nl_domain_bindings + *_nl_expand_alias (0)], - [LIBINTL="$LIBINTL $LIBICONV" - LTLIBINTL="$LTLIBINTL $LTLIBICONV" - gt_cv_func_gnugettext_libintl=yes - ]) - fi - CPPFLAGS="$gt_save_CPPFLAGS" - LIBS="$gt_save_LIBS"]) - fi + dnl to use. If gettext or catgets are available (in this order) we + dnl use this. Else we have to fall back to GNU NLS library. + dnl catgets is only used if permitted by option --with-catgets. + nls_cv_header_intl= + nls_cv_header_libgt= + CATOBJEXT=NONE + + AC_CHECK_HEADER(libintl.h, + [AC_CACHE_CHECK([for gettext in libc], gt_cv_func_gettext_libc, + [AC_TRY_LINK([#include ], [return (int) gettext ("")], + gt_cv_func_gettext_libc=yes, gt_cv_func_gettext_libc=no)]) + + if test "$gt_cv_func_gettext_libc" != "yes"; then + AC_CHECK_LIB(intl, bindtextdomain, + [AC_CACHE_CHECK([for gettext in libintl], + gt_cv_func_gettext_libintl, + [AC_CHECK_LIB(intl, gettext, + gt_cv_func_gettext_libintl=yes, + gt_cv_func_gettext_libintl=no)], + gt_cv_func_gettext_libintl=no)]) + fi + + if test "$gt_cv_func_gettext_libc" = "yes" \ + || test "$gt_cv_func_gettext_libintl" = "yes"; then + AC_DEFINE(HAVE_GETTEXT) + AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no)dnl + if test "$MSGFMT" != "no"; then + AC_CHECK_FUNCS(dcgettext) + AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + AC_TRY_LINK(, [extern int _nl_msg_cat_cntr; + return _nl_msg_cat_cntr], + [CATOBJEXT=.gmo + DATADIRNAME=share], + [CATOBJEXT=.mo + DATADIRNAME=lib]) + INSTOBJEXT=.mo + fi + fi - dnl If an already present or preinstalled GNU gettext() is found, - dnl use it. But if this macro is used in GNU gettext, and GNU - dnl gettext is already preinstalled in libintl, we update this - dnl libintl. (Cf. the install rule in intl/Makefile.in.) - if test "$gt_cv_func_gnugettext_libc" = "yes" \ - || { test "$gt_cv_func_gnugettext_libintl" = "yes" \ - && test "$PACKAGE" != gettext; }; then - gt_use_preinstalled_gnugettext=yes - else - dnl Reset the values set by searching for libintl. - LIBINTL= - LTLIBINTL= - INCINTL= + # Added by Martin Baulig 12/15/98 for libc5 systems + if test "$gt_cv_func_gettext_libc" != "yes" \ + && test "$gt_cv_func_gettext_libintl" = "yes"; then + INTLLIBS=-lintl + LIBS=`echo $LIBS | sed -e 's/-lintl//'` + fi + ]) + + if test "$CATOBJEXT" = "NONE"; then + AC_MSG_CHECKING([whether catgets can be used]) + AC_ARG_WITH(catgets, + [ --with-catgets use catgets functions if available], + nls_cv_use_catgets=$withval, nls_cv_use_catgets=no) + AC_MSG_RESULT($nls_cv_use_catgets) + + if test "$nls_cv_use_catgets" = "yes"; then + dnl No gettext in C library. Try catgets next. + AC_CHECK_LIB(i, main) + AC_CHECK_FUNC(catgets, + [AC_DEFINE(HAVE_CATGETS) + INTLOBJS="\$(CATOBJS)" + AC_PATH_PROG(GENCAT, gencat, no)dnl +# if test "$GENCAT" != "no"; then +# AC_PATH_PROG(GMSGFMT, gmsgfmt, no) +# if test "$GMSGFMT" = "no"; then +# AM_PATH_PROG_WITH_TEST(GMSGFMT, msgfmt, +# [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], no) +# fi +# AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, +# [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) +# USE_INCLUDED_LIBINTL=yes +# CATOBJEXT=.cat +# INSTOBJEXT=.cat +# DATADIRNAME=lib +# INTLDEPS='$(top_builddir)/intl/libintl.a' +# INTLLIBS=$INTLDEPS +# LIBS=`echo $LIBS | sed -e 's/-lintl//'` +# nls_cv_header_intl=intl/libintl.h +# nls_cv_header_libgt=intl/libgettext.h +# fi + ]) + fi fi - ifelse(gt_included_intl, yes, [ - if test "$gt_use_preinstalled_gnugettext" != "yes"; then - dnl GNU gettext is not found in the C library. - dnl Fall back on included GNU gettext library. - nls_cv_use_gnu_gettext=yes + if test "$CATOBJEXT" = "NONE"; then + dnl Neither gettext nor catgets in included in the C library. + dnl Fall back on GNU gettext library. + nls_cv_use_gnu_gettext=yes fi fi - if test "$nls_cv_use_gnu_gettext" = "yes"; then - dnl Mark actions used to generate GNU NLS library. - INTLOBJS="\$(GETTOBJS)" - BUILD_INCLUDED_LIBINTL=yes - USE_INCLUDED_LIBINTL=yes - LIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LIBICONV" - LTLIBINTL="ifelse([$3],[],\${top_builddir}/intl,[$3])/libintl.[]gt_libtool_suffix_prefix[]a $LTLIBICONV" - LIBS=`echo " $LIBS " | sed -e 's/ -lintl / /' -e 's/^ //' -e 's/ $//'` + if test "$nls_cv_use_gnu_gettext" != "yes"; then + AC_DEFINE(ENABLE_NLS) + else + # Unset this variable since we use the non-zero value as a flag. + CATOBJEXT= +# dnl Mark actions used to generate GNU NLS library. +# INTLOBJS="\$(GETTOBJS)" +# AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, +# [test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"], msgfmt) +# AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) +# AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, +# [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) +# AC_SUBST(MSGFMT) +# USE_INCLUDED_LIBINTL=yes +# CATOBJEXT=.gmo +# INSTOBJEXT=.mo +# DATADIRNAME=share +# INTLDEPS='$(top_builddir)/intl/libintl.a' +# INTLLIBS=$INTLDEPS +# LIBS=`echo $LIBS | sed -e 's/-lintl//'` +# nls_cv_header_intl=intl/libintl.h +# nls_cv_header_libgt=intl/libgettext.h fi - if test "$gt_use_preinstalled_gnugettext" = "yes" \ - || test "$nls_cv_use_gnu_gettext" = "yes"; then - dnl Mark actions to use GNU gettext tools. - CATOBJEXT=.gmo + dnl Test whether we really found GNU xgettext. + if test "$XGETTEXT" != ":"; then + dnl If it is no GNU xgettext we define it as : so that the + dnl Makefiles still can work. + if $XGETTEXT --omit-header /dev/null 2> /dev/null; then + : ; + else + AC_MSG_RESULT( + [found xgettext program is not GNU xgettext; ignore it]) + XGETTEXT=":" + fi fi - ]) - if test "$gt_use_preinstalled_gnugettext" = "yes" \ - || test "$nls_cv_use_gnu_gettext" = "yes"; then - AC_DEFINE(ENABLE_NLS, 1, - [Define to 1 if translation of program messages to the user's native language - is requested.]) + # We need to process the po/ directory. + POSUB=po else - USE_NLS=no - fi - fi - - if test "$USE_NLS" = "yes"; then - - if test "$gt_use_preinstalled_gnugettext" = "yes"; then - if test "$gt_cv_func_gnugettext_libintl" = "yes"; then - AC_MSG_CHECKING([how to link with libintl]) - AC_MSG_RESULT([$LIBINTL]) - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCINTL]) - fi - - dnl For backward compatibility. Some packages may be using this. - AC_DEFINE(HAVE_GETTEXT, 1, - [Define if the GNU gettext() function is already present or preinstalled.]) - AC_DEFINE(HAVE_DCGETTEXT, 1, - [Define if the GNU dcgettext() function is already present or preinstalled.]) - fi - - dnl We need to process the po/ directory. - POSUB=po - fi - - ifelse(gt_included_intl, yes, [ - dnl If this is used in GNU gettext we have to set BUILD_INCLUDED_LIBINTL - dnl to 'yes' because some of the testsuite requires it. - if test "$PACKAGE" = gettext; then - BUILD_INCLUDED_LIBINTL=yes + DATADIRNAME=share + nls_cv_header_intl=intl/libintl.h + nls_cv_header_libgt=intl/libgettext.h fi + AC_LINK_FILES($nls_cv_header_libgt, $nls_cv_header_intl) + AC_OUTPUT_COMMANDS( + [case "$CONFIG_FILES" in *po/Makefile.in*) + sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile + esac]) + + +# # If this is used in GNU gettext we have to set USE_NLS to `yes' +# # because some of the sources are only built for this goal. +# if test "$PACKAGE" = gettext; then +# USE_NLS=yes +# USE_INCLUDED_LIBINTL=yes +# fi + + dnl These rules are solely for the distribution goal. While doing this + dnl we only have to keep exactly one list of the available catalogs + dnl in configure.in. + for lang in $ALL_LINGUAS; do + GMOFILES="$GMOFILES $lang.gmo" + POFILES="$POFILES $lang.po" + done dnl Make all variables we use known to autoconf. - AC_SUBST(BUILD_INCLUDED_LIBINTL) AC_SUBST(USE_INCLUDED_LIBINTL) + AC_SUBST(CATALOGS) AC_SUBST(CATOBJEXT) - AC_SUBST(INTLOBJS) - - dnl For backward compatibility. Some configure.ins may be using this. - nls_cv_header_intl= - nls_cv_header_libgt= - - dnl For backward compatibility. Some Makefiles may be using this. - DATADIRNAME=share AC_SUBST(DATADIRNAME) - - dnl For backward compatibility. Some Makefiles may be using this. - INSTOBJEXT=.mo + AC_SUBST(GMOFILES) AC_SUBST(INSTOBJEXT) - - dnl For backward compatibility. Some Makefiles may be using this. - GENCAT=gencat - AC_SUBST(GENCAT) - - dnl Enable libtool support if the surrounding package wishes it. - INTL_LIBTOOL_SUFFIX_PREFIX=gt_libtool_suffix_prefix - AC_SUBST(INTL_LIBTOOL_SUFFIX_PREFIX) - ]) - - dnl For backward compatibility. Some Makefiles may be using this. - INTLLIBS="$LIBINTL" - AC_SUBST(INTLLIBS) - - dnl Make all documented variables known to autoconf. - AC_SUBST(LIBINTL) - AC_SUBST(LTLIBINTL) - AC_SUBST(POSUB) -]) - - -dnl Checks for all prerequisites of the po subdirectory, -dnl except for USE_NLS. -AC_DEFUN([AM_PO_SUBDIRS], -[ - AC_REQUIRE([AC_PROG_MAKE_SET])dnl - AC_REQUIRE([AC_PROG_INSTALL])dnl - AC_REQUIRE([AM_MKINSTALLDIRS])dnl - - dnl Perform the following tests also if --disable-nls has been given, - dnl because they are needed for "make dist" to work. - - dnl Search for GNU msgfmt in the PATH. - dnl The first test excludes Solaris msgfmt and early GNU msgfmt versions. - dnl The second test excludes FreeBSD msgfmt. - AM_PATH_PROG_WITH_TEST(MSGFMT, msgfmt, - [$ac_dir/$ac_word --statistics /dev/null >/dev/null 2>&1 && - (if $ac_dir/$ac_word --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], - :) - AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) - - dnl Search for GNU xgettext 0.11 or newer in the PATH. - dnl The first test excludes Solaris xgettext and early GNU xgettext versions. - dnl The second test excludes FreeBSD xgettext. - AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, - [$ac_dir/$ac_word --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 && - (if $ac_dir/$ac_word --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi)], - :) - dnl Remove leftover from FreeBSD xgettext call. - rm -f messages.po - - dnl Search for GNU msgmerge 0.11 or newer in the PATH. - AM_PATH_PROG_WITH_TEST(MSGMERGE, msgmerge, - [$ac_dir/$ac_word --update -q /dev/null /dev/null >/dev/null 2>&1], :) - - dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. - dnl Test whether we really found GNU msgfmt. - if test "$GMSGFMT" != ":"; then - dnl If it is no GNU msgfmt we define it as : so that the - dnl Makefiles still can work. - if $GMSGFMT --statistics /dev/null >/dev/null 2>&1 && - (if $GMSGFMT --statistics /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then - : ; - else - GMSGFMT=`echo "$GMSGFMT" | sed -e 's,^.*/,,'` - AC_MSG_RESULT( - [found $GMSGFMT program is not GNU msgfmt; ignore it]) - GMSGFMT=":" - fi - fi - - dnl This could go away some day; the PATH_PROG_WITH_TEST already does it. - dnl Test whether we really found GNU xgettext. - if test "$XGETTEXT" != ":"; then - dnl If it is no GNU xgettext we define it as : so that the - dnl Makefiles still can work. - if $XGETTEXT --omit-header --copyright-holder= /dev/null >/dev/null 2>&1 && - (if $XGETTEXT --omit-header --copyright-holder= /dev/null 2>&1 >/dev/null | grep usage >/dev/null; then exit 1; else exit 0; fi); then - : ; - else - AC_MSG_RESULT( - [found xgettext program is not GNU xgettext; ignore it]) - XGETTEXT=":" - fi - dnl Remove leftover from FreeBSD xgettext call. - rm -f messages.po - fi - - AC_OUTPUT_COMMANDS([ - for ac_file in $CONFIG_FILES; do - # Support "outfile[:infile[:infile...]]" - case "$ac_file" in - *:*) ac_file=`echo "$ac_file"|sed 's%:.*%%'` ;; - esac - # PO directories have a Makefile.in generated from Makefile.in.in. - case "$ac_file" in */Makefile.in) - # Adjust a relative srcdir. - ac_dir=`echo "$ac_file"|sed 's%/[^/][^/]*$%%'` - ac_dir_suffix="/`echo "$ac_dir"|sed 's%^\./%%'`" - ac_dots=`echo "$ac_dir_suffix"|sed 's%/[^/]*%../%g'` - # In autoconf-2.13 it is called $ac_given_srcdir. - # In autoconf-2.50 it is called $srcdir. - test -n "$ac_given_srcdir" || ac_given_srcdir="$srcdir" - case "$ac_given_srcdir" in - .) top_srcdir=`echo $ac_dots|sed 's%/$%%'` ;; - /*) top_srcdir="$ac_given_srcdir" ;; - *) top_srcdir="$ac_dots$ac_given_srcdir" ;; - esac - if test -f "$ac_given_srcdir/$ac_dir/POTFILES.in"; then - rm -f "$ac_dir/POTFILES" - test -n "$as_me" && echo "$as_me: creating $ac_dir/POTFILES" || echo "creating $ac_dir/POTFILES" - cat "$ac_given_srcdir/$ac_dir/POTFILES.in" | sed -e "/^#/d" -e "/^[ ]*\$/d" -e "s,.*, $top_srcdir/& \\\\," | sed -e "\$s/\(.*\) \\\\/\1/" > "$ac_dir/POTFILES" - # ALL_LINGUAS, POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES depend - # on $ac_dir but don't depend on user-specified configuration - # parameters. - if test -f "$ac_given_srcdir/$ac_dir/LINGUAS"; then - # The LINGUAS file contains the set of available languages. - if test -n "$ALL_LINGUAS"; then - test -n "$as_me" && echo "$as_me: setting ALL_LINGUAS in configure.in is obsolete" || echo "setting ALL_LINGUAS in configure.in is obsolete" - fi - ALL_LINGUAS_=`sed -e "/^#/d" "$ac_given_srcdir/$ac_dir/LINGUAS"` - # Hide the ALL_LINGUAS assigment from automake. - eval 'ALL_LINGUAS''=$ALL_LINGUAS_' - fi - case "$ac_given_srcdir" in - .) srcdirpre= ;; - *) srcdirpre='$(srcdir)/' ;; - esac - POFILES= - GMOFILES= - UPDATEPOFILES= - DUMMYPOFILES= - for lang in $ALL_LINGUAS; do - POFILES="$POFILES $srcdirpre$lang.po" - GMOFILES="$GMOFILES $srcdirpre$lang.gmo" - UPDATEPOFILES="$UPDATEPOFILES $lang.po-update" - DUMMYPOFILES="$DUMMYPOFILES $lang.nop" - done - # CATALOGS depends on both $ac_dir and the user's LINGUAS - # environment variable. - INST_LINGUAS= - if test -n "$ALL_LINGUAS"; then - for presentlang in $ALL_LINGUAS; do - useit=no - if test "%UNSET%" != "$LINGUAS"; then - desiredlanguages="$LINGUAS" - else - desiredlanguages="$ALL_LINGUAS" - fi - for desiredlang in $desiredlanguages; do - # Use the presentlang catalog if desiredlang is - # a. equal to presentlang, or - # b. a variant of presentlang (because in this case, - # presentlang can be used as a fallback for messages - # which are not translated in the desiredlang catalog). - case "$desiredlang" in - "$presentlang"*) useit=yes;; - esac - done - if test $useit = yes; then - INST_LINGUAS="$INST_LINGUAS $presentlang" - fi - done - fi - CATALOGS= - if test -n "$INST_LINGUAS"; then - for lang in $INST_LINGUAS; do - CATALOGS="$CATALOGS $lang.gmo" - done - fi - test -n "$as_me" && echo "$as_me: creating $ac_dir/Makefile" || echo "creating $ac_dir/Makefile" - sed -e "/^POTFILES =/r $ac_dir/POTFILES" -e "/^# Makevars/r $ac_given_srcdir/$ac_dir/Makevars" -e "s|@POFILES@|$POFILES|g" -e "s|@GMOFILES@|$GMOFILES|g" -e "s|@UPDATEPOFILES@|$UPDATEPOFILES|g" -e "s|@DUMMYPOFILES@|$DUMMYPOFILES|g" -e "s|@CATALOGS@|$CATALOGS|g" "$ac_dir/Makefile.in" > "$ac_dir/Makefile" - for f in "$ac_given_srcdir/$ac_dir"/Rules-*; do - if test -f "$f"; then - case "$f" in - *.orig | *.bak | *~) ;; - *) cat "$f" >> "$ac_dir/Makefile" ;; - esac - fi - done - fi - ;; - esac - done], - [# Capture the value of obsolete $ALL_LINGUAS because we need it to compute - # POFILES, GMOFILES, UPDATEPOFILES, DUMMYPOFILES, CATALOGS. But hide it - # from automake. - eval 'ALL_LINGUAS''="$ALL_LINGUAS"' - # Capture the value of LINGUAS because we need it to compute CATALOGS. - LINGUAS="${LINGUAS-%UNSET%}" - ]) -]) - - -dnl Checks for all prerequisites of the intl subdirectory, -dnl except for INTL_LIBTOOL_SUFFIX_PREFIX (and possibly LIBTOOL), INTLOBJS, -dnl USE_INCLUDED_LIBINTL, BUILD_INCLUDED_LIBINTL. -AC_DEFUN([AM_INTL_SUBDIR], -[ - AC_REQUIRE([AC_PROG_INSTALL])dnl - AC_REQUIRE([AM_MKINSTALLDIRS])dnl - AC_REQUIRE([AC_PROG_CC])dnl - AC_REQUIRE([AC_CANONICAL_HOST])dnl - AC_REQUIRE([AC_PROG_RANLIB])dnl - AC_REQUIRE([AC_ISC_POSIX])dnl - AC_REQUIRE([AC_HEADER_STDC])dnl - AC_REQUIRE([AC_C_CONST])dnl - AC_REQUIRE([AC_C_INLINE])dnl - AC_REQUIRE([AC_TYPE_OFF_T])dnl - AC_REQUIRE([AC_TYPE_SIZE_T])dnl - AC_REQUIRE([AC_FUNC_ALLOCA])dnl - AC_REQUIRE([AC_FUNC_MMAP])dnl - AC_REQUIRE([jm_GLIBC21])dnl - - AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h stddef.h \ -stdlib.h string.h unistd.h sys/param.h]) - AC_CHECK_FUNCS([feof_unlocked fgets_unlocked getc_unlocked getcwd getegid \ -geteuid getgid getuid mempcpy munmap putenv setenv setlocale stpcpy \ -strcasecmp strdup strtoul tsearch __argz_count __argz_stringify __argz_next]) - - AM_ICONV - AM_LANGINFO_CODESET - AM_LC_MESSAGES - - dnl intl/plural.c is generated from intl/plural.y. It requires bison, - dnl because plural.y uses bison specific features. It requires at least - dnl bison-1.26 because earlier versions generate a plural.c that doesn't - dnl compile. - dnl bison is only needed for the maintainer (who touches plural.y). But in - dnl order to avoid separate Makefiles or --enable-maintainer-mode, we put - dnl the rule in general Makefile. Now, some people carelessly touch the - dnl files or have a broken "make" program, hence the plural.c rule will - dnl sometimes fire. To avoid an error, defines BISON to ":" if it is not - dnl present or too old. - AC_CHECK_PROGS([INTLBISON], [bison]) - if test -z "$INTLBISON"; then - ac_verc_fail=yes - else - dnl Found it, now check the version. - AC_MSG_CHECKING([version of bison]) -changequote(<<,>>)dnl - ac_prog_version=`$INTLBISON --version 2>&1 | sed -n 's/^.*GNU Bison.* \([0-9]*\.[0-9.]*\).*$/\1/p'` - case $ac_prog_version in - '') ac_prog_version="v. ?.??, bad"; ac_verc_fail=yes;; - 1.2[6-9]* | 1.[3-9][0-9]* | [2-9].*) -changequote([,])dnl - ac_prog_version="$ac_prog_version, ok"; ac_verc_fail=no;; - *) ac_prog_version="$ac_prog_version, bad"; ac_verc_fail=yes;; - esac - AC_MSG_RESULT([$ac_prog_version]) - fi - if test $ac_verc_fail = yes; then - INTLBISON=: - fi -]) - - -AC_DEFUN([AM_MKINSTALLDIRS], -[ - dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly - dnl find the mkinstalldirs script in another subdir but $(top_srcdir). - dnl Try to locate is. - MKINSTALLDIRS= - if test -n "$ac_aux_dir"; then - MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" - fi - if test -z "$MKINSTALLDIRS"; then - MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" - fi - AC_SUBST(MKINSTALLDIRS) -]) - -# lib-link.m4 serial 1 (gettext-0.11) -dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Bruno Haible. - -dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and -dnl the libraries corresponding to explicit and implicit dependencies. -dnl Sets and AC_SUBSTs the LIB${NAME} and LTLIB${NAME} variables and -dnl augments the CPPFLAGS variable. -AC_DEFUN([AC_LIB_LINKFLAGS], -[ - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - define([Name],[translit([$1],[./-], [___])]) - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - AC_CACHE_CHECK([how to link with lib[]$1], [ac_cv_lib[]Name[]_libs], [ - AC_LIB_LINKFLAGS_BODY([$1], [$2]) - ac_cv_lib[]Name[]_libs="$LIB[]NAME" - ac_cv_lib[]Name[]_ltlibs="$LTLIB[]NAME" - ac_cv_lib[]Name[]_cppflags="$INC[]NAME" - ]) - LIB[]NAME="$ac_cv_lib[]Name[]_libs" - LTLIB[]NAME="$ac_cv_lib[]Name[]_ltlibs" - INC[]NAME="$ac_cv_lib[]Name[]_cppflags" - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) - AC_SUBST([LIB]NAME) - AC_SUBST([LTLIB]NAME) - dnl Also set HAVE_LIB[]NAME so that AC_LIB_HAVE_LINKFLAGS can reuse the - dnl results of this search when this library appears as a dependency. - HAVE_LIB[]NAME=yes - undefine([Name]) - undefine([NAME]) -]) - -dnl AC_LIB_HAVE_LINKFLAGS(name, dependencies, includes, testcode) -dnl searches for libname and the libraries corresponding to explicit and -dnl implicit dependencies, together with the specified include files and -dnl the ability to compile and link the specified testcode. If found, it -dnl sets and AC_SUBSTs HAVE_LIB${NAME}=yes and the LIB${NAME} and -dnl LTLIB${NAME} variables and augments the CPPFLAGS variable, and -dnl #defines HAVE_LIB${NAME} to 1. Otherwise, it sets and AC_SUBSTs -dnl HAVE_LIB${NAME}=no and LIB${NAME} and LTLIB${NAME} to empty. -AC_DEFUN([AC_LIB_HAVE_LINKFLAGS], -[ - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - define([Name],[translit([$1],[./-], [___])]) - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - - dnl Search for lib[]Name and define LIB[]NAME, LTLIB[]NAME and INC[]NAME - dnl accordingly. - AC_LIB_LINKFLAGS_BODY([$1], [$2]) - - dnl Add $INC[]NAME to CPPFLAGS before performing the following checks, - dnl because if the user has installed lib[]Name and not disabled its use - dnl via --without-lib[]Name-prefix, he wants to use it. - ac_save_CPPFLAGS="$CPPFLAGS" - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INC]NAME) - - AC_CACHE_CHECK([for lib[]$1], [ac_cv_lib[]Name], [ - ac_save_LIBS="$LIBS" - LIBS="$LIBS $LIB[]NAME" - AC_TRY_LINK([$3], [$4], [ac_cv_lib[]Name=yes], [ac_cv_lib[]Name=no]) - LIBS="$ac_save_LIBS" - ]) - if test "$ac_cv_lib[]Name" = yes; then - HAVE_LIB[]NAME=yes - AC_DEFINE([HAVE_LIB]NAME, 1, [Define if you have the $1 library.]) - AC_MSG_CHECKING([how to link with lib[]$1]) - AC_MSG_RESULT([$LIB[]NAME]) - else - HAVE_LIB[]NAME=no - dnl If $LIB[]NAME didn't lead to a usable library, we don't need - dnl $INC[]NAME either. - CPPFLAGS="$ac_save_CPPFLAGS" - LIB[]NAME= - LTLIB[]NAME= - fi - AC_SUBST([HAVE_LIB]NAME) - AC_SUBST([LIB]NAME) - AC_SUBST([LTLIB]NAME) - undefine([Name]) - undefine([NAME]) -]) - -dnl Determine the platform dependent parameters needed to use rpath: -dnl libext, shlibext, hardcode_libdir_flag_spec, hardcode_libdir_separator, -dnl hardcode_direct, hardcode_minus_L, -dnl sys_lib_search_path_spec, sys_lib_dlsearch_path_spec. -AC_DEFUN([AC_LIB_RPATH], -[ - AC_REQUIRE([AC_PROG_CC]) dnl we use $CC, $GCC, $LDFLAGS - AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld - AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host - AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir - AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [ - CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ - ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh - . ./conftest.sh - rm -f ./conftest.sh - acl_cv_rpath=done - ]) - wl="$acl_cv_wl" - libext="$acl_cv_libext" - shlibext="$acl_cv_shlibext" - hardcode_libdir_flag_spec="$acl_cv_hardcode_libdir_flag_spec" - hardcode_libdir_separator="$acl_cv_hardcode_libdir_separator" - hardcode_direct="$acl_cv_hardcode_direct" - hardcode_minus_L="$acl_cv_hardcode_minus_L" - sys_lib_search_path_spec="$acl_cv_sys_lib_search_path_spec" - sys_lib_dlsearch_path_spec="$acl_cv_sys_lib_dlsearch_path_spec" -]) - -dnl AC_LIB_LINKFLAGS_BODY(name [, dependencies]) searches for libname and -dnl the libraries corresponding to explicit and implicit dependencies. -dnl Sets the LIB${NAME}, LTLIB${NAME} and INC${NAME} variables. -AC_DEFUN([AC_LIB_LINKFLAGS_BODY], -[ - define([NAME],[translit([$1],[abcdefghijklmnopqrstuvwxyz./-], - [ABCDEFGHIJKLMNOPQRSTUVWXYZ___])]) - dnl By default, look in $includedir and $libdir. - use_additional=yes - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - AC_ARG_WITH([lib$1-prefix], -[ --with-lib$1-prefix[=DIR] search for lib$1 in DIR/include and DIR/lib - --without-lib$1-prefix don't search for lib$1 in includedir and libdir], -[ - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - else - additional_includedir="$withval/include" - additional_libdir="$withval/lib" - fi - fi -]) - dnl Search the library and its dependencies in $additional_libdir and - dnl $LDFLAGS. Using breadth-first-seach. - LIB[]NAME= - LTLIB[]NAME= - INC[]NAME= - rpathdirs= - ltrpathdirs= - names_already_handled= - names_next_round='$1 $2' - while test -n "$names_next_round"; do - names_this_round="$names_next_round" - names_next_round= - for name in $names_this_round; do - already_handled= - for n in $names_already_handled; do - if test "$n" = "$name"; then - already_handled=yes - break - fi - done - if test -z "$already_handled"; then - names_already_handled="$names_already_handled $name" - dnl See if it was already located by an earlier AC_LIB_LINKFLAGS - dnl or AC_LIB_HAVE_LINKFLAGS call. - uppername=`echo "$name" | sed -e 'y|abcdefghijklmnopqrstuvwxyz./-|ABCDEFGHIJKLMNOPQRSTUVWXYZ___|'` - eval value=\"\$HAVE_LIB$uppername\" - if test -n "$value"; then - if test "$value" = yes; then - eval value=\"\$LIB$uppername\" - test -z "$value" || LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$value" - eval value=\"\$LTLIB$uppername\" - test -z "$value" || LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$value" - else - dnl An earlier call to AC_LIB_HAVE_LINKFLAGS has determined - dnl that this library doesn't exist. So just drop it. - : - fi - else - dnl Search the library lib$name in $additional_libdir and $LDFLAGS - dnl and the already constructed $LIBNAME/$LTLIBNAME. - found_dir= - found_la= - found_so= - found_a= - if test $use_additional = yes; then - if test -n "$shlibext" && test -f "$additional_libdir/lib$name.$shlibext"; then - found_dir="$additional_libdir" - found_so="$additional_libdir/lib$name.$shlibext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi - else - if test -f "$additional_libdir/lib$name.$libext"; then - found_dir="$additional_libdir" - found_a="$additional_libdir/lib$name.$libext" - if test -f "$additional_libdir/lib$name.la"; then - found_la="$additional_libdir/lib$name.la" - fi - fi - fi - fi - if test "X$found_dir" = "X"; then - for x in $LDFLAGS $LTLIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - case "$x" in - -L*) - dir=`echo "X$x" | sed -e 's/^X-L//'` - if test -n "$shlibext" && test -f "$dir/lib$name.$shlibext"; then - found_dir="$dir" - found_so="$dir/lib$name.$shlibext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi - else - if test -f "$dir/lib$name.$libext"; then - found_dir="$dir" - found_a="$dir/lib$name.$libext" - if test -f "$dir/lib$name.la"; then - found_la="$dir/lib$name.la" - fi - fi - fi - ;; - esac - if test "X$found_dir" != "X"; then - break - fi - done - fi - if test "X$found_dir" != "X"; then - dnl Found the library. - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$found_dir -l$name" - if test "X$found_so" != "X"; then - dnl Linking with a shared library. We attempt to hardcode its - dnl directory into the executable's runpath, unless it's the - dnl standard /usr/lib. - if test "X$found_dir" = "X/usr/lib"; then - dnl No hardcoding is needed. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - dnl Use an explicit option to hardcode DIR into the resulting - dnl binary. - dnl Potentially add DIR to ltrpathdirs. - dnl The ltrpathdirs will be appended to $LTLIBNAME at the end. - haveit= - for x in $ltrpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - ltrpathdirs="$ltrpathdirs $found_dir" - fi - dnl The hardcoding into $LIBNAME is system dependent. - if test "$hardcode_direct" = yes; then - dnl Using DIR/libNAME.so during linking hardcodes DIR into the - dnl resulting binary. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - if test -n "$hardcode_libdir_flag_spec" && test "$hardcode_minus_L" = no; then - dnl Use an explicit option to hardcode DIR into the resulting - dnl binary. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - dnl Potentially add DIR to rpathdirs. - dnl The rpathdirs will be appended to $LIBNAME at the end. - haveit= - for x in $rpathdirs; do - if test "X$x" = "X$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - rpathdirs="$rpathdirs $found_dir" - fi - else - dnl Rely on "-L$found_dir". - dnl But don't add it if it's already contained in the LDFLAGS - dnl or the already constructed $LIBNAME - haveit= - for x in $LDFLAGS $LIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$found_dir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir" - fi - if test "$hardcode_minus_L" != no; then - dnl FIXME: Not sure whether we should use - dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" - dnl here. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_so" - else - dnl We cannot use $hardcode_runpath_var and LD_RUN_PATH - dnl here, because this doesn't fit in flags passed to the - dnl compiler. So give up. No hardcoding. This affects only - dnl very old systems. - dnl FIXME: Not sure whether we should use - dnl "-L$found_dir -l$name" or "-L$found_dir $found_so" - dnl here. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" - fi - fi - fi - fi - else - if test "X$found_a" != "X"; then - dnl Linking with a static library. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$found_a" - else - dnl We shouldn't come here, but anyway it's good to have a - dnl fallback. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$found_dir -l$name" - fi - fi - dnl Assume the include files are nearby. - additional_includedir= - case "$found_dir" in - */lib | */lib/) - basedir=`echo "X$found_dir" | sed -e 's,^X,,' -e 's,/lib/*$,,'` - additional_includedir="$basedir/include" - ;; - esac - if test "X$additional_includedir" != "X"; then - dnl Potentially add $additional_includedir to $INCNAME. - dnl But don't add it - dnl 1. if it's the standard /usr/include, - dnl 2. if it's /usr/local/include and we are using GCC on Linux, - dnl 3. if it's already present in $CPPFLAGS or the already - dnl constructed $INCNAME, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_includedir" != "X/usr/include"; then - haveit= - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in - linux*) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - for x in $CPPFLAGS $INC[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-I$additional_includedir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_includedir"; then - dnl Really add $additional_includedir to $INCNAME. - INC[]NAME="${INC[]NAME}${INC[]NAME:+ }-I$additional_includedir" - fi - fi - fi - fi - fi - dnl Look for dependencies. - if test -n "$found_la"; then - dnl Read the .la file. It defines the variables - dnl dlname, library_names, old_library, dependency_libs, current, - dnl age, revision, installed, dlopen, dlpreopen, libdir. - save_libdir="$libdir" - case "$found_la" in - */* | *\\*) . "$found_la" ;; - *) . "./$found_la" ;; - esac - libdir="$save_libdir" - dnl We use only dependency_libs. - for dep in $dependency_libs; do - case "$dep" in - -L*) - additional_libdir=`echo "X$dep" | sed -e 's/^X-L//'` - dnl Potentially add $additional_libdir to $LIBNAME and $LTLIBNAME. - dnl But don't add it - dnl 1. if it's the standard /usr/lib, - dnl 2. if it's /usr/local/lib and we are using GCC on Linux, - dnl 3. if it's already present in $LDFLAGS or the already - dnl constructed $LIBNAME, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_libdir" != "X/usr/lib"; then - haveit= - if test "X$additional_libdir" = "X/usr/local/lib"; then - if test -n "$GCC"; then - case $host_os in - linux*) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - haveit= - for x in $LDFLAGS $LIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LIBNAME. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-L$additional_libdir" - fi - fi - haveit= - for x in $LDFLAGS $LTLIB[]NAME; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LTLIBNAME. - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-L$additional_libdir" - fi - fi - fi - fi - ;; - -l*) - dnl Handle this in the next round. - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's/^X-l//'` - ;; - *.la) - dnl Handle this in the next round. Throw away the .la's - dnl directory; it is already contained in a preceding -L - dnl option. - names_next_round="$names_next_round "`echo "X$dep" | sed -e 's,^X.*/,,' -e 's,^lib,,' -e 's,\.la$,,'` - ;; - *) - dnl Most likely an immediate library name. - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$dep" - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }$dep" - ;; - esac - done - fi - else - dnl Didn't find the library; assume it is in the system directories - dnl known to the linker and runtime loader. (All the system - dnl directories known to the linker should also be known to the - dnl runtime loader, otherwise the system is severely misconfigured.) - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }-l$name" - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-l$name" - fi - fi - fi - done - done - if test "X$rpathdirs" != "X"; then - if test -n "$hardcode_libdir_separator"; then - dnl Weird platform: only the last -rpath option counts, the user must - dnl pass all path elements in one option. We can arrange that for a - dnl single library, but not when more than one $LIBNAMEs are used. - alldirs= - for found_dir in $rpathdirs; do - alldirs="${alldirs}${alldirs:+$hardcode_libdir_separator}$found_dir" - done - dnl Note: hardcode_libdir_flag_spec uses $libdir and $wl. - acl_save_libdir="$libdir" - libdir="$alldirs" - eval flag=\"$hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" - else - dnl The -rpath options are cumulative. - for found_dir in $rpathdirs; do - acl_save_libdir="$libdir" - libdir="$found_dir" - eval flag=\"$hardcode_libdir_flag_spec\" - libdir="$acl_save_libdir" - LIB[]NAME="${LIB[]NAME}${LIB[]NAME:+ }$flag" - done - fi - fi - if test "X$ltrpathdirs" != "X"; then - dnl When using libtool, the option that works for both libraries and - dnl executables is -R. The -R options are cumulative. - for found_dir in $ltrpathdirs; do - LTLIB[]NAME="${LTLIB[]NAME}${LTLIB[]NAME:+ }-R$found_dir" - done - fi -]) - -dnl AC_LIB_APPENDTOVAR(VAR, CONTENTS) appends the elements of CONTENTS to VAR, -dnl unless already present in VAR. -dnl Works only for CPPFLAGS, not for LIB* variables because that sometimes -dnl contains two or three consecutive elements that belong together. -AC_DEFUN([AC_LIB_APPENDTOVAR], -[ - for element in [$2]; do - haveit= - for x in $[$1]; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X$element"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - [$1]="${[$1]}${[$1]:+ }$element" - fi - done -]) - -# lib-prefix.m4 serial 1 (gettext-0.11) -dnl Copyright (C) 2001-2002 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Bruno Haible. - -dnl AC_LIB_PREFIX adds to the CPPFLAGS and LDFLAGS the flags that are needed -dnl to access previously installed libraries. The basic assumption is that -dnl a user will want packages to use other packages he previously installed -dnl with the same --prefix option. -dnl This macro is not needed if only AC_LIB_LINKFLAGS is used to locate -dnl libraries, but is otherwise very convenient. -AC_DEFUN([AC_LIB_PREFIX], -[ - AC_BEFORE([$0], [AC_LIB_LINKFLAGS]) - AC_REQUIRE([AC_PROG_CC]) - AC_REQUIRE([AC_CANONICAL_HOST]) - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - dnl By default, look in $includedir and $libdir. - use_additional=yes - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" + AC_SUBST(INTLDEPS) + AC_SUBST(INTLLIBS) + AC_SUBST(INTLOBJS) + AC_SUBST(POFILES) + AC_SUBST(POSUB) ]) - AC_ARG_WITH([lib-prefix], -[ --with-lib-prefix[=DIR] search for libraries in DIR/include and DIR/lib - --without-lib-prefix don't search for libraries in includedir and libdir], -[ - if test "X$withval" = "Xno"; then - use_additional=no - else - if test "X$withval" = "X"; then - AC_LIB_WITH_FINAL_PREFIX([ - eval additional_includedir=\"$includedir\" - eval additional_libdir=\"$libdir\" - ]) - else - additional_includedir="$withval/include" - additional_libdir="$withval/lib" - fi - fi -]) - if test $use_additional = yes; then - dnl Potentially add $additional_includedir to $CPPFLAGS. - dnl But don't add it - dnl 1. if it's the standard /usr/include, - dnl 2. if it's already present in $CPPFLAGS, - dnl 3. if it's /usr/local/include and we are using GCC on Linux, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_includedir" != "X/usr/include"; then - haveit= - for x in $CPPFLAGS; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-I$additional_includedir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test "X$additional_includedir" = "X/usr/local/include"; then - if test -n "$GCC"; then - case $host_os in - linux*) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - if test -d "$additional_includedir"; then - dnl Really add $additional_includedir to $CPPFLAGS. - CPPFLAGS="${CPPFLAGS}${CPPFLAGS:+ }-I$additional_includedir" - fi - fi - fi - fi - dnl Potentially add $additional_libdir to $LDFLAGS. - dnl But don't add it - dnl 1. if it's the standard /usr/lib, - dnl 2. if it's already present in $LDFLAGS, - dnl 3. if it's /usr/local/lib and we are using GCC on Linux, - dnl 4. if it doesn't exist as a directory. - if test "X$additional_libdir" != "X/usr/lib"; then - haveit= - for x in $LDFLAGS; do - AC_LIB_WITH_FINAL_PREFIX([eval x=\"$x\"]) - if test "X$x" = "X-L$additional_libdir"; then - haveit=yes - break - fi - done - if test -z "$haveit"; then - if test "X$additional_libdir" = "X/usr/local/lib"; then - if test -n "$GCC"; then - case $host_os in - linux*) haveit=yes;; - esac - fi - fi - if test -z "$haveit"; then - if test -d "$additional_libdir"; then - dnl Really add $additional_libdir to $LDFLAGS. - LDFLAGS="${LDFLAGS}${LDFLAGS:+ }-L$additional_libdir" - fi - fi - fi - fi - fi -]) - -dnl AC_LIB_PREPARE_PREFIX creates variables acl_final_prefix, -dnl acl_final_exec_prefix, containing the values to which $prefix and -dnl $exec_prefix will expand at the end of the configure script. -AC_DEFUN([AC_LIB_PREPARE_PREFIX], -[ - dnl Unfortunately, prefix and exec_prefix get only finally determined - dnl at the end of configure. - if test "X$prefix" = "XNONE"; then - acl_final_prefix="$ac_default_prefix" - else - acl_final_prefix="$prefix" - fi - if test "X$exec_prefix" = "XNONE"; then - acl_final_exec_prefix='${prefix}' - else - acl_final_exec_prefix="$exec_prefix" - fi - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - eval acl_final_exec_prefix=\"$acl_final_exec_prefix\" - prefix="$acl_save_prefix" -]) - -dnl AC_LIB_WITH_FINAL_PREFIX([statement]) evaluates statement, with the -dnl variables prefix and exec_prefix bound to the values they will have -dnl at the end of the configure script. -AC_DEFUN([AC_LIB_WITH_FINAL_PREFIX], -[ - acl_save_prefix="$prefix" - prefix="$acl_final_prefix" - acl_save_exec_prefix="$exec_prefix" - exec_prefix="$acl_final_exec_prefix" - $1 - exec_prefix="$acl_save_exec_prefix" - prefix="$acl_save_prefix" -]) - -# lib-ld.m4 serial 1 (gettext-0.11) -dnl Copyright (C) 1996-2002 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl Subroutines of libtool.m4, -dnl with replacements s/AC_/AC_LIB/ and s/lt_cv/acl_cv/ to avoid collision -dnl with libtool.m4. -dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. -AC_DEFUN([AC_LIB_PROG_LD_GNU], -[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld, -[# I'd rather use --version here, but apparently some GNU ld's only accept -v. -if $LD -v 2>&1 &5; then - acl_cv_prog_gnu_ld=yes -else - acl_cv_prog_gnu_ld=no -fi]) -with_gnu_ld=$acl_cv_prog_gnu_ld -]) +AC_DEFUN(AM_GNOME_GETTEXT, + [AC_REQUIRE([AC_PROG_MAKE_SET])dnl + AC_REQUIRE([AC_PROG_CC])dnl + AC_REQUIRE([AC_PROG_RANLIB])dnl + AC_REQUIRE([AC_ISC_POSIX])dnl + AC_REQUIRE([AC_HEADER_STDC])dnl + AC_REQUIRE([AC_C_CONST])dnl + AC_REQUIRE([AC_C_INLINE])dnl + AC_REQUIRE([AC_TYPE_OFF_T])dnl + AC_REQUIRE([AC_TYPE_SIZE_T])dnl + AC_REQUIRE([AC_FUNC_ALLOCA])dnl + AC_REQUIRE([AC_FUNC_MMAP])dnl + + AC_CHECK_HEADERS([argz.h limits.h locale.h nl_types.h malloc.h string.h \ +unistd.h sys/param.h]) + AC_CHECK_FUNCS([getcwd munmap putenv setenv setlocale strchr strcasecmp \ +strdup __argz_count __argz_stringify __argz_next]) + + if test "${ac_cv_func_stpcpy+set}" != "set"; then + AC_CHECK_FUNCS(stpcpy) + fi + if test "${ac_cv_func_stpcpy}" = "yes"; then + AC_DEFINE(HAVE_STPCPY) + fi -dnl From libtool-1.4. Sets the variable LD. -AC_DEFUN([AC_LIB_PROG_LD], -[AC_ARG_WITH(gnu-ld, -[ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], -test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -ac_prog=ld -if test "$GCC" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by GCC]) - case $host in - *-*-mingw*) - # gcc leaves a trailing carriage return which upsets mingw - ac_prog=`($CC -print-prog-name=ld) 2>&5 | tr -d '\015'` ;; - *) - ac_prog=`($CC -print-prog-name=ld) 2>&5` ;; - esac - case $ac_prog in - # Accept absolute paths. - [[\\/]* | [A-Za-z]:[\\/]*)] - [re_direlt='/[^/][^/]*/\.\./'] - # Canonicalize the path of ld - ac_prog=`echo $ac_prog| sed 's%\\\\%/%g'` - while echo $ac_prog | grep "$re_direlt" > /dev/null 2>&1; do - ac_prog=`echo $ac_prog| sed "s%$re_direlt%/%"` - done - test -z "$LD" && LD="$ac_prog" - ;; - "") - # If it fails, then pretend we aren't using GCC. - ac_prog=ld - ;; - *) - # If it is relative, then search for the first ld in PATH. - with_gnu_ld=unknown - ;; - esac -elif test "$with_gnu_ld" = yes; then - AC_MSG_CHECKING([for GNU ld]) -else - AC_MSG_CHECKING([for non-GNU ld]) -fi -AC_CACHE_VAL(acl_cv_path_LD, -[if test -z "$LD"; then - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then - acl_cv_path_LD="$ac_dir/$ac_prog" - # Check to see if the program is GNU ld. I'd rather use --version, - # but apparently some GNU ld's only accept -v. - # Break only if it was the GNU/non-GNU ld that we prefer. - if "$acl_cv_path_LD" -v 2>&1 < /dev/null | egrep '(GNU|with BFD)' > /dev/null; then - test "$with_gnu_ld" != no && break - else - test "$with_gnu_ld" != yes && break - fi - fi - done - IFS="$ac_save_ifs" -else - acl_cv_path_LD="$LD" # Let the user override the test with a path. -fi]) -LD="$acl_cv_path_LD" -if test -n "$LD"; then - AC_MSG_RESULT($LD) -else - AC_MSG_RESULT(no) -fi -test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) -AC_LIB_PROG_LD_GNU -]) + AM_LC_MESSAGES + AM_GNOME_WITH_NLS -# iconv.m4 serial AM3 (gettext-0.11) -dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. + if test "x$CATOBJEXT" != "x"; then + if test "x$ALL_LINGUAS" = "x"; then + LINGUAS= + else + AC_MSG_CHECKING(for catalogs to be installed) + NEW_LINGUAS= + if test "x$LINGUAS" = "x"; then + LINGUAS=$ALL_LINGUAS + fi + for lang in $LINGUAS; do + case "$ALL_LINGUAS" in + *$lang*) NEW_LINGUAS="$NEW_LINGUAS $lang" ;; + esac + done + LINGUAS=$NEW_LINGUAS + AC_MSG_RESULT($LINGUAS) + fi -dnl From Bruno Haible. + dnl Construct list of names of catalog files to be constructed. + if test -n "$LINGUAS"; then + for lang in $LINGUAS; do CATALOGS="$CATALOGS $lang$CATOBJEXT"; done + fi + fi -AC_DEFUN([AM_ICONV_LINK], -[ - dnl Some systems have iconv in libc, some have it in libiconv (OSF/1 and - dnl those with the standalone portable GNU libiconv installed). - - dnl Prerequisites of AC_LIB_LINKFLAGS_BODY. - AC_REQUIRE([AC_LIB_PREPARE_PREFIX]) - AC_REQUIRE([AC_LIB_RPATH]) - - dnl Search for libiconv and define LIBICONV, LTLIBICONV and INCICONV - dnl accordingly. - AC_LIB_LINKFLAGS_BODY([iconv]) - - dnl Add $INCICONV to CPPFLAGS before performing the following checks, - dnl because if the user has installed libiconv and not disabled its use - dnl via --without-libiconv-prefix, he wants to use it. The first - dnl AC_TRY_LINK will then fail, the second AC_TRY_LINK will succeed. - am_save_CPPFLAGS="$CPPFLAGS" - AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCICONV]) - - AC_CACHE_CHECK(for iconv, am_cv_func_iconv, [ - am_cv_func_iconv="no, consider installing GNU libiconv" - am_cv_lib_iconv=no - AC_TRY_LINK([#include -#include ], - [iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd);], - am_cv_func_iconv=yes) - if test "$am_cv_func_iconv" != yes; then - am_save_LIBS="$LIBS" - LIBS="$LIBS $LIBICONV" - AC_TRY_LINK([#include -#include ], - [iconv_t cd = iconv_open("",""); - iconv(cd,NULL,NULL,NULL,NULL); - iconv_close(cd);], - am_cv_lib_iconv=yes - am_cv_func_iconv=yes) - LIBS="$am_save_LIBS" - fi + dnl The reference to in the installed file + dnl must be resolved because we cannot expect the users of this + dnl to define HAVE_LOCALE_H. + if test $ac_cv_header_locale_h = yes; then + INCLUDE_LOCALE_H="#include " + else + INCLUDE_LOCALE_H="\ +/* The system does not provide the header . Take care yourself. */" + fi + AC_SUBST(INCLUDE_LOCALE_H) + + dnl Determine which catalog format we have (if any is needed) + dnl For now we know about two different formats: + dnl Linux libc-5 and the normal X/Open format + test -d intl || mkdir intl + if test "$CATOBJEXT" = ".cat"; then + AC_CHECK_HEADER(linux/version.h, msgformat=linux, msgformat=xopen) + + dnl Transform the SED scripts while copying because some dumb SEDs + dnl cannot handle comments. + sed -e '/^#/d' $srcdir/intl/$msgformat-msg.sed > intl/po2msg.sed + fi + dnl po2tbl.sed is always needed. + sed -e '/^#.*[^\\]$/d' -e '/^#$/d' \ + $srcdir/intl/po2tbl.sed.in > intl/po2tbl.sed + + dnl In the intl/Makefile.in we have a special dependency which makes + dnl only sense for gettext. We comment this out for non-gettext + dnl packages. + if test "$PACKAGE" = "gettext"; then + GT_NO="#NO#" + GT_YES= + else + GT_NO= + GT_YES="#YES#" + fi + AC_SUBST(GT_NO) + AC_SUBST(GT_YES) + + dnl If the AC_CONFIG_AUX_DIR macro for autoconf is used we possibly + dnl find the mkinstalldirs script in another subdir but ($top_srcdir). + dnl Try to locate is. + MKINSTALLDIRS= + if test -n "$ac_aux_dir"; then + MKINSTALLDIRS="$ac_aux_dir/mkinstalldirs" + fi + if test -z "$MKINSTALLDIRS"; then + MKINSTALLDIRS="\$(top_srcdir)/mkinstalldirs" + fi + AC_SUBST(MKINSTALLDIRS) + + dnl *** For now the libtool support in intl/Makefile is not for real. + l= + AC_SUBST(l) + + dnl Generate list of files to be processed by xgettext which will + dnl be included in po/Makefile. + test -d po || mkdir po + if test "x$srcdir" != "x."; then + if test "x`echo $srcdir | sed 's@/.*@@'`" = "x"; then + posrcprefix="$srcdir/" + else + posrcprefix="../$srcdir/" + fi + else + posrcprefix="../" + fi + rm -f po/POTFILES + sed -e "/^#/d" -e "/^\$/d" -e "s,.*, $posrcprefix& \\\\," -e "\$s/\(.*\) \\\\/\1/" \ + < $srcdir/po/POTFILES.in > po/POTFILES ]) - if test "$am_cv_func_iconv" = yes; then - AC_DEFINE(HAVE_ICONV, 1, [Define if you have the iconv() function.]) - fi - if test "$am_cv_lib_iconv" = yes; then - AC_MSG_CHECKING([how to link with libiconv]) - AC_MSG_RESULT([$LIBICONV]) - else - dnl If $LIBICONV didn't lead to a usable library, we don't need $INCICONV - dnl either. - CPPFLAGS="$am_save_CPPFLAGS" - LIBICONV= - LTLIBICONV= - fi - AC_SUBST(LIBICONV) - AC_SUBST(LTLIBICONV) -]) -AC_DEFUN([AM_ICONV], -[ - AC_REQUIRE([AM_ICONV_LINK]) - if test "$am_cv_func_iconv" = yes; then - AC_MSG_CHECKING([for iconv declaration]) - AC_CACHE_VAL(am_cv_proto_iconv, [ - AC_TRY_COMPILE([ -#include -#include -extern -#ifdef __cplusplus -"C" -#endif -#if defined(__STDC__) || defined(__cplusplus) -size_t iconv (iconv_t cd, char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft); -#else -size_t iconv(); -#endif -], [], am_cv_proto_iconv_arg1="", am_cv_proto_iconv_arg1="const") - am_cv_proto_iconv="extern size_t iconv (iconv_t cd, $am_cv_proto_iconv_arg1 char * *inbuf, size_t *inbytesleft, char * *outbuf, size_t *outbytesleft);"]) - am_cv_proto_iconv=`echo "[$]am_cv_proto_iconv" | tr -s ' ' | sed -e 's/( /(/'` - AC_MSG_RESULT([$]{ac_t:- - }[$]am_cv_proto_iconv) - AC_DEFINE_UNQUOTED(ICONV_CONST, $am_cv_proto_iconv_arg1, - [Define as const if the declaration of iconv() needs const.]) - fi -]) # progtest.m4 serial 2 (gettext-0.10.40) dnl Copyright (C) 1996-2002 Free Software Foundation, Inc. @@ -2334,63 +1283,6 @@ fi AC_SUBST($1)dnl ]) -# glibc21.m4 serial 2 (fileutils-4.1.3, gettext-0.10.40) -dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -# Test for the GNU C Library, version 2.1 or newer. -# From Bruno Haible. - -AC_DEFUN([jm_GLIBC21], - [ - AC_CACHE_CHECK(whether we are using the GNU C Library 2.1 or newer, - ac_cv_gnu_library_2_1, - [AC_EGREP_CPP([Lucky GNU user], - [ -#include -#ifdef __GNU_LIBRARY__ - #if (__GLIBC__ == 2 && __GLIBC_MINOR__ >= 1) || (__GLIBC__ > 2) - Lucky GNU user - #endif -#endif - ], - ac_cv_gnu_library_2_1=yes, - ac_cv_gnu_library_2_1=no) - ] - ) - AC_SUBST(GLIBC21) - GLIBC21="$ac_cv_gnu_library_2_1" - ] -) - -# codeset.m4 serial AM1 (gettext-0.10.40) -dnl Copyright (C) 2000-2002 Free Software Foundation, Inc. -dnl This file is free software, distributed under the terms of the GNU -dnl General Public License. As a special exception to the GNU General -dnl Public License, this file may be distributed as part of a program -dnl that contains a configuration script generated by Autoconf, under -dnl the same distribution terms as the rest of that program. - -dnl From Bruno Haible. - -AC_DEFUN([AM_LANGINFO_CODESET], -[ - AC_CACHE_CHECK([for nl_langinfo and CODESET], am_cv_langinfo_codeset, - [AC_TRY_LINK([#include ], - [char* cs = nl_langinfo(CODESET);], - am_cv_langinfo_codeset=yes, - am_cv_langinfo_codeset=no) - ]) - if test $am_cv_langinfo_codeset = yes; then - AC_DEFINE(HAVE_LANGINFO_CODESET, 1, - [Define if you have and nl_langinfo(CODESET).]) - fi -]) - # lcmessage.m4 serial 2 (gettext-0.10.40) dnl Copyright (C) 1995-2002 Free Software Foundation, Inc. dnl This file is free software, distributed under the terms of the GNU diff --git a/glabels1/config.h.in b/glabels1/config.h.in index 8ebeb8de..939f7192 100644 --- a/glabels1/config.h.in +++ b/glabels1/config.h.in @@ -60,36 +60,15 @@ /* Define if you have the __argz_stringify function. */ #undef HAVE___ARGZ_STRINGIFY -/* Define if you have the feof_unlocked function. */ -#undef HAVE_FEOF_UNLOCKED - -/* Define if you have the fgets_unlocked function. */ -#undef HAVE_FGETS_UNLOCKED - -/* Define if you have the getc_unlocked function. */ -#undef HAVE_GETC_UNLOCKED +/* Define if you have the dcgettext function. */ +#undef HAVE_DCGETTEXT /* Define if you have the getcwd function. */ #undef HAVE_GETCWD -/* Define if you have the getegid function. */ -#undef HAVE_GETEGID - -/* Define if you have the geteuid function. */ -#undef HAVE_GETEUID - -/* Define if you have the getgid function. */ -#undef HAVE_GETGID - /* Define if you have the getpagesize function. */ #undef HAVE_GETPAGESIZE -/* Define if you have the getuid function. */ -#undef HAVE_GETUID - -/* Define if you have the mempcpy function. */ -#undef HAVE_MEMPCPY - /* Define if you have the munmap function. */ #undef HAVE_MUNMAP @@ -108,15 +87,12 @@ /* Define if you have the strcasecmp function. */ #undef HAVE_STRCASECMP +/* Define if you have the strchr function. */ +#undef HAVE_STRCHR + /* Define if you have the strdup function. */ #undef HAVE_STRDUP -/* Define if you have the strtoul function. */ -#undef HAVE_STRTOUL - -/* Define if you have the tsearch function. */ -#undef HAVE_TSEARCH - /* Define if you have the header file. */ #undef HAVE_X11_SM_SMLIB_H @@ -135,9 +111,6 @@ /* Define if you have the header file. */ #undef HAVE_NL_TYPES_H -/* Define if you have the header file. */ -#undef HAVE_STDDEF_H - /* Define if you have the header file. */ #undef HAVE_STDLIB_H @@ -156,31 +129,15 @@ /* Define if you have the header file. */ #undef HAVE_UNISTD_H +/* Define if you have the i library (-li). */ +#undef HAVE_LIBI + /* Name of package */ #undef PACKAGE /* Version number of package */ #undef VERSION -/* Define if you have the iconv() function. */ -#undef HAVE_ICONV - -/* Define as const if the declaration of iconv() needs const. */ -#undef ICONV_CONST - -/* Define if you have and nl_langinfo(CODESET). */ -#undef HAVE_LANGINFO_CODESET - /* Define if your file defines LC_MESSAGES. */ #undef HAVE_LC_MESSAGES -/* Define to 1 if translation of program messages to the user's native language - is requested. */ -#undef ENABLE_NLS - -/* Define if the GNU gettext() function is already present or preinstalled. */ -#undef HAVE_GETTEXT - -/* Define if the GNU dcgettext() function is already present or preinstalled. */ -#undef HAVE_DCGETTEXT - diff --git a/glabels1/configure.in b/glabels1/configure.in index 942870df..652feecc 100644 --- a/glabels1/configure.in +++ b/glabels1/configure.in @@ -5,6 +5,7 @@ AM_INIT_AUTOMAKE(glabels, 0.4.4) AM_CONFIG_HEADER(config.h) dnl Pick up the Gnome macros. +AM_MAINTAINER_MODE AM_ACLOCAL_INCLUDE(macros) GNOME_INIT @@ -86,7 +87,7 @@ dnl * Supported languages dnl **************************************** dnl Add the languages which your application supports here. ALL_LINGUAS="fr de ja pt_BR es" -AM_GNU_GETTEXT +AM_GNOME_GETTEXT dnl **************************************** dnl * Set PACKAGE_LOCALE_DIR in config.h. @@ -123,7 +124,7 @@ fi dnl **************************************** dnl * Makefiles dnl **************************************** -AC_OUTPUT([ m4/Makefile +AC_OUTPUT([ Makefile macros/Makefile src/Makefile @@ -136,3 +137,14 @@ glabels.spec ]) + +dnl **************************************** +dnl Print configuration summary +dnl **************************************** +echo " + +Configuration: + + Source code location: ${srcdir} + Compiler: ${CC} +" diff --git a/glabels1/intl/Makefile.in b/glabels1/intl/Makefile.in index 3f14c13c..4bdb186d 100644 --- a/glabels1/intl/Makefile.in +++ b/glabels1/intl/Makefile.in @@ -33,12 +33,10 @@ includedir = $(prefix)/include datadir = $(prefix)/@DATADIRNAME@ localedir = $(datadir)/locale gnulocaledir = $(prefix)/share/locale -gettextsrcdir = $(datadir)/gettext/intl +gettextsrcdir = @datadir@/gettext/intl aliaspath = $(localedir):. subdir = intl -DESTDIR = - INSTALL = @INSTALL@ INSTALL_DATA = @INSTALL_DATA@ MKINSTALLDIRS = @MKINSTALLDIRS@ @@ -116,26 +114,26 @@ install-exec: all if test "$(PACKAGE)" = "gettext" \ && test '@INTLOBJS@' = '$(GETTOBJS)'; then \ if test -r $(MKINSTALLDIRS); then \ - $(MKINSTALLDIRS) $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \ + $(MKINSTALLDIRS) $(libdir) $(includedir); \ else \ - $(top_srcdir)/mkinstalldirs $(DESTDIR)$(libdir) $(DESTDIR)$(includedir); \ + $(top_srcdir)/mkinstalldirs $(libdir) $(includedir); \ fi; \ - $(INSTALL_DATA) intlh.inst $(DESTDIR)$(includedir)/libintl.h; \ - $(INSTALL_DATA) libintl.a $(DESTDIR)$(libdir)/libintl.a; \ + $(INSTALL_DATA) intlh.inst $(includedir)/libintl.h; \ + $(INSTALL_DATA) libintl.a $(libdir)/libintl.a; \ else \ : ; \ fi install-data: all if test "$(PACKAGE)" = "gettext"; then \ if test -r $(MKINSTALLDIRS); then \ - $(MKINSTALLDIRS) $(DESTDIR)$(gettextsrcdir); \ + $(MKINSTALLDIRS) $(gettextsrcdir); \ else \ - $(top_srcdir)/mkinstalldirs $(DESTDIR)$(gettextsrcdir); \ + $(top_srcdir)/mkinstalldirs $(gettextsrcdir); \ fi; \ - $(INSTALL_DATA) VERSION $(DESTDIR)$(gettextsrcdir)/VERSION; \ + $(INSTALL_DATA) VERSION $(gettextsrcdir)/VERSION; \ dists="$(DISTFILES.common)"; \ for file in $$dists; do \ - $(INSTALL_DATA) $(srcdir)/$$file $(DESTDIR)$(gettextsrcdir)/$$file; \ + $(INSTALL_DATA) $(srcdir)/$$file $(gettextsrcdir)/$$file; \ done; \ else \ : ; \ @@ -147,7 +145,7 @@ installcheck: uninstall: dists="$(DISTFILES.common)"; \ for file in $$dists; do \ - rm -f $(DESTDIR)$(gettextsrcdir)/$$file; \ + rm -f $(gettextsrcdir)/$$file; \ done info dvi: diff --git a/glabels1/macros/Makefile.in b/glabels1/macros/Makefile.in index cb407c82..3f4fc95d 100644 --- a/glabels1/macros/Makefile.in +++ b/glabels1/macros/Makefile.in @@ -1,6 +1,6 @@ -# Makefile.in generated automatically by automake 1.4 from Makefile.am +# Makefile.in generated automatically by automake 1.4-p5 from Makefile.am -# Copyright (C) 1994, 1995-8, 1999 Free Software Foundation, Inc. +# Copyright (C) 1994, 1995-8, 1999, 2001 Free Software Foundation, Inc. # This Makefile.in is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -93,9 +93,9 @@ INSTOBJEXT = @INSTOBJEXT@ INTLDEPS = @INTLDEPS@ INTLLIBS = @INTLLIBS@ INTLOBJS = @INTLOBJS@ +MAINT = @MAINT@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ -MSGFMT = @MSGFMT@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ ORBIT_CONFIG = @ORBIT_CONFIG@ ORBIT_IDL = @ORBIT_IDL@ @@ -114,15 +114,37 @@ cflags_set = @cflags_set@ cxxflags_set = @cxxflags_set@ l = @l@ -MACROS = aclocal-include.m4 compiler-flags.m4 curses.m4 gnome-bonobo-check.m4 gnome-fileutils.m4 gnome-gettext.m4 gnome-ghttp-check.m4 gnome-gnorba-check.m4 gnome-guile-checks.m4 gnome-libgtop-check.m4 gnome-objc-checks.m4 gnome-orbit-check.m4 gnome-print-check.m4 gnome-pthread-check.m4 gnome-support.m4 gnome-undelfs.m4 gnome-vfs.m4 gnome-x-checks.m4 gnome-xml-check.m4 gnome.m4 linger.m4 need-declaration.m4 +MACROS = \ + aclocal-include.m4 \ + compiler-flags.m4 \ + curses.m4 \ + gnome-bonobo-check.m4 \ + gnome-fileutils.m4 \ + gnome-gettext.m4 \ + gnome-ghttp-check.m4 \ + gnome-gnorba-check.m4 \ + gnome-guile-checks.m4 \ + gnome-libgtop-check.m4 \ + gnome-objc-checks.m4 \ + gnome-orbit-check.m4 \ + gnome-print-check.m4 \ + gnome-pthread-check.m4 \ + gnome-support.m4 \ + gnome-undelfs.m4 \ + gnome-vfs.m4 \ + gnome-x-checks.m4 \ + gnome-xml-check.m4 \ + gnome.m4 \ + linger.m4 \ + need-declaration.m4 EXTRA_DIST = $(MACROS) gnome-common.m4 autogen.sh MAINTAINERCLEANFILES = macros.dep -@INSIDE_GNOME_COMMON_TRUE@gnome_aclocaldir = $(datadir)/aclocal/gnome +@INSIDE_GNOME_COMMON_TRUE@gnome_aclocaldir = @INSIDE_GNOME_COMMON_TRUE@$(datadir)/aclocal/gnome -@INSIDE_GNOME_COMMON_TRUE@gnome_aclocal_DATA = $(MACROS) gnome-macros.dep gnome-common.m4 autogen.sh +@INSIDE_GNOME_COMMON_TRUE@gnome_aclocal_DATA = @INSIDE_GNOME_COMMON_TRUE@$(MACROS) gnome-macros.dep gnome-common.m4 autogen.sh mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../config.h CONFIG_CLEAN_FILES = @@ -137,7 +159,7 @@ TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps macros/Makefile Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status @@ -245,8 +267,8 @@ installdirs mostlyclean-generic distclean-generic clean-generic \ maintainer-clean-generic clean mostlyclean distclean maintainer-clean -macros.dep: Makefile.am - @echo '$$(top_srcdir)/aclocal.m4: $(MACROS:%=macros/%)' > $@ +@MAINT@macros.dep: Makefile.am +@MAINT@ @echo '$$(top_srcdir)/aclocal.m4: $(MACROS:%=macros/%)' > $@ @INSIDE_GNOME_COMMON_TRUE@gnome-macros.dep: Makefile.am @INSIDE_GNOME_COMMON_TRUE@ @echo '$$(top_srcdir)/aclocal.m4: $(MACROS:%=$(gnome_aclocaldir)/%)' > $@ diff --git a/glabels1/po/ChangeLog b/glabels1/po/ChangeLog index d87dc6cb..dcc1d3dc 100644 --- a/glabels1/po/ChangeLog +++ b/glabels1/po/ChangeLog @@ -1,13 +1,6 @@ -2002-06-17 gettextize +2002-06-27 gettextize - * Makefile.in.in: Upgrade to gettext-0.11.1. - * boldquot.sed: New file, from gettext-0.11.1. - * en@boldquot.header: New file, from gettext-0.11.1. - * en@quot.header: New file, from gettext-0.11.1. - * insert-header.sin: New file, from gettext-0.11.1. - * quot.sed: New file, from gettext-0.11.1. - * remove-potcdate.sin: New file, from gettext-0.11.1. - * Rules-quot: New file, from gettext-0.11.1. + * Makefile.in.in: Upgrade to gettext-0.10.38. * cat-id-tbl.c: Remove file. * stamp-cat-id: Remove file. diff --git a/glabels1/po/Makefile.in.in b/glabels1/po/Makefile.in.in index ada8bb4f..32b73765 100644 --- a/glabels1/po/Makefile.in.in +++ b/glabels1/po/Makefile.in.in @@ -1,16 +1,18 @@ -# Makefile for PO directory in any package using GNU gettext. -# Copyright (C) 1995-1997, 2000-2002 by Ulrich Drepper +# Makefile for program source directory in GNU NLS utilities package. +# Copyright (C) 1995-1997, 2000, 2001 by Ulrich Drepper # -# 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. +# 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. PACKAGE = @PACKAGE@ VERSION = @VERSION@ +# These two variables depend on the location of this directory. +subdir = po +top_builddir = .. + SHELL = /bin/sh @SET_MAKE@ @@ -29,47 +31,45 @@ INSTALL_DATA = @INSTALL_DATA@ MKINSTALLDIRS = @MKINSTALLDIRS@ mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac` +CC = @CC@ GMSGFMT = @GMSGFMT@ MSGFMT = @MSGFMT@ XGETTEXT = @XGETTEXT@ MSGMERGE = msgmerge -MSGMERGE_UPDATE = @MSGMERGE@ --update -MSGINIT = msginit -MSGCONV = msgconv -MSGFILTER = msgfilter + +DEFS = @DEFS@ +CFLAGS = @CFLAGS@ +CPPFLAGS = @CPPFLAGS@ + +INCLUDES = -I.. -I$(top_srcdir)/intl + +COMPILE = $(CC) -c $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $(XCFLAGS) POFILES = @POFILES@ GMOFILES = @GMOFILES@ -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) +DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(PACKAGE).pot \ +$(POFILES) $(GMOFILES) POTFILES = \ CATALOGS = @CATALOGS@ -# Makevars gets inserted here. (Don't remove this line!) - .SUFFIXES: -.SUFFIXES: .po .gmo .mo .sed .sin .nop .po-update +.SUFFIXES: .c .o .po .pox .gmo .mo + +.c.o: + $(COMPILE) $< + +.po.pox: + $(MAKE) $(PACKAGE).pot + $(MSGMERGE) $< $(srcdir)/$(PACKAGE).pot -o $*.pox .po.mo: - @echo "$(MSGFMT) -c -o $@ $<"; \ - $(MSGFMT) -c -o t-$@ $< && mv t-$@ $@ + $(MSGFMT) -o $@ $< .po.gmo: - @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 - -.sin.sed: - sed -e '/^#/d' $< > t-$@ - mv t-$@ $@ + file=$(srcdir)/`echo $* | sed 's,.*/,,'`.gmo \ + && rm -f $$file && $(GMSGFMT) --statistics -o $$file $< all: all-@USE_NLS@ @@ -77,38 +77,17 @@ all: all-@USE_NLS@ all-yes: $(CATALOGS) all-no: -# Note: Target 'all' must not depend on target '$(DOMAIN).pot-update', +# Note: Target 'all' must not depend on target '$(srcdir)/$(PACKAGE).pot', # otherwise packages like GCC can not be built if only parts of the source # have been downloaded. -$(DOMAIN).pot-update: $(POTFILES) $(srcdir)/POTFILES.in remove-potcdate.sed - $(XGETTEXT) --default-domain=$(DOMAIN) --directory=$(top_srcdir) \ - --add-comments=TRANSLATORS: $(XGETTEXT_OPTIONS) \ +$(srcdir)/$(PACKAGE).pot: $(POTFILES) $(srcdir)/POTFILES.in + $(XGETTEXT) --default-domain=$(PACKAGE) --directory=$(top_srcdir) \ + --add-comments --keyword=_ --keyword=N_ \ --files-from=$(srcdir)/POTFILES.in \ - --copyright-holder='$(COPYRIGHT_HOLDER)' - test ! -f $(DOMAIN).po || { \ - if test -f $(srcdir)/$(DOMAIN).pot; then \ - sed -f remove-potcdate.sed < $(srcdir)/$(DOMAIN).pot > $(DOMAIN).1po && \ - sed -f remove-potcdate.sed < $(DOMAIN).po > $(DOMAIN).2po && \ - if cmp $(DOMAIN).1po $(DOMAIN).2po >/dev/null 2>&1; then \ - rm -f $(DOMAIN).1po $(DOMAIN).2po $(DOMAIN).po; \ - else \ - rm -f $(DOMAIN).1po $(DOMAIN).2po $(srcdir)/$(DOMAIN).pot && \ - mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \ - fi; \ - else \ - mv $(DOMAIN).po $(srcdir)/$(DOMAIN).pot; \ - fi; \ - } - -$(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}$(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot"; \ - cd $(srcdir) && $(MSGMERGE_UPDATE) $${lang}.po $(DOMAIN).pot + && test ! -f $(PACKAGE).po \ + || ( rm -f $(srcdir)/$(PACKAGE).pot \ + && mv $(PACKAGE).po $(srcdir)/$(PACKAGE).pot ) install: install-exec install-data @@ -116,10 +95,8 @@ install-exec: install-data: install-data-@USE_NLS@ if test "$(PACKAGE)" = "gettext"; then \ $(mkinstalldirs) $(DESTDIR)$(gettextsrcdir); \ - for file in $(DISTFILES.common); do \ - $(INSTALL_DATA) $(srcdir)/$$file \ - $(DESTDIR)$(gettextsrcdir)/$$file; \ - done; \ + $(INSTALL_DATA) $(srcdir)/Makefile.in.in \ + $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ else \ : ; \ fi @@ -129,117 +106,41 @@ install-data-yes: all @catalogs='$(CATALOGS)'; \ for cat in $$catalogs; do \ cat=`basename $$cat`; \ - lang=`echo $$cat | sed -e 's/\.gmo$$//'`; \ + lang=`echo $$cat | sed '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; \ - done; \ + if test -r $$cat; then \ + $(INSTALL_DATA) $$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \ + echo "installing $$cat as $(DESTDIR)$$dir/$(PACKAGE).mo"; \ + else \ + $(INSTALL_DATA) $(srcdir)/$$cat $(DESTDIR)$$dir/$(PACKAGE).mo; \ + echo "installing $(srcdir)/$$cat as" \ + "$(DESTDIR)$$dir/$(PACKAGE).mo"; \ + fi; \ done -install-strip: install +# Define this as empty until I found a useful application. +installcheck: -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)'; \ +uninstall: + 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; \ + lang=`echo $$cat | sed 's/\.gmo$$//'`; \ + rm -f $(DESTDIR)$(localedir)/$$lang/LC_MESSAGES/$(PACKAGE).mo; \ done - -# Define this as empty until I found a useful application. -installcheck: - -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; \ + rm -f $(DESTDIR)$(gettextsrcdir)/Makefile.in.in; \ else \ : ; \ fi -uninstall-data-no: -uninstall-data-yes: - catalogs='$(CATALOGS)'; \ - for cat in $$catalogs; do \ - cat=`basename $$cat`; \ - 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 check: all dvi info tags TAGS ID: mostlyclean: - rm -f remove-potcdate.sed - rm -f core core.* $(DOMAIN).po $(DOMAIN).1po $(DOMAIN).2po *.new.po + rm -f core core.* *.pox $(PACKAGE).po *.new.po rm -fr *.o clean: mostlyclean @@ -259,48 +160,28 @@ dist distdir: # 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 \ - if test -f $$file; then \ - cp -p $$file $(distdir); \ - else \ - cp -p $(srcdir)/$$file $(distdir); \ - fi; \ + if test -f $$file; then dir=.; else dir=$(srcdir); fi; \ + cp -p $$dir/$$file $(distdir); \ done update-po: Makefile - $(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$$//'`; \ + $(MAKE) $(PACKAGE).pot if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; fi; \ - tmpdir=`pwd`; \ - echo "$$lang:"; \ - test "$(srcdir)" = . && cdcmd="" || cdcmd="cd $(srcdir) && "; \ - echo "$${cdcmd}$(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$lang.new.po"; \ cd $(srcdir); \ - if $(MSGMERGE) $$lang.po $(DOMAIN).pot -o $$tmpdir/$$lang.new.po; then \ - if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ - rm -f $$tmpdir/$$lang.new.po; \ + catalogs='$(GMOFILES)'; \ + for cat in $$catalogs; do \ + cat=`basename $$cat`; \ + lang=`echo $$cat | sed 's/\.gmo$$//'`; \ + echo "$$lang:"; \ + if $(MSGMERGE) $$lang.po $(PACKAGE).pot -o $$lang.new.po; then \ + mv -f $$lang.new.po $$lang.po; \ else \ - if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ - :; \ - else \ - echo "msgmerge for $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ - exit 1; \ - fi; \ + echo "msgmerge for $$cat failed!"; \ + rm -f $$lang.new.po; \ fi; \ - else \ - echo "msgmerge for $$lang.po failed!" 1>&2; \ - rm -f $$tmpdir/$$lang.new.po; \ - fi - -$(DUMMYPOFILES): + done + $(MAKE) update-gmo update-gmo: Makefile $(GMOFILES) @: @@ -310,8 +191,6 @@ Makefile: Makefile.in.in $(top_builddir)/config.status POTFILES.in && 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/glabels1/po/Makevars b/glabels1/po/Makevars deleted file mode 100644 index 31d731ab..00000000 --- a/glabels1/po/Makevars +++ /dev/null @@ -1,25 +0,0 @@ -# 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 = Jim Evins - -# 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 = diff --git a/glabels1/po/Rules-quot b/glabels1/po/Rules-quot deleted file mode 100644 index 5f46d237..00000000 --- a/glabels1/po/Rules-quot +++ /dev/null @@ -1,42 +0,0 @@ -# Special Makefile rules for English message catalogs with quotation marks. - -DISTFILES.common.extra1 = quot.sed boldquot.sed en@quot.header en@boldquot.header insert-header.sin Rules-quot - -.SUFFIXES: .insert-header .po-update-en - -en@quot.po-update: en@quot.po-update-en -en@boldquot.po-update: en@boldquot.po-update-en - -.insert-header.po-update-en: - @lang=`echo $@ | sed -e 's/\.po-update-en$$//'`; \ - if test "$(PACKAGE)" = "gettext"; then PATH=`pwd`/../src:$$PATH; GETTEXTLIBDIR=`cd $(top_srcdir)/src && pwd`; export GETTEXTLIBDIR; fi; \ - tmpdir=`pwd`; \ - echo "$$lang:"; \ - ll=`echo $$lang | sed -e 's/@.*//'`; \ - LC_ALL=C; export LC_ALL; \ - cd $(srcdir); \ - if $(MSGINIT) -i $(DOMAIN).pot --no-translator -l $$ll -o - 2>/dev/null | sed -f $$tmpdir/$$lang.insert-header | $(MSGCONV) -t UTF-8 | $(MSGFILTER) sed -f `echo $$lang | sed -e 's/.*@//'`.sed 2>/dev/null > $$tmpdir/$$lang.new.po; then \ - if cmp $$lang.po $$tmpdir/$$lang.new.po >/dev/null 2>&1; then \ - rm -f $$tmpdir/$$lang.new.po; \ - else \ - if mv -f $$tmpdir/$$lang.new.po $$lang.po; then \ - :; \ - else \ - echo "creation of $$lang.po failed: cannot move $$tmpdir/$$lang.new.po to $$lang.po" 1>&2; \ - exit 1; \ - fi; \ - fi; \ - else \ - echo "creation of $$lang.po failed!" 1>&2; \ - rm -f $$tmpdir/$$lang.new.po; \ - fi - -en@quot.insert-header: insert-header.sin - sed -e '/^#/d' -e 's/HEADER/en@quot.header/g' $(srcdir)/insert-header.sin > en@quot.insert-header - -en@boldquot.insert-header: insert-header.sin - sed -e '/^#/d' -e 's/HEADER/en@boldquot.header/g' $(srcdir)/insert-header.sin > en@boldquot.insert-header - -mostlyclean: mostlyclean-quot -mostlyclean-quot: - rm -f *.insert-header diff --git a/glabels1/po/boldquot.sed b/glabels1/po/boldquot.sed deleted file mode 100644 index 4b937aa5..00000000 --- a/glabels1/po/boldquot.sed +++ /dev/null @@ -1,10 +0,0 @@ -s/"\([^"]*\)"/“\1”/g -s/`\([^`']*\)'/‘\1’/g -s/ '\([^`']*\)' / ‘\1’ /g -s/ '\([^`']*\)'$/ ‘\1’/g -s/^'\([^`']*\)' /‘\1’ /g -s/“”/""/g -s/“/“/g -s/”/”/g -s/‘/‘/g -s/’/’/g diff --git a/glabels1/po/cat-id-tbl.c b/glabels1/po/cat-id-tbl.c index aa418676..e69de29b 100644 --- a/glabels1/po/cat-id-tbl.c +++ b/glabels1/po/cat-id-tbl.c @@ -1,184 +0,0 @@ -/* Automatically generated by po2tbl.sed from glabels.pot. */ - -#if HAVE_CONFIG_H -# include -#endif - -#include "libgettext.h" - -const struct _msg_ent _msg_tbl[] = { - {"", 1}, - {"print this message", 2}, - {"print the version of glabels-batch being used", 3}, - {"set output filename (default=\"output.ps\")", 4}, - {"filename", 5}, - {"number of sheets (default=1)", 6}, - {"sheets", 7}, - {"number of copies (default=1)", 8}, - {"copies", 9}, - {"print outlines (to test printer alignment)", 10}, - {"print in reverse (i.e. a mirror image)", 11}, - {"[OPTION...] GLABELS_FILE...", 12}, - {"missing glabels file\n", 13}, - {"cannot open glabels file %s\n", 14}, - {"Revert to saved copy of %s?", 15}, - {"Unknown media type. Using default.", 16}, - {"\ -``%s'' has been modified.\n\ -\n\ -Do you wish to save it?", 17}, - {"Don't save", 18}, - {"Cannot save file", 19}, - {"Save As", 20}, - {"Close / Save label as", 21}, - {"Label no longer valid!", 22}, - {"Must supply file name", 23}, - {"Error writing file", 24}, - {"Delete", 25}, - {"Bring to front", 26}, - {"Send to back", 27}, - {"Edit properties...", 28}, - {"Edit text object properties", 29}, - {"Text", 30}, - {"Appearance", 31}, - {"Text Properties", 32}, - {"Position", 33}, - {"Edit line object properties", 34}, - {"Line", 35}, - {"Position/Size", 36}, - {"Size", 37}, - {"Edit box object properties", 38}, - {"Outline", 39}, - {"Fill", 40}, - {"Edit ellipse object properties", 41}, - {"Edit image object properties", 42}, - {"Image", 43}, - {"Reset image size", 44}, - {"Image format not currently supported", 45}, - {"Edit barcode object properties", 46}, - {"Data", 47}, - {"Barcode data", 48}, - {"General", 49}, - {"Style", 50}, - {"Invalid barcode", 51}, - {"Width:", 52}, - {"Height:", 53}, - {"Maintain current aspect ratio", 54}, - {"X:", 55}, - {"Y:", 56}, - {"points", 57}, - {"Color:", 58}, - {"Font:", 59}, - {"Alignment:", 60}, - {"Key:", 61}, - {"Insert merge field", 62}, - {"Length:", 63}, - {"Angle:", 64}, - {"degrees", 65}, - {"Scale:", 66}, - {"%", 67}, - {"Show text with barcode", 68}, - {"Literal:", 69}, - {"xmlParseFile error", 70}, - {"No document root", 71}, - {"document of the wrong type, glabels Namespace not found", 72}, - {"Bad root node = \"%s\"", 73}, - {"bad node = \"%s\"", 74}, - {"Problem saving xml file.", 75}, - {"No template files found!", 76}, - {"Edit document-merge properties", 77}, - {"Source", 78}, - {"Format:", 79}, - {"Location:", 80}, - {"Fields", 81}, - {"None", 82}, - {"Text with tab separators", 83}, - {"Text with comma separators", 84}, - {"Text with colon separators", 85}, - {"N/A", 86}, - {"Select merge-database source", 87}, - {"Column", 88}, - {"Custom field key", 89}, - {"Sample data", 90}, - {"_New", 91}, - {"Make a new, empty label", 92}, - {"U_nselect All ", 93}, - {"Remove all selections", 94}, - {"Select", 95}, - {"Select, move and modify objects", 96}, - {"Create text object", 97}, - {"Box", 98}, - {"Create box/rectangle object", 99}, - {"Create line object", 100}, - {"Ellipse", 101}, - {"Create ellipse/circle object", 102}, - {"Create image object", 103}, - {"Barcode", 104}, - {"Create barcode object", 105}, - {"Zoom in", 106}, - {"Zoom out", 107}, - {"Zoom 1:1", 108}, - {"Zoom to 1:1", 109}, - {"Merge properties", 110}, - {"Edit merge properties", 111}, - {"_Tools", 112}, - {" New ", 113}, - {"New Label/Card", 114}, - {" Open ", 115}, - {"Open a file", 116}, - {" Save ", 117}, - {"Save current file", 118}, - {" Print ", 119}, - {"Print current file", 120}, - {"\ -A label and business card creation program for GNOME.\n\ - \n\ -Glabels is free software; you can redistribute it and/or modify it under the \ -terms of the GNU General Public License as published by the Free Software \ -Foundation; either version 2 of the License, or (at your option) any later \ -version.\n\ - \n\ -This program is distributed in the hope that it will be useful, but WITHOUT \ -ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or \ -FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for \ -more details.\n", 121}, - {"Function is not implemented!", 122}, - {"New Label or Card", 123}, - {"Media Type", 124}, - {"Label orientation", 125}, - {"Open", 126}, - {"Open label", 127}, - {"Cannot open file", 128}, - {"Save label as", 129}, - {"Description:", 130}, - {"Page size:", 131}, - {"Label size:", 132}, - {"Layout:", 133}, - {"%d x %d (%d per sheet)", 134}, - {"%s x %s %s", 135}, - {"%.5g x %.5g %s", 136}, - {"Rotate", 137}, - {"Print", 138}, - {"Copies", 139}, - {"Document merge control", 140}, - {"Options", 141}, - {"Print preview", 142}, - {"Sheets:", 143}, - {"Labels", 144}, - {"from:", 145}, - {"to:", 146}, - {"Start on label", 147}, - {"on 1st sheet", 148}, - {"Collate", 149}, - {"Copies:", 150}, - {"Glabels: Preferences", 151}, - {"Display units", 152}, - {"Points", 153}, - {"Inches", 154}, - {"Millimeters", 155}, - {"Default page size", 156}, - {"inches", 157}, - {"mm", 158}, -}; - -int _msg_tbl_length = 158; diff --git a/glabels1/po/de.gmo b/glabels1/po/de.gmo index 354814fc245de64dee0ca76855b0e8c888a0a780..479b6faf4124d3896d3230b5532c0f733901f27e 100644 GIT binary patch delta 2344 zcmXZee`r-@9LMqJ+@|fEMBVM)+^;(~e=K#Z+*;nbTAS3=R5UWhiu*@|H)}a<*3?!z z1j48WMTb?G605K#DvmoSjE0$kW>8Vfe=@Ow5eTtS>&Gg3e|Eo@``p*_ob#OL`+a_# z=})b%w}wB)3;G?O9!fc7R)KTJ@t^DY;d3%@t`LXJQ|4#pm*{bS6ldc_oQGGDultXm zIWgz_8}jWE+6k^N!t0z1-AXEYuo>s#1~Y?6+8wA|4&Y4eGb6ix5Y_J;EW?jb6ZsBr z#Bq${41&mFRGb39Ps4n^AGHSU`NYlZpoDM0I=xwM1`N`xwrkJ&cR+6l#FWs2N>FzV0u6*gfYn zJtaOHS#`G<)xQokej}=1D~8(JHYz@DMD5)+)C%lI4bY8R;$CFW++oy;4IquD%Q2mEd0Y64fYy_+E0xrXFf{OMu#fc*aSA_{)=mu0G_p-iPs{751*^YYe zyHGRShdMjGcK>bsnhr-%iFR`{g?*@aN0IXyx)W3?xiErSy34p2|3)QH$vSE#OU>n| z8K+TO(}H~6R(^QI?Ly|{dXd=fEo%>9746SaEBf>FefIwv6%80G$sdjY)3nP`nLmIU zXgexkx3ynGotY0%iJwCyFox~x|yiI2UVzmb*MxdQD>tS^}4UdP=W5FqP^LI+Uq@L4=T`$ zr~wb5`W-_h{Ds{gv+I+n00~|x1ujJ$x+>HexdpYQ&8UP{m$U!6vC(d1P=T`6p$oN? zJ*dR`QD@^_)XdML`d`5s97hF6k)_71Mor*$RKjafTloks#l0!kU+?7r7qr)BQJIaR z0$)PS%zKLlF2gjs^sv@1}DtPR!gF-+rr)N43o4xiJ-jiULl}kAlLj znP;f#(?!ur@mIh-NZCNyK~e0dC<`f%QraoIDcdRfXtA=>wfui68m+EHem44~@NVyk z$n$Hw=c8KxX7BN6i{Fxb()tK3igxDdXwWZ9?W1-VMN6rV_MU}s_fYmkSNwTJ`>8ck zR#5cW8~H(5vNPXsOUyO6D_R*mob0eG&zar0GdCC%7v_G5k9fg~+WK^5T|-m-ZMpXn LqkisS#X0YPE0of+ delta 2374 zcmXZce`wTo9LMp`H>bP1#&p+Rb8a`!)|S)VA01~K$(*KRTV9sX3Yleg7;Cz8Z7tW- zGyfVC*!b3DD#nrwgAwf_2?~sU7(*hbLk6SBw2%l3bC4MId~NS9_qoUC^ZkDA^ZtC^ zpU?M()?Qhg{V|;Pj^oNw$|#XM=SHz0z!%rqkaMbjX^xv0&1v*_ehmxpH!Q{(%e<)ueA?jIqjpk1V6L(B~-whs0l1uI2W)6 z)ows7pv~@QP;q)OPifyzMFSi{b$l0oTKVIsmA2abc2uBV)Wi;>Ch$Hg z<)5NfJb?;4g^F_x`M5v$(nS6%BL7N#h|!ng3M{}!Q9pPZmC9|X74@P9?nkZs5Nd*h z_WTIyY#cYwpe8zj>i;|5hqsZJ!o{*2QB~rol~gwwq2m0CTHtl8!t4x{6;xuJIPGmSGC7yV2ru?F)Wmwovr@L-959Da z@BavDg(p#GXw06E;}3M0L{0P*4`X-+XW#!xDmuMW7{}|V6o$xKC03#)uo1PAC(Sn0 zil0YqQ3vvIuk*za?kKW0H-^M^-&%Vbm(l(cXW##D$y|qG)PM=pAz6jB*o2yS7B$dY zsDP)e{RQgmTtrR$CTaqOG}NyOHEunsUn6QEJ0$1N?V_SX(Tz;X4WS132({BaO6}S;~=+dY&vIVuJ?Pd1Dq<2r8AQ zQ4>3hIvd}kR{l4te*w`~Vi_txGb-R_)B>JEO}HDim2bw#e>Ii&xS=gLkJ{@SsKENe zSKt6@B}>gJ)EP;jGS^^kz$)4;7{@)R!#0TOpTk=G2K74ro3)BghGskuwZa0_dtZ#& z%L-JWHTHZxCTMR$&YRn3&xdd|?PJ!yY)+#B{)}4SRaEAd+@g}A5{l0Scmx%&Dem9S zf9jcDs=8jKC}aE^xGj`4&Q2?)OIn>%E=+ zUxAh00Y4Ue!0YfEgALJ6>m!sCZO|+JaIiGiM{Ny7snn%2Kmy$cN{@dbSX}fPwR*}! z6kU7$e}bjaZffn6<+{byMA_q4huWgMXWRU(nfvgi+;C`dV18zIXXp0ZvG64?lu9J) Z;>qO0sbsD%G8xR@s7F29bE)zx-v3rv*&F}> diff --git a/glabels1/po/de.po b/glabels1/po/de.po index bf87e63b..9b167ffe 100644 --- a/glabels1/po/de.po +++ b/glabels1/po/de.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: glabels 0.2.0\n" -"POT-Creation-Date: 2002-04-28 22:42-0400\n" +"POT-Creation-Date: 2002-06-27 14:23-0400\n" "PO-Revision-Date: 2001-10-15 15:31+0200\n" "Last-Translator: Marcus Bauer \n" "Language-Team: German <>\n" @@ -398,7 +398,8 @@ msgid "Text with tab separators" msgstr "Text mit Tabulatoren als Trennern" #: src/merge.c:94 -msgid "Text with comma separators" +#, fuzzy +msgid "Text with comma separators (CSV)" msgstr "Text mit Kommata als Separatoren" #: src/merge.c:102 diff --git a/glabels1/po/en@boldquot.header b/glabels1/po/en@boldquot.header deleted file mode 100644 index fedb6a06..00000000 --- a/glabels1/po/en@boldquot.header +++ /dev/null @@ -1,25 +0,0 @@ -# All this catalog "translates" are quotation characters. -# The msgids must be ASCII and therefore cannot contain real quotation -# characters, only substitutes like grave accent (0x60), apostrophe (0x27) -# and double quote (0x22). These substitutes look strange; see -# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html -# -# This catalog translates grave accent (0x60) and apostrophe (0x27) to -# left single quotation mark (U+2018) and right single quotation mark (U+2019). -# It also translates pairs of apostrophe (0x27) to -# left single quotation mark (U+2018) and right single quotation mark (U+2019) -# and pairs of quotation mark (0x22) to -# left double quotation mark (U+201C) and right double quotation mark (U+201D). -# -# When output to an UTF-8 terminal, the quotation characters appear perfectly. -# When output to an ISO-8859-1 terminal, the single quotation marks are -# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to -# grave/acute accent (by libiconv), and the double quotation marks are -# transliterated to 0x22. -# When output to an ASCII terminal, the single quotation marks are -# transliterated to apostrophes, and the double quotation marks are -# transliterated to 0x22. -# -# This catalog furthermore displays the text between the quotation marks in -# bold face, assuming the VT100/XTerm escape sequences. -# diff --git a/glabels1/po/en@quot.header b/glabels1/po/en@quot.header deleted file mode 100644 index a9647fc3..00000000 --- a/glabels1/po/en@quot.header +++ /dev/null @@ -1,22 +0,0 @@ -# All this catalog "translates" are quotation characters. -# The msgids must be ASCII and therefore cannot contain real quotation -# characters, only substitutes like grave accent (0x60), apostrophe (0x27) -# and double quote (0x22). These substitutes look strange; see -# http://www.cl.cam.ac.uk/~mgk25/ucs/quotes.html -# -# This catalog translates grave accent (0x60) and apostrophe (0x27) to -# left single quotation mark (U+2018) and right single quotation mark (U+2019). -# It also translates pairs of apostrophe (0x27) to -# left single quotation mark (U+2018) and right single quotation mark (U+2019) -# and pairs of quotation mark (0x22) to -# left double quotation mark (U+201C) and right double quotation mark (U+201D). -# -# When output to an UTF-8 terminal, the quotation characters appear perfectly. -# When output to an ISO-8859-1 terminal, the single quotation marks are -# transliterated to apostrophes (by iconv in glibc 2.2 or newer) or to -# grave/acute accent (by libiconv), and the double quotation marks are -# transliterated to 0x22. -# When output to an ASCII terminal, the single quotation marks are -# transliterated to apostrophes, and the double quotation marks are -# transliterated to 0x22. -# diff --git a/glabels1/po/es.gmo b/glabels1/po/es.gmo index 0006ad08f7ec54aaeb20cfaa596e6a5ef9a19988..569aa00359b2cc346e0eb3fa8af4af33e6be5524 100644 GIT binary patch delta 2628 zcmXZc4QQ2B7{KwfHnrVrHFw=g*YvKbt?9z4^JA$wO(t2R#2QF}PzEM0v+`@{wP~7P zHMl4>Br{6HK&UmMCbd~;gk=~?5lv-EVn`unh*|yr^Sr$0{?2(n&Uwyr&U+8fyk3{- zDa_j$I9e%pQg-Ks&}}`RACC0E5N^h@Xk~PKbSma>e>UEV^>{lzjtOjvuEzefH^%lh z92`O>?4mM&8y_HNXy+#vyU-55!UFsudJco&A>HGVuJMe;t=dhakK(`Z!Ef3YS8U79ZPWzx+k7N zGq(;o!@O+tC2uM+50Z*YFtH;RQ5+-_e1uA!o>?Gy5q* zpDT}6qDxk7{)ba(KsQ$t+CekA1RKy9wxJ#DK{K)s4Y(uT??hH9bfKH?do=Lh(C72m z@^@hh?Pnt1gqdlvG6PM?EHr?JVtYP1vnSC&7NZ?B;W&H=&B%WAy-#rxcB27aMW6o< z9k4$;(~0II*E6A*$|x?BVkJI+?t$l!;KK`eH~%o3&<+o>4sNcG(ZD{BeuMrIokC~) zBbvcq(Ixm7eLkOy23mv(zyDGyrm6y+NgbNPdFYInqN!buL$D>@-;M6>Ptd?lq8fpgJ7UPP~NMF;Fa&TuHUPoXpYC3+s+JD0Eu zuf*#kh|d1TpqZSB_E(Sg-!PQ?`{HUYIKvj?414(T!OzgIqdQ(di)1nUgU&R?H)tkG z(RL-8u?c9uwdmT^kffZPeYq1XZqSt%TKcb82Y-Rp~ zWgDq_JVx0cbSJ! z0h~hxG>EB;@2*nu%|9`!e#c7j|($DcXz5NGrx7MGbfg72riwAVa7%`~}tFEmQ#ip$7KR300SZ z>L(ZV+CE2_mSO_MtlX9F>tvsDPt(e+adNBdE=H&HNWN zffa0dy|)gtu>#d!cn6gQRCb$9sMNHe0(r&SVblx{qXIgP>fi*H;2BhAMp5tmhU;+( z6=;whspr?A#w$i99CoF4qY_tfqYBsH9@JhqiA=(Mh^zUh`2yA9&#Z?w**Ge&8|FW# zKO_(7(~K9QGU?}}rN~D;UyAYi{x{lF2R zf|-okJ1eme19tsURDboTOg5wXdpV8#YvBD{(2HkLGrWNO+;^Px;P0rfWXi5D;oDQj zR-@ zZ0)EyjO<4@YVAK!0o+7o=oaQ-66>b`)+3kPHsr4%>|UZ$&V_@h7r#dRK}5}OQENP8 zj-etSM+JTz72phNrnj*G6SC%0T!y+|jhk?rwRJ!3TGBtX{7J9f@@CF>{s*K$^jQD^ diff --git a/glabels1/po/es.po b/glabels1/po/es.po index 484644d1..77e234a2 100644 --- a/glabels1/po/es.po +++ b/glabels1/po/es.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: glabels 0.2.0\n" -"POT-Creation-Date: 2002-04-28 22:42-0400\n" +"POT-Creation-Date: 2002-06-27 14:23-0400\n" "PO-Revision-Date: 2002-04-16 12:19+0200\n" "Last-Translator: victor \n" "Language-Team: Spanish/Spain \n" @@ -385,7 +385,8 @@ msgid "Text with tab separators" msgstr "Texto separado con tabuladores" #: src/merge.c:94 -msgid "Text with comma separators" +#, fuzzy +msgid "Text with comma separators (CSV)" msgstr "Texto separado con commas" #: src/merge.c:102 diff --git a/glabels1/po/fr.gmo b/glabels1/po/fr.gmo index 68123401ddb927c62d4988e6050a628f978934f8..74601ae132efbeb97317cac4105351022e41e843 100644 GIT binary patch delta 2667 zcmXZce@vBC9LMo<;cDD_Sp*2Ep%;Qc63n$<1v>R|X zc3S(Oc?vU`-(8@hi2g-In9eK;q!87AH)@5o)?bebU>hp1Hk^hXsONf6TiIvrK~#o6 zvi4cj^P?EarE;E%2E2xv*vk)#b{VJ%@=+@*L>_Tr3}7|ty*kvyjb;<-z3r&8(}p@u z-8cvPP-o=B6!NdsouPxpyKhkgUqoeM9CZe~?2jf+K#ql*je5QSXW|mngzL-)QR8et zjlT&M;In3{^>?O{f308-9g1|H-8hI!(I66oi&_5})P&!o0vtmH5>I}$RWnfIEkp%S zhMG8xT0jLVpbeLv9LuF(f74S8?A5V1J z!UWXen~4fMgnE7r-hz=@DjKLA`Al7x*@MbRFDignt$hHsvUgE|458jXhQ)Xim61PD z?|F#241K5oSD>C>jm#Hu_fgSGtL(-`%%k0ax8ZKo890vGiW7J{|8c%Ty?33Hq?86& zo>rWW3NR1#kEs~7;u4&NVVv9oyg!cpZ=|AuPLd}@d=_ybUEgo=33Om zkD&%^LA~FBn(zQB;P+4&JBr!(h4ufA3usSZq<~5uv(3j!vlZ2U*c?S2%KwmLxlE$e z{Zdo_k04{YCr~TvL~TJY>J05S523bp0QKHCbJ>5T^gJDkd>ob9D>x6YqXx`pcCB~; z^2NDTsOM^||50Rj+;&vPqNofUHe=>zsP{&!JsONmJ$Qi*?b&5is*qBMc2x=>akw5nfKbla3Y9Z56{|Ef2af1;mN=1oTj{1C7qF$&*rSM_Y z>29$0R#eK{QJHxYmD(7RH1{Jau&bDlX?*M&XDRATtU}Ebd58*&c2A-P+=beT_fcQP z5Qgv+7UAEhm1dC!rFb#s;!0G&o6IIuCYn(h*lX@bZQ)y(rSE@;iUt_98xvSYJ3yxb z31d92HLFl7sYZR*8_mtAfLrbUPE=<5u^8V#owYAff&Pl+?g8iipyH(?p97#9g&2n+ z)PReuKaBcH?#1P}4HejN)QV1^2X*a=R{MgB_f9n?6TQ&t?1$S)*<$S;tfo9p(P+Bb zqJzHqX)V<5p(rMD;z}v6M8|x=vNo02TIw%HcLbU}d!l~@Qu+2d=agqu r;o3~uJy~NLW7&y?zF1@0h{wOEsJJZaj*=zCq1dvF;lx;W?u6%mnh5oT delta 2725 zcmY+^e@s?Y9LMqV2#C*vh5Ql}5%WP20aK*JVvRD#hAuPgkH-8JI+Y{>M_^JH3=|ZK zyvVFpxtcovC|s1TmAcu`np>KhZJ{`@nQhe?Te0S_-XHn?(=*O}opbKJ=X}rioXdq} z2bOyS@sax-Kc6y<@>!&FeYiZxh2Oe~&P~AeW`()UY`_5bTkw9|jmg-JA^Zem$2s?f zwZG+|@$_Fo?t8AEN+KP%FdFY5&$@_M3Qj`0Tp~`wu$hlZw3njZD?<%jZdRDpcE29= zd?Th}H%?=I_bHVGIxb*5-ZcM4O&H`tQruLG!*tX{3s8X;pjNsRCu6C#D{wmPTAYeq z*6uOC!)eU#ey5^{LX55mXQKisMD?#gt?&iw--Zfc7b>t0jKY1W=MJE@@}RX(qB7iP z?VnK3522Sq_ge7=s&8?^UBFt~VP|@3o@NP6z5Z zbz>SHM4gdS@#J5ryGjR1aD%9Uhf$fhi#h{|?2jf+L7j!UsOJ}B3YMTIEH^i!#;HV& zza14|v)OL_T?yo0EBJs8MS9q7^q^975{bcmZT(kK6aI_}a1<3t0{PWeWuV3@LIqHa znz$6TfHG7-m8j=-cvjho+OsxH$HS<@brvZr`5vI{lfQRH)V$IM<-W{#r*Ic@E8s1;sBO?VCU{vhVzZB%Ab ziCXXF;3CXN1-cb^-g7lnG~ssCiW|mmxHgVp&S< z!>E-%jtX!k>L1i<)QZ>Q6nqgw`u=)9>ds#v+xjVob%=nsPS*$czyrBP*IBiKt(o!8Yqqfq0ePLvc2vpv)rsl zP27PR@DS?#k5LnzLk0XjDq}bB0UWmeL++iNE{>$bl>TqTf9m#UV zsQ1>P0@#C$?e?M0LJw*Sj-wWM#ypSO+AGt^zh1mUhf*5B=!$#_Dz#ypgITBnpFyqo zIpoW8)u`uMtbZ@+w10%k*eO&7E}H}9Z>aZ1(!H?e)K2@j}8c`|S zjXK?();@?z`B7A6&Z1H~fF#vL@og)x49vtL)Hs__XTqzdqKTT3B)I*k0Y67=#U<2N zaSa#Zub7KzEMF^KhRV`e` z_1EG!+6|}yJ?n2reJwr~;b~N0%D)1S#DLoT_KxwttFpMlUmc8IywCcz5A&_g{<%Gr z8f&-Vvy=^#d$Ztc{(Hgfq#e|rpeXC)&OJnV)4v`}k87Z&-_w*=DNX);q2ypYH6`qI zKQ~k!+)b^H;`wifmIRvp>!C*jzCR@P0R^Kl~+|(uJ6rE8VZE+bMp#j\n" "Language-Team: French \n" @@ -1186,7 +1186,8 @@ msgstr "Texte avec s # src/merge.c:94 #: src/merge.c:94 -msgid "Text with comma separators" +#, fuzzy +msgid "Text with comma separators (CSV)" msgstr "Texte séparé par des virgules" # src/merge.c:107 diff --git a/glabels1/po/glabels.pot b/glabels1/po/glabels.pot index 30f42c3f..ef96bb38 100644 --- a/glabels1/po/glabels.pot +++ b/glabels1/po/glabels.pot @@ -6,13 +6,13 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2002-04-28 22:42-0400\n" +"POT-Creation-Date: 2002-06-27 14:23-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=CHARSET\n" -"Content-Transfer-Encoding: ENCODING\n" +"Content-Transfer-Encoding: 8bit\n" #: src/glabels_batch.c:47 msgid "print this message" @@ -381,7 +381,7 @@ msgid "Text with tab separators" msgstr "" #: src/merge.c:94 -msgid "Text with comma separators" +msgid "Text with comma separators (CSV)" msgstr "" #: src/merge.c:102 diff --git a/glabels1/po/insert-header.sin b/glabels1/po/insert-header.sin deleted file mode 100644 index b26de01f..00000000 --- a/glabels1/po/insert-header.sin +++ /dev/null @@ -1,23 +0,0 @@ -# Sed script that inserts the file called HEADER before the header entry. -# -# At each occurrence of a line starting with "msgid ", we execute the following -# commands. At the first occurrence, insert the file. At the following -# occurrences, do nothing. The distinction between the first and the following -# occurrences is achieved by looking at the hold space. -/^msgid /{ -x -# Test if the hold space is empty. -s/m/m/ -ta -# Yes it was empty. First occurrence. Read the file. -r HEADER -# Output the file's contents by reading the next line. But don't lose the -# current line while doing this. -g -N -bb -:a -# The hold space was nonempty. Following occurrences. Do nothing. -x -:b -} diff --git a/glabels1/po/ja.gmo b/glabels1/po/ja.gmo index ec4da989fb6f9300c530aa7111818f360b2fcc70..d61ae5891c901e2387a2d8dd518a20734be8dae5 100644 GIT binary patch literal 10293 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 literal 9869 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\n" "Language-Team: Japanese \n" "MIME-Version: 1.0\n" -"Content-Type: text/plain; charset=euc-jp\n" +"Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: src/glabels_batch.c:47 -msgid "print this message" -msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤¹¤ë" - -#: src/glabels_batch.c:49 -msgid "print the version of glabels-batch being used" -msgstr "»ÈÍѤ·¤Æ¤¤¤ë gLabel ¤Î¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨¤¹¤ë" - -#: src/glabels_batch.c:51 -msgid "set output filename (default=\"output.ps\")" -msgstr "½ÐÎϤ¹¤ë¥Õ¥¡¥¤¥ë̾¤ò»ØÄꤹ¤ë (¥Ç¥Õ¥©¥ë¥È = \"output.ps\")" - -#: src/glabels_batch.c:51 -msgid "filename" -msgstr "¥Õ¥¡¥¤¥ë̾" - -#: src/glabels_batch.c:53 -msgid "number of sheets (default=1)" -msgstr "ÍÑ»æ¤Î¿ô (¥Ç¥Õ¥©¥ë¥È = 1)" - -#: src/glabels_batch.c:53 -msgid "sheets" -msgstr "ÍÑ»æ¤Î¿ô" - -#: src/glabels_batch.c:55 -msgid "number of copies (default=1)" -msgstr "¥³¥Ô¡¼¤Î¿ô (¥Ç¥Õ¥©¥ë¥È = 1)" - -#: src/glabels_batch.c:55 -msgid "copies" -msgstr "¥³¥Ô¡¼¤Î¿ô" - -#: src/glabels_batch.c:57 src/print_dialog.c:152 -msgid "print outlines (to test printer alignment)" -msgstr "¥¢¥¦¥È¥é¥¤¥ó¤ò°õºþ¤¹¤ë (°õºþ»þ¤ÎÇÛÃÖ¤ò³Îǧ¤¹¤ë¤¿¤á)" - -#: src/glabels_batch.c:59 src/print_dialog.c:160 -msgid "print in reverse (i.e. a mirror image)" -msgstr "ȿž¤·¤Æ°õºþ (i.e. ²èÁü¤ò¥ß¥é¡¼¤·¤¿¤â¤Î)" - -#: src/glabels_batch.c:89 -msgid "[OPTION...] GLABELS_FILE..." -msgstr "[¥ª¥×¥·¥ç¥ó...] ¥Õ¥¡¥¤¥ë̾..." - -#: src/glabels_batch.c:108 -msgid "missing glabels file\n" -msgstr "gLabel ¤Ç»ÈÍѤ¹¤ë¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó\n" - -#: src/glabels_batch.c:136 -#, c-format -msgid "cannot open glabels file %s\n" -msgstr "gLabel ¤Ç»ÈÍѤ¹¤ë¥Õ¥¡¥¤¥ë %s ¤¬³«¤±¤Þ¤»¤ó\n" - #: src/mdi.c:169 #, c-format msgid "Revert to saved copy of %s?" -msgstr "%s ¤Î¥³¥Ô¡¼¤òȿž¤·¤Þ¤¹¤«¡©" +msgstr "%s のコピーを反転しますか？" #: src/mdi.c:207 msgid "Unknown media type. Using default." -msgstr "¥á¥Ç¥£¥¢¤Î¼ïÎबÆÃÄê¤Ç¤­¤Þ¤»¤ó¡£¥Ç¥Õ¥©¥ë¥È¤ò»ÈÍѤ·¤Þ¤¹¡£" +msgstr "" +"メディアの種類が特定できません。デフォルトを使用しã" +"¾ã™ã€‚" #: src/mdi.c:455 #, c-format @@ -82,173 +31,173 @@ msgid "" "\n" "Do you wish to save it?" msgstr "" -"%s ¤ÏÊÔ½¸¤µ¤ì¤Æ¤¤¤Þ¤¹¡£\n" +"%s は編集されています。\n" "\n" -"Êݸ¤·¤Þ¤¹¤«¡©" +"保存しますか？" #: src/mdi.c:459 msgid "Don't save" -msgstr "Êݸ¤·¤Ê¤¤" +msgstr "保存しない" #: src/file.c:288 src/mdi.c:601 msgid "Cannot save file" -msgstr "¥Õ¥¡¥¤¥ë¤òÊݸ¤¹¤ë¤³¤È¤¬½ÐÍè¤Þ¤»¤ó" +msgstr "ファイルを保存することが出来ません" #: src/file.c:311 src/mdi.c:623 msgid "Save As" -msgstr "̾Á°¤òÉÕ¤±¤ÆÊݸ" +msgstr "名前を付けて保存" #: src/mdi.c:626 msgid "Close / Save label as" -msgstr "¥é¥Ù¥ë¤Ë̾Á°¤òÉÕ¤±¤ÆÊݸ¤·¤ÆÊĤ¸¤Þ¤¹" +msgstr "ラベルに名前を付けて保存して閉じます" #: src/file.c:352 src/mdi.c:680 msgid "Label no longer valid!" -msgstr "¥é¥Ù¥ë¤ÏÍ­¸ú¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó¡ª" +msgstr "ラベルは有効ではありません！" #: src/file.c:362 src/mdi.c:693 msgid "Must supply file name" -msgstr "¥Õ¥¡¥¤¥ë̾¤ò»ØÄꤷ¤Æ²¼¤µ¤¤" +msgstr "ファイル名を指定して下さい" #: src/file.c:374 src/mdi.c:705 msgid "Error writing file" -msgstr "¥Õ¥¡¥¤¥ë¤Î½ñ¤­¹þ¤ß¤Ç¥¨¥é¡¼" +msgstr "ファイルの書き込みでエラー" #: src/display.c:1250 src/display.c:1298 msgid "Delete" -msgstr "ºï½ü" +msgstr "削除" #: src/display.c:1260 src/display.c:1308 msgid "Bring to front" -msgstr "Á°¤Ë»ý¤Ã¤ÆÍè¤ë" +msgstr "前に持って来る" #: src/display.c:1266 src/display.c:1314 msgid "Send to back" -msgstr "¸å¤í¤Ë¤Þ¤ï¤¹" +msgstr "後ろにまわす" #: src/display.c:1287 msgid "Edit properties..." -msgstr "¥×¥í¥Ñ¥Æ¥£¤ÎÊÔ½¸..." +msgstr "プロパティの編集..." #: src/item_text.c:450 msgid "Edit text object properties" -msgstr "¥Æ¥­¥¹¥È¤ÎÊÔ½¸" +msgstr "テキストの編集" #: src/item_text.c:460 src/item_text.c:464 src/item_text.c:637 src/menu.c:100 msgid "Text" -msgstr "¥Æ¥­¥¹¥È" +msgstr "テキスト" #: src/item_barcode.c:317 src/item_box.c:245 src/item_ellipse.c:247 #: src/item_line.c:253 src/item_text.c:479 msgid "Appearance" -msgstr "³°´Ñ" +msgstr "外観" #. ------ Begin Text Properties box ------ #: src/item_text.c:482 msgid "Text Properties" -msgstr "ʸ»ú¥×¥í¥Ñ¥Æ¥£..." +msgstr "文字プロパティ..." #. ------ Position Frame ------ #: src/item_barcode.c:345 src/item_barcode.c:348 src/item_box.c:275 #: src/item_ellipse.c:277 src/item_image.c:318 src/item_line.c:274 #: src/item_text.c:500 src/item_text.c:503 msgid "Position" -msgstr "°ÌÃÖ" +msgstr "位置" #: src/item_line.c:243 msgid "Edit line object properties" -msgstr "ľÀþ¤ÎÊÔ½¸" +msgstr "直線の編集" #. ------ Begin Line box ------ #: src/item_line.c:256 src/menu.c:106 msgid "Line" -msgstr "ľÀþ" +msgstr "直線" #: src/item_box.c:272 src/item_ellipse.c:274 src/item_image.c:315 #: src/item_line.c:271 msgid "Position/Size" -msgstr "°ÌÃ֤ȥµ¥¤¥º" +msgstr "位置とサイズ" #. ------ Size Frame ------ #: src/item_box.c:286 src/item_ellipse.c:288 src/item_image.c:329 #: src/item_line.c:285 msgid "Size" -msgstr "¥µ¥¤¥º" +msgstr "サイズ" #: src/item_box.c:235 msgid "Edit box object properties" -msgstr "»Í³Ñ¤ÎÊÔ½¸" +msgstr "四角の編集" #. ------ Line box ------ #: src/item_box.c:248 src/item_ellipse.c:250 msgid "Outline" -msgstr "¶ë·Á" +msgstr "矩形" #. ------ Fill box ------ #: src/item_box.c:258 src/item_ellipse.c:260 msgid "Fill" -msgstr "Åɤê¤Ä¤Ö¤·" +msgstr "塗りつぶし" #: src/item_ellipse.c:237 msgid "Edit ellipse object properties" -msgstr "ÂʱߤÎÊÔ½¸" +msgstr "楕円の編集" #: src/item_image.c:257 msgid "Edit image object properties" -msgstr "²èÁü¤ÎÊÔ½¸" +msgstr "画像の編集" #: src/item_image.c:268 src/menu.c:113 msgid "Image" -msgstr "²èÁü" +msgstr "画像" #. ------ Size Reset Button ------ #: src/item_image.c:342 msgid "Reset image size" -msgstr "²èÁü¥µ¥¤¥º¤Î¥ê¥»¥Ã¥È" +msgstr "画像サイズのリセット" #: src/item_image.c:389 src/item_image.c:454 msgid "Image format not currently supported" -msgstr "²èÁü¥Õ¥©¡¼¥Þ¥Ã¥È¤Ï¥µ¥Ý¡¼¥È¤·¤Æ¤¤¤Þ¤»¤ó" +msgstr "画像フォーマットはサポートしていません" #: src/item_barcode.c:287 msgid "Edit barcode object properties" -msgstr "¥Ð¡¼¥³¡¼¥É¤ÎÊÔ½¸" +msgstr "バーコードの編集" #: src/item_barcode.c:297 msgid "Data" -msgstr "¥Ç¡¼¥¿" +msgstr "データ" #: src/item_barcode.c:299 msgid "Barcode data" -msgstr "¥Ð¡¼¥³¡¼¥É¡¦¥Ç¡¼¥¿" +msgstr "バーコード・データ" #. ------ Begin Barcode Properties Frame ------ #: src/item_barcode.c:320 src/prefs.c:215 msgid "General" -msgstr "Á´ÈÌ" +msgstr "全般" #. ------ Barcode Style Frame ------ #: src/item_barcode.c:330 msgid "Style" -msgstr "¥¹¥¿¥¤¥ë" +msgstr "スタイル" -#: src/item_barcode.c:549 src/item_barcode.c:572 src/print.c:631 +#: src/item_barcode.c:549 src/item_barcode.c:572 src/print.c:627 msgid "Invalid barcode" -msgstr "¤ª¤«¤·¤Ê¥Ð¡¼¥³¡¼¥É" +msgstr "おかしなバーコード" #. W Label #: src/prop_line.c:169 src/prop_size.c:182 msgid "Width:" -msgstr "Éý:" +msgstr "幅:" #. H label #: src/prop_size.c:198 msgid "Height:" -msgstr "¹â¤µ:" +msgstr "高さ:" #: src/prop_size.c:222 msgid "Maintain current aspect ratio" -msgstr "¸½ºß¤Î¥¢¥¹¥Ú¥¯¥ÈÈæΨ¤ò°Ý»ý¤¹¤ë" +msgstr "現在のアスペクト比率を維持する" #. X label #: src/prop_position.c:173 @@ -263,52 +212,52 @@ msgstr "Y:" #. Line Width units #: src/prefs.c:448 src/prefs.c:455 src/prop_line.c:183 msgid "points" -msgstr "¥Ý¥¤¥ó¥È" +msgstr "ポイント" #. Line Color Label #: src/prop_bc.c:188 src/prop_fill.c:166 src/prop_line.c:189 #: src/prop_text.c:234 msgid "Color:" -msgstr "¿§:" +msgstr "色:" #. Font label #: src/prop_text.c:181 msgid "Font:" -msgstr "¥Õ¥©¥ó¥È:" +msgstr "フォント:" #. Alignment label #: src/prop_text.c:248 msgid "Alignment:" -msgstr "°ÌÃÖ:" +msgstr "位置:" #. Insert merge field label #: src/prop_bc_data.c:196 src/prop_text_entry.c:180 msgid "Key:" -msgstr "¥­¡¼:" +msgstr "キー:" #: src/prop_text_entry.c:196 msgid "Insert merge field" -msgstr "·ë¹ç¥Õ¥£¡¼¥ë¥É¤ÎÁÞÆþ" +msgstr "結合フィールドの挿入" #. Length label #: src/prop_vector.c:183 msgid "Length:" -msgstr "Ťµ:" +msgstr "長さ:" #. Angle label #: src/prop_vector.c:207 msgid "Angle:" -msgstr "³ÑÅÙ:" +msgstr "角度:" #. Angle units label #: src/prop_vector.c:224 msgid "degrees" -msgstr "ÅÙ" +msgstr "度" #. Scale Label #: src/prop_bc.c:168 msgid "Scale:" -msgstr "À£Ë¡:" +msgstr "寸法:" #. % Label #: src/prop_bc.c:182 @@ -318,77 +267,79 @@ msgstr "%" #: src/prop_bc_style.c:313 msgid "Show text with barcode" -msgstr "¥Ð¡¼¥³¡¼¥É¤òÉÕ¤±¤Æ¥Æ¥­¥¹¥È¤òɽ¼¨¤¹¤ë" +msgstr "バーコードを付けてテキストを表示する" #: src/prop_bc_data.c:176 msgid "Literal:" -msgstr "¥ê¥Æ¥é¥ë:" +msgstr "リテラル:" #: src/label.c:173 src/label.c:197 msgid "xmlParseFile error" -msgstr "xmlParseFile ¥¨¥é¡¼" +msgstr "xmlParseFile エラー" #: src/label.c:228 msgid "No document root" -msgstr "root ¥É¥­¥å¥á¥ó¥È¤Ç¤Ï¤¢¤ê¤Þ¤»¤ó" +msgstr "root ドキュメントではありません" #: src/label.c:239 msgid "document of the wrong type, glabels Namespace not found" -msgstr "¥É¥­¥å¥á¥ó¥È¤Î¼ïÎब´Ö°ã¤Ã¤Æ¤¤¤Þ¤¹¡£Glabels ̾Á°¶õ´Ö¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡£" +msgstr "" +"ドキュメントの種類が間違っています。Glabels " +"名前空間が見つかりません。" #: src/label.c:244 #, c-format msgid "Bad root node = \"%s\"" -msgstr "¤ª¤«¤·¤Ê root ¤Î¥Î¡¼¥É = \"%s\"" +msgstr "おかしな root のノード = \"%s\"" #: src/label.c:291 #, c-format msgid "bad node = \"%s\"" -msgstr "¤ª¤«¤·¤Ê¥Î¡¼¥É = \"%s\"" +msgstr "おかしなノード = \"%s\"" #: src/label.c:606 msgid "Problem saving xml file." -msgstr "XML ¥Õ¥¡¥¤¥ë¤ÎÊݸ¤ÇÌäÂ꤬¤¢¤ê¤Þ¤¹" +msgstr "XML ファイルの保存で問題があります" #: src/template.c:224 msgid "No template files found!" -msgstr "¥Æ¥ó¥×¥ì¡¼¥È¡¦¥Õ¥¡¥¤¥ë¤¬¸«¤Ä¤«¤ê¤Þ¤»¤ó¡ª" +msgstr "テンプレート・ファイルが見つかりません！" #: src/merge_properties.c:82 msgid "Edit document-merge properties" -msgstr "·ë¹ç¥É¥­¥å¥á¥ó¥È¡¦¥×¥í¥Ñ¥Æ¥£¤ÎÊÔ½¸" +msgstr "結合ドキュメント・プロパティの編集" #: src/merge_properties.c:131 msgid "Source" -msgstr "¥½¡¼¥¹" +msgstr "ソース" #: src/merge_properties.c:143 msgid "Format:" -msgstr "½ñ¼°:" +msgstr "書式:" #: src/merge_properties.c:158 msgid "Location:" -msgstr "¾ì½ê:" +msgstr "場所:" #: src/merge_properties.c:168 msgid "Fields" -msgstr "¥Õ¥£¡¼¥ë¥É" +msgstr "フィールド" #: src/merge.c:78 msgid "None" -msgstr "¤Ê¤·" +msgstr "なし" #: src/merge.c:86 msgid "Text with tab separators" -msgstr "¥¿¥Ö¤Ç¶èÀڤ俥ƥ­¥¹¥È" +msgstr "タブで区切ったテキスト" #: src/merge.c:94 msgid "Text with comma separators" -msgstr "¥³¥ó¥Þ¤Ç¶èÀڤ俥ƥ­¥¹¥È" +msgstr "コンマで区切ったテキスト" #: src/merge.c:102 msgid "Text with colon separators" -msgstr "¥³¥í¥ó¤Ç¶èÀڤ俥ƥ­¥¹¥È" +msgstr "コロンで区切ったテキスト" #: src/merge_ui.c:207 src/merge_ui.c:242 src/merge_ui.c:387 src/merge_ui.c:428 msgid "N/A" @@ -396,139 +347,139 @@ msgstr "N/A" #: src/merge_ui_text.c:170 msgid "Select merge-database source" -msgstr "·ë¹ç¥Ç¡¼¥¿¥Ù¡¼¥¹¡¦¥½¡¼¥¹¤ÎÁªÂò" +msgstr "結合データベース・ソースの選択" #: src/merge_ui_text.c:330 msgid "Column" -msgstr "Îó" +msgstr "列" #: src/merge_ui_text.c:334 msgid "Custom field key" -msgstr "¥«¥¹¥¿¥à¡¦¥Õ¥£¡¼¥ë¥É¡¦¥­¡¼" +msgstr "カスタム・フィールド・キー" #: src/merge_ui_text.c:338 msgid "Sample data" -msgstr "¥µ¥ó¥×¥ë¥Ç¡¼¥¿" +msgstr "サンプルデータ" #: src/menu.c:50 msgid "_New" -msgstr "¿·µ¬(_N)" +msgstr "新規(_N)" #: src/menu.c:51 msgid "Make a new, empty label" -msgstr "¿·µ¬¤Ë¶õ¤Î¥é¥Ù¥ë¤òºîÀ®¤·¤Þ¤¹" +msgstr "新規に空のラベルを作成します" #: src/menu.c:85 msgid "U_nselect All " -msgstr "Á´¤ÆÁªÂò²ò½ü(_N)" +msgstr "全て選択解除(_N)" #: src/menu.c:86 msgid "Remove all selections" -msgstr "ÁªÂòÈϰϤò²ò½ü¤·¤Þ¤¹" +msgstr "選択範囲を解除します" #: src/menu.c:94 msgid "Select" -msgstr "ÁªÂò" +msgstr "選択" #: src/menu.c:95 src/menu.c:186 msgid "Select, move and modify objects" -msgstr "¥ª¥Ö¥¸¥§¥¯¥È¤ÎÁªÂò¡¢°ÜÆ°¡¢ÊÔ½¸¤ò¹Ô¤¤¤Þ¤¹" +msgstr "オブジェクトの選択、移動、編集を行います" #: src/menu.c:100 src/menu.c:191 msgid "Create text object" -msgstr "¥Æ¥­¥¹¥È¡¦¥ª¥Ö¥¸¥§¥¯¥È¤òºîÀ®¤·¤Þ¤¹" +msgstr "テキスト・オブジェクトを作成します" #: src/menu.c:103 msgid "Box" -msgstr "»Í³Ñ" +msgstr "四角" #: src/menu.c:103 src/menu.c:194 msgid "Create box/rectangle object" -msgstr "»Í³Ñ/»°³Ñ¤Î¥ª¥Ö¥¸¥§¥¯¥È¤òºîÀ®¤·¤Þ¤¹" +msgstr "四角/三角のオブジェクトを作成します" #: src/menu.c:106 src/menu.c:197 msgid "Create line object" -msgstr "ľÀþ¥ª¥Ö¥¸¥§¥¯¥È¤òºîÀ®¤·¤Þ¤¹" +msgstr "直線オブジェクトを作成します" #: src/menu.c:109 msgid "Ellipse" -msgstr "Âʱß" +msgstr "楕円" #: src/menu.c:110 src/menu.c:200 msgid "Create ellipse/circle object" -msgstr "Âʱß/±ß¥ª¥Ö¥¸¥§¥¯¥È¤òºîÀ®¤·¤Þ¤¹" +msgstr "楕円/円オブジェクトを作成します" #: src/menu.c:113 src/menu.c:203 msgid "Create image object" -msgstr "²èÁü¥ª¥Ö¥¸¥§¥¯¥È¤òºîÀ®¤·¤Þ¤¹" +msgstr "画像オブジェクトを作成します" #: src/menu.c:116 msgid "Barcode" -msgstr "¥Ð¡¼¥³¡¼¥É" +msgstr "バーコード" #: src/menu.c:116 src/menu.c:206 msgid "Create barcode object" -msgstr "¥Ð¡¼¥³¡¼¥É¡¦¥ª¥Ö¥¸¥§¥¯¥È¤òºîÀ®¤·¤Þ¤¹" +msgstr "バーコード・オブジェクトを作成します" #: src/menu.c:121 src/menu.c:211 msgid "Zoom in" -msgstr "³ÈÂç" +msgstr "拡大" #: src/menu.c:124 src/menu.c:214 msgid "Zoom out" -msgstr "½Ì¾®" +msgstr "縮小" #: src/menu.c:127 msgid "Zoom 1:1" -msgstr "¸µ¤Î¥µ¥¤¥º¤Ø" +msgstr "元のサイズへ" #: src/menu.c:127 src/menu.c:217 msgid "Zoom to 1:1" -msgstr "½Ä²£Èæ 1:1 ¤Î¥µ¥¤¥º¤Ë¤·¤Þ¤¹" +msgstr "縦横比 1:1 のサイズにします" #: src/menu.c:132 src/menu.c:223 msgid "Merge properties" -msgstr "·ë¹ç¥×¥í¥Ñ¥Æ¥£" +msgstr "結合プロパティ" #: src/menu.c:133 msgid "Edit merge properties" -msgstr "·ë¹ç¥×¥í¥Ñ¥Æ¥£¤òÊÔ½¸¤·¤Þ¤¹" +msgstr "結合プロパティを編集します" #: src/menu.c:157 msgid "_Tools" -msgstr "¥Ä¡¼¥ë(_T)" +msgstr "ツール(_T)" #: src/menu.c:168 msgid " New " -msgstr " ¿·µ¬ " +msgstr " 新規 " #: src/menu.c:168 msgid "New Label/Card" -msgstr "¿·µ¬¤Î¥é¥Ù¥ë/¥«¡¼¥É¤òºîÀ®¤·¤Þ¤¹" +msgstr "新規のラベル/カードを作成します" #: src/menu.c:170 msgid " Open " -msgstr " ³«¤¯ " +msgstr " 開く " #: src/menu.c:170 msgid "Open a file" -msgstr "¥Õ¥¡¥¤¥ë¤ò³«¤­¤Þ¤¹" +msgstr "ファイルを開きます" #: src/menu.c:172 msgid " Save " -msgstr " Êݸ " +msgstr " 保存 " #: src/menu.c:172 msgid "Save current file" -msgstr "¤³¤Î¥Õ¥¡¥¤¥ë¤òÊݸ¤·¤Þ¤¹" +msgstr "このファイルを保存します" #: src/menu.c:175 msgid " Print " -msgstr " °õºþ " +msgstr " 印刷 " #: src/menu.c:175 msgid "Print current file" -msgstr "¤³¤Î¥Õ¥¡¥¤¥ë¤ò°õºþ¤·¤Þ¤¹" +msgstr "このファイルを印刷します" #: src/menu.c:290 msgid "" @@ -544,68 +495,72 @@ msgid "" "FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for " "more details.\n" msgstr "" -"GNOME ¸þ¤±¤Î¥é¥Ù¥ë/¥Ó¥¸¥Í¥¹¥«¡¼¥É¤ÎºîÀ®¥×¥í¥°¥é¥à¤Ç¤¹¡£\n" +"GNOME " +"向けのラベル/ビジネスカードの作成プログラムです。\n" "\n" -"Glabels ¤Ï¥Õ¥ê¡¼¥½¥Õ¥È¤Ç¤¹¡£¥Õ¥ê¡¼¥½¥Õ¥È¥¦¥§¥¢ºâÃĤ¬Äê¤á¤ë GNU °ìÈ̸øÍ­»ÈÍѵö" -"Âú·ÀÌó½ñ¤ÎÂè2ÈǤ⤷¤¯¤Ï¤½¤ì°Ê¹ß¤Î¥Ð¡¼¥¸¥ç¥ó¤Î²¼¤ÇÊ£À½¡¢²þÊÔ¡¢ºÆÇÛÉÛ¤¬Ç§¤á¤é¤ì" -"¤Æ¤¤¤Þ¤¹¡£\n" +"Glabels " +"はフリーソフトです。フリーソフトウェア財団が定める " +"GNU " +"一般公有使用許諾契約書の第2版もしくはそれ以降のバーã" +"‚¸ãƒ§ãƒ³ã®ä¸‹ã§è¤‡è£½ã€æ”¹ç·¨ã€å†é…å¸ƒãŒèªã‚ã‚‰ã‚Œã¦ã„ます。\n" "\n" -"¤³¤Î¥×¥í¥°¥é¥à¤¬Ìò¤ËΩ¤Ä¤³¤È¤ò˾¤àÃæ¤ÇÇÛÉÛ¤µ¤ì¤Æ¤¤¤Þ¤¹¤¬¡¢´°Á´ÌµÊݾڤǤ¹¡£ÈÎ" -"ÇäÌÜŪ¤Þ¤¿¤Ï¾¦ÍÑÌÜŪ¤ÎÊݾڤϤ¢¤ê¤Þ¤»¤ó¡£¾ÜºÙ¤Ë¤Ä¤¤¤Æ¤Ï GNU °ìÈ̸øÍ­»ÈÍѵöÂú·À" -"Ìó½ñ¤ò»²¾È¤·¤Æ²¼¤µ¤¤¡£\n" +"このプログラムが役に立つことを望む中で配布されていã" +"¾ã™ãŒã€å®Œå…¨ç„¡ä¿è¨¼ã§ã™ã€‚販売目的または商用目的の保証ã" +"¯ã‚りません。詳細については GNU " +"一般公有使用許諾契約書を参照して下さい。\n" #: src/menu.c:326 msgid "Function is not implemented!" -msgstr "¤Þ¤À¤³¤Îµ¡Ç½¤Ï¼ÂÁõ¤µ¤ì¤Æ¤¤¤Þ¤»¤ó¡ª" +msgstr "まだこの機能は実装されていません！" #: src/file.c:72 msgid "New Label or Card" -msgstr "¿·µ¬¥é¥Ù¥ë¤Þ¤¿¤Ï¥«¡¼¥É" +msgstr "新規ラベルまたはカード" #: src/file.c:98 msgid "Media Type" -msgstr "¥á¥Ç¥£¥¢¤Î¼ïÎà" +msgstr "メディアの種類" #: src/file.c:109 msgid "Label orientation" -msgstr "¥é¥Ù¥ë¤Î¸þ¤­" +msgstr "ラベルの向き" #: src/file.c:211 msgid "Open" -msgstr "³«¤¯" +msgstr "開く" #: src/file.c:213 msgid "Open label" -msgstr "¥é¥Ù¥ë¤ò³«¤­¤Þ¤¹" +msgstr "ラベルを開きます" #: src/file.c:249 msgid "Cannot open file" -msgstr "¥Õ¥¡¥¤¥ë¤¬³«¤±¤Þ¤»¤ó" +msgstr "ファイルが開けません" #: src/file.c:316 msgid "Save label as" -msgstr "¥é¥Ù¥ë¤Ë̾Á°¤òÉÕ¤±¤ÆÊݸ¤·¤Þ¤¹" +msgstr "ラベルに名前を付けて保存します" #: src/media_select.c:222 msgid "Description:" -msgstr "ÀâÌÀ:" +msgstr "説明:" #: src/media_select.c:227 msgid "Page size:" -msgstr "ÍÑ»æ¤Î¥µ¥¤¥º:" +msgstr "用紙のサイズ:" #: src/media_select.c:232 msgid "Label size:" -msgstr "¥é¥Ù¥ë¤ÎÂ礭¤µ:" +msgstr "ラベルの大きさ:" #: src/media_select.c:237 msgid "Layout:" -msgstr "¥ì¥¤¥¢¥¦¥È:" +msgstr "レイアウト:" #: src/media_select.c:353 #, c-format msgid "%d x %d (%d per sheet)" -msgstr "%d x %d (%d ¸Ä/¥·¡¼¥È)" +msgstr "%d x %d (%d 個/シート)" #: src/media_select.c:367 #, c-format @@ -619,93 +574,102 @@ msgstr "%.5g x %.5g %s" #: src/rotate_select.c:169 msgid "Rotate" -msgstr "²óž¤µ¤»¤ë" +msgstr "回転させる" #: src/print_dialog.c:99 msgid "Print" -msgstr "°õºþ" +msgstr "印刷" #. ----------- Add simple-copies widget ------------ #: src/print_dialog.c:104 msgid "Copies" -msgstr "¥³¥Ô¡¼" +msgstr "コピー" #. -------Otherwise add merge control widget ------------ #: src/print_dialog.c:121 msgid "Document merge control" -msgstr "¥É¥­¥å¥á¥ó¥È¤ò¥³¥ó¥È¥í¡¼¥ë¤Ë¥Þ¡¼¥¸¤¹¤ë" +msgstr "ドキュメントをコントロールにマージする" #. ----------- Add custom print options area ------------ #: src/print_dialog.c:141 msgid "Options" -msgstr "¥ª¥×¥·¥ç¥ó" +msgstr "オプション" + +#: src/print_dialog.c:152 +msgid "print outlines (to test printer alignment)" +msgstr "" +"アウトラインを印刷する (印刷時の配置を確認するため)" + +#: src/print_dialog.c:160 +msgid "print in reverse (i.e. a mirror image)" +msgstr "反転して印刷 (i.e. 画像をミラーしたもの)" #: src/print_dialog.c:241 src/print_dialog.c:280 msgid "Print preview" -msgstr "°õºþ¥×¥ì¥Ó¥å¡¼" +msgstr "印刷プレビュー" #: src/print_copies.c:170 msgid "Sheets:" -msgstr "ÍÑ»æ:" +msgstr "用紙:" #: src/print_copies.c:187 msgid "Labels" -msgstr "¥é¥Ù¥ë" +msgstr "ラベル" #: src/print_copies.c:190 msgid "from:" -msgstr "³«»Ï:" +msgstr "開始:" #: src/print_copies.c:198 msgid "to:" -msgstr "½ªÎ»:" +msgstr "終了:" #: src/print_merge.c:170 msgid "Start on label" -msgstr "¥é¥Ù¥ë¤Î³«»Ï" +msgstr "ラベルの開始" #: src/print_merge.c:179 msgid "on 1st sheet" -msgstr "(ºÇ½é¤Î¥·¡¼¥È)" +msgstr "(最初のシート)" #: src/print_merge.c:188 msgid "Collate" -msgstr "À½ËÜ" +msgstr "製本" #: src/print_merge.c:195 msgid "Copies:" -msgstr "¥³¥Ô¡¼:" +msgstr "コピー:" #: src/prefs.c:86 msgid "Glabels: Preferences" -msgstr "Glabels: ÀßÄê" +msgstr "Glabels: 設定" #. ----- Display Units Frame ------------------------------------ #: src/prefs.c:220 msgid "Display units" -msgstr "ɽ¼¨¤¹¤ëñ°Ì" +msgstr "表示する単位" #: src/prefs.c:231 msgid "Points" -msgstr "¥Ý¥¤¥ó¥È" +msgstr "ポイント" #: src/prefs.c:237 msgid "Inches" -msgstr "¥¤¥ó¥Á" +msgstr "インチ" #: src/prefs.c:244 msgid "Millimeters" -msgstr "¥ß¥ê" +msgstr "ミリ" #. ----- Display Units Frame ------------------------------------ #: src/prefs.c:249 msgid "Default page size" -msgstr "¥Ç¥Õ¥©¥ë¥È¤ÎÍѻ極¥¤¥º" +msgstr "デフォルトの用紙サイズ" #: src/prefs.c:450 msgid "inches" -msgstr "[¥¤¥ó¥Á]" +msgstr "[インチ]" #: src/prefs.c:452 msgid "mm" -msgstr "[¥ß¥ê]" +msgstr "[ミリ]" diff --git a/glabels1/po/pt_BR.gmo b/glabels1/po/pt_BR.gmo index d0ce570aa15dc1a4d3059231d45c3fbd8dc4e7d5..546522dc9e35c4b172ec3bbee173e94c795fc2ee 100644 GIT binary patch delta 2628 zcmXZdeQ1?c9Ki8&=i7E~wcLwV)3$r3)tr{@HZ>IuWww@@y_rN&pkXPFkPKg%w=6ZY zsdZgpmK10X1EFS-M${%z;3|<>e^h2KU`CV;LkWw%-|aj+=YGy}p65B|cYfzQ+lj_) zjk%L01KR?}cFG9KYXd{*v|hvyN7W@E6k<9$CYp^-!vyym@G`swhvNcFVlx&Ogs?hZ zZ|0%FwC_Of=fW;3Wi-5nL-0f7*>D60;4$P3J^WmbKS$4DIoE@V`#Y?NW}-D{f8){T zCSwK8LnpcvOBp|GqEbS`uIK@DpiU$i;W!S(Z_vokpaGsmXZSA;!xS%hox!Vd9A1TU z;`Nf~Ml^uESi$(Ai;5ARL<2eJ4IIL#&Y&7?uSElxjt16%gRlvGZa&)a!g#$B&1_4& zehGd4RUCzHV9pLdrQ!hH$YjC~=m3ABGdqWzA;m)}9ErYHgMBHEPDbCm8Qn7t=r)>% zBXJ?RH=aN?JeklThPGvpaCC7m*^|-9rhYv-)17DsyU|SSMFTzmf7`iJNg z_U#qy+bif2B)O;{f^sx~38ZO=-~V(f?$X)FvW5BRj27dSxDuVoHZ-6%sW@;mI>7p98yY}6+Hn^;qtDQePoXnAjjnw! z`iG~0-kneyug6-f#`~}a*WoB^$DEZf;sd?N8HN!i*$!Fs#U^yXW+aSG z(1CtOH*GIElfjw(_9U9gQZ(QibRvytzYn70Jcjho|9>h4H0+7)>%S59qifrNM*30o zb2Naj(WUtgufsEF%1c-`@27DFUW)^82^#1!EWi~wG>m08#~YiljvHIC9y`&`?mW6? z7pwDQiki~TQuVlpvYE2V3yzr-Gad46MQhWWs60Wedf*t*10nJf=`KQttI49yj6k{J2y_ zdKjBi^`&d6J>@0GbNQXAsfpDcCsH>QbySvjCz2D#)lI6J UaO0G^Y{%cjUQBhonK_vFANI%X*#H0l delta 2658 zcmXZeX>6257{Ku zTrH-s9$n~KEMorf5|u(a_C?=EC;AFWMmUGp;?L+rm(c)y$Q34V0H$I)gM(>L!a+DM zw%0^oL<2a8DdrC+sTkn}G?08|GtzO0GI`9}YunEzr zvHvbK@HuFJ^NYy8FD##GK9)}^iVaS18hZ8|2&$~J?H>$qnS8}2K-UHe*)dQFVI8xL-ZeX z0sV>I_eNnUPD01aHc;W`85Tz$KvUC*2C_P~H=rxrga(vD2Y4AX_&S=IljwUt;cfUU z8fY1-@%drsd}ELWXG2B2QG+*fV;bIq%h5B?if+lPSixVK189KfIZ4_P{R<7S6a9mf zWZAAbfo7nXFSnu+Q$$dMef<5;BVR_m6g{mgkZla>&=s}d^|%vV$q_W5qsS+;M=zkK zynusYhHgSvJR(|w&Qpy(HwBCR{WnnI6PoyP;#PEm{n4Xn0PX0&9q5WKq7x)JNv^CA zJp*a<570<-LDO**&cQNl#$mVzv*lFUsp#MFfi&S!4R;{f4)y4ZtI!Eskt~Ouv3(ew z=!4k)6y2IHkx%%RFEe)uIS%1pG!sRG$-e`p2-iI?MF+YYop>&~^5y7ro6(fF#QS@Z z10If{?|p-wfwSnZ={I!Z%V=zMhKr{ zhW6K3iM_~gK2AdSZc2G>P{Exg%~ZYWC|fCy+2EQ&G2@TsnhVyIY^L@MWf|puioahk zC-8bYSCS~o+m@?Ll-;nMc1u@p2)ClE+(2

nL6OmTO8Zt8AjxKzWwp+Mc4+QoO1u zn<#T_#H$K-dL}XgkyITwY?_$jtbmnN0P#OxuY8JCeOtcRaj!)q@M#rj;Jg`yU%w^lktE diff --git a/glabels1/po/pt_BR.po b/glabels1/po/pt_BR.po index bea34f97..489c4798 100644 --- a/glabels1/po/pt_BR.po +++ b/glabels1/po/pt_BR.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: glabels 0.4.1\n" -"POT-Creation-Date: 2002-04-28 22:42-0400\n" +"POT-Creation-Date: 2002-06-27 14:23-0400\n" "PO-Revision-Date: 2002-01-31 21:20+ZONE\n" "Last-Translator: Paulo R. Ormenese \n" "Language-Team: Brazilian portuguese <>\n" @@ -386,7 +386,8 @@ msgid "Text with tab separators" msgstr "Texto separado com tab" #: src/merge.c:94 -msgid "Text with comma separators" +#, fuzzy +msgid "Text with comma separators (CSV)" msgstr "Texto separado com vírgula" #: src/merge.c:102 diff --git a/glabels1/po/quot.sed b/glabels1/po/quot.sed deleted file mode 100644 index 0122c463..00000000 --- a/glabels1/po/quot.sed +++ /dev/null @@ -1,6 +0,0 @@ -s/"\([^"]*\)"/“\1”/g -s/`\([^`']*\)'/‘\1’/g -s/ '\([^`']*\)' / ‘\1’ /g -s/ '\([^`']*\)'$/ ‘\1’/g -s/^'\([^`']*\)' /‘\1’ /g -s/“”/""/g diff --git a/glabels1/po/remove-potcdate.sin b/glabels1/po/remove-potcdate.sin deleted file mode 100644 index 2436c49e..00000000 --- a/glabels1/po/remove-potcdate.sin +++ /dev/null @@ -1,19 +0,0 @@ -# Sed script that remove the POT-Creation-Date line in the header entry -# from a POT file. -# -# The distinction between the first and the following occurrences of the -# pattern is achieved by looking at the hold space. -/^"POT-Creation-Date: .*"$/{ -x -# Test if the hold space is empty. -s/P/P/ -ta -# Yes it was empty. First occurrence. Remove the line. -g -d -bb -:a -# The hold space was nonempty. Following occurrences. Do nothing. -x -:b -} -- 2.39.5