From: Jim Evins Date: Wed, 11 Sep 2002 01:19:25 +0000 (+0000) Subject: More screwing with build environment X-Git-Tag: glabels-2_3_0~772 X-Git-Url: https://git.sur5r.net/?a=commitdiff_plain;h=39b55bb6524feb82f3ca6c9e2f98ab7d60d006fd;p=glabels More screwing with build environment git-svn-id: https://glabels.svn.sourceforge.net/svnroot/glabels/trunk@113 f5e0f49d-192f-0410-a22d-a8d8700d0965 --- diff --git a/glabels1/ABOUT-NLS b/glabels1/ABOUT-NLS index 7e6b3809..022965c6 100644 --- a/glabels1/ABOUT-NLS +++ b/glabels1/ABOUT-NLS @@ -113,6 +113,13 @@ 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. @@ -164,102 +171,193 @@ Available Packages ================== Languages are not equally supported in all packages. The following -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 +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 translation percentage of at least 50%. - 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 + 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 - 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 + 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 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 @@ -272,7 +370,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 May 2001 seems to be old, you may fetch a more recent copy of + If March 2002 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'. @@ -282,13 +380,15 @@ 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 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 +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 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 e69de29b..3fbdc21a 100644 --- a/glabels1/ChangeLog +++ b/glabels1/ChangeLog @@ -0,0 +1,8 @@ +2002-08-24 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 1d991502..56db8cff 100644 --- a/glabels1/Makefile.am +++ b/glabels1/Makefile.am @@ -2,9 +2,9 @@ LIB_BARCODE_DIR = barcode-0.98 -SUBDIRS = intl po macros src doc +SUBDIRS = m4 po macros src doc -EXTRA_DIST = \ +EXTRA_DIST = config.rpath \ glabels.desktop glabels.spec.in glabels.spec autogen.sh Applicationsdir = $(datadir)/gnome/apps/Applications @@ -56,3 +56,5 @@ 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/barcode-0.98/configure b/glabels1/barcode-0.98/configure index aebdc4d5..81f79e08 100755 --- a/glabels1/barcode-0.98/configure +++ b/glabels1/barcode-0.98/configure @@ -1,7 +1,7 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated automatically using autoconf version 2.12 +# Generated automatically using autoconf version 2.13 # Copyright (C) 1992, 93, 94, 95, 96 Free Software Foundation, Inc. # # This configure script is free software; the Free Software Foundation @@ -49,6 +49,7 @@ mandir='${prefix}/man' # Initialize some other variables. subdirs= MFLAGS= MAKEFLAGS= +SHELL=${CONFIG_SHELL-/bin/sh} # Maximum number of lines to put in a shell here document. ac_max_here_lines=12 @@ -332,7 +333,7 @@ EOF verbose=yes ;; -version | --version | --versio | --versi | --vers) - echo "configure generated by autoconf version 2.12" + echo "configure generated by autoconf version 2.13" exit 0 ;; -with-* | --with-*) @@ -502,9 +503,11 @@ ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross +ac_exeext= +ac_objext=o if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then # Stardent Vistra SVR4 grep lacks -e, says ghazi@caip.rutgers.edu. if (echo -n testing; echo 1,2,3) | sed s/-n/xn/ | grep xn >/dev/null; then @@ -523,15 +526,16 @@ fi # Extract the first word of "gcc", so it can be a program name with args. set dummy gcc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:527: checking for $ac_word" >&5 +echo "configure:530: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_CC="gcc" @@ -552,16 +556,17 @@ if test -z "$CC"; then # Extract the first word of "cc", so it can be a program name with args. set dummy cc; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:556: checking for $ac_word" >&5 +echo "configure:560: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$CC"; then ac_cv_prog_CC="$CC" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" ac_prog_rejected=no - for ac_dir in $PATH; do + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then if test "$ac_dir/$ac_word" = "/usr/ucb/cc"; then @@ -596,25 +601,61 @@ else echo "$ac_t""no" 1>&6 fi + if test -z "$CC"; then + case "`uname -s`" in + *win32* | *WIN32*) + # Extract the first word of "cl", so it can be a program name with args. +set dummy cl; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:611: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_prog_CC'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + if test -n "$CC"; then + ac_cv_prog_CC="$CC" # Let the user override the test. +else + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + ac_cv_prog_CC="cl" + break + fi + done + IFS="$ac_save_ifs" +fi +fi +CC="$ac_cv_prog_CC" +if test -n "$CC"; then + echo "$ac_t""$CC" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + ;; + esac + fi test -z "$CC" && { echo "configure: error: no acceptable cc found in \$PATH" 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works""... $ac_c" 1>&6 -echo "configure:604: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 +echo "configure:643: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) works" >&5 ac_ext=c # CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. ac_cpp='$CPP $CPPFLAGS' ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' -ac_link='${CC-cc} -o conftest $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' cross_compiling=$ac_cv_prog_cc_cross -cat > conftest.$ac_ext < conftest.$ac_ext << EOF + +#line 654 "configure" #include "confdefs.h" + main(){return(0);} EOF -if { (eval echo configure:618: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:659: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then ac_cv_prog_cc_works=yes # If we can't run a trivial program, we are probably using a cross compiler. if (./conftest; exit) 2>/dev/null; then @@ -628,18 +669,24 @@ else ac_cv_prog_cc_works=no fi rm -fr conftest* +ac_ext=c +# CFLAGS is not in ac_cpp because -g, -O, etc. are not valid cpp options. +ac_cpp='$CPP $CPPFLAGS' +ac_compile='${CC-cc} -c $CFLAGS $CPPFLAGS conftest.$ac_ext 1>&5' +ac_link='${CC-cc} -o conftest${ac_exeext} $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5' +cross_compiling=$ac_cv_prog_cc_cross echo "$ac_t""$ac_cv_prog_cc_works" 1>&6 if test $ac_cv_prog_cc_works = no; then { echo "configure: error: installation or configuration problem: C compiler cannot create executables." 1>&2; exit 1; } fi echo $ac_n "checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler""... $ac_c" 1>&6 -echo "configure:638: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 +echo "configure:685: checking whether the C compiler ($CC $CFLAGS $LDFLAGS) is a cross-compiler" >&5 echo "$ac_t""$ac_cv_prog_cc_cross" 1>&6 cross_compiling=$ac_cv_prog_cc_cross echo $ac_n "checking whether we are using GNU C""... $ac_c" 1>&6 -echo "configure:643: checking whether we are using GNU C" >&5 +echo "configure:690: checking whether we are using GNU C" >&5 if eval "test \"`echo '$''{'ac_cv_prog_gcc'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -648,7 +695,7 @@ else yes; #endif EOF -if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:652: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then +if { ac_try='${CC-cc} -E conftest.c'; { (eval echo configure:699: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }; } | egrep yes >/dev/null 2>&1; then ac_cv_prog_gcc=yes else ac_cv_prog_gcc=no @@ -659,11 +706,15 @@ echo "$ac_t""$ac_cv_prog_gcc" 1>&6 if test $ac_cv_prog_gcc = yes; then GCC=yes - ac_test_CFLAGS="${CFLAGS+set}" - ac_save_CFLAGS="$CFLAGS" - CFLAGS= - echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 -echo "configure:667: checking whether ${CC-cc} accepts -g" >&5 +else + GCC= +fi + +ac_test_CFLAGS="${CFLAGS+set}" +ac_save_CFLAGS="$CFLAGS" +CFLAGS= +echo $ac_n "checking whether ${CC-cc} accepts -g""... $ac_c" 1>&6 +echo "configure:718: checking whether ${CC-cc} accepts -g" >&5 if eval "test \"`echo '$''{'ac_cv_prog_cc_g'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -678,30 +729,35 @@ rm -f conftest* fi echo "$ac_t""$ac_cv_prog_cc_g" 1>&6 - if test "$ac_test_CFLAGS" = set; then - CFLAGS="$ac_save_CFLAGS" - elif test $ac_cv_prog_cc_g = yes; then +if test "$ac_test_CFLAGS" = set; then + CFLAGS="$ac_save_CFLAGS" +elif test $ac_cv_prog_cc_g = yes; then + if test "$GCC" = yes; then CFLAGS="-g -O2" else - CFLAGS="-O2" + CFLAGS="-g" fi else - GCC= - test "${CFLAGS+set}" = set || CFLAGS="-g" + if test "$GCC" = yes; then + CFLAGS="-O2" + else + CFLAGS= + fi fi # Extract the first word of "ranlib", so it can be a program name with args. set dummy ranlib; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:697: checking for $ac_word" >&5 +echo "configure:752: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_prog_RANLIB'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else if test -n "$RANLIB"; then ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS=":" + ac_dummy="$PATH" + for ac_dir in $ac_dummy; do test -z "$ac_dir" && ac_dir=. if test -f $ac_dir/$ac_word; then ac_cv_prog_RANLIB="ranlib" @@ -745,28 +801,30 @@ ac_configure=$ac_aux_dir/configure # This should be Cygnus configure. # SunOS /usr/etc/install # IRIX /sbin/install # AIX /bin/install +# AIX 4 /usr/bin/installbsd, which doesn't work without a -g flag # AFS /usr/afsws/bin/install, which mishandles nonexistent args # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff" # ./install, which can be erroneously created by make from ./install.sh. echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6 -echo "configure:753: checking for a BSD compatible install" >&5 +echo "configure:810: checking for a BSD compatible install" >&5 if test -z "$INSTALL"; then if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS="${IFS}:" + IFS="${IFS= }"; ac_save_IFS="$IFS"; IFS=":" for ac_dir in $PATH; do # Account for people who put trailing slashes in PATH elements. case "$ac_dir/" in /|./|.//|/etc/*|/usr/sbin/*|/usr/etc/*|/sbin/*|/usr/afsws/bin/*|/usr/ucb/*) ;; *) # OSF1 and SCO ODT 3.0 have their own names for install. - for ac_prog in ginstall installbsd scoinst install; do + # Don't use installbsd from OSF since it installs stuff as root + # by default. + for ac_prog in ginstall scoinst install; do if test -f $ac_dir/$ac_prog; then if test $ac_prog = install && grep dspmsg $ac_dir/$ac_prog >/dev/null 2>&1; then # AIX install. It has an incompatible calling convention. - # OSF/1 installbsd also uses dspmsg, but is usable. : else ac_cv_path_install="$ac_dir/$ac_prog -c" @@ -796,6 +854,8 @@ echo "$ac_t""$INSTALL" 1>&6 # It thinks the first close brace ends the variable substitution. test -z "$INSTALL_PROGRAM" && INSTALL_PROGRAM='${INSTALL}' +test -z "$INSTALL_SCRIPT" && INSTALL_SCRIPT='${INSTALL_PROGRAM}' + test -z "$INSTALL_DATA" && INSTALL_DATA='${INSTALL} -m 644' @@ -805,7 +865,7 @@ fi echo $ac_n "checking how to run the C preprocessor""... $ac_c" 1>&6 -echo "configure:809: checking how to run the C preprocessor" >&5 +echo "configure:869: checking how to run the C preprocessor" >&5 # On Suns, sometimes $CPP names a directory. if test -n "$CPP" && test -d "$CPP"; then CPP= @@ -820,14 +880,14 @@ else # On the NeXT, cc -E runs the code through the compiler's parser, # not just through cpp. cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:830: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:890: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : else @@ -837,14 +897,31 @@ else rm -rf conftest* CPP="${CC-cc} -E -traditional-cpp" cat > conftest.$ac_ext < Syntax Error EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:847: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:907: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` +if test -z "$ac_err"; then + : +else + echo "$ac_err" >&5 + echo "configure: failed program was:" >&5 + cat conftest.$ac_ext >&5 + rm -rf conftest* + CPP="${CC-cc} -nologo -E" + cat > conftest.$ac_ext < +Syntax Error +EOF +ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" +{ (eval echo configure:924: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then : else @@ -856,6 +933,8 @@ else fi rm -f conftest* fi +rm -f conftest* +fi rm -f conftest* ac_cv_prog_CPP="$CPP" fi @@ -867,18 +946,18 @@ echo "$ac_t""$CPP" 1>&6 ac_safe=`echo "getopt.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for getopt.h""... $ac_c" 1>&6 -echo "configure:871: checking for getopt.h" >&5 +echo "configure:950: checking for getopt.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:881: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:960: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" @@ -901,18 +980,18 @@ fi ac_safe=`echo "paper.h" | sed 'y%./+-%__p_%'` echo $ac_n "checking for paper.h""... $ac_c" 1>&6 -echo "configure:905: checking for paper.h" >&5 +echo "configure:984: checking for paper.h" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:915: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:994: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" @@ -937,18 +1016,18 @@ for ac_hdr in unistd.h do ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'` echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6 -echo "configure:941: checking for $ac_hdr" >&5 +echo "configure:1020: checking for $ac_hdr" >&5 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext < EOF ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out" -{ (eval echo configure:951: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } -ac_err=`grep -v '^ *+' conftest.out` +{ (eval echo configure:1030: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; } +ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"` if test -z "$ac_err"; then rm -rf conftest* eval "ac_cv_header_$ac_safe=yes" @@ -975,12 +1054,12 @@ done echo $ac_n "checking for strerror""... $ac_c" 1>&6 -echo "configure:979: checking for strerror" >&5 +echo "configure:1058: checking for strerror" >&5 if eval "test \"`echo '$''{'ac_cv_func_strerror'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1086: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_strerror=yes" else @@ -1026,12 +1105,12 @@ fi for ac_func in strcasecmp do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:1030: checking for $ac_func" >&5 +echo "configure:1109: checking for $ac_func" >&5 if eval "test \"`echo '$''{'ac_cv_func_$ac_func'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else cat > conftest.$ac_ext <&5; (eval $ac_link) 2>&5; } && test -s conftest; then +if { (eval echo configure:1137: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then rm -rf conftest* eval "ac_cv_func_$ac_func=yes" else @@ -1080,7 +1159,7 @@ done echo $ac_n "checking "for gmake"""... $ac_c" 1>&6 -echo "configure:1084: checking "for gmake"" >&5 +echo "configure:1163: checking "for gmake"" >&5 GMAKE=no ${MAKE=make} --version 2> /dev/null | grep GNU > /dev/null && GMAKE=yes echo "$ac_t""$GMAKE" 1>&6 @@ -1091,7 +1170,7 @@ if test "$GMAKE" = "yes"; then fi echo $ac_n "checking "if makeinfo can output html"""... $ac_c" 1>&6 -echo "configure:1095: checking "if makeinfo can output html"" >&5 +echo "configure:1174: checking "if makeinfo can output html"" >&5 MAKEINFOHTML=no ${MAKEINFO=makeinfo} --help | grep .--html > /dev/null && MAKEINFOHTML=yes echo "$ac_t""$MAKEINFOHTML" 1>&6 @@ -1136,7 +1215,7 @@ EOF # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. (set) 2>&1 | - case `(ac_space=' '; set) 2>&1` in + case `(ac_space=' '; set | grep ac_space) 2>&1` in *ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote substitution # turns \\\\ into \\, and sed turns \\ into \). @@ -1215,7 +1294,7 @@ do echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.12" + echo "$CONFIG_STATUS generated by autoconf version 2.13" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; @@ -1235,9 +1314,11 @@ sed 's/%@/@@/; s/@%/@@/; s/%g\$/@g/; /@g\$/s/[\\\\&%]/\\\\&/g; s/@@/%@/; s/@@/@%/; s/@g\$/%g/' > conftest.subs <<\\CEOF $ac_vpsub $extrasub +s%@SHELL@%$SHELL%g s%@CFLAGS@%$CFLAGS%g s%@CPPFLAGS@%$CPPFLAGS%g s%@CXXFLAGS@%$CXXFLAGS%g +s%@FFLAGS@%$FFLAGS%g s%@DEFS@%$DEFS%g s%@LDFLAGS@%$LDFLAGS%g s%@LIBS@%$LIBS%g @@ -1259,6 +1340,7 @@ s%@mandir@%$mandir%g s%@CC@%$CC%g s%@RANLIB@%$RANLIB%g s%@INSTALL_PROGRAM@%$INSTALL_PROGRAM%g +s%@INSTALL_SCRIPT@%$INSTALL_SCRIPT%g s%@INSTALL_DATA@%$INSTALL_DATA%g s%@CPP@%$CPP%g s%@GETOPT_O@%$GETOPT_O%g @@ -1409,7 +1491,7 @@ EOF # Ultrix sh set writes to stderr and can't be redirected directly, # and sets the high bit in the cache file unless we assign to the vars. (set) 2>&1 | - case `(ac_space=' '; set) 2>&1` in + case `(ac_space=' '; set | grep ac_space) 2>&1` in *ac_space=\ *) # `set' does not quote correctly, so add quotes (double-quote substitution # turns \\\\ into \\, and sed turns \\ into \). @@ -1488,7 +1570,7 @@ do echo "running \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion" exec \${CONFIG_SHELL-/bin/sh} $0 $ac_configure_args --no-create --no-recursion ;; -version | --version | --versio | --versi | --vers | --ver | --ve | --v) - echo "$CONFIG_STATUS generated by autoconf version 2.12" + echo "$CONFIG_STATUS generated by autoconf version 2.13" exit 0 ;; -help | --help | --hel | --he | --h) echo "\$ac_cs_usage"; exit 0 ;; diff --git a/glabels1/doc/C/Makefile.in b/glabels1/doc/C/Makefile.in index d066f16a..0a63d133 100644 --- a/glabels1/doc/C/Makefile.in +++ b/glabels1/doc/C/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@ @@ -116,13 +116,18 @@ l = @l@ glabels_helpdir = $(datadir)/gnome/help/glabels/C -glabels_help_DATA = index.html topic.dat +glabels_help_DATA = \ + index.html \ + topic.dat -SGML_FILES = glabels.sgml +SGML_FILES = \ + glabels.sgml -EXTRA_DIST = topic.dat $(SGML_FILES) +EXTRA_DIST = \ + topic.dat \ + $(SGML_FILES) mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = ../../config.h @@ -138,10 +143,10 @@ TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/C/Makefile +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/C/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -173,6 +178,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) subdir = doc/C distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu doc/C/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff --git a/glabels1/doc/Makefile.in b/glabels1/doc/Makefile.in index 878fdd3e..255f675c 100644 --- a/glabels1/doc/Makefile.in +++ b/glabels1/doc/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@ @@ -127,10 +127,10 @@ TAR = gtar GZIP_ENV = --best all: all-redirect .SUFFIXES: -$(srcdir)/Makefile.in: Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps doc/Makefile +$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) + cd $(top_srcdir) && $(AUTOMAKE) --gnu doc/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -171,7 +171,7 @@ maintainer-clean-recursive: dot_seen=no; \ rev=''; list='$(SUBDIRS)'; for subdir in $$list; do \ rev="$$subdir $$rev"; \ - test "$$subdir" = "." && dot_seen=yes; \ + test "$$subdir" != "." || dot_seen=yes; \ done; \ test "$$dot_seen" = "no" && rev=". $$rev"; \ target=`echo $@ | sed s/-recursive//`; \ @@ -229,6 +229,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) subdir = doc distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu doc/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff --git a/glabels1/macros/Makefile.in b/glabels1/macros/Makefile.in index 3f4fc95d..f1d35e35 100644 --- a/glabels1/macros/Makefile.in +++ b/glabels1/macros/Makefile.in @@ -160,9 +160,9 @@ GZIP_ENV = --best all: all-redirect .SUFFIXES: $(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ Makefile.am $(top_srcdir)/configure.in $(ACLOCAL_M4) - cd $(top_srcdir) && $(AUTOMAKE) --gnu --include-deps macros/Makefile + cd $(top_srcdir) && $(AUTOMAKE) --gnu macros/Makefile -Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status +Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status $(BUILT_SOURCES) cd $(top_builddir) \ && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= $(SHELL) ./config.status @@ -194,6 +194,11 @@ distdir = $(top_builddir)/$(PACKAGE)-$(VERSION)/$(subdir) subdir = macros distdir: $(DISTFILES) + here=`cd $(top_builddir) && pwd`; \ + top_distdir=`cd $(top_distdir) && pwd`; \ + distdir=`cd $(distdir) && pwd`; \ + cd $(top_srcdir) \ + && $(AUTOMAKE) --include-deps --build-dir=$$here --srcdir-name=$(top_srcdir) --output-dir=$$top_distdir --gnu macros/Makefile @for file in $(DISTFILES); do \ d=$(srcdir); \ if test -d $$d/$$file; then \ diff --git a/glabels1/po/ChangeLog b/glabels1/po/ChangeLog index f7f06e89..bd1b32e6 100644 --- a/glabels1/po/ChangeLog +++ b/glabels1/po/ChangeLog @@ -1,3 +1,16 @@ +2002-08-24 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. + * cat-id-tbl.c: Remove file. + * stamp-cat-id: Remove file. + 2002-06-29 Olivier Berger * fr.po: updated translation for 0.4.4 diff --git a/glabels1/po/de.po b/glabels1/po/de.po index 9b167ffe..60c51fe7 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-06-27 14:23-0400\n" +"POT-Creation-Date: 2002-08-24 22:30-0400\n" "PO-Revision-Date: 2001-10-15 15:31+0200\n" "Last-Translator: Marcus Bauer \n" "Language-Team: German <>\n" @@ -13,57 +13,57 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: src/glabels_batch.c:47 +#: src/glabels_batch.c:49 msgid "print this message" msgstr "" -#: src/glabels_batch.c:49 +#: src/glabels_batch.c:51 msgid "print the version of glabels-batch being used" msgstr "" -#: src/glabels_batch.c:51 +#: src/glabels_batch.c:53 msgid "set output filename (default=\"output.ps\")" msgstr "" -#: src/glabels_batch.c:51 +#: src/glabels_batch.c:53 msgid "filename" msgstr "" -#: src/glabels_batch.c:53 +#: src/glabels_batch.c:55 msgid "number of sheets (default=1)" msgstr "" -#: src/glabels_batch.c:53 +#: src/glabels_batch.c:55 #, fuzzy msgid "sheets" msgstr "Seiten:" -#: src/glabels_batch.c:55 +#: src/glabels_batch.c:57 msgid "number of copies (default=1)" msgstr "" -#: src/glabels_batch.c:55 +#: src/glabels_batch.c:57 #, fuzzy msgid "copies" msgstr "Kopien" -#: src/glabels_batch.c:57 src/print_dialog.c:152 +#: src/glabels_batch.c:59 src/print_dialog.c:152 msgid "print outlines (to test printer alignment)" msgstr "Begrenzungen drucken (um Druckausrichtung zu testen)" -#: src/glabels_batch.c:59 src/print_dialog.c:160 +#: src/glabels_batch.c:61 src/print_dialog.c:160 msgid "print in reverse (i.e. a mirror image)" msgstr "Spiegelbildlich drucken" -#: src/glabels_batch.c:89 +#: src/glabels_batch.c:92 msgid "[OPTION...] GLABELS_FILE..." msgstr "" -#: src/glabels_batch.c:108 +#: src/glabels_batch.c:111 msgid "missing glabels file\n" msgstr "" -#: src/glabels_batch.c:136 +#: src/glabels_batch.c:139 #, fuzzy, c-format msgid "cannot open glabels file %s\n" msgstr "Datei kann nicht geöffnet werden" @@ -92,11 +92,11 @@ msgstr "" msgid "Don't save" msgstr "Nicht speichern." -#: src/file.c:288 src/mdi.c:601 +#: src/mdi.c:601 src/file.c:288 msgid "Cannot save file" msgstr "Kann Datei nicht speichern" -#: src/file.c:311 src/mdi.c:623 +#: src/mdi.c:623 src/file.c:311 msgid "Save As" msgstr "Speichern unter..." @@ -104,15 +104,15 @@ msgstr "Speichern unter..." msgid "Close / Save label as" msgstr "Schließen / Speichern des Etikett als" -#: src/file.c:352 src/mdi.c:680 +#: src/mdi.c:680 src/file.c:352 msgid "Label no longer valid!" msgstr "Etikett nicht mehr gültig!" -#: src/file.c:362 src/mdi.c:693 +#: src/mdi.c:693 src/file.c:362 msgid "Must supply file name" msgstr "Dateinamen angeben" -#: src/file.c:374 src/mdi.c:705 +#: src/mdi.c:705 src/file.c:374 msgid "Error writing file" msgstr "Fehler beim Schreiben der Datei" @@ -140,8 +140,8 @@ msgstr "Text Objekt bearbeiten" msgid "Text" msgstr "Text" -#: 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 +#: src/item_text.c:479 src/item_line.c:253 src/item_box.c:245 +#: src/item_ellipse.c:247 src/item_barcode.c:317 msgid "Appearance" msgstr "Erscheinungsbild" @@ -152,9 +152,9 @@ msgid "Text Properties" msgstr "Text Einstellungen" #. ------ 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 +#: src/item_text.c:500 src/item_text.c:503 src/item_line.c:274 +#: src/item_box.c:275 src/item_ellipse.c:277 src/item_image.c:318 +#: src/item_barcode.c:345 src/item_barcode.c:348 msgid "Position" msgstr "Position" @@ -167,14 +167,14 @@ msgstr "Linienobjekt bearbeiten..." msgid "Line" msgstr "Linie" -#: src/item_box.c:272 src/item_ellipse.c:274 src/item_image.c:315 -#: src/item_line.c:271 +#: src/item_line.c:271 src/item_box.c:272 src/item_ellipse.c:274 +#: src/item_image.c:315 msgid "Position/Size" msgstr "Position/Breite" #. ------ Size Frame ------ -#: src/item_box.c:286 src/item_ellipse.c:288 src/item_image.c:329 -#: src/item_line.c:285 +#: src/item_line.c:285 src/item_box.c:286 src/item_ellipse.c:288 +#: src/item_image.c:329 msgid "Size" msgstr "Breite" @@ -241,7 +241,7 @@ msgid "Invalid barcode" msgstr "Ungültiger Barcode-Wert" #. W Label -#: src/prop_line.c:169 src/prop_size.c:182 +#: src/prop_size.c:182 src/prop_line.c:169 #, fuzzy msgid "Width:" msgstr "Länge der Linie" @@ -267,14 +267,14 @@ msgid "Y:" msgstr "Y:" #. Line Width units -#: src/prefs.c:448 src/prefs.c:455 src/prop_line.c:183 +#: src/prop_line.c:183 src/prefs.c:448 src/prefs.c:455 #, fuzzy msgid "points" msgstr "Punkt" #. Line Color Label -#: src/prop_bc.c:188 src/prop_fill.c:166 src/prop_line.c:189 -#: src/prop_text.c:234 +#: src/prop_line.c:189 src/prop_fill.c:166 src/prop_text.c:234 +#: src/prop_bc.c:188 #, fuzzy msgid "Color:" msgstr "Farbe" @@ -292,7 +292,7 @@ msgid "Alignment:" msgstr "Textanordnung:" #. Insert merge field label -#: src/prop_bc_data.c:196 src/prop_text_entry.c:180 +#: src/prop_text_entry.c:180 src/prop_bc_data.c:196 msgid "Key:" msgstr "Key:" @@ -325,7 +325,6 @@ msgstr "Skalierung" #. % Label #: src/prop_bc.c:182 -#, c-format msgid "%" msgstr "%" diff --git a/glabels1/po/es.po b/glabels1/po/es.po index 77e234a2..44f00ddb 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-06-27 14:23-0400\n" +"POT-Creation-Date: 2002-08-24 22:30-0400\n" "PO-Revision-Date: 2002-04-16 12:19+0200\n" "Last-Translator: victor \n" "Language-Team: Spanish/Spain \n" @@ -13,57 +13,57 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: src/glabels_batch.c:47 +#: src/glabels_batch.c:49 msgid "print this message" msgstr "" -#: src/glabels_batch.c:49 +#: src/glabels_batch.c:51 msgid "print the version of glabels-batch being used" msgstr "" -#: src/glabels_batch.c:51 +#: src/glabels_batch.c:53 msgid "set output filename (default=\"output.ps\")" msgstr "" -#: src/glabels_batch.c:51 +#: src/glabels_batch.c:53 msgid "filename" msgstr "" -#: src/glabels_batch.c:53 +#: src/glabels_batch.c:55 msgid "number of sheets (default=1)" msgstr "" -#: src/glabels_batch.c:53 +#: src/glabels_batch.c:55 #, fuzzy msgid "sheets" msgstr "Hojas:" -#: src/glabels_batch.c:55 +#: src/glabels_batch.c:57 msgid "number of copies (default=1)" msgstr "" -#: src/glabels_batch.c:55 +#: src/glabels_batch.c:57 #, fuzzy msgid "copies" msgstr "Copias" -#: src/glabels_batch.c:57 src/print_dialog.c:152 +#: src/glabels_batch.c:59 src/print_dialog.c:152 msgid "print outlines (to test printer alignment)" msgstr "Imprimir un esbozo (para verificar la alineación de la impresora)" -#: src/glabels_batch.c:59 src/print_dialog.c:160 +#: src/glabels_batch.c:61 src/print_dialog.c:160 msgid "print in reverse (i.e. a mirror image)" msgstr "Impresión invertida (imagen espejo)" -#: src/glabels_batch.c:89 +#: src/glabels_batch.c:92 msgid "[OPTION...] GLABELS_FILE..." msgstr "" -#: src/glabels_batch.c:108 +#: src/glabels_batch.c:111 msgid "missing glabels file\n" msgstr "" -#: src/glabels_batch.c:136 +#: src/glabels_batch.c:139 #, fuzzy, c-format msgid "cannot open glabels file %s\n" msgstr "No puedo abrir el archivo" @@ -92,11 +92,11 @@ msgstr "" msgid "Don't save" msgstr "No salvar" -#: src/file.c:288 src/mdi.c:601 +#: src/mdi.c:601 src/file.c:288 msgid "Cannot save file" msgstr "No puedo salvar el archivo" -#: src/file.c:311 src/mdi.c:623 +#: src/mdi.c:623 src/file.c:311 msgid "Save As" msgstr "Salva como" @@ -104,15 +104,15 @@ msgstr "Salva como" msgid "Close / Save label as" msgstr "Cerrar / Salvar etiqueta como" -#: src/file.c:352 src/mdi.c:680 +#: src/mdi.c:680 src/file.c:352 msgid "Label no longer valid!" msgstr "¡ La etiqueta ya no es válida !" -#: src/file.c:362 src/mdi.c:693 +#: src/mdi.c:693 src/file.c:362 msgid "Must supply file name" msgstr "Debe proporcionar un nombre de archivo" -#: src/file.c:374 src/mdi.c:705 +#: src/mdi.c:705 src/file.c:374 msgid "Error writing file" msgstr "Error salvando el archivo" @@ -140,8 +140,8 @@ msgstr "Modificar las propiedades del objeto texto" msgid "Text" msgstr "Texto" -#: 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 +#: src/item_text.c:479 src/item_line.c:253 src/item_box.c:245 +#: src/item_ellipse.c:247 src/item_barcode.c:317 msgid "Appearance" msgstr "Apariencia" @@ -151,9 +151,9 @@ msgid "Text Properties" msgstr "Propiedades del texto" #. ------ 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 +#: src/item_text.c:500 src/item_text.c:503 src/item_line.c:274 +#: src/item_box.c:275 src/item_ellipse.c:277 src/item_image.c:318 +#: src/item_barcode.c:345 src/item_barcode.c:348 msgid "Position" msgstr "Posición" @@ -166,14 +166,14 @@ msgstr "Modificar las propiedades del objeto l msgid "Line" msgstr "Línea" -#: src/item_box.c:272 src/item_ellipse.c:274 src/item_image.c:315 -#: src/item_line.c:271 +#: src/item_line.c:271 src/item_box.c:272 src/item_ellipse.c:274 +#: src/item_image.c:315 msgid "Position/Size" msgstr "Posición/Tamaño" #. ------ Size Frame ------ -#: src/item_box.c:286 src/item_ellipse.c:288 src/item_image.c:329 -#: src/item_line.c:285 +#: src/item_line.c:285 src/item_box.c:286 src/item_ellipse.c:288 +#: src/item_image.c:329 msgid "Size" msgstr "Tamaño" @@ -239,7 +239,7 @@ msgid "Invalid barcode" msgstr "Código de barras no válido" #. W Label -#: src/prop_line.c:169 src/prop_size.c:182 +#: src/prop_size.c:182 src/prop_line.c:169 msgid "Width:" msgstr "Ancho" @@ -263,13 +263,13 @@ msgid "Y:" msgstr "Y:" #. Line Width units -#: src/prefs.c:448 src/prefs.c:455 src/prop_line.c:183 +#: src/prop_line.c:183 src/prefs.c:448 src/prefs.c:455 msgid "points" msgstr "puntos" #. Line Color Label -#: src/prop_bc.c:188 src/prop_fill.c:166 src/prop_line.c:189 -#: src/prop_text.c:234 +#: src/prop_line.c:189 src/prop_fill.c:166 src/prop_text.c:234 +#: src/prop_bc.c:188 msgid "Color:" msgstr "Color" @@ -284,7 +284,7 @@ msgid "Alignment:" msgstr "Alineación:" #. Insert merge field label -#: src/prop_bc_data.c:196 src/prop_text_entry.c:180 +#: src/prop_text_entry.c:180 src/prop_bc_data.c:196 msgid "Key:" msgstr "Clave:" @@ -314,7 +314,6 @@ msgstr "Escala:" #. % Label #: src/prop_bc.c:182 -#, c-format msgid "%" msgstr "%" diff --git a/glabels1/po/fr.po b/glabels1/po/fr.po index 953de4fa..bcceafa2 100644 --- a/glabels1/po/fr.po +++ b/glabels1/po/fr.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: glabels 0.4.4\n" -"POT-Creation-Date: 2002-06-27 14:23-0400\n" +"POT-Creation-Date: 2002-08-24 22:30-0400\n" "PO-Revision-Date: 2001-10-15 15:31+0200\n" "Last-Translator: Olivier Berger \n" "Language-Team: French \n" @@ -13,23 +13,23 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: src/glabels_batch.c:47 +#: src/glabels_batch.c:49 msgid "print this message" msgstr "imprimer ce message" -#: src/glabels_batch.c:49 +#: src/glabels_batch.c:51 msgid "print the version of glabels-batch being used" msgstr "imprimer la version de glabels-batch utilisée" -#: src/glabels_batch.c:51 +#: src/glabels_batch.c:53 msgid "set output filename (default=\"output.ps\")" msgstr "définit le fichier de sortie (défaut=\"output.ps\")" -#: src/glabels_batch.c:51 +#: src/glabels_batch.c:53 msgid "filename" msgstr "nom de fichier" -#: src/glabels_batch.c:53 +#: src/glabels_batch.c:55 msgid "number of sheets (default=1)" msgstr "nombre de pages (défaut=1)" @@ -37,11 +37,11 @@ msgstr "nombre de pages (d # src/print_copies.c:193 # src/print_copies.c:171 # src/print_copies.c:170 -#: src/glabels_batch.c:53 +#: src/glabels_batch.c:55 msgid "sheets" msgstr "feuilles" -#: src/glabels_batch.c:55 +#: src/glabels_batch.c:57 msgid "number of copies (default=1)" msgstr "nombre de copies (défaut=1)" @@ -49,7 +49,7 @@ msgstr "nombre de copies (d # src/print.c:153 # src/print.c:146 # src/print_dialog.c:104 -#: src/glabels_batch.c:55 +#: src/glabels_batch.c:57 msgid "copies" msgstr "copies" @@ -57,20 +57,20 @@ msgstr "copies" # src/print.c:180 # src/print.c:196 # src/print_dialog.c:152 -#: src/glabels_batch.c:57 src/print_dialog.c:152 +#: src/glabels_batch.c:59 src/print_dialog.c:152 msgid "print outlines (to test printer alignment)" msgstr "imprimer des bordures (pour tester l'alignement de l'imprimante)" # src/print_dialog.c:160 -#: src/glabels_batch.c:59 src/print_dialog.c:160 +#: src/glabels_batch.c:61 src/print_dialog.c:160 msgid "print in reverse (i.e. a mirror image)" msgstr "imprimer à l'envers (i.e. une image miroir)" -#: src/glabels_batch.c:89 +#: src/glabels_batch.c:92 msgid "[OPTION...] GLABELS_FILE..." msgstr "[OPTION...] FICHIER_GLABELS..." -#: src/glabels_batch.c:108 +#: src/glabels_batch.c:111 msgid "missing glabels file\n" msgstr "fichier glabels manquant\n" @@ -78,7 +78,7 @@ msgstr "fichier glabels manquant\n" # src/file.c:214 # src/file.c:249 # src/file.c:249 -#: src/glabels_batch.c:136 +#: src/glabels_batch.c:139 #, c-format msgid "cannot open glabels file %s\n" msgstr "impossible d'ouvrir le fichier glabels %s\n" @@ -126,7 +126,7 @@ msgstr "Ne pas sauver" # src/file.c:248 src/mdi.c:641 # src/file.c:288 src/mdi.c:601 # src/file.c:288 src/mdi.c:601 -#: src/file.c:288 src/mdi.c:601 +#: src/mdi.c:601 src/file.c:288 msgid "Cannot save file" msgstr "Impossible d'enregistrer le fichier" @@ -134,7 +134,7 @@ msgstr "Impossible d'enregistrer le fichier" # src/file.c:271 src/mdi.c:666 # src/file.c:311 src/mdi.c:623 # src/file.c:311 src/mdi.c:623 -#: src/file.c:311 src/mdi.c:623 +#: src/mdi.c:623 src/file.c:311 msgid "Save As" msgstr "Enregistrer sous" @@ -150,7 +150,7 @@ msgstr "Fermer / Enregistrer l' # src/file.c:309 src/mdi.c:722 # src/file.c:352 src/mdi.c:680 # src/file.c:352 src/mdi.c:680 -#: src/file.c:352 src/mdi.c:680 +#: src/mdi.c:680 src/file.c:352 msgid "Label no longer valid!" msgstr "Etiquette plus valide !" @@ -158,7 +158,7 @@ msgstr "Etiquette plus valide !" # src/file.c:319 src/mdi.c:735 # src/file.c:362 src/mdi.c:693 # src/file.c:362 src/mdi.c:693 -#: src/file.c:362 src/mdi.c:693 +#: src/mdi.c:693 src/file.c:362 msgid "Must supply file name" msgstr "Vous devez donner un nom de fichier" @@ -166,7 +166,7 @@ msgstr "Vous devez donner un nom de fichier" # src/file.c:330 src/mdi.c:746 # src/file.c:374 src/mdi.c:705 # src/file.c:374 src/mdi.c:705 -#: src/file.c:374 src/mdi.c:705 +#: src/mdi.c:705 src/file.c:374 msgid "Error writing file" msgstr "Erreur d'écriture du fichier" @@ -226,8 +226,8 @@ msgstr "Texte" # src/item_line.c:253 src/item_text.c:479 # 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 -#: 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 +#: src/item_text.c:479 src/item_line.c:253 src/item_box.c:245 +#: src/item_ellipse.c:247 src/item_barcode.c:317 msgid "Appearance" msgstr "Apparence" @@ -253,9 +253,9 @@ msgstr "Propri # 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 #. ------ 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 +#: src/item_text.c:500 src/item_text.c:503 src/item_line.c:274 +#: src/item_box.c:275 src/item_ellipse.c:277 src/item_image.c:318 +#: src/item_barcode.c:345 src/item_barcode.c:348 msgid "Position" msgstr "Position" @@ -284,8 +284,8 @@ msgstr "Ligne" # src/item_line.c:271 # src/item_box.c:272 src/item_ellipse.c:274 src/item_image.c:315 # src/item_line.c:271 -#: src/item_box.c:272 src/item_ellipse.c:274 src/item_image.c:315 -#: src/item_line.c:271 +#: src/item_line.c:271 src/item_box.c:272 src/item_ellipse.c:274 +#: src/item_image.c:315 msgid "Position/Size" msgstr "Position/Taille" @@ -298,8 +298,8 @@ msgstr "Position/Taille" # src/item_box.c:286 src/item_ellipse.c:288 src/item_image.c:329 # src/item_line.c:285 #. ------ Size Frame ------ -#: src/item_box.c:286 src/item_ellipse.c:288 src/item_image.c:329 -#: src/item_line.c:285 +#: src/item_line.c:285 src/item_box.c:286 src/item_ellipse.c:288 +#: src/item_image.c:329 msgid "Size" msgstr "Taille" @@ -425,7 +425,7 @@ msgstr "Code-barre invalide" # src/prop_line.c:169 src/prop_size.c:182 # src/prop_line.c:169 src/prop_size.c:182 #. W Label -#: src/prop_line.c:169 src/prop_size.c:182 +#: src/prop_size.c:182 src/prop_line.c:169 msgid "Width:" msgstr "Largeur :" @@ -466,7 +466,7 @@ msgstr "Y :" # src/prefs.c:445 src/prefs.c:452 src/prop_line.c:183 # src/prefs.c:448 src/prefs.c:455 src/prop_line.c:183 #. Line Width units -#: src/prefs.c:448 src/prefs.c:455 src/prop_line.c:183 +#: src/prop_line.c:183 src/prefs.c:448 src/prefs.c:455 msgid "points" msgstr "points" @@ -479,8 +479,8 @@ msgstr "points" # src/prop_bc.c:188 src/prop_fill.c:166 src/prop_line.c:189 # src/prop_text.c:234 #. Line Color Label -#: src/prop_bc.c:188 src/prop_fill.c:166 src/prop_line.c:189 -#: src/prop_text.c:234 +#: src/prop_line.c:189 src/prop_fill.c:166 src/prop_text.c:234 +#: src/prop_bc.c:188 msgid "Color:" msgstr "Couleur :" @@ -505,7 +505,7 @@ msgstr "Alignement :" # src/prop_bc_data.c:196 src/prop_text_entry.c:180 # src/prop_bc_data.c:196 src/prop_text_entry.c:180 #. Insert merge field label -#: src/prop_bc_data.c:196 src/prop_text_entry.c:180 +#: src/prop_text_entry.c:180 src/prop_bc_data.c:196 msgid "Key:" msgstr "Clé :" @@ -555,7 +555,6 @@ msgstr "Echelle :" # src/prop_bc.c:182 #. % Label #: src/prop_bc.c:182 -#, c-format msgid "%" msgstr "%" diff --git a/glabels1/po/glabels.pot b/glabels1/po/glabels.pot index ef96bb38..18fa25df 100644 --- a/glabels1/po/glabels.pot +++ b/glabels1/po/glabels.pot @@ -1,12 +1,13 @@ # SOME DESCRIPTIVE TITLE. -# Copyright (C) YEAR Free Software Foundation, Inc. +# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER +# This file is distributed under the same license as the PACKAGE package. # FIRST AUTHOR , YEAR. # #, fuzzy msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2002-06-27 14:23-0400\n" +"POT-Creation-Date: 2002-08-24 22:30-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -14,55 +15,55 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: src/glabels_batch.c:47 +#: src/glabels_batch.c:49 msgid "print this message" msgstr "" -#: src/glabels_batch.c:49 +#: src/glabels_batch.c:51 msgid "print the version of glabels-batch being used" msgstr "" -#: src/glabels_batch.c:51 +#: src/glabels_batch.c:53 msgid "set output filename (default=\"output.ps\")" msgstr "" -#: src/glabels_batch.c:51 +#: src/glabels_batch.c:53 msgid "filename" msgstr "" -#: src/glabels_batch.c:53 +#: src/glabels_batch.c:55 msgid "number of sheets (default=1)" msgstr "" -#: src/glabels_batch.c:53 +#: src/glabels_batch.c:55 msgid "sheets" msgstr "" -#: src/glabels_batch.c:55 +#: src/glabels_batch.c:57 msgid "number of copies (default=1)" msgstr "" -#: src/glabels_batch.c:55 +#: src/glabels_batch.c:57 msgid "copies" msgstr "" -#: src/glabels_batch.c:57 src/print_dialog.c:152 +#: src/glabels_batch.c:59 src/print_dialog.c:152 msgid "print outlines (to test printer alignment)" msgstr "" -#: src/glabels_batch.c:59 src/print_dialog.c:160 +#: src/glabels_batch.c:61 src/print_dialog.c:160 msgid "print in reverse (i.e. a mirror image)" msgstr "" -#: src/glabels_batch.c:89 +#: src/glabels_batch.c:92 msgid "[OPTION...] GLABELS_FILE..." msgstr "" -#: src/glabels_batch.c:108 +#: src/glabels_batch.c:111 msgid "missing glabels file\n" msgstr "" -#: src/glabels_batch.c:136 +#: src/glabels_batch.c:139 #, c-format msgid "cannot open glabels file %s\n" msgstr "" @@ -88,11 +89,11 @@ msgstr "" msgid "Don't save" msgstr "" -#: src/file.c:288 src/mdi.c:601 +#: src/mdi.c:601 src/file.c:288 msgid "Cannot save file" msgstr "" -#: src/file.c:311 src/mdi.c:623 +#: src/mdi.c:623 src/file.c:311 msgid "Save As" msgstr "" @@ -100,15 +101,15 @@ msgstr "" msgid "Close / Save label as" msgstr "" -#: src/file.c:352 src/mdi.c:680 +#: src/mdi.c:680 src/file.c:352 msgid "Label no longer valid!" msgstr "" -#: src/file.c:362 src/mdi.c:693 +#: src/mdi.c:693 src/file.c:362 msgid "Must supply file name" msgstr "" -#: src/file.c:374 src/mdi.c:705 +#: src/mdi.c:705 src/file.c:374 msgid "Error writing file" msgstr "" @@ -136,8 +137,8 @@ msgstr "" msgid "Text" 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 +#: src/item_text.c:479 src/item_line.c:253 src/item_box.c:245 +#: src/item_ellipse.c:247 src/item_barcode.c:317 msgid "Appearance" msgstr "" @@ -147,9 +148,9 @@ msgid "Text Properties" 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 +#: src/item_text.c:500 src/item_text.c:503 src/item_line.c:274 +#: src/item_box.c:275 src/item_ellipse.c:277 src/item_image.c:318 +#: src/item_barcode.c:345 src/item_barcode.c:348 msgid "Position" msgstr "" @@ -162,14 +163,14 @@ msgstr "" msgid "Line" msgstr "" -#: src/item_box.c:272 src/item_ellipse.c:274 src/item_image.c:315 -#: src/item_line.c:271 +#: src/item_line.c:271 src/item_box.c:272 src/item_ellipse.c:274 +#: src/item_image.c:315 msgid "Position/Size" msgstr "" #. ------ Size Frame ------ -#: src/item_box.c:286 src/item_ellipse.c:288 src/item_image.c:329 -#: src/item_line.c:285 +#: src/item_line.c:285 src/item_box.c:286 src/item_ellipse.c:288 +#: src/item_image.c:329 msgid "Size" msgstr "" @@ -235,7 +236,7 @@ msgid "Invalid barcode" msgstr "" #. W Label -#: src/prop_line.c:169 src/prop_size.c:182 +#: src/prop_size.c:182 src/prop_line.c:169 msgid "Width:" msgstr "" @@ -259,13 +260,13 @@ msgid "Y:" msgstr "" #. Line Width units -#: src/prefs.c:448 src/prefs.c:455 src/prop_line.c:183 +#: src/prop_line.c:183 src/prefs.c:448 src/prefs.c:455 msgid "points" msgstr "" #. Line Color Label -#: src/prop_bc.c:188 src/prop_fill.c:166 src/prop_line.c:189 -#: src/prop_text.c:234 +#: src/prop_line.c:189 src/prop_fill.c:166 src/prop_text.c:234 +#: src/prop_bc.c:188 msgid "Color:" msgstr "" @@ -280,7 +281,7 @@ msgid "Alignment:" msgstr "" #. Insert merge field label -#: src/prop_bc_data.c:196 src/prop_text_entry.c:180 +#: src/prop_text_entry.c:180 src/prop_bc_data.c:196 msgid "Key:" msgstr "" @@ -310,7 +311,6 @@ msgstr "" #. % Label #: src/prop_bc.c:182 -#, c-format msgid "%" msgstr "" diff --git a/glabels1/po/ja.po b/glabels1/po/ja.po index 17a5c910..f52d7c23 100644 --- a/glabels1/po/ja.po +++ b/glabels1/po/ja.po @@ -2,11 +2,10 @@ # Copyright (C) 2001 Free Software Foundation, Inc. # Takeshi Aihana , 2001, 2002. # -#, no-wrap msgid "" msgstr "" "Project-Id-Version: glabels 0.4.3\n" -"POT-Creation-Date: 2002-03-10 21:14+0900\n" +"POT-Creation-Date: 2002-08-24 22:30-0400\n" "PO-Revision-Date: 2002-03-10 21:17+0900\n" "Last-Translator: Takeshi Aihana \n" "Language-Team: Japanese \n" @@ -14,55 +13,55 @@ msgstr "" "Content-Type: text/plain; charset=euc-jp\n" "Content-Transfer-Encoding: 8bit\n" -#: src/glabels_batch.c:47 +#: src/glabels_batch.c:49 msgid "print this message" msgstr "¤³¤Î¥á¥Ã¥»¡¼¥¸¤òɽ¼¨¤¹¤ë" -#: src/glabels_batch.c:49 +#: src/glabels_batch.c:51 msgid "print the version of glabels-batch being used" msgstr "»ÈÍѤ·¤Æ¤¤¤ë gLabel ¤Î¥Ð¡¼¥¸¥ç¥ó¤òɽ¼¨¤¹¤ë" -#: src/glabels_batch.c:51 +#: src/glabels_batch.c:53 msgid "set output filename (default=\"output.ps\")" msgstr "½ÐÎϤ¹¤ë¥Õ¥¡¥¤¥ë̾¤ò»ØÄꤹ¤ë (¥Ç¥Õ¥©¥ë¥È = \"output.ps\")" -#: src/glabels_batch.c:51 +#: src/glabels_batch.c:53 msgid "filename" msgstr "¥Õ¥¡¥¤¥ë̾" -#: src/glabels_batch.c:53 +#: src/glabels_batch.c:55 msgid "number of sheets (default=1)" msgstr "ÍÑ»æ¤Î¿ô (¥Ç¥Õ¥©¥ë¥È = 1)" -#: src/glabels_batch.c:53 +#: src/glabels_batch.c:55 msgid "sheets" msgstr "ÍÑ»æ¤Î¿ô" -#: src/glabels_batch.c:55 +#: src/glabels_batch.c:57 msgid "number of copies (default=1)" msgstr "¥³¥Ô¡¼¤Î¿ô (¥Ç¥Õ¥©¥ë¥È = 1)" -#: src/glabels_batch.c:55 +#: src/glabels_batch.c:57 msgid "copies" msgstr "¥³¥Ô¡¼¤Î¿ô" -#: src/glabels_batch.c:57 src/print_dialog.c:152 +#: src/glabels_batch.c:59 src/print_dialog.c:152 msgid "print outlines (to test printer alignment)" msgstr "¥¢¥¦¥È¥é¥¤¥ó¤ò°õºþ¤¹¤ë (°õºþ»þ¤ÎÇÛÃÖ¤ò³Îǧ¤¹¤ë¤¿¤á)" -#: src/glabels_batch.c:59 src/print_dialog.c:160 +#: src/glabels_batch.c:61 src/print_dialog.c:160 msgid "print in reverse (i.e. a mirror image)" msgstr "ȿž¤·¤Æ°õºþ (i.e. ²èÁü¤ò¥ß¥é¡¼¤·¤¿¤â¤Î)" -#: src/glabels_batch.c:89 +#: src/glabels_batch.c:92 msgid "[OPTION...] GLABELS_FILE..." msgstr "[¥ª¥×¥·¥ç¥ó...] ¥Õ¥¡¥¤¥ë̾..." -#: src/glabels_batch.c:108 +#: src/glabels_batch.c:111 msgid "missing glabels file\n" msgstr "gLabel ¤Ç»ÈÍѤ¹¤ë¥Õ¥¡¥¤¥ë¤¬¤¢¤ê¤Þ¤»¤ó\n" -#: src/glabels_batch.c:136 +#: src/glabels_batch.c:139 #, c-format msgid "cannot open glabels file %s\n" msgstr "gLabel ¤Ç»ÈÍѤ¹¤ë¥Õ¥¡¥¤¥ë %s ¤¬³«¤±¤Þ¤»¤ó\n" @@ -233,7 +232,7 @@ msgstr " msgid "Style" msgstr "¥¹¥¿¥¤¥ë" -#: src/item_barcode.c:549 src/item_barcode.c:572 src/print.c:627 +#: src/item_barcode.c:549 src/item_barcode.c:572 src/print.c:631 msgid "Invalid barcode" msgstr "¤ª¤«¤·¤Ê¥Ð¡¼¥³¡¼¥É" @@ -383,7 +382,8 @@ msgid "Text with tab separators" msgstr "¥¿¥Ö¤Ç¶èÀڤ俥ƥ­¥¹¥È" #: src/merge.c:94 -msgid "Text with comma separators" +#, fuzzy +msgid "Text with comma separators (CSV)" msgstr "¥³¥ó¥Þ¤Ç¶èÀڤ俥ƥ­¥¹¥È" #: src/merge.c:102 diff --git a/glabels1/po/pl.po b/glabels1/po/pl.po index e38f57fc..bfa7d1b3 100644 --- a/glabels1/po/pl.po +++ b/glabels1/po/pl.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gLabels\n" -"POT-Creation-Date: 2002-06-27 14:23-0400\n" +"POT-Creation-Date: 2002-08-24 22:30-0400\n" "PO-Revision-Date: 2002-07-23 11:43+0100\n" "Last-Translator: Arkadiusz Lipiec \n" "Language-Team: Polish \n" @@ -13,55 +13,55 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-2\n" "Content-Transfer-Encoding: 8bit\n" -#: src/glabels_batch.c:47 +#: src/glabels_batch.c:49 msgid "print this message" msgstr "wy¶wietla ten komunikat" -#: src/glabels_batch.c:49 +#: src/glabels_batch.c:51 msgid "print the version of glabels-batch being used" msgstr "wy¶wietla aktualnie u¿ywan± wersjê glabel-batch" -#: src/glabels_batch.c:51 +#: src/glabels_batch.c:53 msgid "set output filename (default=\"output.ps\")" msgstr "okre¶l nazwê pliku wyj¶ciowego (domy¶lnie=\"output.ps\")" -#: src/glabels_batch.c:51 +#: src/glabels_batch.c:53 msgid "filename" msgstr "nazwa pliku" -#: src/glabels_batch.c:53 +#: src/glabels_batch.c:55 msgid "number of sheets (default=1)" msgstr "liczba arkuszy (domy¶lnie=1)" -#: src/glabels_batch.c:53 +#: src/glabels_batch.c:55 msgid "sheets" msgstr "arkusz(e/y)" -#: src/glabels_batch.c:55 +#: src/glabels_batch.c:57 msgid "number of copies (default=1)" msgstr "liczba kopii (domy¶lnie=1)" -#: src/glabels_batch.c:55 +#: src/glabels_batch.c:57 msgid "copies" msgstr "kopi(a/e/i)" -#: src/glabels_batch.c:57 src/print_dialog.c:152 +#: src/glabels_batch.c:59 src/print_dialog.c:152 msgid "print outlines (to test printer alignment)" msgstr "drukowanie ramek (w celu przetestowania wyrównania)" -#: src/glabels_batch.c:59 src/print_dialog.c:160 +#: src/glabels_batch.c:61 src/print_dialog.c:160 msgid "print in reverse (i.e. a mirror image)" msgstr "drukowanie odwrócone (np. odbicie zwierciadlane)" -#: src/glabels_batch.c:89 +#: src/glabels_batch.c:92 msgid "[OPTION...] GLABELS_FILE..." msgstr "[OPCJA...] PLIK_GLABELS..." -#: src/glabels_batch.c:108 +#: src/glabels_batch.c:111 msgid "missing glabels file\n" msgstr "brak pliku glabels\n" -#: src/glabels_batch.c:136 +#: src/glabels_batch.c:139 #, c-format msgid "cannot open glabels file %s\n" msgstr "nie mo¿na otworzyæ pliku glabels o nazwie %s\n" @@ -90,11 +90,11 @@ msgstr "" msgid "Don't save" msgstr "Nie zapisuj" -#: src/file.c:288 src/mdi.c:601 +#: src/mdi.c:601 src/file.c:288 msgid "Cannot save file" msgstr "Nie mo¿na zapisaæ pliku" -#: src/file.c:311 src/mdi.c:623 +#: src/mdi.c:623 src/file.c:311 msgid "Save As" msgstr "Zapisz jako" @@ -102,15 +102,15 @@ msgstr "Zapisz jako" msgid "Close / Save label as" msgstr "Zamyka / Zapisuje etykietê jako" -#: src/file.c:352 src/mdi.c:680 +#: src/mdi.c:680 src/file.c:352 msgid "Label no longer valid!" msgstr "Etykieta nie jest ju¿ poprawna!" -#: src/file.c:362 src/mdi.c:693 +#: src/mdi.c:693 src/file.c:362 msgid "Must supply file name" msgstr "Nale¿y podaæ nazwê pliku" -#: src/file.c:374 src/mdi.c:705 +#: src/mdi.c:705 src/file.c:374 msgid "Error writing file" msgstr "B³±d podczas zapisu pliku" @@ -138,8 +138,8 @@ msgstr "Modyfikacja w msgid "Text" msgstr "Tekst" -#: 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 +#: src/item_text.c:479 src/item_line.c:253 src/item_box.c:245 +#: src/item_ellipse.c:247 src/item_barcode.c:317 msgid "Appearance" msgstr "Wygl±d" @@ -149,9 +149,9 @@ msgid "Text Properties" msgstr "W³a¶ciwo¶ci tekstu" #. ------ 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 +#: src/item_text.c:500 src/item_text.c:503 src/item_line.c:274 +#: src/item_box.c:275 src/item_ellipse.c:277 src/item_image.c:318 +#: src/item_barcode.c:345 src/item_barcode.c:348 msgid "Position" msgstr "Pozycja" @@ -164,14 +164,14 @@ msgstr "Modyfikacja w msgid "Line" msgstr "Linia" -#: src/item_box.c:272 src/item_ellipse.c:274 src/item_image.c:315 -#: src/item_line.c:271 +#: src/item_line.c:271 src/item_box.c:272 src/item_ellipse.c:274 +#: src/item_image.c:315 msgid "Position/Size" msgstr "Pozycja/Rozmiar" #. ------ Size Frame ------ -#: src/item_box.c:286 src/item_ellipse.c:288 src/item_image.c:329 -#: src/item_line.c:285 +#: src/item_line.c:285 src/item_box.c:286 src/item_ellipse.c:288 +#: src/item_image.c:329 msgid "Size" msgstr "Rozmiar" @@ -237,7 +237,7 @@ msgid "Invalid barcode" msgstr "Niepoprawny kod paskowy" #. W Label -#: src/prop_line.c:169 src/prop_size.c:182 +#: src/prop_size.c:182 src/prop_line.c:169 msgid "Width:" msgstr "Szeroko¶æ:" @@ -261,13 +261,13 @@ msgid "Y:" msgstr "Y:" #. Line Width units -#: src/prefs.c:448 src/prefs.c:455 src/prop_line.c:183 +#: src/prop_line.c:183 src/prefs.c:448 src/prefs.c:455 msgid "points" msgstr "punkty(-ów)" #. Line Color Label -#: src/prop_bc.c:188 src/prop_fill.c:166 src/prop_line.c:189 -#: src/prop_text.c:234 +#: src/prop_line.c:189 src/prop_fill.c:166 src/prop_text.c:234 +#: src/prop_bc.c:188 msgid "Color:" msgstr "Kolor:" @@ -282,7 +282,7 @@ msgid "Alignment:" msgstr "Wyrównanie:" #. Insert merge field label -#: src/prop_bc_data.c:196 src/prop_text_entry.c:180 +#: src/prop_text_entry.c:180 src/prop_bc_data.c:196 msgid "Key:" msgstr "Klucz:" @@ -312,7 +312,6 @@ msgstr "Skala" #. % Label #: src/prop_bc.c:182 -#, c-format msgid "%" msgstr "%" @@ -334,8 +333,8 @@ msgstr "Brak g #: src/label.c:239 msgid "document of the wrong type, glabels Namespace not found" -msgstr "dokument jest niepoprawnego typu, nie odnaleziono przestrzeni nazw " -"glabels" +msgstr "" +"dokument jest niepoprawnego typu, nie odnaleziono przestrzeni nazw glabels" #: src/label.c:244 #, c-format @@ -547,10 +546,10 @@ msgid "" msgstr "" "Program do tworzenia etykiet i wizytówek dla GNOME.\n" "\n" -"Glabels jest oprogramowaniem wolnodostêpnym, mo¿na rozpowszechniaæ go lub/i" -"modyfikowaæ na zasadach Licencji Publicznej GNU opublikowanej przez " -"Free Software Foundation; zarówno w wersji 2 tej licencji, jak (do wyboru) " -"i dowolnej pó¼niejszej wersji.\n" +"Glabels jest oprogramowaniem wolnodostêpnym, mo¿na rozpowszechniaæ go lub/" +"imodyfikowaæ na zasadach Licencji Publicznej GNU opublikowanej przez Free " +"Software Foundation; zarówno w wersji 2 tej licencji, jak (do wyboru) i " +"dowolnej pó¼niejszej wersji.\n" "\n" "Ten program jest rozpowszechniany w nadziei u¿yteczno¶ci, lecz BEZ ¯ADNEJ " "GWARANCJI; nawet wynikaj±cej z RÊKOJMI lub U¯YWANIA W OKRE¦LONYM CELU. " diff --git a/glabels1/po/pt_BR.po b/glabels1/po/pt_BR.po index 489c4798..1f3eb8dc 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-06-27 14:23-0400\n" +"POT-Creation-Date: 2002-08-24 22:30-0400\n" "PO-Revision-Date: 2002-01-31 21:20+ZONE\n" "Last-Translator: Paulo R. Ormenese \n" "Language-Team: Brazilian portuguese <>\n" @@ -13,57 +13,57 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: src/glabels_batch.c:47 +#: src/glabels_batch.c:49 msgid "print this message" msgstr "" -#: src/glabels_batch.c:49 +#: src/glabels_batch.c:51 msgid "print the version of glabels-batch being used" msgstr "" -#: src/glabels_batch.c:51 +#: src/glabels_batch.c:53 msgid "set output filename (default=\"output.ps\")" msgstr "" -#: src/glabels_batch.c:51 +#: src/glabels_batch.c:53 msgid "filename" msgstr "" -#: src/glabels_batch.c:53 +#: src/glabels_batch.c:55 msgid "number of sheets (default=1)" msgstr "" -#: src/glabels_batch.c:53 +#: src/glabels_batch.c:55 #, fuzzy msgid "sheets" msgstr "Páginas:" -#: src/glabels_batch.c:55 +#: src/glabels_batch.c:57 msgid "number of copies (default=1)" msgstr "" -#: src/glabels_batch.c:55 +#: src/glabels_batch.c:57 #, fuzzy msgid "copies" msgstr "Cópias" -#: src/glabels_batch.c:57 src/print_dialog.c:152 +#: src/glabels_batch.c:59 src/print_dialog.c:152 msgid "print outlines (to test printer alignment)" msgstr "imprimir contornos (testar alinhamento da impressora)" -#: src/glabels_batch.c:59 src/print_dialog.c:160 +#: src/glabels_batch.c:61 src/print_dialog.c:160 msgid "print in reverse (i.e. a mirror image)" msgstr "imprimir ao contrário (como uma imagem de espelho)" -#: src/glabels_batch.c:89 +#: src/glabels_batch.c:92 msgid "[OPTION...] GLABELS_FILE..." msgstr "" -#: src/glabels_batch.c:108 +#: src/glabels_batch.c:111 msgid "missing glabels file\n" msgstr "" -#: src/glabels_batch.c:136 +#: src/glabels_batch.c:139 #, fuzzy, c-format msgid "cannot open glabels file %s\n" msgstr "Impossível abrir o arquivo" @@ -92,11 +92,11 @@ msgstr "" msgid "Don't save" msgstr "Não salve" -#: src/file.c:288 src/mdi.c:601 +#: src/mdi.c:601 src/file.c:288 msgid "Cannot save file" msgstr "Não posso salvar o arquivo" -#: src/file.c:311 src/mdi.c:623 +#: src/mdi.c:623 src/file.c:311 msgid "Save As" msgstr "Salvar como" @@ -104,15 +104,15 @@ msgstr "Salvar como" msgid "Close / Save label as" msgstr "Fechar / Salvar etiqueta como" -#: src/file.c:352 src/mdi.c:680 +#: src/mdi.c:680 src/file.c:352 msgid "Label no longer valid!" msgstr "Etiqueta não é mais válida" -#: src/file.c:362 src/mdi.c:693 +#: src/mdi.c:693 src/file.c:362 msgid "Must supply file name" msgstr "Necessário informar nome do arquivo" -#: src/file.c:374 src/mdi.c:705 +#: src/mdi.c:705 src/file.c:374 msgid "Error writing file" msgstr "Erro gravando o arquivo" @@ -140,8 +140,8 @@ msgstr "Editar propriedades do objeto texto" msgid "Text" msgstr "Texto" -#: 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 +#: src/item_text.c:479 src/item_line.c:253 src/item_box.c:245 +#: src/item_ellipse.c:247 src/item_barcode.c:317 msgid "Appearance" msgstr "Aparência" @@ -151,9 +151,9 @@ msgid "Text Properties" msgstr "Propriedades de Texto" #. ------ 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 +#: src/item_text.c:500 src/item_text.c:503 src/item_line.c:274 +#: src/item_box.c:275 src/item_ellipse.c:277 src/item_image.c:318 +#: src/item_barcode.c:345 src/item_barcode.c:348 msgid "Position" msgstr "Posição" @@ -166,14 +166,14 @@ msgstr "Editar propriedades do objeto linha" msgid "Line" msgstr "Linha" -#: src/item_box.c:272 src/item_ellipse.c:274 src/item_image.c:315 -#: src/item_line.c:271 +#: src/item_line.c:271 src/item_box.c:272 src/item_ellipse.c:274 +#: src/item_image.c:315 msgid "Position/Size" msgstr "Posição/Tamanho" #. ------ Size Frame ------ -#: src/item_box.c:286 src/item_ellipse.c:288 src/item_image.c:329 -#: src/item_line.c:285 +#: src/item_line.c:285 src/item_box.c:286 src/item_ellipse.c:288 +#: src/item_image.c:329 msgid "Size" msgstr "Tamanho" @@ -239,7 +239,7 @@ msgid "Invalid barcode" msgstr "Código de barras inválido" #. W Label -#: src/prop_line.c:169 src/prop_size.c:182 +#: src/prop_size.c:182 src/prop_line.c:169 msgid "Width:" msgstr "Largura:" @@ -263,13 +263,13 @@ msgid "Y:" msgstr "Y:" #. Line Width units -#: src/prefs.c:448 src/prefs.c:455 src/prop_line.c:183 +#: src/prop_line.c:183 src/prefs.c:448 src/prefs.c:455 msgid "points" msgstr "pontos" #. Line Color Label -#: src/prop_bc.c:188 src/prop_fill.c:166 src/prop_line.c:189 -#: src/prop_text.c:234 +#: src/prop_line.c:189 src/prop_fill.c:166 src/prop_text.c:234 +#: src/prop_bc.c:188 msgid "Color:" msgstr "Cor:" @@ -284,7 +284,7 @@ msgid "Alignment:" msgstr "Alinhamento:" #. Insert merge field label -#: src/prop_bc_data.c:196 src/prop_text_entry.c:180 +#: src/prop_text_entry.c:180 src/prop_bc_data.c:196 msgid "Key:" msgstr "Chave:" @@ -314,7 +314,6 @@ msgstr "Escala:" #. % Label #: src/prop_bc.c:182 -#, c-format msgid "%" msgstr "%" diff --git a/glabels1/po/zh_TW.Big5.po b/glabels1/po/zh_TW.Big5.po index 2d2f6d00..864f6187 100644 --- a/glabels1/po/zh_TW.Big5.po +++ b/glabels1/po/zh_TW.Big5.po @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: glabels 0.4.4\n" -"POT-Creation-Date: 2002-06-27 14:23-0400\n" +"POT-Creation-Date: 2002-08-24 22:30-0400\n" "PO-Revision-Date: 2002-07-14 18:30+0800\n" "Last-Translator: Shell Hung \n" "Language-Team: zh-l10n \n" @@ -13,55 +13,55 @@ msgstr "" "Content-Type: text/plain; charset=big5\n" "Content-Transfer-Encoding: 8bit\n" -#: src/glabels_batch.c:47 +#: src/glabels_batch.c:49 msgid "print this message" msgstr "¦C¦L³o­Ó°T®§" -#: src/glabels_batch.c:49 +#: src/glabels_batch.c:51 msgid "print the version of glabels-batch being used" msgstr "¦C¦L¥X glabels-batch ªºª©¥»¸ê°T" -#: src/glabels_batch.c:51 +#: src/glabels_batch.c:53 msgid "set output filename (default=\"output.ps\")" msgstr "³]©w¿é¥XÀɦWºÙ (¹w³]¬°\"output.ps\")" -#: src/glabels_batch.c:51 +#: src/glabels_batch.c:53 msgid "filename" msgstr "ÀɮצWºÙ" -#: src/glabels_batch.c:53 +#: src/glabels_batch.c:55 msgid "number of sheets (default=1)" msgstr "¯È±i¼Æ¥Ø (¹w³]¬° 1)" -#: src/glabels_batch.c:53 +#: src/glabels_batch.c:55 msgid "sheets" msgstr "¯È±i" -#: src/glabels_batch.c:55 +#: src/glabels_batch.c:57 msgid "number of copies (default=1)" msgstr "¥÷¼Æ (¹w³]¬° 1)" -#: src/glabels_batch.c:55 +#: src/glabels_batch.c:57 msgid "copies" msgstr "¥÷¼Æ" -#: src/glabels_batch.c:57 src/print_dialog.c:152 +#: src/glabels_batch.c:59 src/print_dialog.c:152 msgid "print outlines (to test printer alignment)" msgstr "¦L¥X¥~Ãä (´ú¸Õ¥´¦L¾÷°Ñ¼Æ)" -#: src/glabels_batch.c:59 src/print_dialog.c:160 +#: src/glabels_batch.c:61 src/print_dialog.c:160 msgid "print in reverse (i.e. a mirror image)" msgstr "¤Ï¤è¦V¦C¦L (¦p­Ë¦V¼v¹³)" -#: src/glabels_batch.c:89 +#: src/glabels_batch.c:92 msgid "[OPTION...] GLABELS_FILE..." msgstr "[¿ï¶µ...] GLABELS_FILE..." -#: src/glabels_batch.c:108 +#: src/glabels_batch.c:111 msgid "missing glabels file\n" msgstr "¨S¦³¿é¤J glabels ªºÀÉ®×\n" -#: src/glabels_batch.c:136 +#: src/glabels_batch.c:139 #, c-format msgid "cannot open glabels file %s\n" msgstr "¶}±ÒÀÉ®×¥¢±Ñ %s\n" @@ -90,11 +90,11 @@ msgstr "" msgid "Don't save" msgstr "¤£­nÀx¦s" -#: src/file.c:288 src/mdi.c:601 +#: src/mdi.c:601 src/file.c:288 msgid "Cannot save file" msgstr "¤£¯àÀx¦sÀÉ®×" -#: src/file.c:311 src/mdi.c:623 +#: src/mdi.c:623 src/file.c:311 msgid "Save As" msgstr "¥t¦s¬°..." @@ -102,15 +102,15 @@ msgstr " msgid "Close / Save label as" msgstr "Ãö³¬ / Àx¦s¼Ðñ¬°..." -#: src/file.c:352 src/mdi.c:680 +#: src/mdi.c:680 src/file.c:352 msgid "Label no longer valid!" msgstr "¼Ðñ¨Ã¤£¬O¥¿½T¥iŪªº !" -#: src/file.c:362 src/mdi.c:693 +#: src/mdi.c:693 src/file.c:362 msgid "Must supply file name" msgstr "½Ð¥²»Ý¿é¤JÀɮצWºÙ" -#: src/file.c:374 src/mdi.c:705 +#: src/mdi.c:705 src/file.c:374 msgid "Error writing file" msgstr "¦b¼g¤JÀɮ׮ɵo¥Í¿ù»~" @@ -138,8 +138,8 @@ msgstr " msgid "Text" msgstr "¤å¦r" -#: 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 +#: src/item_text.c:479 src/item_line.c:253 src/item_box.c:245 +#: src/item_ellipse.c:247 src/item_barcode.c:317 msgid "Appearance" msgstr "¼Ë»ª" @@ -149,9 +149,9 @@ msgid "Text Properties" msgstr "¤å¦r¼Ë»ª" #. ------ 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 +#: src/item_text.c:500 src/item_text.c:503 src/item_line.c:274 +#: src/item_box.c:275 src/item_ellipse.c:277 src/item_image.c:318 +#: src/item_barcode.c:345 src/item_barcode.c:348 msgid "Position" msgstr "¦ì¸m" @@ -164,14 +164,14 @@ msgstr " msgid "Line" msgstr "½u" -#: src/item_box.c:272 src/item_ellipse.c:274 src/item_image.c:315 -#: src/item_line.c:271 +#: src/item_line.c:271 src/item_box.c:272 src/item_ellipse.c:274 +#: src/item_image.c:315 msgid "Position/Size" msgstr "¦ì¸m/¤j¤p" #. ------ Size Frame ------ -#: src/item_box.c:286 src/item_ellipse.c:288 src/item_image.c:329 -#: src/item_line.c:285 +#: src/item_line.c:285 src/item_box.c:286 src/item_ellipse.c:288 +#: src/item_image.c:329 msgid "Size" msgstr "¤j¤p" @@ -237,7 +237,7 @@ msgid "Invalid barcode" msgstr "¤£¥¿½Tªº¼Æ½X±ø" #. W Label -#: src/prop_line.c:169 src/prop_size.c:182 +#: src/prop_size.c:182 src/prop_line.c:169 msgid "Width:" msgstr "Áï«×:" @@ -261,13 +261,13 @@ msgid "Y:" msgstr "Y:" #. Line Width units -#: src/prefs.c:448 src/prefs.c:455 src/prop_line.c:183 +#: src/prop_line.c:183 src/prefs.c:448 src/prefs.c:455 msgid "points" msgstr "ÂI" #. Line Color Label -#: src/prop_bc.c:188 src/prop_fill.c:166 src/prop_line.c:189 -#: src/prop_text.c:234 +#: src/prop_line.c:189 src/prop_fill.c:166 src/prop_text.c:234 +#: src/prop_bc.c:188 msgid "Color:" msgstr "ÃC¦â:" @@ -282,7 +282,7 @@ msgid "Alignment:" msgstr "¹ï¸m:" #. Insert merge field label -#: src/prop_bc_data.c:196 src/prop_text_entry.c:180 +#: src/prop_text_entry.c:180 src/prop_bc_data.c:196 msgid "Key:" msgstr "¸ê®Æ­È:" @@ -312,7 +312,6 @@ msgstr " #. % Label #: src/prop_bc.c:182 -#, c-format msgid "%" msgstr "%"