diff -durpN ghfaxviewer-0.21.0/ABOUT-NLS ghfaxviewer-0.21.1/ABOUT-NLS --- ghfaxviewer-0.21.0/ABOUT-NLS Fri Apr 13 12:48:46 2001 +++ ghfaxviewer-0.21.1/ABOUT-NLS Fri Apr 27 13:52:56 2001 @@ -100,16 +100,18 @@ Using This Package As a user, if your language has been installed for this package, you only have to set the `LANG' environment variable to the appropriate -ISO 639 `LL' two-letter code prior to using the programs in the -package. For example, let's suppose that you speak German. At the -shell prompt, merely execute `setenv LANG de' (in `csh'), -`export LANG; LANG=de' (in `sh') or `export LANG=de' (in `bash'). This -can be done from your `.login' or `.profile' file, once and for all. +`LL_CC' combination. Here `LL' is an ISO 639 two-letter language code, +and `CC' is an ISO 3166 two-letter country code. For example, let's +suppose that you speak German and live in Germany. At the shell +prompt, merely execute `setenv LANG de_DE' (in `csh'), +`export LANG; LANG=de_DE' (in `sh') or `export LANG=de_DE' (in `bash'). +This can be done from your `.login' or `.profile' file, once and for +all. - Some languages have dialects in different countries. To specify -such a dialect, the notation `LL_CC' can be used, which combines an -ISO 639 language code `LL' and an ISO 3166 two-letter country code -`CC'. For example, `de_AT' is used for Austria, and `pt_BR' for Brazil. + You might think that the country code specification is redundant. +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. Not all programs have translations for all languages. By default, an English message is shown in place of a nonexistent translation. If you @@ -120,7 +122,13 @@ for the purpose of message handling, but set to the primary language; this is required by other parts of the system libraries. For example, some Swedish users who would rather read translations in German than English for when Swedish is not -available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv'. +available, set `LANGUAGE' to `sv:de' while leaving `LANG' to `sv_SE'. + + In the `LANGUAGE' environment variable, but not in the `LANG' +environment variable, `LL_CC' combinations can be abbreviated as `LL' +to denote the language's main dialect. For example, `de' is equivalent +to `de_DE' (German as spoken in Germany), and `pt' to `pt_PT' +(Portuguese as spoken in Portugal) in this context. Translating Teams ================= diff -durpN ghfaxviewer-0.21.0/AUTHORS ghfaxviewer-0.21.1/AUTHORS --- ghfaxviewer-0.21.0/AUTHORS Sun Apr 15 00:31:37 2001 +++ ghfaxviewer-0.21.1/AUTHORS Thu Apr 26 03:42:23 2001 @@ -1,11 +1,13 @@ Maintainer and main author of ghfaxviewer : -Wolfgang Sourdeau +Wolfgang Sourdeau -src/cursors.c and src/cursors.h were originally written by Federico -Mena Quintero and are copyrighted by the Free Software Foundation +From the Eye of GNOME, which is copyrighted by the Free Software +Foundation and written by Federico Mena Quintero: +src/cursors.c and src/cursors.h +the function "stock_init" in src/setup.c The GNU HaliFAX team: -Wolfgang Sourdeau +Wolfgang Sourdeau George Farris Tilman Bubeck @@ -14,5 +16,7 @@ Thomas Bartschies, Tilman Bubeck: German Kevin Chen: Traditional Chinese (zh_TW.Big5.po) Zbigniew Baniewski: Polish translation (pl.po) -Small modifications by Dominik Brettnacher (FreeBSD port) in -src/ps_print.c to obtain "__compare_fn_t" on non-glibc systems +ports: +Dominik Brettnacher (FreeBSD): + small modifications in src/ps_print.c to obtain + "__compare_fn_t" on non-glibc systems diff -durpN ghfaxviewer-0.21.0/ChangeLog ghfaxviewer-0.21.1/ChangeLog --- ghfaxviewer-0.21.0/ChangeLog Wed Apr 18 14:22:20 2001 +++ ghfaxviewer-0.21.1/ChangeLog Fri Apr 27 16:11:16 2001 @@ -1,3 +1,67 @@ +2001-04-27 Wolfgang Sourdeau + + * configure.in: reversed dependency from gnome-print 0.28 to 0.25. + release 0.21.1. + + * src/gtkutils.c (dialog_window_new): automatically display + dialogs at the center of the screen + + * ghfaxviewer.1: we now have a manpage describing ghfaxviewer + + * src/progress.c (gfv_progress_new): the cancel button is a + GNOME_STOCK_BUTTON_CANCEL if compiled for GNOME + + * src/gn_print.c (prepare_print_master): display a progress dialog + to show print status as well as to permit to cancel the operation + + * src/errors.c (display_failure): same thing as below for error + dialogs + + * src/progress.c (gfv_progress_new): the progress windows are now + using the DialogWindow facility from gtkutils.c + + * src/gtkutils.c (dialog_window_set_button): new function to make + it shorter to create dialog boxes with only one button; + +2001-04-26 Wolfgang Sourdeau + + * src/viewer.c (fax_viewer_open_file): added a reference to the + parent window so that the file open error msgbox is transient for + it. + + * src/errors.c: added a short description for the file. + (display_failure): the error message is now transient for the + viewer window + + * src/setup.c: "viewer_def_*" and "default_dir" replaced with + macros, for cleanliness. + (CONFIG_KEY): added an ending '/' because of previous change + + * src/menu.c (gnome_menu_bar_new): same thing as below. + + * src/toolbar.c (gnome_toolbar_new): following the modification + below, the toolbar is using stock pixmaps for zoom buttons. + + * src/setup.c (stock_init): copied this function from the Eye of + GNOME to obtain stock pixmaps for zoom icons: + STOCK_ZOOM_IN, STOCK_ZOOM_OUT, STOCK_ZOOM_IN_MENU, + STOCK_ZOOM_OUT_MENU + + * src/viewer.h (struct _ViewerData): see below + + * src/draw_page.c (refresh_widgets): see below + + * src/viewer.c: GNOME widgets are partially adapted to the status + of the viewer (the toolbar buttons are enabled/disabled) + +2001-04-25 Wolfgang Sourdeau + + * src/pixmaps/ghfaxviewer-icon.xpm: made the icon compliant with + the standard 24 colour palette of Debian, for standard compliance. + + * src/setup.c (gnome_screen_setup): initialized gerror to NULL for + platforms that don't make pointers point to NULL automatically + 2001-04-18 Wolfgang Sourdeau * configure.in: new release before going to Québec, diff -durpN ghfaxviewer-0.21.0/Makefile.am ghfaxviewer-0.21.1/Makefile.am --- ghfaxviewer-0.21.0/Makefile.am Fri Apr 13 12:51:35 2001 +++ ghfaxviewer-0.21.1/Makefile.am Fri Apr 27 13:04:23 2001 @@ -2,4 +2,6 @@ PACKAGE = @PACKAGE@ VERSION = @VERSION@ SUBDIRS = docs intl po src debian macros -EXTRA_DIST = README ghfaxviewer.spec Makefile.win32.in gfv_gtkrc +man_MANS = ghfaxviewer.1 + +EXTRA_DIST = README ghfaxviewer.spec Makefile.win32.in gfv_gtkrc $(man_MANS) diff -durpN ghfaxviewer-0.21.0/Makefile.in ghfaxviewer-0.21.1/Makefile.in --- ghfaxviewer-0.21.0/Makefile.in Wed Apr 18 15:05:22 2001 +++ ghfaxviewer-0.21.1/Makefile.in Fri Apr 27 17:14:50 2001 @@ -59,13 +59,11 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ -AS = @AS@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ DATADIRNAME = @DATADIRNAME@ -DLLTOOL = @DLLTOOL@ EXEEXT = @EXEEXT@ GCONF_CFLAGS = @GCONF_CFLAGS@ GCONF_CONFIG = @GCONF_CONFIG@ @@ -100,7 +98,6 @@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ LIBICONV = @LIBICONV@ LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ LPC_COMMAND = @LPC_COMMAND@ LPSTAT_COMMAND = @LPSTAT_COMMAND@ MAINT = @MAINT@ @@ -108,7 +105,6 @@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ -OBJDUMP = @OBJDUMP@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ ORBIT_CONFIG = @ORBIT_CONFIG@ ORBIT_IDL = @ORBIT_IDL@ @@ -135,11 +131,17 @@ PACKAGE = @PACKAGE@ VERSION = @VERSION@ SUBDIRS = docs intl po src debian macros -EXTRA_DIST = README ghfaxviewer.spec Makefile.win32.in gfv_gtkrc +man_MANS = ghfaxviewer.1 + +EXTRA_DIST = README ghfaxviewer.spec Makefile.win32.in gfv_gtkrc $(man_MANS) ACLOCAL_M4 = $(top_srcdir)/aclocal.m4 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs CONFIG_HEADER = config.h CONFIG_CLEAN_FILES = Makefile.win32 ghfaxviewer.spec +man1dir = $(mandir)/man1 +MANS = $(man_MANS) + +NROFF = nroff DIST_COMMON = README ./stamp-h.in ABOUT-NLS AUTHORS COPYING ChangeLog \ INSTALL Makefile.am Makefile.in Makefile.win32.in NEWS TODO acconfig.h \ aclocal.m4 config.guess config.h.in config.sub configure configure.in \ @@ -199,6 +201,45 @@ Makefile.win32: $(top_builddir)/config.s ghfaxviewer.spec: $(top_builddir)/config.status ghfaxviewer.spec.in cd $(top_builddir) && CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status +install-man1: + $(mkinstalldirs) $(DESTDIR)$(man1dir) + @list='$(man1_MANS)'; \ + l2='$(man_MANS)'; for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + if test -f $(srcdir)/$$i; then file=$(srcdir)/$$i; \ + else file=$$i; fi; \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst"; \ + $(INSTALL_DATA) $$file $(DESTDIR)$(man1dir)/$$inst; \ + done + +uninstall-man1: + @list='$(man1_MANS)'; \ + l2='$(man_MANS)'; for i in $$l2; do \ + case "$$i" in \ + *.1*) list="$$list $$i" ;; \ + esac; \ + done; \ + for i in $$list; do \ + ext=`echo $$i | sed -e 's/^.*\\.//'`; \ + inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \ + inst=`echo $$inst | sed '$(transform)'`.$$ext; \ + echo " rm -f $(DESTDIR)$(man1dir)/$$inst"; \ + rm -f $(DESTDIR)$(man1dir)/$$inst; \ + done +install-man: $(MANS) + @$(NORMAL_INSTALL) + $(MAKE) $(AM_MAKEFLAGS) install-man1 +uninstall-man: + @$(NORMAL_UNINSTALL) + $(MAKE) $(AM_MAKEFLAGS) uninstall-man1 + # This directory's subdirectories are mostly independent; you can cd # into them and run `make' without going through this Makefile. # To change the values of `make' variables: instead of editing Makefiles, @@ -360,20 +401,21 @@ all-recursive-am: config.h install-exec-am: install-exec: install-exec-recursive -install-data-am: +install-data-am: install-man install-data: install-data-recursive install-am: all-am @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am install: install-recursive -uninstall-am: +uninstall-am: uninstall-man uninstall: uninstall-recursive -all-am: Makefile config.h +all-am: Makefile $(MANS) config.h all-redirect: all-recursive-am install-strip: $(MAKE) $(AM_MAKEFLAGS) AM_INSTALL_PROGRAM_FLAGS=-s install installdirs: installdirs-recursive installdirs-am: + $(mkinstalldirs) $(DESTDIR)$(mandir)/man1 mostlyclean-generic: @@ -407,6 +449,7 @@ maintainer-clean: maintainer-clean-recur -rm -f config.status .PHONY: mostlyclean-hdr distclean-hdr clean-hdr maintainer-clean-hdr \ +install-man1 uninstall-man1 install-man uninstall-man \ install-data-recursive uninstall-data-recursive install-exec-recursive \ uninstall-exec-recursive installdirs-recursive uninstalldirs-recursive \ all-recursive check-recursive installcheck-recursive info-recursive \ diff -durpN ghfaxviewer-0.21.0/Makefile.win32.in ghfaxviewer-0.21.1/Makefile.win32.in --- ghfaxviewer-0.21.0/Makefile.win32.in Fri Apr 13 12:55:58 2001 +++ ghfaxviewer-0.21.1/Makefile.win32.in Fri Apr 27 04:28:24 2001 @@ -34,7 +34,7 @@ dir-skeleton: doc-conversion: @for text in $(DIST_DOCFILES); do \ if [ -f $$text ]; then \ - todos < $$text > $(DIST_DOCDIR)/$$text.txt; \ + todos < $$text > $(DIST_DOCDIR)/`basename $$text.txt`; \ echo $$text.txt generated; \ else \ echo $$text.txt skipped; \ diff -durpN ghfaxviewer-0.21.0/aclocal.m4 ghfaxviewer-0.21.1/aclocal.m4 --- ghfaxviewer-0.21.0/aclocal.m4 Fri Apr 13 12:49:17 2001 +++ ghfaxviewer-0.21.1/aclocal.m4 Fri Apr 27 13:53:14 2001 @@ -184,13 +184,13 @@ AC_DEFUN([AC_ISC_POSIX], # but which still want to provide support for the GNU gettext functionality. # Please note that the actual code is *not* freely available. -# serial 8 +# serial 9 dnl Usage: AM_WITH_NLS([TOOLSYMBOL], [NEEDSYMBOL], [LIBDIR]). dnl If TOOLSYMBOL is specified and 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). Otherwise, a static library +dnl AM-DISABLE-SHARED). Otherwise, 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 @@ -274,21 +274,21 @@ return (int) gettext ("")]ifelse([$2], n if test "$gt_cv_func_gnugettext_libc" = "yes" \ || test "$gt_cv_func_gnugettext_libintl" = "yes"; then - AC_DEFINE(HAVE_GETTEXT, 1, - [Define if the GNU gettext() function is already present or preinstalled.]) - 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)'`"], :) - CATOBJEXT=.gmo - fi - if test "$gt_cv_func_gnugettext_libintl" = "yes"; then - INTLLIBS="-lintl" - fi - fi + AC_DEFINE(HAVE_GETTEXT, 1, + [Define if the GNU gettext() function is already present or preinstalled.]) + AC_CHECK_FUNCS(dcgettext) + 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_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT) + fi + AM_PATH_PROG_WITH_TEST(XGETTEXT, xgettext, + [test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :) + CATOBJEXT=.gmo + if test "$gt_cv_func_gnugettext_libintl" = "yes"; then + INTLLIBS="-lintl" + fi + fi ]) if test "$CATOBJEXT" = "NONE"; then @@ -337,8 +337,9 @@ return (int) gettext ("")]ifelse([$2], n POSUB=po fi AC_OUTPUT_COMMANDS( - [case " $CONFIG_FILES " in *" po/Makefile.in "* | *" po/Makefile.in:"*) + [case " "$CONFIG_FILES" " in *" po/Makefile.in "* | *" po/Makefile.in:"*) sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile + ;; esac]) @@ -500,419 +501,6 @@ __argz_count __argz_stringify __argz_nex < $srcdir/po/POTFILES.in > po/POTFILES fi ]) - - -# serial 40 AC_PROG_LIBTOOL -AC_DEFUN(AC_PROG_LIBTOOL, -[AC_REQUIRE([AC_LIBTOOL_SETUP])dnl - -# Save cache, so that ltconfig can load it -AC_CACHE_SAVE - -# Actually configure libtool. ac_aux_dir is where install-sh is found. -CC="$CC" CFLAGS="$CFLAGS" CPPFLAGS="$CPPFLAGS" \ -LD="$LD" LDFLAGS="$LDFLAGS" LIBS="$LIBS" \ -LN_S="$LN_S" NM="$NM" RANLIB="$RANLIB" \ -DLLTOOL="$DLLTOOL" AS="$AS" OBJDUMP="$OBJDUMP" \ -${CONFIG_SHELL-/bin/sh} $ac_aux_dir/ltconfig --no-reexec \ -$libtool_flags --no-verify $ac_aux_dir/ltmain.sh $lt_target \ -|| AC_MSG_ERROR([libtool configure failed]) - -# Reload cache, that may have been modified by ltconfig -AC_CACHE_LOAD - -# This can be used to rebuild libtool when needed -LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh" - -# Always use our own libtool. -LIBTOOL='$(SHELL) $(top_builddir)/libtool' -AC_SUBST(LIBTOOL)dnl - -# Redirect the config.log output again, so that the ltconfig log is not -# clobbered by the next message. -exec 5>>./config.log -]) - -AC_DEFUN(AC_LIBTOOL_SETUP, -[AC_PREREQ(2.13)dnl -AC_REQUIRE([AC_ENABLE_SHARED])dnl -AC_REQUIRE([AC_ENABLE_STATIC])dnl -AC_REQUIRE([AC_ENABLE_FAST_INSTALL])dnl -AC_REQUIRE([AC_CANONICAL_HOST])dnl -AC_REQUIRE([AC_CANONICAL_BUILD])dnl -AC_REQUIRE([AC_PROG_RANLIB])dnl -AC_REQUIRE([AC_PROG_CC])dnl -AC_REQUIRE([AC_PROG_LD])dnl -AC_REQUIRE([AC_PROG_NM])dnl -AC_REQUIRE([AC_PROG_LN_S])dnl -dnl - -case "$target" in -NONE) lt_target="$host" ;; -*) lt_target="$target" ;; -esac - -# Check for any special flags to pass to ltconfig. -libtool_flags="--cache-file=$cache_file" -test "$enable_shared" = no && libtool_flags="$libtool_flags --disable-shared" -test "$enable_static" = no && libtool_flags="$libtool_flags --disable-static" -test "$enable_fast_install" = no && libtool_flags="$libtool_flags --disable-fast-install" -test "$ac_cv_prog_gcc" = yes && libtool_flags="$libtool_flags --with-gcc" -test "$ac_cv_prog_gnu_ld" = yes && libtool_flags="$libtool_flags --with-gnu-ld" -ifdef([AC_PROVIDE_AC_LIBTOOL_DLOPEN], -[libtool_flags="$libtool_flags --enable-dlopen"]) -ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL], -[libtool_flags="$libtool_flags --enable-win32-dll"]) -AC_ARG_ENABLE(libtool-lock, - [ --disable-libtool-lock avoid locking (might break parallel builds)]) -test "x$enable_libtool_lock" = xno && libtool_flags="$libtool_flags --disable-lock" -test x"$silent" = xyes && libtool_flags="$libtool_flags --silent" - -# Some flags need to be propagated to the compiler or linker for good -# libtool support. -case "$lt_target" in -*-*-irix6*) - # Find out which ABI we are using. - echo '[#]line __oline__ "configure"' > conftest.$ac_ext - if AC_TRY_EVAL(ac_compile); then - case "`/usr/bin/file conftest.o`" in - *32-bit*) - LD="${LD-ld} -32" - ;; - *N32*) - LD="${LD-ld} -n32" - ;; - *64-bit*) - LD="${LD-ld} -64" - ;; - esac - fi - rm -rf conftest* - ;; - -*-*-sco3.2v5*) - # On SCO OpenServer 5, we need -belf to get full-featured binaries. - SAVE_CFLAGS="$CFLAGS" - CFLAGS="$CFLAGS -belf" - AC_CACHE_CHECK([whether the C compiler needs -belf], lt_cv_cc_needs_belf, - [AC_TRY_LINK([],[],[lt_cv_cc_needs_belf=yes],[lt_cv_cc_needs_belf=no])]) - if test x"$lt_cv_cc_needs_belf" != x"yes"; then - # this is probably gcc 2.8.0, egcs 1.0 or newer; no need for -belf - CFLAGS="$SAVE_CFLAGS" - fi - ;; - -ifdef([AC_PROVIDE_AC_LIBTOOL_WIN32_DLL], -[*-*-cygwin* | *-*-mingw*) - AC_CHECK_TOOL(DLLTOOL, dlltool, false) - AC_CHECK_TOOL(AS, as, false) - AC_CHECK_TOOL(OBJDUMP, objdump, false) - ;; -]) -esac -]) - -# AC_LIBTOOL_DLOPEN - enable checks for dlopen support -AC_DEFUN(AC_LIBTOOL_DLOPEN, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])]) - -# AC_LIBTOOL_WIN32_DLL - declare package support for building win32 dll's -AC_DEFUN(AC_LIBTOOL_WIN32_DLL, [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])]) - -# AC_ENABLE_SHARED - implement the --enable-shared flag -# Usage: AC_ENABLE_SHARED[(DEFAULT)] -# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to -# `yes'. -AC_DEFUN(AC_ENABLE_SHARED, [dnl -define([AC_ENABLE_SHARED_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE(shared, -changequote(<<, >>)dnl -<< --enable-shared[=PKGS] build shared libraries [default=>>AC_ENABLE_SHARED_DEFAULT], -changequote([, ])dnl -[p=${PACKAGE-default} -case "$enableval" in -yes) enable_shared=yes ;; -no) enable_shared=no ;; -*) - enable_shared=no - # Look at the argument we got. We use all the common list separators. - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," - for pkg in $enableval; do - if test "X$pkg" = "X$p"; then - enable_shared=yes - fi - done - IFS="$ac_save_ifs" - ;; -esac], -enable_shared=AC_ENABLE_SHARED_DEFAULT)dnl -]) - -# AC_DISABLE_SHARED - set the default shared flag to --disable-shared -AC_DEFUN(AC_DISABLE_SHARED, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_SHARED(no)]) - -# AC_ENABLE_STATIC - implement the --enable-static flag -# Usage: AC_ENABLE_STATIC[(DEFAULT)] -# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to -# `yes'. -AC_DEFUN(AC_ENABLE_STATIC, [dnl -define([AC_ENABLE_STATIC_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE(static, -changequote(<<, >>)dnl -<< --enable-static[=PKGS] build static libraries [default=>>AC_ENABLE_STATIC_DEFAULT], -changequote([, ])dnl -[p=${PACKAGE-default} -case "$enableval" in -yes) enable_static=yes ;; -no) enable_static=no ;; -*) - enable_static=no - # Look at the argument we got. We use all the common list separators. - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," - for pkg in $enableval; do - if test "X$pkg" = "X$p"; then - enable_static=yes - fi - done - IFS="$ac_save_ifs" - ;; -esac], -enable_static=AC_ENABLE_STATIC_DEFAULT)dnl -]) - -# AC_DISABLE_STATIC - set the default static flag to --disable-static -AC_DEFUN(AC_DISABLE_STATIC, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_STATIC(no)]) - - -# AC_ENABLE_FAST_INSTALL - implement the --enable-fast-install flag -# Usage: AC_ENABLE_FAST_INSTALL[(DEFAULT)] -# Where DEFAULT is either `yes' or `no'. If omitted, it defaults to -# `yes'. -AC_DEFUN(AC_ENABLE_FAST_INSTALL, [dnl -define([AC_ENABLE_FAST_INSTALL_DEFAULT], ifelse($1, no, no, yes))dnl -AC_ARG_ENABLE(fast-install, -changequote(<<, >>)dnl -<< --enable-fast-install[=PKGS] optimize for fast installation [default=>>AC_ENABLE_FAST_INSTALL_DEFAULT], -changequote([, ])dnl -[p=${PACKAGE-default} -case "$enableval" in -yes) enable_fast_install=yes ;; -no) enable_fast_install=no ;; -*) - enable_fast_install=no - # Look at the argument we got. We use all the common list separators. - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:," - for pkg in $enableval; do - if test "X$pkg" = "X$p"; then - enable_fast_install=yes - fi - done - IFS="$ac_save_ifs" - ;; -esac], -enable_fast_install=AC_ENABLE_FAST_INSTALL_DEFAULT)dnl -]) - -# AC_ENABLE_FAST_INSTALL - set the default to --disable-fast-install -AC_DEFUN(AC_DISABLE_FAST_INSTALL, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl -AC_ENABLE_FAST_INSTALL(no)]) - -# AC_PROG_LD - find the path to the GNU or non-GNU linker -AC_DEFUN(AC_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_REQUIRE([AC_CANONICAL_BUILD])dnl -ac_prog=ld -if test "$ac_cv_prog_gcc" = yes; then - # Check if gcc -print-prog-name=ld gives a path. - AC_MSG_CHECKING([for ld used by GCC]) - ac_prog=`($CC -print-prog-name=ld) 2>&5` - case "$ac_prog" in - # Accept absolute paths. -changequote(,)dnl - [\\/]* | [A-Za-z]:[\\/]*) - re_direlt='/[^/][^/]*/\.\./' -changequote([,])dnl - # 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(ac_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 - ac_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 "$ac_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 - ac_cv_path_LD="$LD" # Let the user override the test with a path. -fi]) -LD="$ac_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_PROG_LD_GNU -]) - -AC_DEFUN(AC_PROG_LD_GNU, -[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], ac_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 - ac_cv_prog_gnu_ld=yes -else - ac_cv_prog_gnu_ld=no -fi]) -]) - -# AC_PROG_NM - find the path to a BSD-compatible name lister -AC_DEFUN(AC_PROG_NM, -[AC_MSG_CHECKING([for BSD-compatible nm]) -AC_CACHE_VAL(ac_cv_path_NM, -[if test -n "$NM"; then - # Let the user override the test. - ac_cv_path_NM="$NM" -else - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" - for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/nm || test -f $ac_dir/nm$ac_exeext ; then - # Check to see if the nm accepts a BSD-compat flag. - # Adding the `sed 1q' prevents false positives on HP-UX, which says: - # nm: unknown option "B" ignored - if ($ac_dir/nm -B /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then - ac_cv_path_NM="$ac_dir/nm -B" - break - elif ($ac_dir/nm -p /dev/null 2>&1 | sed '1q'; exit 0) | egrep /dev/null >/dev/null; then - ac_cv_path_NM="$ac_dir/nm -p" - break - else - ac_cv_path_NM=${ac_cv_path_NM="$ac_dir/nm"} # keep the first match, but - continue # so that we can try to find one that supports BSD flags - fi - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_NM" && ac_cv_path_NM=nm -fi]) -NM="$ac_cv_path_NM" -AC_MSG_RESULT([$NM]) -]) - -# AC_CHECK_LIBM - check for math library -AC_DEFUN(AC_CHECK_LIBM, -[AC_REQUIRE([AC_CANONICAL_HOST])dnl -LIBM= -case "$lt_target" in -*-*-beos* | *-*-cygwin*) - # These system don't have libm - ;; -*-ncr-sysv4.3*) - AC_CHECK_LIB(mw, _mwvalidcheckl, LIBM="-lmw") - AC_CHECK_LIB(m, main, LIBM="$LIBM -lm") - ;; -*) - AC_CHECK_LIB(m, main, LIBM="-lm") - ;; -esac -]) - -# AC_LIBLTDL_CONVENIENCE[(dir)] - sets LIBLTDL to the link flags for -# the libltdl convenience library and INCLTDL to the include flags for -# the libltdl header and adds --enable-ltdl-convenience to the -# configure arguments. Note that LIBLTDL and INCLTDL are not -# AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If DIR is not -# provided, it is assumed to be `libltdl'. LIBLTDL will be prefixed -# with '${top_builddir}/' and INCLTDL will be prefixed with -# '${top_srcdir}/' (note the single quotes!). If your package is not -# flat and you're not using automake, define top_builddir and -# top_srcdir appropriately in the Makefiles. -AC_DEFUN(AC_LIBLTDL_CONVENIENCE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl - case "$enable_ltdl_convenience" in - no) AC_MSG_ERROR([this package needs a convenience libltdl]) ;; - "") enable_ltdl_convenience=yes - ac_configure_args="$ac_configure_args --enable-ltdl-convenience" ;; - esac - LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdlc.la - INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) -]) - -# AC_LIBLTDL_INSTALLABLE[(dir)] - sets LIBLTDL to the link flags for -# the libltdl installable library and INCLTDL to the include flags for -# the libltdl header and adds --enable-ltdl-install to the configure -# arguments. Note that LIBLTDL and INCLTDL are not AC_SUBSTed, nor is -# AC_CONFIG_SUBDIRS called. If DIR is not provided and an installed -# libltdl is not found, it is assumed to be `libltdl'. LIBLTDL will -# be prefixed with '${top_builddir}/' and INCLTDL will be prefixed -# with '${top_srcdir}/' (note the single quotes!). If your package is -# not flat and you're not using automake, define top_builddir and -# top_srcdir appropriately in the Makefiles. -# In the future, this macro may have to be called after AC_PROG_LIBTOOL. -AC_DEFUN(AC_LIBLTDL_INSTALLABLE, [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl - AC_CHECK_LIB(ltdl, main, - [test x"$enable_ltdl_install" != xyes && enable_ltdl_install=no], - [if test x"$enable_ltdl_install" = xno; then - AC_MSG_WARN([libltdl not installed, but installation disabled]) - else - enable_ltdl_install=yes - fi - ]) - if test x"$enable_ltdl_install" = x"yes"; then - ac_configure_args="$ac_configure_args --enable-ltdl-install" - LIBLTDL='${top_builddir}/'ifelse($#,1,[$1],['libltdl'])/libltdl.la - INCLTDL='-I${top_srcdir}/'ifelse($#,1,[$1],['libltdl']) - else - ac_configure_args="$ac_configure_args --enable-ltdl-install=no" - LIBLTDL="-lltdl" - INCLTDL= - fi -]) - -dnl old names -AC_DEFUN(AM_PROG_LIBTOOL, [indir([AC_PROG_LIBTOOL])])dnl -AC_DEFUN(AM_ENABLE_SHARED, [indir([AC_ENABLE_SHARED], $@)])dnl -AC_DEFUN(AM_ENABLE_STATIC, [indir([AC_ENABLE_STATIC], $@)])dnl -AC_DEFUN(AM_DISABLE_SHARED, [indir([AC_DISABLE_SHARED], $@)])dnl -AC_DEFUN(AM_DISABLE_STATIC, [indir([AC_DISABLE_STATIC], $@)])dnl -AC_DEFUN(AM_PROG_LD, [indir([AC_PROG_LD])])dnl -AC_DEFUN(AM_PROG_NM, [indir([AC_PROG_NM])])dnl - -dnl This is just to silence aclocal about the macro not being used -ifelse([AC_DISABLE_FAST_INSTALL])dnl # Search path for a program which passes the given test. # Ulrich Drepper , 1996. diff -durpN ghfaxviewer-0.21.0/configure ghfaxviewer-0.21.1/configure --- ghfaxviewer-0.21.0/configure Wed Apr 18 15:05:08 2001 +++ ghfaxviewer-0.21.1/configure Fri Apr 27 13:53:24 2001 @@ -757,7 +757,7 @@ fi PACKAGE=ghfaxviewer -VERSION=0.21.0 +VERSION=0.21.1 if test "`cd $srcdir && pwd`" != "`pwd`" && test -f $srcdir/config.status; then { echo "configure: error: source directory already configured; run "make distclean" there first" 1>&2; exit 1; } @@ -3068,53 +3068,19 @@ echo "$ac_t""$gt_cv_func_gnugettext1_lib if test "$gt_cv_func_gnugettext1_libc" = "yes" \ || test "$gt_cv_func_gnugettext1_libintl" = "yes"; then - cat >> confdefs.h <<\EOF + cat >> confdefs.h <<\EOF #define HAVE_GETTEXT 1 EOF - # Extract the first word of "msgfmt", so it can be a program name with args. -set dummy msgfmt; ac_word=$2 -echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3079: checking for $ac_word" >&5 -if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then - echo $ac_n "(cached) $ac_c" 1>&6 -else - case "$MSGFMT" in - /*) - ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. - ;; - *) - IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" - for ac_dir in $PATH; do - test -z "$ac_dir" && ac_dir=. - if test -f $ac_dir/$ac_word; then - if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then - ac_cv_path_MSGFMT="$ac_dir/$ac_word" - break - fi - fi - done - IFS="$ac_save_ifs" - test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no" - ;; -esac -fi -MSGFMT="$ac_cv_path_MSGFMT" -if test -n "$MSGFMT"; then - echo "$ac_t""$MSGFMT" 1>&6 -else - echo "$ac_t""no" 1>&6 -fi - if test "$MSGFMT" != "no"; then - for ac_func in dcgettext + for ac_func in dcgettext do echo $ac_n "checking for $ac_func""... $ac_c" 1>&6 -echo "configure:3113: checking for $ac_func" >&5 +echo "configure:3079: 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${ac_exeext}; then +if { (eval echo configure:3107: \"$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 @@ -3161,7 +3127,41 @@ else fi done - # Extract the first word of "gmsgfmt", so it can be a program name with args. + # Extract the first word of "msgfmt", so it can be a program name with args. +set dummy msgfmt; ac_word=$2 +echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 +echo "configure:3134: checking for $ac_word" >&5 +if eval "test \"`echo '$''{'ac_cv_path_MSGFMT'+set}'`\" = set"; then + echo $ac_n "(cached) $ac_c" 1>&6 +else + case "$MSGFMT" in + /*) + ac_cv_path_MSGFMT="$MSGFMT" # Let the user override the test with a path. + ;; + *) + IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}:" + for ac_dir in $PATH; do + test -z "$ac_dir" && ac_dir=. + if test -f $ac_dir/$ac_word; then + if test -z "`$ac_dir/$ac_word -h 2>&1 | grep 'dv '`"; then + ac_cv_path_MSGFMT="$ac_dir/$ac_word" + break + fi + fi + done + IFS="$ac_save_ifs" + test -z "$ac_cv_path_MSGFMT" && ac_cv_path_MSGFMT="no" + ;; +esac +fi +MSGFMT="$ac_cv_path_MSGFMT" +if test -n "$MSGFMT"; then + echo "$ac_t""$MSGFMT" 1>&6 +else + echo "$ac_t""no" 1>&6 +fi + if test "$MSGFMT" != "no"; then + # Extract the first word of "gmsgfmt", so it can be a program name with args. set dummy gmsgfmt; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 echo "configure:3168: checking for $ac_word" >&5 @@ -3197,10 +3197,11 @@ else echo "$ac_t""no" 1>&6 fi - # Extract the first word of "xgettext", so it can be a program name with args. + fi + # Extract the first word of "xgettext", so it can be a program name with args. set dummy xgettext; ac_word=$2 echo $ac_n "checking for $ac_word""... $ac_c" 1>&6 -echo "configure:3204: checking for $ac_word" >&5 +echo "configure:3205: checking for $ac_word" >&5 if eval "test \"`echo '$''{'ac_cv_path_XGETTEXT'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else @@ -3231,12 +3232,11 @@ else echo "$ac_t""no" 1>&6 fi - CATOBJEXT=.gmo - fi - if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then - INTLLIBS="-lintl" - fi - fi + CATOBJEXT=.gmo + if test "$gt_cv_func_gnugettext1_libintl" = "yes"; then + INTLLIBS="-lintl" + fi + fi else echo "$ac_t""no" 1>&6 @@ -4822,7 +4822,7 @@ else echo "$ac_t""no" 1>&6 fi - min_gnome_print_version=0.28.0 + min_gnome_print_version=0.25.0 echo $ac_n "checking for GNOME-PRINT - version >= $min_gnome_print_version""... $ac_c" 1>&6 echo "configure:4828: checking for GNOME-PRINT - version >= $min_gnome_print_version" >&5 no_gnome_print="" @@ -7088,8 +7088,9 @@ cat >> $CONFIG_STATUS <> $CONFIG_STATUS <<\EOF test -z "$CONFIG_HEADERS" || echo timestamp > stamp-h -case " $CONFIG_FILES " in *" po/Makefile.in "* | *" po/Makefile.in:"*) +case " "$CONFIG_FILES" " in *" po/Makefile.in "* | *" po/Makefile.in:"*) sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile + ;; esac exit 0 diff -durpN ghfaxviewer-0.21.0/configure.in ghfaxviewer-0.21.1/configure.in --- ghfaxviewer-0.21.0/configure.in Wed Apr 18 14:21:00 2001 +++ ghfaxviewer-0.21.1/configure.in Fri Apr 27 12:45:49 2001 @@ -1,7 +1,7 @@ dnl Process this file with autoconf to produce a configure script. AC_INIT(src/cursors.c) AM_CONFIG_HEADER(config.h) -AM_INIT_AUTOMAKE(ghfaxviewer, 0.21.0) +AM_INIT_AUTOMAKE(ghfaxviewer, 0.21.1) AM_MAINTAINER_MODE @@ -126,7 +126,7 @@ if test "x$want_gnome" = "xyes"; then CFLAGS="$CFLAGS `gnome-config --cflags gnomeui`" LDFLAGS="$LDFLAGS `gnome-config --libs gnomeui`" USING_GNOME="yes" - AM_PATH_GNOME_PRINT(0.28.0) + AM_PATH_GNOME_PRINT(0.25.0) AM_PATH_GCONF(1.0.0,,,gconf-gtk) if test "x$no_gconf" = xyes; then AC_MSG_ERROR([You need gconf installed to compile this application for GNOME. diff -durpN ghfaxviewer-0.21.0/debian/Makefile.in ghfaxviewer-0.21.1/debian/Makefile.in --- ghfaxviewer-0.21.0/debian/Makefile.in Wed Apr 18 15:05:25 2001 +++ ghfaxviewer-0.21.1/debian/Makefile.in Fri Apr 27 17:14:53 2001 @@ -59,13 +59,11 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ -AS = @AS@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ DATADIRNAME = @DATADIRNAME@ -DLLTOOL = @DLLTOOL@ EXEEXT = @EXEEXT@ GCONF_CFLAGS = @GCONF_CFLAGS@ GCONF_CONFIG = @GCONF_CONFIG@ @@ -100,7 +98,6 @@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ LIBICONV = @LIBICONV@ LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ LPC_COMMAND = @LPC_COMMAND@ LPSTAT_COMMAND = @LPSTAT_COMMAND@ MAINT = @MAINT@ @@ -108,7 +105,6 @@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ -OBJDUMP = @OBJDUMP@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ ORBIT_CONFIG = @ORBIT_CONFIG@ ORBIT_IDL = @ORBIT_IDL@ diff -durpN ghfaxviewer-0.21.0/debian/changelog ghfaxviewer-0.21.1/debian/changelog --- ghfaxviewer-0.21.0/debian/changelog Wed Apr 18 15:02:07 2001 +++ ghfaxviewer-0.21.1/debian/changelog Fri Apr 27 17:14:10 2001 @@ -1,3 +1,18 @@ +ghfaxviewer (0.21.1-2) unstable; urgency=low + + * 0.21.1-1 was built against a bad archive. + * locale files were not correctly installed. + + -- Wolfgang Sourdeau Fri, 27 Apr 2001 17:02:39 -0400 + +ghfaxviewer (0.21.1-1) unstable; urgency=low + + * New upstream release. + * First release uploaded to the Debian machines (closes: #95485) + * We now have a manpage for ghfaxviewer + + -- Wolfgang Sourdeau Fri, 27 Apr 2001 12:35:16 -0400 + ghfaxviewer (0.21.0-1) unstable; urgency=low * New upstream release. diff -durpN ghfaxviewer-0.21.0/debian/control ghfaxviewer-0.21.1/debian/control --- ghfaxviewer-0.21.0/debian/control Wed Apr 18 15:01:44 2001 +++ ghfaxviewer-0.21.1/debian/control Wed Apr 25 16:38:37 2001 @@ -1,7 +1,7 @@ Source: ghfaxviewer Section: graphics Priority: optional -Maintainer: Wolfgang Sourdeau +Maintainer: Wolfgang Sourdeau Build-Depends: debhelper, gettext, libtiffg3-dev, libgtk1.2-dev, libgnome-dev, libgconf-dev, libgnomeprint-dev Standards-Version: 3.5.2 diff -durpN ghfaxviewer-0.21.0/debian/copyright ghfaxviewer-0.21.1/debian/copyright --- ghfaxviewer-0.21.0/debian/copyright Wed Apr 11 10:48:09 2001 +++ ghfaxviewer-0.21.1/debian/copyright Thu Apr 26 00:21:29 2001 @@ -1,7 +1,7 @@ -This package was debianized by Wolfgang Sourdeau on +This package was debianized by Wolfgang Sourdeau on Wed, 20 Sep 2000 23:49:50 -0400. -It was downloaded from nowhere at this time. +It was downloaded from ftp://ftp.gnu.org/gnu/halifax/. Copyright: @@ -9,7 +9,7 @@ GNU HaliFAX - Viewer Copyright (C) 2000, 2001 Wolfgang Sourdeau -Author: Wolfgang Sourdeau +Author: Wolfgang Sourdeau This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by diff -durpN ghfaxviewer-0.21.0/debian/rules ghfaxviewer-0.21.1/debian/rules --- ghfaxviewer-0.21.0/debian/rules Wed Apr 18 14:57:30 2001 +++ ghfaxviewer-0.21.1/debian/rules Fri Apr 27 17:13:42 2001 @@ -38,7 +38,8 @@ install-stamp: build-stamp prefix=`pwd`/debian/ghfaxviewer/usr \ sysconfdir=`pwd`/debian/ghfaxviewer/etc \ infodir=`pwd`/debian/ghfaxviewer/usr/share/info \ - mandir=`pwd`/debian/ghfaxviewer/usr/share/man + mandir=`pwd`/debian/ghfaxviewer/usr/share/man \ + datadir=`pwd`/debian/ghfaxviewer/usr/share touch install-stamp @@ -59,9 +60,9 @@ binary-arch: build install #dh_installmime #dh_installinit #dh_installcron - #dh_installman + dh_installman ghfaxviewer.1 #dh_installinfo - dh_undocumented ghfaxviewer.1.gz + #dh_undocumented ghfaxviewer.1.gz dh_installchangelogs ChangeLog dh_link dh_strip diff -durpN ghfaxviewer-0.21.0/docs/Makefile.in ghfaxviewer-0.21.1/docs/Makefile.in --- ghfaxviewer-0.21.0/docs/Makefile.in Wed Apr 18 15:05:23 2001 +++ ghfaxviewer-0.21.1/docs/Makefile.in Fri Apr 27 17:14:51 2001 @@ -59,13 +59,11 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ -AS = @AS@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ DATADIRNAME = @DATADIRNAME@ -DLLTOOL = @DLLTOOL@ EXEEXT = @EXEEXT@ GCONF_CFLAGS = @GCONF_CFLAGS@ GCONF_CONFIG = @GCONF_CONFIG@ @@ -100,7 +98,6 @@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ LIBICONV = @LIBICONV@ LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ LPC_COMMAND = @LPC_COMMAND@ LPSTAT_COMMAND = @LPSTAT_COMMAND@ MAINT = @MAINT@ @@ -108,7 +105,6 @@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ -OBJDUMP = @OBJDUMP@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ ORBIT_CONFIG = @ORBIT_CONFIG@ ORBIT_IDL = @ORBIT_IDL@ diff -durpN ghfaxviewer-0.21.0/docs/README ghfaxviewer-0.21.1/docs/README --- ghfaxviewer-0.21.0/docs/README Fri Apr 13 12:43:51 2001 +++ ghfaxviewer-0.21.1/docs/README Tue Apr 24 02:06:16 2001 @@ -55,19 +55,19 @@ Notes (Win32 only) Bug reports and discussions --------------------------- Whenever you find a bug in GNU HaliFAX, please write the most detailed -description you can have to bug-halifax@gnu.org. Just include pure +description you can have to halifax-bugs@gnu.org. Just include pure text in those messages, no .gz and no core file for example. Text diffs are ok though. For general discussion about GNU HaliFAX, you can subscribe by using your favourite free web browser pointing to -http://mail.gnu.org/mailman/listinfo/discuss-halifax +http://mail.gnu.org/mailman/listinfo/halifax-discuss otherwise, you can send send a message to -discuss-halifax-request@gnu.org with "subscribe" in the body of the +halifax-discuss-request@gnu.org with "subscribe" in the body of the message. The subject line doesn't have to be modified. If you wish to unsuscribe, do the same with the word "unsubscribe" in -the body of the message. DO NOT send it to discuss-halifax@gnu.org or +the body of the message. DO NOT send it to halifax-discuss@gnu.org or otherwise you will be flamed like you never were before. CVS diff -durpN ghfaxviewer-0.21.0/ghfaxviewer.1 ghfaxviewer-0.21.1/ghfaxviewer.1 --- ghfaxviewer-0.21.0/ghfaxviewer.1 Wed Dec 31 19:00:00 1969 +++ ghfaxviewer-0.21.1/ghfaxviewer.1 Fri Apr 27 12:54:38 2001 @@ -0,0 +1,55 @@ +.TH "ghfaxviewer" "1" "0.21.1" "Wolfgang Sourdeau" "The GNU HaliFAX Viewer" +.SH "NAME" +.LP +ghfaxviewer \- display G3/G4 (fax) encoded TIFF files +.SH "SYNTAX" +.LP +ghfaxviewer [\fIoptions\fP] <\fIfilename\fP> +.br +ghfaxviewer + +.SH "DESCRIPTION" +.LP +This program is the GNU HaliFAX project's viewer. It is able to display fax files output by the \fIHylaFAX(tm)\fP system as well as any other G3/G4\-encoded TIFF fax file. +.LP +The range of supported file\-formats will be extended in future versions. +.LP +More informations about the GNU HaliFAX project are available at the GNU HaliFAX official website: +.LP +\fBhttp://www.gnu.org/software/halifax/\fP +.SH "OPTIONS" +.LP +.TP +\fB\-\-help\fR +Output help information and exit. +.TP +\fB\-\-version\fR +Output version information and exit. +.SH "FILES" +.LP +\fI~/.gconf/apps/ghfaxviewer/*\fP on the GNOME version +.br +.SH "ENVIRONMENT VARIABLES" +.LP +.TP +\fBPRINTER\fP +Specifies the default printer. +.br +If this variable isn't set, the system default printer will be used instead. The system default printer generally is the first entry specified in /etc/printcap. +.SH "EXAMPLES" +.LP +To run this program the standard way type: +.LP +ghfaxviewer +.LP +Alternatively you can specify a filename on the command\-line: +.LP +ghfaxviewer /var/spool/fax/recvq/fax00005.tif +.SH "AUTHORS" +.LP +Wolfgang Sourdeau +.SH "SEE ALSO" +.LP +gfax(1) \- the GNU HaliFAX Sender +.br +viewfax(1) diff -durpN ghfaxviewer-0.21.0/ghfaxviewer.spec ghfaxviewer-0.21.1/ghfaxviewer.spec --- ghfaxviewer-0.21.0/ghfaxviewer.spec Wed Apr 18 15:05:19 2001 +++ ghfaxviewer-0.21.1/ghfaxviewer.spec Fri Apr 27 17:04:12 2001 @@ -1,5 +1,8 @@ # Note that this is NOT a relocatable package -%define ver 0.21.0 + +# for Mandrake, you might want to change the .gz extension to .bz2 +# for the manpage (at the end of the file) +%define ver 0.21.1 %define rel 1 %define prefix /usr @@ -11,7 +14,7 @@ Obsoletes: gfaxviewer Copyright: GPL Group: Applications/GNOME Vendor: Wolfgang Sourdeau -Source: http://www.ultim.net/~wolfgang/gnu_halifax/ghfaxviewer-%{ver}.tar.gz +Source: ftp://ftp.gnu.org/gnu/halifax/ghfaxviewer-%{ver}.tar.gz BuildRoot: /var/tmp/ghfaxviewer-%{PACKAGE_VERSION}-root @@ -38,7 +41,8 @@ make %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{prefix} -make prefix=$RPM_BUILD_ROOT%{prefix} install +make mandir=%{?buildroot:%{buildroot}}%{_mandir} install-man +%{makeinstall} %post @@ -55,3 +59,4 @@ rm -rf $RPM_BUILD_ROOT %{prefix}/share/locale/*/LC_MESSAGES/%{name}.mo %{prefix}/share/pixmaps/ghfaxviewer/* %{prefix}/share/gnome/apps/Graphics/* +%(_mandir}/man1/ghfaxviewer.1.gz diff -durpN ghfaxviewer-0.21.0/ghfaxviewer.spec.in ghfaxviewer-0.21.1/ghfaxviewer.spec.in --- ghfaxviewer-0.21.0/ghfaxviewer.spec.in Fri Apr 13 12:47:30 2001 +++ ghfaxviewer-0.21.1/ghfaxviewer.spec.in Fri Apr 27 16:07:33 2001 @@ -1,4 +1,7 @@ # Note that this is NOT a relocatable package + +# for Mandrake, you might want to change the .gz extension to .bz2 +# for the manpage (at the end of the file) %define ver @VERSION@ %define rel 1 %define prefix /usr @@ -11,7 +14,7 @@ Obsoletes: gfaxviewer Copyright: GPL Group: Applications/GNOME Vendor: Wolfgang Sourdeau -Source: http://www.ultim.net/~wolfgang/gnu_halifax/ghfaxviewer-%{ver}.tar.gz +Source: ftp://ftp.gnu.org/gnu/halifax/ghfaxviewer-%{ver}.tar.gz BuildRoot: /var/tmp/ghfaxviewer-%{PACKAGE_VERSION}-root @@ -38,7 +41,8 @@ make %install rm -rf $RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{prefix} -make prefix=$RPM_BUILD_ROOT%{prefix} install +make mandir=%{?buildroot:%{buildroot}}%{_mandir} install-man +%{makeinstall} %post @@ -55,3 +59,4 @@ rm -rf $RPM_BUILD_ROOT %{prefix}/share/locale/*/LC_MESSAGES/%{name}.mo %{prefix}/share/pixmaps/ghfaxviewer/* %{prefix}/share/gnome/apps/Graphics/* +%(_mandir}/man1/ghfaxviewer.1.gz diff -durpN ghfaxviewer-0.21.0/intl/ChangeLog ghfaxviewer-0.21.1/intl/ChangeLog --- ghfaxviewer-0.21.0/intl/ChangeLog Fri Apr 13 12:48:46 2001 +++ ghfaxviewer-0.21.1/intl/ChangeLog Fri Apr 27 13:52:56 2001 @@ -1,4 +1,4 @@ -2001-03-09 GNU +2001-04-19 GNU - * Version 0.10.36 released. + * Version 0.10.37 released. diff -durpN ghfaxviewer-0.21.0/intl/Makefile.in ghfaxviewer-0.21.1/intl/Makefile.in --- ghfaxviewer-0.21.0/intl/Makefile.in Fri Apr 13 12:48:47 2001 +++ ghfaxviewer-0.21.1/intl/Makefile.in Fri Apr 27 13:52:57 2001 @@ -28,11 +28,11 @@ VPATH = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ transform = @program_transform_name@ -libdir = $(exec_prefix)/lib -includedir = $(prefix)/include -datadir = $(prefix)/share +libdir = @libdir@ +includedir = @includedir@ +datadir = @datadir@ localedir = $(datadir)/locale -gettextsrcdir = @datadir@/gettext/intl +gettextsrcdir = $(datadir)/gettext/intl aliaspath = $(localedir) subdir = intl @@ -83,7 +83,7 @@ DISTFILES.obsolete = xopen-msg.sed linux # Maintainers of other packages that include the intl directory must *not* # change these values. LTV_CURRENT=1 -LTV_REVISION=0 +LTV_REVISION=1 LTV_AGE=0 .SUFFIXES: diff -durpN ghfaxviewer-0.21.0/intl/VERSION ghfaxviewer-0.21.1/intl/VERSION --- ghfaxviewer-0.21.0/intl/VERSION Fri Apr 13 12:48:47 2001 +++ ghfaxviewer-0.21.1/intl/VERSION Fri Apr 27 13:52:57 2001 @@ -1 +1 @@ -GNU gettext library from gettext-0.10.36 +GNU gettext library from gettext-0.10.37 diff -durpN ghfaxviewer-0.21.0/intl/bindtextdom.c ghfaxviewer-0.21.1/intl/bindtextdom.c --- ghfaxviewer-0.21.0/intl/bindtextdom.c Fri Apr 13 12:48:46 2001 +++ ghfaxviewer-0.21.1/intl/bindtextdom.c Fri Apr 27 13:52:57 2001 @@ -202,6 +202,7 @@ set_binding_values (domainname, dirnamep free (binding->codeset); binding->codeset = result; + binding->codeset_cntr++; modified = 1; } } @@ -265,6 +266,8 @@ set_binding_values (domainname, dirnamep /* The default value. */ new_binding->dirname = (char *) _nl_default_dirname; + new_binding->codeset_cntr = 0; + if (codesetp) { const char *codeset = *codesetp; @@ -285,6 +288,7 @@ set_binding_values (domainname, dirnamep memcpy (result, codeset, len); #endif codeset = result; + new_binding->codeset_cntr++; } *codesetp = codeset; new_binding->codeset = (char *) codeset; diff -durpN ghfaxviewer-0.21.0/intl/dcigettext.c ghfaxviewer-0.21.1/intl/dcigettext.c --- ghfaxviewer-0.21.0/intl/dcigettext.c Fri Apr 13 12:48:47 2001 +++ ghfaxviewer-0.21.1/intl/dcigettext.c Fri Apr 27 13:52:57 2001 @@ -203,7 +203,7 @@ static void *mempcpy PARAMS ((void *dest However it does not specify the exact format. Neither do SUSV2 and ISO C 99. So we can use this feature only on selected systems (e.g. those using GNU C Library). */ -#ifdef _LIBC +#if defined _LIBC || (defined __GNU_LIBRARY__ && __GNU_LIBRARY__ >= 2) # define HAVE_LOCALE_NULL #endif @@ -584,7 +584,7 @@ DCIGETTEXT (domainname, msgid1, msgid2, if (domain != NULL) { - retval = _nl_find_msg (domain, msgid1, &retlen); + retval = _nl_find_msg (domain, binding, msgid1, &retlen); if (retval == NULL) { @@ -592,8 +592,8 @@ DCIGETTEXT (domainname, msgid1, msgid2, for (cnt = 0; domain->successor[cnt] != NULL; ++cnt) { - retval = _nl_find_msg (domain->successor[cnt], msgid1, - &retlen); + retval = _nl_find_msg (domain->successor[cnt], binding, + msgid1, &retlen); if (retval != NULL) { @@ -662,8 +662,9 @@ DCIGETTEXT (domainname, msgid1, msgid2, char * internal_function -_nl_find_msg (domain_file, msgid, lengthp) +_nl_find_msg (domain_file, domainbinding, msgid, lengthp) struct loaded_l10nfile *domain_file; + struct binding *domainbinding; const char *msgid; size_t *lengthp; { @@ -673,7 +674,7 @@ _nl_find_msg (domain_file, msgid, length size_t resultlen; if (domain_file->decided == 0) - _nl_load_domain (domain_file); + _nl_load_domain (domain_file, domainbinding); if (domain_file->data == NULL) return NULL; @@ -752,6 +753,16 @@ _nl_find_msg (domain_file, msgid, length resultlen = W (domain->must_swap, domain->trans_tab[act].length) + 1; #if defined _LIBC || HAVE_ICONV + if (domain->codeset_cntr + != (domainbinding != NULL ? domainbinding->codeset_cntr : 0)) + { + /* The domain's codeset has changed through bind_textdomain_codeset() + since the message catalog was initialized or last accessed. We + have to reinitialize the converter. */ + _nl_free_domain_conv (domain); + _nl_init_domain_conv (domain_file, domain, domainbinding); + } + if ( # ifdef _LIBC domain->conv != (__gconv_t) -1 diff -durpN ghfaxviewer-0.21.0/intl/finddomain.c ghfaxviewer-0.21.1/intl/finddomain.c --- ghfaxviewer-0.21.0/intl/finddomain.c Fri Apr 13 12:48:47 2001 +++ ghfaxviewer-0.21.1/intl/finddomain.c Fri Apr 27 13:52:57 2001 @@ -89,15 +89,14 @@ _nl_find_domain (dirname, locale, domain be one data set in the list of loaded domains. */ retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname, strlen (dirname) + 1, 0, locale, NULL, NULL, - NULL, NULL, NULL, NULL, NULL, domainname, - domainbinding, 0); + NULL, NULL, NULL, NULL, NULL, domainname, 0); if (retval != NULL) { /* We know something about this locale. */ int cnt; if (retval->decided == 0) - _nl_load_domain (retval); + _nl_load_domain (retval, domainbinding); if (retval->data != NULL) return retval; @@ -105,7 +104,7 @@ _nl_find_domain (dirname, locale, domain for (cnt = 0; retval->successor[cnt] != NULL; ++cnt) { if (retval->successor[cnt]->decided == 0) - _nl_load_domain (retval->successor[cnt]); + _nl_load_domain (retval->successor[cnt], domainbinding); if (retval->successor[cnt]->data != NULL) break; @@ -146,21 +145,20 @@ _nl_find_domain (dirname, locale, domain retval = _nl_make_l10nflist (&_nl_loaded_domains, dirname, strlen (dirname) + 1, mask, language, territory, codeset, normalized_codeset, modifier, special, - sponsor, revision, domainname, domainbinding, - 1); + sponsor, revision, domainname, 1); if (retval == NULL) /* This means we are out of core. */ return NULL; if (retval->decided == 0) - _nl_load_domain (retval); + _nl_load_domain (retval, domainbinding); if (retval->data == NULL) { int cnt; for (cnt = 0; retval->successor[cnt] != NULL; ++cnt) { if (retval->successor[cnt]->decided == 0) - _nl_load_domain (retval->successor[cnt]); + _nl_load_domain (retval->successor[cnt], domainbinding); if (retval->successor[cnt]->data != NULL) break; } diff -durpN ghfaxviewer-0.21.0/intl/gettextP.h ghfaxviewer-0.21.1/intl/gettextP.h --- ghfaxviewer-0.21.0/intl/gettextP.h Fri Apr 13 12:48:47 2001 +++ ghfaxviewer-0.21.1/intl/gettextP.h Fri Apr 27 13:52:57 2001 @@ -128,6 +128,7 @@ struct loaded_domain struct string_desc *trans_tab; nls_uint32 hash_size; nls_uint32 *hash_tab; + int codeset_cntr; #ifdef _LIBC __gconv_t conv; #else @@ -155,6 +156,7 @@ struct binding { struct binding *next; char *dirname; + int codeset_cntr; /* Incremented each time codeset changes. */ char *codeset; char domainname[ZERO]; }; @@ -169,9 +171,21 @@ struct loaded_l10nfile *_nl_find_domain const char *__domainname, struct binding *__domainbinding)) internal_function; -void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain)) +void _nl_load_domain PARAMS ((struct loaded_l10nfile *__domain, + struct binding *__domainbinding)) internal_function; void _nl_unload_domain PARAMS ((struct loaded_domain *__domain)) + internal_function; +const char *_nl_init_domain_conv PARAMS ((struct loaded_l10nfile *__domain_file, + struct loaded_domain *__domain, + struct binding *__domainbinding)) + internal_function; +void _nl_free_domain_conv PARAMS ((struct loaded_domain *__domain)) + internal_function; + +char *_nl_find_msg PARAMS ((struct loaded_l10nfile *domain_file, + struct binding *domainbinding, + const char *msgid, size_t *lengthp)) internal_function; #ifdef _LIBC diff -durpN ghfaxviewer-0.21.0/intl/l10nflist.c ghfaxviewer-0.21.1/intl/l10nflist.c --- ghfaxviewer-0.21.0/intl/l10nflist.c Fri Apr 13 12:48:47 2001 +++ ghfaxviewer-0.21.1/intl/l10nflist.c Fri Apr 27 13:52:57 2001 @@ -163,7 +163,7 @@ pop (x) struct loaded_l10nfile * _nl_make_l10nflist (l10nfile_list, dirlist, dirlist_len, mask, language, territory, codeset, normalized_codeset, modifier, special, - sponsor, revision, filename, domainbinding, do_allocate) + sponsor, revision, filename, do_allocate) struct loaded_l10nfile **l10nfile_list; const char *dirlist; size_t dirlist_len; @@ -177,7 +177,6 @@ _nl_make_l10nflist (l10nfile_list, dirli const char *sponsor; const char *revision; const char *filename; - struct binding *domainbinding; int do_allocate; { char *abs_filename; @@ -298,7 +297,6 @@ _nl_make_l10nflist (l10nfile_list, dirli return NULL; retval->filename = abs_filename; - retval->domainbinding = domainbinding; retval->decided = (__argz_count (dirlist, dirlist_len) != 1 || ((mask & XPG_CODESET) != 0 && (mask & XPG_NORM_CODESET) != 0)); @@ -334,8 +332,7 @@ _nl_make_l10nflist (l10nfile_list, dirli = _nl_make_l10nflist (l10nfile_list, dir, strlen (dir) + 1, cnt, language, territory, codeset, normalized_codeset, modifier, special, - sponsor, revision, filename, domainbinding, - 1); + sponsor, revision, filename, 1); } retval->successor[entries] = NULL; diff -durpN ghfaxviewer-0.21.0/intl/loadinfo.h ghfaxviewer-0.21.1/intl/loadinfo.h --- ghfaxviewer-0.21.0/intl/loadinfo.h Fri Apr 13 12:48:47 2001 +++ ghfaxviewer-0.21.1/intl/loadinfo.h Fri Apr 27 13:52:57 2001 @@ -63,7 +63,6 @@ struct loaded_l10nfile { const char *filename; - struct binding *domainbinding; int decided; const void *data; @@ -88,8 +87,7 @@ _nl_make_l10nflist PARAMS ((struct loade const char *normalized_codeset, const char *modifier, const char *special, const char *sponsor, const char *revision, - const char *filename, - struct binding *domainbinding, int do_allocate)); + const char *filename, int do_allocate)); extern const char *_nl_expand_alias PARAMS ((const char *name)); @@ -106,10 +104,5 @@ extern int _nl_explode_name PARAMS ((cha const char **revision)); extern char *_nl_find_language PARAMS ((const char *name)); - - -extern char *_nl_find_msg PARAMS ((struct loaded_l10nfile *domain_file, - const char *msgid, size_t *lengthp)) - internal_function; #endif /* loadinfo.h */ diff -durpN ghfaxviewer-0.21.0/intl/loadmsgcat.c ghfaxviewer-0.21.1/intl/loadmsgcat.c --- ghfaxviewer-0.21.0/intl/loadmsgcat.c Fri Apr 13 12:48:47 2001 +++ ghfaxviewer-0.21.1/intl/loadmsgcat.c Fri Apr 27 13:52:57 2001 @@ -131,7 +131,7 @@ char *alloca (); cached by one of GCC's features. */ int _nl_msg_cat_cntr; -#if defined __GNUC__ \ +#if (defined __GNUC__ && !defined __APPLE_CC__) \ || (defined __STDC_VERSION__ && __STDC_VERSION__ >= 199901L) /* These structs are the constant expression for the germanic plural @@ -199,12 +199,146 @@ init_germanic_plural () #endif +/* Initialize the codeset dependent parts of an opened message catalog. + Return the header entry. */ +const char * +internal_function +_nl_init_domain_conv (domain_file, domain, domainbinding) + struct loaded_l10nfile *domain_file; + struct loaded_domain *domain; + struct binding *domainbinding; +{ + /* Find out about the character set the file is encoded with. + This can be found (in textual form) in the entry "". If this + entry does not exist or if this does not contain the `charset=' + information, we will assume the charset matches the one the + current locale and we don't have to perform any conversion. */ + char *nullentry; + size_t nullentrylen; + + /* Preinitialize fields, to avoid recursion during _nl_find_msg. */ + domain->codeset_cntr = + (domainbinding != NULL ? domainbinding->codeset_cntr : 0); +#ifdef _LIBC + domain->conv = (__gconv_t) -1; +#else +# if HAVE_ICONV + domain->conv = (iconv_t) -1; +# endif +#endif + domain->conv_tab = NULL; + + /* Get the header entry. */ + nullentry = _nl_find_msg (domain_file, domainbinding, "", &nullentrylen); + + if (nullentry != NULL) + { +#if defined _LIBC || HAVE_ICONV + const char *charsetstr; + + charsetstr = strstr (nullentry, "charset="); + if (charsetstr != NULL) + { + size_t len; + char *charset; + const char *outcharset; + + charsetstr += strlen ("charset="); + len = strcspn (charsetstr, " \t\n"); + + charset = (char *) alloca (len + 1); +# if defined _LIBC || HAVE_MEMPCPY + *((char *) mempcpy (charset, charsetstr, len)) = '\0'; +# else + memcpy (charset, charsetstr, len); + charset[len] = '\0'; +# endif + + /* The output charset should normally be determined by the + locale. But sometimes the locale is not used or not correctly + set up, so we provide a possibility for the user to override + this. Moreover, the value specified through + bind_textdomain_codeset overrides both. */ + if (domainbinding != NULL && domainbinding->codeset != NULL) + outcharset = domainbinding->codeset; + else + { + outcharset = getenv ("OUTPUT_CHARSET"); + if (outcharset == NULL || outcharset[0] == '\0') + { +# ifdef _LIBC + outcharset = (*_nl_current[LC_CTYPE])->values[_NL_ITEM_INDEX (CODESET)].string; +# else +# if HAVE_ICONV + extern const char *locale_charset (void); + outcharset = locale_charset (); +# endif +# endif + } + } + +# ifdef _LIBC + /* We always want to use transliteration. */ + outcharset = norm_add_slashes (outcharset, "TRANSLIT"); + charset = norm_add_slashes (charset, NULL); + if (__gconv_open (outcharset, charset, &domain->conv, + GCONV_AVOID_NOCONV) + != __GCONV_OK) + domain->conv = (__gconv_t) -1; +# else +# if HAVE_ICONV + /* When using GNU libiconv, we want to use transliteration. */ +# if _LIBICONV_VERSION >= 0x0105 + len = strlen (outcharset); + { + char *tmp = (char *) alloca (len + 10 + 1); + memcpy (tmp, outcharset, len); + memcpy (tmp + len, "//TRANSLIT", 10 + 1); + outcharset = tmp; + } +# endif + domain->conv = iconv_open (outcharset, charset); +# if _LIBICONV_VERSION >= 0x0105 + freea (outcharset); +# endif +# endif +# endif + + freea (charset); + } +#endif /* _LIBC || HAVE_ICONV */ + } + + return nullentry; +} + +/* Frees the codeset dependent parts of an opened message catalog. */ +void +internal_function +_nl_free_domain_conv (domain) + struct loaded_domain *domain; +{ + if (domain->conv_tab != NULL && domain->conv_tab != (char **) -1) + free (domain->conv_tab); + +#ifdef _LIBC + if (domain->conv != (__gconv_t) -1) + __gconv_close (domain->conv); +#else +# if HAVE_ICONV + if (domain->conv != (iconv_t) -1) + iconv_close (domain->conv); +# endif +#endif +} + /* Load the message catalogs specified by FILENAME. If it is no valid message catalog do nothing. */ void internal_function -_nl_load_domain (domain_file) +_nl_load_domain (domain_file, domainbinding) struct loaded_l10nfile *domain_file; + struct binding *domainbinding; { int fd; size_t size; @@ -216,12 +350,15 @@ _nl_load_domain (domain_file) struct mo_file_header *data = (struct mo_file_header *) -1; int use_mmap = 0; struct loaded_domain *domain; - char *nullentry; - size_t nullentrylen; + const char *nullentry; domain_file->decided = 1; domain_file->data = NULL; + /* Note that it would be useless to store domainbinding in domain_file + because domainbinding might be == NULL now but != NULL later (after + a call to bind_textdomain_codeset). */ + /* If the record does not represent a valid locale the FILENAME might be NULL. This can happen when according to the given specification the locale file name is different for XPG and CEN @@ -347,85 +484,10 @@ _nl_load_domain (domain_file) return; } - /* Now find out about the character set the file is encoded with. - This can be found (in textual form) in the entry "". If this - entry does not exist or if this does not contain the `charset=' - information, we will assume the charset matches the one the - current locale and we don't have to perform any conversion. */ -#ifdef _LIBC - domain->conv = (__gconv_t) -1; -#else -# if HAVE_ICONV - domain->conv = (iconv_t) -1; -# endif -#endif - domain->conv_tab = NULL; - nullentry = _nl_find_msg (domain_file, "", &nullentrylen); - if (nullentry != NULL) - { -#if defined _LIBC || HAVE_ICONV - const char *charsetstr; - - charsetstr = strstr (nullentry, "charset="); - if (charsetstr != NULL) - { - size_t len; - char *charset; - const char *outcharset; - - charsetstr += strlen ("charset="); - len = strcspn (charsetstr, " \t\n"); - - charset = (char *) alloca (len + 1); -# if defined _LIBC || HAVE_MEMPCPY - *((char *) mempcpy (charset, charsetstr, len)) = '\0'; -# else - memcpy (charset, charsetstr, len); - charset[len] = '\0'; -# endif - - /* The output charset should normally be determined by the - locale. But sometimes the locale is not used or not correctly - set up, so we provide a possibility for the user to override - this. Moreover, the value specified through - bind_textdomain_codeset overrides both. */ - if (domain_file->domainbinding != NULL - && domain_file->domainbinding->codeset != NULL) - outcharset = domain_file->domainbinding->codeset; - else - { - outcharset = getenv ("OUTPUT_CHARSET"); - if (outcharset == NULL || outcharset[0] == '\0') - { -# ifdef _LIBC - outcharset = (*_nl_current[LC_CTYPE])->values[_NL_ITEM_INDEX (CODESET)].string; -# else -# if HAVE_ICONV - extern const char *locale_charset (void); - outcharset = locale_charset (); -# endif -# endif - } - } - -# ifdef _LIBC - /* We always want to use transliteration. */ - outcharset = norm_add_slashes (outcharset, "TRANSLIT"); - charset = norm_add_slashes (charset, NULL); - if (__gconv_open (outcharset, charset, &domain->conv, - GCONV_AVOID_NOCONV) - != __GCONV_OK) - domain->conv = (__gconv_t) -1; -# else -# if HAVE_ICONV - domain->conv = iconv_open (outcharset, charset); -# endif -# endif - - freea (charset); - } -#endif /* _LIBC || HAVE_ICONV */ - } + /* Now initialize the character set converter from the character set + the file is encoded with (found in the header entry) to the domain's + specified character set or the locale's character set. */ + nullentry = _nl_init_domain_conv (domain_file, domain, domainbinding); /* Also look for a plural specification. */ if (nullentry != NULL) @@ -490,11 +552,7 @@ _nl_unload_domain (domain) if (domain->plural != &germanic_plural) __gettext_free_exp (domain->plural); - if (domain->conv_tab != NULL && domain->conv_tab != (char **) -1) - free (domain->conv_tab); - - if (domain->conv != (__gconv_t) -1) - __gconv_close (domain->conv); + _nl_free_domain_conv (domain); # ifdef _POSIX_MAPPED_FILES if (domain->use_mmap) diff -durpN ghfaxviewer-0.21.0/macros/Makefile.in ghfaxviewer-0.21.1/macros/Makefile.in --- ghfaxviewer-0.21.0/macros/Makefile.in Wed Apr 18 15:05:26 2001 +++ ghfaxviewer-0.21.1/macros/Makefile.in Fri Apr 27 17:14:53 2001 @@ -59,13 +59,11 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ -AS = @AS@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ DATADIRNAME = @DATADIRNAME@ -DLLTOOL = @DLLTOOL@ EXEEXT = @EXEEXT@ GCONF_CFLAGS = @GCONF_CFLAGS@ GCONF_CONFIG = @GCONF_CONFIG@ @@ -100,7 +98,6 @@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ LIBICONV = @LIBICONV@ LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ LPC_COMMAND = @LPC_COMMAND@ LPSTAT_COMMAND = @LPSTAT_COMMAND@ MAINT = @MAINT@ @@ -108,7 +105,6 @@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ -OBJDUMP = @OBJDUMP@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ ORBIT_CONFIG = @ORBIT_CONFIG@ ORBIT_IDL = @ORBIT_IDL@ diff -durpN ghfaxviewer-0.21.0/po/ChangeLog ghfaxviewer-0.21.1/po/ChangeLog --- ghfaxviewer-0.21.0/po/ChangeLog Fri Apr 13 12:49:07 2001 +++ ghfaxviewer-0.21.1/po/ChangeLog Fri Apr 27 13:52:57 2001 @@ -1,3 +1,18 @@ +2001-04-27 gettextize + + * Makefile.in.in: Upgrade to gettext-0.10.37. + +2001-04-27 Wolfgang Sourdeau + + * pl.po: same as below + + * zh_TW.Big5.po: same as below + + * de.po: same as below + + * fr.po: the degree sign was not an ascii character, it was + replaced with the word "degree" so that we avoid confusing gettext + 2001-04-12 Wolfgang Sourdeau * de.po: Tilman Bubeck as last translator; diff -durpN ghfaxviewer-0.21.0/po/Makefile.in.in ghfaxviewer-0.21.1/po/Makefile.in.in --- ghfaxviewer-0.21.0/po/Makefile.in.in Fri Apr 13 12:48:47 2001 +++ ghfaxviewer-0.21.1/po/Makefile.in.in Fri Apr 27 13:52:57 2001 @@ -19,9 +19,9 @@ VPATH = @srcdir@ prefix = @prefix@ exec_prefix = @exec_prefix@ -datadir = $(prefix)/share +datadir = @datadir@ localedir = $(datadir)/locale -gettextsrcdir = $(prefix)/share/gettext/po +gettextsrcdir = $(datadir)/gettext/po subdir = po INSTALL = @INSTALL@ @@ -30,7 +30,6 @@ MKINSTALLDIRS = @MKINSTALLDIRS@ mkinstalldirs = $(SHELL) `case "$(MKINSTALLDIRS)" in /*) echo "$(MKINSTALLDIRS)" ;; *) echo "$(top_builddir)/$(MKINSTALLDIRS)" ;; esac` CC = @CC@ -GENCAT = @GENCAT@ GMSGFMT = @GMSGFMT@ MSGFMT = @MSGFMT@ XGETTEXT = @XGETTEXT@ Binary files ghfaxviewer-0.21.0/po/de.gmo and ghfaxviewer-0.21.1/po/de.gmo differ diff -durpN ghfaxviewer-0.21.0/po/de.po ghfaxviewer-0.21.1/po/de.po --- ghfaxviewer-0.21.0/po/de.po Wed Apr 18 15:05:23 2001 +++ ghfaxviewer-0.21.1/po/de.po Fri Apr 27 17:14:51 2001 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gfaxviewer 0.9.8\n" -"POT-Creation-Date: 2001-04-10 11:58-0400\n" +"POT-Creation-Date: 2001-04-27 13:53-0400\n" "PO-Revision-Date: 2000-10-21 00:30-04:00\n" "Last-Translator: Tilman Bubeck \n" "Language-Team: German\n" @@ -13,142 +13,157 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8bit\n" -#: src/thumbnails.c:188 +#: src/thumbnails.c:191 #, c-format msgid "Page %d" msgstr "Seite %d" -#: src/ps_print.c:617 src/thumbnails.c:212 src/winprint.c:165 +#: src/gn_print.c:189 src/ps_print.c:643 src/thumbnails.c:215 +#: src/winprint.c:167 msgid "Please wait..." msgstr "Bitte warten..." -#: src/thumbnails.c:226 +#: src/thumbnails.c:229 #, c-format msgid "Computing index for page %d of %d..." msgstr "Berechne Index für Seite %d von %d..." -#: src/tiffimages.c:87 +#: src/tiffimages.c:89 #, c-format msgid "%s is not a G3/G4 Fax File" msgstr "%s ist keine G3/G4 Faxdatei" -#: src/tiffimages.c:91 +#: src/tiffimages.c:93 #, c-format msgid "%s is not a TIFF file" msgstr "%s ist keine TIFF Datei" -#: src/tiffimages.c:95 +#: src/tiffimages.c:97 #, c-format msgid "%s seems corrupted or incomplete" msgstr "%s ist beschädigt oder unvollständig" -#: src/tiffimages.c:99 +#: src/tiffimages.c:101 #, c-format msgid "%s could not be found" msgstr "%s konnte nicht gefunden werden" -#: src/tiffimages.c:104 +#: src/tiffimages.c:106 #, c-format msgid "permission to read %s is missing" msgstr "Keine Berechtigung zum Lesen %s" -#: src/about.c:67 src/viewer.c:264 src/viewer.c:452 src/viewer.c:457 +#: src/about.c:82 src/viewer.c:266 src/viewer.c:445 src/viewer.c:450 msgid "GNU HaliFAX - Viewer" msgstr "GNU HaliFAX - Betrachter" -#: src/menu.c:69 src/menu.c:167 src/toolbar.c:53 src/toolbar.c:164 +#: src/menu.c:70 src/menu.c:168 src/toolbar.c:69 src/toolbar.c:182 msgid "Go to previous page" msgstr "Vorherige Seite" -#: src/menu.c:63 src/menu.c:166 src/toolbar.c:59 src/toolbar.c:171 +#: src/menu.c:64 src/menu.c:167 src/toolbar.c:75 src/toolbar.c:189 msgid "Go to next page" msgstr "Nächste Seite" -#: src/menu.c:76 src/menu.c:169 src/toolbar.c:66 src/toolbar.c:180 +#: src/menu.c:77 src/menu.c:170 src/toolbar.c:82 src/toolbar.c:198 msgid "Zoom in" msgstr "Vergrößern" -#: src/menu.c:82 src/menu.c:170 src/toolbar.c:72 src/toolbar.c:187 +#: src/menu.c:83 src/menu.c:171 src/toolbar.c:88 src/toolbar.c:205 msgid "Zoom out" msgstr "Verkleinern" -#: src/menu.c:89 src/menu.c:95 src/menu.c:172 src/menu.c:174 src/toolbar.c:79 -#: src/toolbar.c:91 src/toolbar.c:196 src/toolbar.c:210 -#, fuzzy -msgid "Rotate 90" -msgstr "Um 90° im Uhrzeigersinn drehen" - -#: src/menu.c:95 src/menu.c:174 src/toolbar.c:79 src/toolbar.c:196 -#, fuzzy -msgid " counter-clockwise" +#: src/menu.c:96 src/menu.c:175 src/toolbar.c:95 src/toolbar.c:214 +msgid "Rotate 90 degrees counter-clockwise" msgstr "Um 90° im Gegenuhrzeigersinn drehen" -#: src/menu.c:101 src/menu.c:176 src/toolbar.c:85 src/toolbar.c:203 +#: src/menu.c:102 src/menu.c:177 src/toolbar.c:101 src/toolbar.c:221 msgid "Reverse image" msgstr "Seite invertieren" -#: src/menu.c:89 src/menu.c:172 src/toolbar.c:91 src/toolbar.c:210 -#, fuzzy -msgid " clockwise" +#: src/menu.c:90 src/menu.c:173 src/toolbar.c:107 src/toolbar.c:228 +msgid "Rotate 90 degrees clockwise" msgstr "Um 90° im Uhrzeigersinn drehen" -#: src/menu.c:148 src/toolbar.c:98 src/toolbar.c:219 +#: src/menu.c:149 src/toolbar.c:114 src/toolbar.c:237 msgid "Print fax" msgstr "Fax drucken" -#: src/menu.c:150 src/toolbar.c:105 src/toolbar.c:229 +#: src/menu.c:151 src/toolbar.c:121 src/toolbar.c:247 msgid "Properties..." msgstr "Eigenschaften..." -#: src/menu.c:141 src/ps_print.c:303 src/ps_print.c:314 +#: src/menu.c:142 src/ps_print.c:329 src/ps_print.c:340 msgid "File" msgstr "Datei" -#: src/menu.c:145 +#: src/menu.c:146 msgid "Open..." msgstr "Öffnen..." -#: src/about.c:174 src/info.c:327 src/menu.c:146 +#: src/about.c:189 src/info.c:327 src/menu.c:147 msgid "Close" msgstr "Schließen" -#: src/menu.c:152 +#: src/menu.c:153 msgid "Quit" msgstr "Beenden" -#: src/menu.c:162 +#: src/menu.c:163 msgid "View" msgstr "Aansicht" -#: src/menu.c:187 +#: src/menu.c:188 msgid "Settings" msgstr "Einstellungen" -#: src/menu.c:191 +#: src/menu.c:192 msgid "Preferences..." msgstr "Einstellungen..." -#: src/menu.c:201 +#: src/menu.c:202 msgid "Help" msgstr "Hilfe" -#: src/about.c:168 src/menu.c:205 +#: src/about.c:185 src/menu.c:206 msgid "About..." msgstr "Info..." -#: src/about.c:95 +#: src/about.c:47 +msgid "Copyright (C) 2000,2001 Wolfgang Sourdeau" +msgstr "" + +#: src/about.c:49 +msgid "This program displays image files received on a HylaFAX system." +msgstr "" +"Dieses Programm zeigt Bilddateien an, die von einem HylaFAX-System empfangen " +"wurden." + +#: src/about.c:51 +msgid "" +"This program is free software, you are welcome to use it, modify it and " +"redistribute it under certain conditions. See the file COPYING for further " +"informations. There is NO warranty; not even for MERCHANTABILITY or FITNESS " +"FOR A PARTICULAR PURPOSE." +msgstr "" +"Dieses Programm ist freie Software; Sie können es benutzen, verändern und " +"unter bestimmten Bedingungen weitergeben. Beachten Sie die Datei COPYING für " +"weitere Informationen. Es wird KEINE Garantie gegeben; nicht einmal für die " +"Möglichkeit des VERKAUFS oder die EIGNUNG FÜR EINEN BESTIMMTEN ZWECK." + +#: src/about.c:110 msgid "About the GNU HaliFAX - Viewer..." msgstr "Über den GNU HaliFAX - Betrachter..." -#: src/about.c:103 +#: src/about.c:118 msgid "Version :" -msgstr "" +msgstr "Version :" -#: src/about.c:106 +#: src/about.c:121 msgid "The GNU HaliFAX team :" msgstr "Das GNU HaliFAX team :" -#: src/about.c:109 +#: src/about.c:124 msgid "" "The GNU HaliFAX - Viewer was enhanced in various ways thanks to those " "people :" @@ -156,19 +171,19 @@ msgstr "" "Der GNU HaliFAX - Betrachter wurde dank der folgenden Leute vielfach " "verbessert :" -#: src/about.c:115 +#: src/about.c:130 msgid "What is the GNU HaliFAX - Viewer ?" msgstr "Was ist der GNU HaliFAX - Betrachter?" -#: src/about.c:118 +#: src/about.c:133 msgid "Copyright :" msgstr "" -#: src/about.c:121 +#: src/about.c:136 msgid "Licensing :" msgstr "Lizenz :" -#: src/about.c:137 +#: src/about.c:152 msgid "" "Thomas Bartschies, German translation\n" "Kevin Chen, Traditional Chinese translation\n" @@ -178,106 +193,106 @@ msgstr "" "Kevin Chen, Traditonnell-Chinesische Übersetzung\n" "Zbigniew Baniewski, Polnische Übersetzung" -#: src/info.c:47 +#: src/info.c:49 msgid "this fax is clean" msgstr "dieses FAX is sauber" -#: src/info.c:50 +#: src/info.c:52 msgid "some lines have been regenerated" msgstr "einige Zeilen wurden neu erzeugt" -#: src/info.c:53 +#: src/info.c:55 msgid "this fax is not clean" msgstr "dieses FAX ist nicht sauber" -#: src/info.c:56 src/info.c:82 src/info.c:108 src/info.c:149 src/info.c:184 +#: src/info.c:58 src/info.c:84 src/info.c:110 src/info.c:151 src/info.c:186 msgid "invalid data" msgstr "ungültige Daten" -#: src/info.c:73 +#: src/info.c:75 msgid "low resolution (204 dpi x 98 dpi)" msgstr "niedere Auflösung (204 dpi x 98 dpi)" -#: src/info.c:76 +#: src/info.c:78 msgid "high resolution (204 dpi x 196 dpi)" msgstr "hohe Auflösung (204 dpi x 196 dpi)" -#: src/info.c:79 +#: src/info.c:81 msgid "strange resolution" msgstr "seltsame Auflösung" -#: src/info.c:105 +#: src/info.c:107 msgid "strange compression type" msgstr "seltsame Komressionsart" -#: src/info.c:153 +#: src/info.c:155 msgid "2D encoding" msgstr "2D-Kodierung" -#: src/info.c:156 +#: src/info.c:158 msgid "uncompressed" msgstr "unkomprimiert" -#: src/info.c:159 +#: src/info.c:161 msgid "fill bits" msgstr "Bits füllen" -#: src/info.c:178 +#: src/info.c:180 msgid "least to most significant bit (big endian)" msgstr "nieder- zum höchstwertigsten Bit (Big-Endian)" -#: src/info.c:181 +#: src/info.c:183 msgid "most to least significant bit (little endian)" msgstr "höchst- zum niederwertigsten Bit (Little-Endian)" #. label = gtk_label_new (_("Fax properties")); #. gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); #. gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 0, 1); -#: src/info.c:230 +#: src/info.c:232 msgid "Sender ID" msgstr "Absender ID" -#: src/info.c:233 +#: src/info.c:235 msgid "Destination subaddress" msgstr "Empfänger Subadresse" -#: src/info.c:236 +#: src/info.c:238 msgid "Date & time of reception" msgstr "Datum & Uhrzeit des Empfangs" -#: src/info.c:239 +#: src/info.c:241 msgid "Fax data cleanliness" msgstr "FAX-Daten Sauberkeit" -#: src/info.c:242 +#: src/info.c:244 msgid "Resolution" msgstr "Resolution" -#: src/info.c:245 +#: src/info.c:247 msgid "Compression type" msgstr "Kompressionsart" -#: src/info.c:248 +#: src/info.c:250 msgid "G3/G4 Options" msgstr "G3/G4 Optionen" -#: src/info.c:251 +#: src/info.c:253 msgid "Pixel fill order" msgstr "Pixel-Füllrichtung" -#: src/info.c:254 +#: src/info.c:256 msgid "Make and model of receiving fax" msgstr "Hersteller und Modell des empfangenen Faxes" -#: src/info.c:257 +#: src/info.c:259 msgid "Software" msgstr "Software" -#: src/info.c:260 +#: src/info.c:262 msgid "Receiving computer hostname" msgstr "Empfange Computer-Name" -#: src/info.c:318 +#: src/info.c:320 msgid "Fax properties" msgstr "FAX Eigenschaften" @@ -285,11 +300,11 @@ msgstr "FAX Eigenschaften" msgid "Please choose a FAX G3 file to open..." msgstr "Bitte wählen Sie eine FAX G3 Datei zum öffnen..." -#: src/errors.c:130 +#: src/errors.c:112 msgid "Something strange happened..." msgstr "Etwas Seltsames ist geschehen..." -#: src/errors.c:132 +#: src/errors.c:114 #, c-format msgid "" "The specified file, %s, could not be opened\n" @@ -300,77 +315,73 @@ msgstr "" "weil %s.\n" "Bitte korrigieren und noch einmal versuchen." -#: src/errors.c:136 +#: src/errors.c:118 msgid "I am sorry" msgstr "Es tut mir leid" -#: src/progress.c:56 -msgid "Processing" -msgstr "Verarbeitung läuft" - -#: src/progress.c:73 src/ps_print.c:914 +#: src/progress.c:94 src/ps_print.c:940 msgid "Cancel" msgstr "Abbruch" -#: src/progress.c:188 +#: src/progress.c:216 #, c-format msgid "%s (done)" msgstr "%s (fertig)" -#: src/winprint.c:139 +#: src/winprint.c:141 msgid "Printer cannot display bitmaps." msgstr "Drucker kann keine Bitmaps verarbeiten." -#: src/winprint.c:140 +#: src/winprint.c:142 msgid "Device Error" msgstr "Gerätefehler" -#: src/ps_print.c:592 src/ps_print.c:594 src/winprint.c:155 +#: src/ps_print.c:618 src/ps_print.c:620 src/winprint.c:157 msgid "The GNU HaliFAX Viewer" msgstr "GNU HaliFAX Betrachter" -#: src/ps_print.c:621 src/winprint.c:174 +#: src/gn_print.c:118 src/gn_print.c:152 src/ps_print.c:647 src/winprint.c:176 #, c-format msgid "Printing page %d (%d left)" msgstr "Seite %d wird gedruckt (%d übrig)" -#: src/ps_print.c:289 +#: src/ps_print.c:315 msgid "Output to" msgstr "Ausgabe nach" -#: src/ps_print.c:298 +#: src/ps_print.c:324 msgid "Printer" msgstr "Drucker" -#: src/ps_print.c:312 +#: src/ps_print.c:338 msgid "Command" msgstr "Kommando" -#: src/ps_print.c:322 +#: src/ps_print.c:348 msgid "Fax Output.ps" msgstr "Fax Ausgabe.ps" -#: src/ps_print.c:392 +#: src/ps_print.c:418 msgid "Page selection" msgstr "Seitenauswahl" -#: src/ps_print.c:400 +#: src/ps_print.c:426 msgid "All pages" msgstr "Alle Seiten" -#: src/ps_print.c:413 +#: src/ps_print.c:439 msgid "From" msgstr "Von" -#: src/ps_print.c:435 +#: src/ps_print.c:461 msgid "to" msgstr "an" -#: src/gn_print.c:236 src/ps_print.c:452 +#: src/gn_print.c:298 src/ps_print.c:478 msgid "Current page only" msgstr "Nur die aktuelle Seite" -#: src/ps_print.c:736 +#: src/ps_print.c:762 #, c-format msgid "" "%s already exists.\n" @@ -379,53 +390,33 @@ msgstr "" "%s existiert bereits.\n" "Soll die Datei überschrieben werden?" -#: src/ps_print.c:741 +#: src/ps_print.c:767 msgid "Please answer..." msgstr "Bitte antworten Sie..." -#: src/ps_print.c:758 +#: src/ps_print.c:784 msgid "Yes, please do" msgstr "Ja, bitte ausführen" -#: src/ps_print.c:764 +#: src/ps_print.c:790 msgid "No thanks" msgstr "Nein Danke" -#: src/gn_print.c:225 src/ps_print.c:890 +#: src/gn_print.c:287 src/ps_print.c:916 msgid "Print..." msgstr "Drucke..." -#: src/ps_print.c:906 +#: src/ps_print.c:932 msgid "Print" msgstr "Druck" -#: src/gn_print.c:185 +#: src/gn_print.c:246 msgid "Print preview..." msgstr "Druckvorschau..." -#: src/gn_print.c:237 +#: src/gn_print.c:299 msgid "Range" msgstr "Bereich" -#~ msgid "Rotate 90° clockwise" -#~ msgstr "Um 90° im Uhrzeigersinn drehen" - -#~ msgid "Rotate 90° counter-clockwise" -#~ msgstr "Um 90° im Gegenuhrzeigersinn drehen" - -#~ msgid "This program displays image files received on a HylaFAX system." -#~ msgstr "" -#~ "Dieses Programm zeigt Bilddateien an, die von einem HylaFAX-System " -#~ "empfangen wurden." - -#~ msgid "" -#~ "This program is free software, you are welcome to use it, modify it and " -#~ "redistribute it under certain conditions. See the file COPYING for " -#~ "further informations. There is NO warranty; not even for MERCHANTABILITY " -#~ "or FITNESS FOR A PARTICULAR PURPOSE." -#~ msgstr "" -#~ "Dieses Programm ist freie Software; Sie können es benutzen, verändern und " -#~ "unter bestimmten Bedingungen weitergeben. Beachten Sie die Datei COPYING " -#~ "für weitere Informationen. Es wird KEINE Garantie gegeben; nicht einmal " -#~ "für die Möglichkeit des VERKAUFS oder die EIGNUNG FÜR EINEN BESTIMMTEN " -#~ "ZWECK." +#~ msgid "Processing" +#~ msgstr "Verarbeitung läuft" Binary files ghfaxviewer-0.21.0/po/fr.gmo and ghfaxviewer-0.21.1/po/fr.gmo differ diff -durpN ghfaxviewer-0.21.0/po/fr.po ghfaxviewer-0.21.1/po/fr.po --- ghfaxviewer-0.21.0/po/fr.po Wed Apr 18 15:05:23 2001 +++ ghfaxviewer-0.21.1/po/fr.po Fri Apr 27 17:14:51 2001 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gfaxviewer 0.9.9\n" -"POT-Creation-Date: 2001-04-10 11:58-0400\n" +"POT-Creation-Date: 2001-04-27 13:53-0400\n" "PO-Revision-Date: 2001-02-08 18:21-05:00\n" "Last-Translator: Wolfgang Sourdeau \n" "Language-Team: none\n" @@ -13,142 +13,158 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-1\n" "Content-Transfer-Encoding: 8-bit\n" -#: src/thumbnails.c:188 +#: src/thumbnails.c:191 #, c-format msgid "Page %d" msgstr "Page %d" -#: src/ps_print.c:617 src/thumbnails.c:212 src/winprint.c:165 +#: src/gn_print.c:189 src/ps_print.c:643 src/thumbnails.c:215 +#: src/winprint.c:167 msgid "Please wait..." msgstr "Patience, patience..." -#: src/thumbnails.c:226 +#: src/thumbnails.c:229 #, c-format msgid "Computing index for page %d of %d..." msgstr "Calcul de l'index de la page %d sur %d..." -#: src/tiffimages.c:87 +#: src/tiffimages.c:89 #, c-format msgid "%s is not a G3/G4 Fax File" msgstr "%s n'est pas un Fax G3 ni G4" -#: src/tiffimages.c:91 +#: src/tiffimages.c:93 #, c-format msgid "%s is not a TIFF file" msgstr "%s n'est pas un fichier TIFF" -#: src/tiffimages.c:95 +#: src/tiffimages.c:97 #, c-format msgid "%s seems corrupted or incomplete" msgstr "%s paraît être corrompu ou incomplet" -#: src/tiffimages.c:99 +#: src/tiffimages.c:101 #, c-format msgid "%s could not be found" msgstr "%s n'a pu être trouvé" -#: src/tiffimages.c:104 +#: src/tiffimages.c:106 #, c-format msgid "permission to read %s is missing" msgstr "la lecture du fichier %s n'est pas permise" -#: src/about.c:67 src/viewer.c:264 src/viewer.c:452 src/viewer.c:457 +#: src/about.c:82 src/viewer.c:266 src/viewer.c:445 src/viewer.c:450 msgid "GNU HaliFAX - Viewer" msgstr "GNU HaliFAX - Visionneuse" -#: src/menu.c:69 src/menu.c:167 src/toolbar.c:53 src/toolbar.c:164 +#: src/menu.c:70 src/menu.c:168 src/toolbar.c:69 src/toolbar.c:182 msgid "Go to previous page" msgstr "Page précédente" -#: src/menu.c:63 src/menu.c:166 src/toolbar.c:59 src/toolbar.c:171 +#: src/menu.c:64 src/menu.c:167 src/toolbar.c:75 src/toolbar.c:189 msgid "Go to next page" msgstr "Page suivante" -#: src/menu.c:76 src/menu.c:169 src/toolbar.c:66 src/toolbar.c:180 +#: src/menu.c:77 src/menu.c:170 src/toolbar.c:82 src/toolbar.c:198 msgid "Zoom in" msgstr "Agrandir l'image" -#: src/menu.c:82 src/menu.c:170 src/toolbar.c:72 src/toolbar.c:187 +#: src/menu.c:83 src/menu.c:171 src/toolbar.c:88 src/toolbar.c:205 msgid "Zoom out" msgstr "Retrécir l'image" -#: src/menu.c:89 src/menu.c:95 src/menu.c:172 src/menu.c:174 src/toolbar.c:79 -#: src/toolbar.c:91 src/toolbar.c:196 src/toolbar.c:210 -#, fuzzy -msgid "Rotate 90" -msgstr "Pivoter de 90° dans le sens des aiguilles d'une montre" - -#: src/menu.c:95 src/menu.c:174 src/toolbar.c:79 src/toolbar.c:196 -#, fuzzy -msgid " counter-clockwise" +#: src/menu.c:96 src/menu.c:175 src/toolbar.c:95 src/toolbar.c:214 +msgid "Rotate 90 degrees counter-clockwise" msgstr "Pivoter de 90° dans le sens contraire des aiguilles d'une montre" -#: src/menu.c:101 src/menu.c:176 src/toolbar.c:85 src/toolbar.c:203 +#: src/menu.c:102 src/menu.c:177 src/toolbar.c:101 src/toolbar.c:221 msgid "Reverse image" msgstr "Retourner l'image" -#: src/menu.c:89 src/menu.c:172 src/toolbar.c:91 src/toolbar.c:210 -#, fuzzy -msgid " clockwise" +#: src/menu.c:90 src/menu.c:173 src/toolbar.c:107 src/toolbar.c:228 +msgid "Rotate 90 degrees clockwise" msgstr "Pivoter de 90° dans le sens des aiguilles d'une montre" -#: src/menu.c:148 src/toolbar.c:98 src/toolbar.c:219 +#: src/menu.c:149 src/toolbar.c:114 src/toolbar.c:237 msgid "Print fax" msgstr "Imprimer la télécopie" -#: src/menu.c:150 src/toolbar.c:105 src/toolbar.c:229 +#: src/menu.c:151 src/toolbar.c:121 src/toolbar.c:247 msgid "Properties..." msgstr "Propriétés..." -#: src/menu.c:141 src/ps_print.c:303 src/ps_print.c:314 +#: src/menu.c:142 src/ps_print.c:329 src/ps_print.c:340 msgid "File" msgstr "Fichier" -#: src/menu.c:145 +#: src/menu.c:146 msgid "Open..." msgstr "Ouvrir..." -#: src/about.c:174 src/info.c:327 src/menu.c:146 +#: src/about.c:189 src/info.c:327 src/menu.c:147 msgid "Close" msgstr "Fermer" -#: src/menu.c:152 +#: src/menu.c:153 msgid "Quit" msgstr "Quitter" -#: src/menu.c:162 +#: src/menu.c:163 msgid "View" msgstr "Vue" -#: src/menu.c:187 +#: src/menu.c:188 msgid "Settings" msgstr "Paramètres" -#: src/menu.c:191 +#: src/menu.c:192 msgid "Preferences..." msgstr "Préférences..." -#: src/menu.c:201 +#: src/menu.c:202 msgid "Help" msgstr "Aide" -#: src/about.c:168 src/menu.c:205 +#: src/about.c:185 src/menu.c:206 msgid "About..." msgstr "À propos..." -#: src/about.c:95 +#: src/about.c:47 +msgid "Copyright (C) 2000,2001 Wolfgang Sourdeau" +msgstr "" + +#: src/about.c:49 +msgid "This program displays image files received on a HylaFAX system." +msgstr "" +"Ce programme sert à afficher des fichiers d'image reçus par un système de " +"télécopie HylaFAX." + +#: src/about.c:51 +msgid "" +"This program is free software, you are welcome to use it, modify it and " +"redistribute it under certain conditions. See the file COPYING for further " +"informations. There is NO warranty; not even for MERCHANTABILITY or FITNESS " +"FOR A PARTICULAR PURPOSE." +msgstr "" +"Ceci est un logiciel libre, vous êtes invités à l'utiliser, le modifier et " +"le redistribuer sous certaines conditions. Veuillez consulter le fichier " +"COPYING (NdT: en anglais) pour de plus amples informations. AUCUNE garantie " +"n'est donnée; tant pour des raisons COMMERÇIALES que pour RÉPONDRE À UN " +"BESOIN PARTICULIER." + +#: src/about.c:110 msgid "About the GNU HaliFAX - Viewer..." msgstr "À propos de la Visionneuse de GNU HaliFAX..." -#: src/about.c:103 +#: src/about.c:118 msgid "Version :" -msgstr "" +msgstr "Version :" -#: src/about.c:106 +#: src/about.c:121 msgid "The GNU HaliFAX team :" msgstr "L'équipe de GNU HaliFAX :" -#: src/about.c:109 +#: src/about.c:124 msgid "" "The GNU HaliFAX - Viewer was enhanced in various ways thanks to those " "people :" @@ -156,19 +172,19 @@ msgstr "" "La Visionneuse de GNU HaliFAX s'est vue améliorée de diverses manières grâce " "à ces gens :" -#: src/about.c:115 +#: src/about.c:130 msgid "What is the GNU HaliFAX - Viewer ?" msgstr "Qu'est-ce que la Visionneuse de GNU HaliFAX ?" -#: src/about.c:118 +#: src/about.c:133 msgid "Copyright :" msgstr "" -#: src/about.c:121 +#: src/about.c:136 msgid "Licensing :" msgstr "Politique de licence: " -#: src/about.c:137 +#: src/about.c:152 msgid "" "Thomas Bartschies, German translation\n" "Kevin Chen, Traditional Chinese translation\n" @@ -178,106 +194,106 @@ msgstr "" "Kevin Chen, traduction en chinois traditionnel\n" "Zbigniew Baniewski, traduction polonaise" -#: src/info.c:47 +#: src/info.c:49 msgid "this fax is clean" msgstr "cette télécopie est propre" -#: src/info.c:50 +#: src/info.c:52 msgid "some lines have been regenerated" msgstr "quelques lignes ont été regénérées" -#: src/info.c:53 +#: src/info.c:55 msgid "this fax is not clean" msgstr "cette télécopie n'est pas propre" -#: src/info.c:56 src/info.c:82 src/info.c:108 src/info.c:149 src/info.c:184 +#: src/info.c:58 src/info.c:84 src/info.c:110 src/info.c:151 src/info.c:186 msgid "invalid data" msgstr "donnée invalide" -#: src/info.c:73 +#: src/info.c:75 msgid "low resolution (204 dpi x 98 dpi)" msgstr "basse résolution (204 ppp x 98 ppp)" -#: src/info.c:76 +#: src/info.c:78 msgid "high resolution (204 dpi x 196 dpi)" msgstr "haute résolution (204 ppp x 196 ppp)" -#: src/info.c:79 +#: src/info.c:81 msgid "strange resolution" msgstr "résolution anormale" -#: src/info.c:105 +#: src/info.c:107 msgid "strange compression type" msgstr "type de compression anormal" -#: src/info.c:153 +#: src/info.c:155 msgid "2D encoding" msgstr "encodage 2D" -#: src/info.c:156 +#: src/info.c:158 msgid "uncompressed" msgstr "non-compressé" -#: src/info.c:159 +#: src/info.c:161 msgid "fill bits" msgstr "fill bits" -#: src/info.c:178 +#: src/info.c:180 msgid "least to most significant bit (big endian)" msgstr "du bit le moins significatif au plus significatif (big endian)" -#: src/info.c:181 +#: src/info.c:183 msgid "most to least significant bit (little endian)" msgstr "du bit le plus significatif au moins significatif (little endian)" #. label = gtk_label_new (_("Fax properties")); #. gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); #. gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 0, 1); -#: src/info.c:230 +#: src/info.c:232 msgid "Sender ID" msgstr "Identification de l'envoyeur" -#: src/info.c:233 +#: src/info.c:235 msgid "Destination subaddress" msgstr "Sous-adresse de destination" -#: src/info.c:236 +#: src/info.c:238 msgid "Date & time of reception" msgstr "Date & heure de réception" -#: src/info.c:239 +#: src/info.c:241 msgid "Fax data cleanliness" msgstr "Propreté des données de la télécopie" -#: src/info.c:242 +#: src/info.c:244 msgid "Resolution" msgstr "Résolution" -#: src/info.c:245 +#: src/info.c:247 msgid "Compression type" msgstr "Type de compression" -#: src/info.c:248 +#: src/info.c:250 msgid "G3/G4 Options" msgstr "Options G3 ou G4" -#: src/info.c:251 +#: src/info.c:253 msgid "Pixel fill order" msgstr "Ordre de codage des bits" -#: src/info.c:254 +#: src/info.c:256 msgid "Make and model of receiving fax" msgstr "Marque et modèle du télécopieur de réception" -#: src/info.c:257 +#: src/info.c:259 msgid "Software" msgstr "Logiciel" -#: src/info.c:260 +#: src/info.c:262 msgid "Receiving computer hostname" msgstr "Nom d'hôte de l'ordinateur de réception" -#: src/info.c:318 +#: src/info.c:320 msgid "Fax properties" msgstr "Propriétés de la télécopie" @@ -285,11 +301,11 @@ msgstr "Propriétés de la télécopie" msgid "Please choose a FAX G3 file to open..." msgstr "Veuillez choisir un fichier FAX G3 à ouvrir..." -#: src/errors.c:130 +#: src/errors.c:112 msgid "Something strange happened..." msgstr "Quelque chose a cloché..." -#: src/errors.c:132 +#: src/errors.c:114 #, c-format msgid "" "The specified file, %s, could not be opened\n" @@ -300,77 +316,73 @@ msgstr "" "%s.\n" "Veuillez y remédier et réessayer plus tard." -#: src/errors.c:136 +#: src/errors.c:118 msgid "I am sorry" msgstr "L'erreur est humaine" -#: src/progress.c:56 -msgid "Processing" -msgstr "Opération en cours" - -#: src/progress.c:73 src/ps_print.c:914 +#: src/progress.c:94 src/ps_print.c:940 msgid "Cancel" msgstr "Annuler" -#: src/progress.c:188 +#: src/progress.c:216 #, c-format msgid "%s (done)" msgstr "%s (terminé)" -#: src/winprint.c:139 +#: src/winprint.c:141 msgid "Printer cannot display bitmaps." msgstr "L'imprimante ne gère par les bitmaps" -#: src/winprint.c:140 +#: src/winprint.c:142 msgid "Device Error" msgstr "Erreur de périphérique" -#: src/ps_print.c:592 src/ps_print.c:594 src/winprint.c:155 +#: src/ps_print.c:618 src/ps_print.c:620 src/winprint.c:157 msgid "The GNU HaliFAX Viewer" msgstr "La Visionneuse de GNU HaliFAX" -#: src/ps_print.c:621 src/winprint.c:174 +#: src/gn_print.c:118 src/gn_print.c:152 src/ps_print.c:647 src/winprint.c:176 #, c-format msgid "Printing page %d (%d left)" msgstr "Impression de la page %d (%d restante)" -#: src/ps_print.c:289 +#: src/ps_print.c:315 msgid "Output to" msgstr "Direction de l'impression" -#: src/ps_print.c:298 +#: src/ps_print.c:324 msgid "Printer" msgstr "Imprimante" -#: src/ps_print.c:312 +#: src/ps_print.c:338 msgid "Command" msgstr "Commande" -#: src/ps_print.c:322 +#: src/ps_print.c:348 msgid "Fax Output.ps" msgstr "Impression Télécopie.ps" -#: src/ps_print.c:392 +#: src/ps_print.c:418 msgid "Page selection" msgstr "Sélection des pages" -#: src/ps_print.c:400 +#: src/ps_print.c:426 msgid "All pages" msgstr "Toutes les pages" -#: src/ps_print.c:413 +#: src/ps_print.c:439 msgid "From" msgstr "De" -#: src/ps_print.c:435 +#: src/ps_print.c:461 msgid "to" msgstr "à" -#: src/gn_print.c:236 src/ps_print.c:452 +#: src/gn_print.c:298 src/ps_print.c:478 msgid "Current page only" msgstr "Page actuelle" -#: src/ps_print.c:736 +#: src/ps_print.c:762 #, c-format msgid "" "%s already exists.\n" @@ -379,55 +391,33 @@ msgstr "" "%s existe déja.\n" "Voulez-vous l'écraser?" -#: src/ps_print.c:741 +#: src/ps_print.c:767 msgid "Please answer..." msgstr "Veuillez répondre..." -#: src/ps_print.c:758 +#: src/ps_print.c:784 msgid "Yes, please do" msgstr "Oui, efface-moi ça" -#: src/ps_print.c:764 +#: src/ps_print.c:790 msgid "No thanks" msgstr "Non" -#: src/gn_print.c:225 src/ps_print.c:890 +#: src/gn_print.c:287 src/ps_print.c:916 msgid "Print..." msgstr "Imprimer..." -#: src/ps_print.c:906 +#: src/ps_print.c:932 msgid "Print" msgstr "Imprimer" -#: src/gn_print.c:185 +#: src/gn_print.c:246 msgid "Print preview..." msgstr "Prévisualisation de l'impression..." -#: src/gn_print.c:237 +#: src/gn_print.c:299 msgid "Range" msgstr "Sélection" -#, fuzzy -#~ msgid "Rotate 90° clockwise" -#~ msgstr "Pivoter de 90° dans le sens des aiguilles d'une montre" - -#, fuzzy -#~ msgid "Rotate 90° counter-clockwise" -#~ msgstr "Pivoter de 90° dans le sens contraire des aiguilles d'une montre" - -#~ msgid "This program displays image files received on a HylaFAX system." -#~ msgstr "" -#~ "Ce programme sert à afficher des fichiers d'image reçus par un système de " -#~ "télécopie HylaFAX." - -#~ msgid "" -#~ "This program is free software, you are welcome to use it, modify it and " -#~ "redistribute it under certain conditions. See the file COPYING for " -#~ "further informations. There is NO warranty; not even for MERCHANTABILITY " -#~ "or FITNESS FOR A PARTICULAR PURPOSE." -#~ msgstr "" -#~ "Ceci est un logiciel libre, vous êtes invités à l'utiliser, le modifier " -#~ "et le redistribuer sous certaines conditions. Veuillez consulter le " -#~ "fichier COPYING (NdT: en anglais) pour de plus amples informations. " -#~ "AUCUNE garantie n'est donnée; tant pour des raisons COMMERÇIALES que pour " -#~ "RÉPONDRE À UN BESOIN PARTICULIER." +#~ msgid "Processing" +#~ msgstr "Opération en cours" diff -durpN ghfaxviewer-0.21.0/po/ghfaxviewer.pot ghfaxviewer-0.21.1/po/ghfaxviewer.pot --- ghfaxviewer-0.21.0/po/ghfaxviewer.pot Wed Apr 11 10:48:13 2001 +++ ghfaxviewer-0.21.1/po/ghfaxviewer.pot Fri Apr 27 13:53:59 2001 @@ -6,7 +6,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" -"POT-Creation-Date: 2001-04-10 11:58-0400\n" +"POT-Creation-Date: 2001-04-27 13:53-0400\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -14,263 +14,275 @@ msgstr "" "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8-bit\n" -#: src/thumbnails.c:188 +#: src/thumbnails.c:191 #, c-format msgid "Page %d" msgstr "" -#: src/ps_print.c:617 src/thumbnails.c:212 src/winprint.c:165 +#: src/gn_print.c:189 src/ps_print.c:643 src/thumbnails.c:215 +#: src/winprint.c:167 msgid "Please wait..." msgstr "" -#: src/thumbnails.c:226 +#: src/thumbnails.c:229 #, c-format msgid "Computing index for page %d of %d..." msgstr "" -#: src/tiffimages.c:87 +#: src/tiffimages.c:89 #, c-format msgid "%s is not a G3/G4 Fax File" msgstr "" -#: src/tiffimages.c:91 +#: src/tiffimages.c:93 #, c-format msgid "%s is not a TIFF file" msgstr "" -#: src/tiffimages.c:95 +#: src/tiffimages.c:97 #, c-format msgid "%s seems corrupted or incomplete" msgstr "" -#: src/tiffimages.c:99 +#: src/tiffimages.c:101 #, c-format msgid "%s could not be found" msgstr "" -#: src/tiffimages.c:104 +#: src/tiffimages.c:106 #, c-format msgid "permission to read %s is missing" msgstr "" -#: src/about.c:67 src/viewer.c:264 src/viewer.c:452 src/viewer.c:457 +#: src/about.c:82 src/viewer.c:266 src/viewer.c:445 src/viewer.c:450 msgid "GNU HaliFAX - Viewer" msgstr "" -#: src/menu.c:69 src/menu.c:167 src/toolbar.c:53 src/toolbar.c:164 +#: src/menu.c:70 src/menu.c:168 src/toolbar.c:69 src/toolbar.c:182 msgid "Go to previous page" msgstr "" -#: src/menu.c:63 src/menu.c:166 src/toolbar.c:59 src/toolbar.c:171 +#: src/menu.c:64 src/menu.c:167 src/toolbar.c:75 src/toolbar.c:189 msgid "Go to next page" msgstr "" -#: src/menu.c:76 src/menu.c:169 src/toolbar.c:66 src/toolbar.c:180 +#: src/menu.c:77 src/menu.c:170 src/toolbar.c:82 src/toolbar.c:198 msgid "Zoom in" msgstr "" -#: src/menu.c:82 src/menu.c:170 src/toolbar.c:72 src/toolbar.c:187 +#: src/menu.c:83 src/menu.c:171 src/toolbar.c:88 src/toolbar.c:205 msgid "Zoom out" msgstr "" -#: src/menu.c:89 src/menu.c:95 src/menu.c:172 src/menu.c:174 src/toolbar.c:79 -#: src/toolbar.c:91 src/toolbar.c:196 src/toolbar.c:210 -msgid "Rotate 90" -msgstr "" - -#: src/menu.c:95 src/menu.c:174 src/toolbar.c:79 src/toolbar.c:196 -msgid " counter-clockwise" +#: src/menu.c:96 src/menu.c:175 src/toolbar.c:95 src/toolbar.c:214 +msgid "Rotate 90 degrees counter-clockwise" msgstr "" -#: src/menu.c:101 src/menu.c:176 src/toolbar.c:85 src/toolbar.c:203 +#: src/menu.c:102 src/menu.c:177 src/toolbar.c:101 src/toolbar.c:221 msgid "Reverse image" msgstr "" -#: src/menu.c:89 src/menu.c:172 src/toolbar.c:91 src/toolbar.c:210 -msgid " clockwise" +#: src/menu.c:90 src/menu.c:173 src/toolbar.c:107 src/toolbar.c:228 +msgid "Rotate 90 degrees clockwise" msgstr "" -#: src/menu.c:148 src/toolbar.c:98 src/toolbar.c:219 +#: src/menu.c:149 src/toolbar.c:114 src/toolbar.c:237 msgid "Print fax" msgstr "" -#: src/menu.c:150 src/toolbar.c:105 src/toolbar.c:229 +#: src/menu.c:151 src/toolbar.c:121 src/toolbar.c:247 msgid "Properties..." msgstr "" -#: src/menu.c:141 src/ps_print.c:303 src/ps_print.c:314 +#: src/menu.c:142 src/ps_print.c:329 src/ps_print.c:340 msgid "File" msgstr "" -#: src/menu.c:145 +#: src/menu.c:146 msgid "Open..." msgstr "" -#: src/about.c:174 src/info.c:327 src/menu.c:146 +#: src/about.c:189 src/info.c:327 src/menu.c:147 msgid "Close" msgstr "" -#: src/menu.c:152 +#: src/menu.c:153 msgid "Quit" msgstr "" -#: src/menu.c:162 +#: src/menu.c:163 msgid "View" msgstr "" -#: src/menu.c:187 +#: src/menu.c:188 msgid "Settings" msgstr "" -#: src/menu.c:191 +#: src/menu.c:192 msgid "Preferences..." msgstr "" -#: src/menu.c:201 +#: src/menu.c:202 msgid "Help" msgstr "" -#: src/about.c:168 src/menu.c:205 +#: src/about.c:185 src/menu.c:206 msgid "About..." msgstr "" -#: src/about.c:95 +#: src/about.c:47 +msgid "Copyright (C) 2000,2001 Wolfgang Sourdeau" +msgstr "" + +#: src/about.c:49 +msgid "This program displays image files received on a HylaFAX system." +msgstr "" + +#: src/about.c:51 +msgid "" +"This program is free software, you are welcome to use it, modify it and " +"redistribute it under certain conditions. See the file COPYING for further " +"informations. There is NO warranty; not even for MERCHANTABILITY or FITNESS " +"FOR A PARTICULAR PURPOSE." +msgstr "" + +#: src/about.c:110 msgid "About the GNU HaliFAX - Viewer..." msgstr "" -#: src/about.c:103 +#: src/about.c:118 msgid "Version :" msgstr "" -#: src/about.c:106 +#: src/about.c:121 msgid "The GNU HaliFAX team :" msgstr "" -#: src/about.c:109 +#: src/about.c:124 msgid "" "The GNU HaliFAX - Viewer was enhanced in various ways thanks to those " "people :" msgstr "" -#: src/about.c:115 +#: src/about.c:130 msgid "What is the GNU HaliFAX - Viewer ?" msgstr "" -#: src/about.c:118 +#: src/about.c:133 msgid "Copyright :" msgstr "" -#: src/about.c:121 +#: src/about.c:136 msgid "Licensing :" msgstr "" -#: src/about.c:137 +#: src/about.c:152 msgid "" "Thomas Bartschies, German translation\n" "Kevin Chen, Traditional Chinese translation\n" "Zbigniew Baniewski, Polish translation" msgstr "" -#: src/info.c:47 +#: src/info.c:49 msgid "this fax is clean" msgstr "" -#: src/info.c:50 +#: src/info.c:52 msgid "some lines have been regenerated" msgstr "" -#: src/info.c:53 +#: src/info.c:55 msgid "this fax is not clean" msgstr "" -#: src/info.c:56 src/info.c:82 src/info.c:108 src/info.c:149 src/info.c:184 +#: src/info.c:58 src/info.c:84 src/info.c:110 src/info.c:151 src/info.c:186 msgid "invalid data" msgstr "" -#: src/info.c:73 +#: src/info.c:75 msgid "low resolution (204 dpi x 98 dpi)" msgstr "" -#: src/info.c:76 +#: src/info.c:78 msgid "high resolution (204 dpi x 196 dpi)" msgstr "" -#: src/info.c:79 +#: src/info.c:81 msgid "strange resolution" msgstr "" -#: src/info.c:105 +#: src/info.c:107 msgid "strange compression type" msgstr "" -#: src/info.c:153 +#: src/info.c:155 msgid "2D encoding" msgstr "" -#: src/info.c:156 +#: src/info.c:158 msgid "uncompressed" msgstr "" -#: src/info.c:159 +#: src/info.c:161 msgid "fill bits" msgstr "" -#: src/info.c:178 +#: src/info.c:180 msgid "least to most significant bit (big endian)" msgstr "" -#: src/info.c:181 +#: src/info.c:183 msgid "most to least significant bit (little endian)" msgstr "" #. label = gtk_label_new (_("Fax properties")); #. gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); #. gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 0, 1); -#: src/info.c:230 +#: src/info.c:232 msgid "Sender ID" msgstr "" -#: src/info.c:233 +#: src/info.c:235 msgid "Destination subaddress" msgstr "" -#: src/info.c:236 +#: src/info.c:238 msgid "Date & time of reception" msgstr "" -#: src/info.c:239 +#: src/info.c:241 msgid "Fax data cleanliness" msgstr "" -#: src/info.c:242 +#: src/info.c:244 msgid "Resolution" msgstr "" -#: src/info.c:245 +#: src/info.c:247 msgid "Compression type" msgstr "" -#: src/info.c:248 +#: src/info.c:250 msgid "G3/G4 Options" msgstr "" -#: src/info.c:251 +#: src/info.c:253 msgid "Pixel fill order" msgstr "" -#: src/info.c:254 +#: src/info.c:256 msgid "Make and model of receiving fax" msgstr "" -#: src/info.c:257 +#: src/info.c:259 msgid "Software" msgstr "" -#: src/info.c:260 +#: src/info.c:262 msgid "Receiving computer hostname" msgstr "" -#: src/info.c:318 +#: src/info.c:320 msgid "Fax properties" msgstr "" @@ -278,11 +290,11 @@ msgstr "" msgid "Please choose a FAX G3 file to open..." msgstr "" -#: src/errors.c:130 +#: src/errors.c:112 msgid "Something strange happened..." msgstr "" -#: src/errors.c:132 +#: src/errors.c:114 #, c-format msgid "" "The specified file, %s, could not be opened\n" @@ -290,107 +302,103 @@ msgid "" "Please fix this and try again later." msgstr "" -#: src/errors.c:136 +#: src/errors.c:118 msgid "I am sorry" msgstr "" -#: src/progress.c:56 -msgid "Processing" -msgstr "" - -#: src/progress.c:73 src/ps_print.c:914 +#: src/progress.c:94 src/ps_print.c:940 msgid "Cancel" msgstr "" -#: src/progress.c:188 +#: src/progress.c:216 #, c-format msgid "%s (done)" msgstr "" -#: src/winprint.c:139 +#: src/winprint.c:141 msgid "Printer cannot display bitmaps." msgstr "" -#: src/winprint.c:140 +#: src/winprint.c:142 msgid "Device Error" msgstr "" -#: src/ps_print.c:592 src/ps_print.c:594 src/winprint.c:155 +#: src/ps_print.c:618 src/ps_print.c:620 src/winprint.c:157 msgid "The GNU HaliFAX Viewer" msgstr "" -#: src/ps_print.c:621 src/winprint.c:174 +#: src/gn_print.c:118 src/gn_print.c:152 src/ps_print.c:647 src/winprint.c:176 #, c-format msgid "Printing page %d (%d left)" msgstr "" -#: src/ps_print.c:289 +#: src/ps_print.c:315 msgid "Output to" msgstr "" -#: src/ps_print.c:298 +#: src/ps_print.c:324 msgid "Printer" msgstr "" -#: src/ps_print.c:312 +#: src/ps_print.c:338 msgid "Command" msgstr "" -#: src/ps_print.c:322 +#: src/ps_print.c:348 msgid "Fax Output.ps" msgstr "" -#: src/ps_print.c:392 +#: src/ps_print.c:418 msgid "Page selection" msgstr "" -#: src/ps_print.c:400 +#: src/ps_print.c:426 msgid "All pages" msgstr "" -#: src/ps_print.c:413 +#: src/ps_print.c:439 msgid "From" msgstr "" -#: src/ps_print.c:435 +#: src/ps_print.c:461 msgid "to" msgstr "" -#: src/gn_print.c:236 src/ps_print.c:452 +#: src/gn_print.c:298 src/ps_print.c:478 msgid "Current page only" msgstr "" -#: src/ps_print.c:736 +#: src/ps_print.c:762 #, c-format msgid "" "%s already exists.\n" "Do you want to overwrite it?" msgstr "" -#: src/ps_print.c:741 +#: src/ps_print.c:767 msgid "Please answer..." msgstr "" -#: src/ps_print.c:758 +#: src/ps_print.c:784 msgid "Yes, please do" msgstr "" -#: src/ps_print.c:764 +#: src/ps_print.c:790 msgid "No thanks" msgstr "" -#: src/gn_print.c:225 src/ps_print.c:890 +#: src/gn_print.c:287 src/ps_print.c:916 msgid "Print..." msgstr "" -#: src/ps_print.c:906 +#: src/ps_print.c:932 msgid "Print" msgstr "" -#: src/gn_print.c:185 +#: src/gn_print.c:246 msgid "Print preview..." msgstr "" -#: src/gn_print.c:237 +#: src/gn_print.c:299 msgid "Range" msgstr "" Binary files ghfaxviewer-0.21.0/po/pl.gmo and ghfaxviewer-0.21.1/po/pl.gmo differ diff -durpN ghfaxviewer-0.21.0/po/pl.po ghfaxviewer-0.21.1/po/pl.po --- ghfaxviewer-0.21.0/po/pl.po Wed Apr 18 15:05:23 2001 +++ ghfaxviewer-0.21.1/po/pl.po Fri Apr 27 17:14:51 2001 @@ -5,7 +5,7 @@ msgid "" msgstr "" "Project-Id-Version: gfaxviewer 0.9.9\n" -"POT-Creation-Date: 2001-04-10 11:58-0400\n" +"POT-Creation-Date: 2001-04-27 13:53-0400\n" "PO-Revision-Date: 2001-02-23 20:39-05:00\n" "Last-Translator: Zbigniew Baniewski \n" "Language-Team: none\n" @@ -13,142 +13,158 @@ msgstr "" "Content-Type: text/plain; charset=iso-8859-2\n" "Content-Transfer-Encoding: 8-bit\n" -#: src/thumbnails.c:188 +#: src/thumbnails.c:191 #, c-format msgid "Page %d" msgstr "Strona %d" -#: src/ps_print.c:617 src/thumbnails.c:212 src/winprint.c:165 +#: src/gn_print.c:189 src/ps_print.c:643 src/thumbnails.c:215 +#: src/winprint.c:167 msgid "Please wait..." msgstr "Chwileczkê..." -#: src/thumbnails.c:226 +#: src/thumbnails.c:229 #, c-format msgid "Computing index for page %d of %d..." msgstr "Indeksacja strony %d z %d..." -#: src/tiffimages.c:87 +#: src/tiffimages.c:89 #, c-format msgid "%s is not a G3/G4 Fax File" msgstr "%s nie jest plikiem typu G3/G4 Fax" -#: src/tiffimages.c:91 +#: src/tiffimages.c:93 #, c-format msgid "%s is not a TIFF file" msgstr "plik graficzny %s nie ma formatu TIFF" -#: src/tiffimages.c:95 +#: src/tiffimages.c:97 #, c-format msgid "%s seems corrupted or incomplete" msgstr "%s zawiera b³êdy lub nie zosta³ odebrany w ca³o¶ci" -#: src/tiffimages.c:99 +#: src/tiffimages.c:101 #, c-format msgid "%s could not be found" msgstr "nie znaleziono pliku %s" -#: src/tiffimages.c:104 +#: src/tiffimages.c:106 #, c-format msgid "permission to read %s is missing" msgstr "brak prawa do odczytu pliku %s" -#: src/about.c:67 src/viewer.c:264 src/viewer.c:452 src/viewer.c:457 +#: src/about.c:82 src/viewer.c:266 src/viewer.c:445 src/viewer.c:450 msgid "GNU HaliFAX - Viewer" msgstr "Przegl±darka faksów GNU HaliFAX" -#: src/menu.c:69 src/menu.c:167 src/toolbar.c:53 src/toolbar.c:164 +#: src/menu.c:70 src/menu.c:168 src/toolbar.c:69 src/toolbar.c:182 msgid "Go to previous page" msgstr "Strona poprzednia" -#: src/menu.c:63 src/menu.c:166 src/toolbar.c:59 src/toolbar.c:171 +#: src/menu.c:64 src/menu.c:167 src/toolbar.c:75 src/toolbar.c:189 msgid "Go to next page" msgstr "Nastêpna strona" -#: src/menu.c:76 src/menu.c:169 src/toolbar.c:66 src/toolbar.c:180 +#: src/menu.c:77 src/menu.c:170 src/toolbar.c:82 src/toolbar.c:198 msgid "Zoom in" msgstr "Powiêkszenie" -#: src/menu.c:82 src/menu.c:170 src/toolbar.c:72 src/toolbar.c:187 +#: src/menu.c:83 src/menu.c:171 src/toolbar.c:88 src/toolbar.c:205 msgid "Zoom out" msgstr "Zmniejszenie" -#: src/menu.c:89 src/menu.c:95 src/menu.c:172 src/menu.c:174 src/toolbar.c:79 -#: src/toolbar.c:91 src/toolbar.c:196 src/toolbar.c:210 -#, fuzzy -msgid "Rotate 90" -msgstr "Obrót o 90° w prawo" - -#: src/menu.c:95 src/menu.c:174 src/toolbar.c:79 src/toolbar.c:196 -#, fuzzy -msgid " counter-clockwise" +#: src/menu.c:96 src/menu.c:175 src/toolbar.c:95 src/toolbar.c:214 +msgid "Rotate 90 degrees counter-clockwise" msgstr "Obrót o 90° w lewo" -#: src/menu.c:101 src/menu.c:176 src/toolbar.c:85 src/toolbar.c:203 +#: src/menu.c:102 src/menu.c:177 src/toolbar.c:101 src/toolbar.c:221 msgid "Reverse image" msgstr "Odwrócenie obrazu 'do góry nogami'" -#: src/menu.c:89 src/menu.c:172 src/toolbar.c:91 src/toolbar.c:210 -#, fuzzy -msgid " clockwise" +#: src/menu.c:90 src/menu.c:173 src/toolbar.c:107 src/toolbar.c:228 +msgid "Rotate 90 degrees clockwise" msgstr "Obrót o 90° w prawo" -#: src/menu.c:148 src/toolbar.c:98 src/toolbar.c:219 +#: src/menu.c:149 src/toolbar.c:114 src/toolbar.c:237 msgid "Print fax" msgstr "Wydruk faksu" -#: src/menu.c:150 src/toolbar.c:105 src/toolbar.c:229 +#: src/menu.c:151 src/toolbar.c:121 src/toolbar.c:247 msgid "Properties..." msgstr "W³a¶ciwo¶ci..." -#: src/menu.c:141 src/ps_print.c:303 src/ps_print.c:314 +#: src/menu.c:142 src/ps_print.c:329 src/ps_print.c:340 msgid "File" msgstr "Plik" -#: src/menu.c:145 +#: src/menu.c:146 msgid "Open..." msgstr "Otwórz..." -#: src/about.c:174 src/info.c:327 src/menu.c:146 +#: src/about.c:189 src/info.c:327 src/menu.c:147 msgid "Close" msgstr "Zamknij" -#: src/menu.c:152 +#: src/menu.c:153 msgid "Quit" msgstr "Koniec" -#: src/menu.c:162 +#: src/menu.c:163 msgid "View" msgstr "Widok" -#: src/menu.c:187 +#: src/menu.c:188 msgid "Settings" msgstr "Ustawienia" -#: src/menu.c:191 +#: src/menu.c:192 msgid "Preferences..." msgstr "Preferencje..." -#: src/menu.c:201 +#: src/menu.c:202 msgid "Help" msgstr "Pomoc" -#: src/about.c:168 src/menu.c:205 +#: src/about.c:185 src/menu.c:206 msgid "About..." msgstr "O programie" -#: src/about.c:95 +#: src/about.c:47 +msgid "Copyright (C) 2000,2001 Wolfgang Sourdeau" +msgstr "" + +#: src/about.c:49 +msgid "This program displays image files received on a HylaFAX system." +msgstr "" +"Niniejszy program umo¿liwia przegl±danie plików odebranych przezserwer " +"faksów HylaFAX." + +#: src/about.c:51 +msgid "" +"This program is free software, you are welcome to use it, modify it and " +"redistribute it under certain conditions. See the file COPYING for further " +"informations. There is NO warranty; not even for MERCHANTABILITY or FITNESS " +"FOR A PARTICULAR PURPOSE." +msgstr "" +"Program ten jest wolny od op³at, mo¿na go u¿ywaæ, modyfikowaæ i przekazywaæ " +"dalej dotrzymuj±c okre¶lonych zasad i warunków. Szczegó³y w pliku COPYING " +"Nie udziela siê ¿adnej gwarancji na poprawno¶æ jego dzia³ania; w " +"szczególno¶ci gdy chodzi o ZASTOSOWANIA KOMERCYJNE lub DOPASOWANIE DO ¦CI¦LE " +"OKRE¦LONEGO PRZEZNACZENIA." + +#: src/about.c:110 msgid "About the GNU HaliFAX - Viewer..." msgstr "O programie GNU HaliFAX - Viewer..." -#: src/about.c:103 +#: src/about.c:118 msgid "Version :" msgstr "Wersja :" -#: src/about.c:106 +#: src/about.c:121 msgid "The GNU HaliFAX team :" msgstr "Zespó³ rozwijaj±cy GNU HaliFAX: " -#: src/about.c:109 +#: src/about.c:124 msgid "" "The GNU HaliFAX - Viewer was enhanced in various ways thanks to those " "people :" @@ -156,19 +172,19 @@ msgstr "" "Mo¿liwo¶ci programu GNU HaliFAX - Viewer zosta³y w ró¿noraki sposób " "wzbogacone dziêki tym oto osobom :" -#: src/about.c:115 +#: src/about.c:130 msgid "What is the GNU HaliFAX - Viewer ?" msgstr "GNU HaliFAX - Viewer - co to takiego?" -#: src/about.c:118 +#: src/about.c:133 msgid "Copyright :" msgstr "" -#: src/about.c:121 +#: src/about.c:136 msgid "Licensing :" msgstr "Zasady licencjonowania :" -#: src/about.c:137 +#: src/about.c:152 msgid "" "Thomas Bartschies, German translation\n" "Kevin Chen, Traditional Chinese translation\n" @@ -178,106 +194,106 @@ msgstr "" "Kevin Chen, przek³ad na jêzyk chiñski\n" "Zbigniew Baniewski, przek³ad na jêzyk polski" -#: src/info.c:47 +#: src/info.c:49 msgid "this fax is clean" msgstr "faks odebrany bez b³êdów" -#: src/info.c:50 +#: src/info.c:52 msgid "some lines have been regenerated" msgstr "czê¶æ tre¶ci graficznej nale¿a³o odtworzyæ" -#: src/info.c:53 +#: src/info.c:55 msgid "this fax is not clean" msgstr "w trakcie odbioru odnotowano b³êdy" -#: src/info.c:56 src/info.c:82 src/info.c:108 src/info.c:149 src/info.c:184 +#: src/info.c:58 src/info.c:84 src/info.c:110 src/info.c:151 src/info.c:186 msgid "invalid data" msgstr "b³±d danych" -#: src/info.c:73 +#: src/info.c:75 msgid "low resolution (204 dpi x 98 dpi)" msgstr "niska rozdzielczo¶æ (204 dpi x 98 dpi)" -#: src/info.c:76 +#: src/info.c:78 msgid "high resolution (204 dpi x 196 dpi)" msgstr "wysoka rozdzielczo¶æ (204 dpi x 196 dpi)" -#: src/info.c:79 +#: src/info.c:81 msgid "strange resolution" msgstr "rozdzielczo¶æ nietypowa" -#: src/info.c:105 +#: src/info.c:107 msgid "strange compression type" msgstr "nietypowy rodzaj kompresji" -#: src/info.c:153 +#: src/info.c:155 msgid "2D encoding" msgstr "kodowanie 2D" -#: src/info.c:156 +#: src/info.c:158 msgid "uncompressed" msgstr "nieskomprymowany" -#: src/info.c:159 +#: src/info.c:161 msgid "fill bits" msgstr "wype³nienie bitowe" -#: src/info.c:178 +#: src/info.c:180 msgid "least to most significant bit (big endian)" msgstr "od najmniej do najbardziej znacz±cego bitu (big endian)" -#: src/info.c:181 +#: src/info.c:183 msgid "most to least significant bit (little endian)" msgstr "od najbardziej do najmniej znacz±cego bitu (little endian)" #. label = gtk_label_new (_("Fax properties")); #. gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); #. gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 0, 1); -#: src/info.c:230 +#: src/info.c:232 msgid "Sender ID" msgstr "Identyfikator nadawcy" -#: src/info.c:233 +#: src/info.c:235 msgid "Destination subaddress" msgstr "Adresat faksu" -#: src/info.c:236 +#: src/info.c:238 msgid "Date & time of reception" msgstr "Data i czas odbioru" -#: src/info.c:239 +#: src/info.c:241 msgid "Fax data cleanliness" msgstr "Jako¶æ odebranej kopii" -#: src/info.c:242 +#: src/info.c:244 msgid "Resolution" msgstr "Rozdzielczo¶æ" -#: src/info.c:245 +#: src/info.c:247 msgid "Compression type" msgstr "Rodzaj kompresji" -#: src/info.c:248 +#: src/info.c:250 msgid "G3/G4 Options" msgstr "Options G3 ou G4" -#: src/info.c:251 +#: src/info.c:253 msgid "Pixel fill order" msgstr "Opcje G3/G4" -#: src/info.c:254 +#: src/info.c:256 msgid "Make and model of receiving fax" msgstr "Marka i model faksu odbiorcy" -#: src/info.c:257 +#: src/info.c:259 msgid "Software" msgstr "Oprogramowanie" -#: src/info.c:260 +#: src/info.c:262 msgid "Receiving computer hostname" msgstr "Nazwa komputera odbiorcy" -#: src/info.c:318 +#: src/info.c:320 msgid "Fax properties" msgstr "W³a¶ciwo¶ci kopii faksowej" @@ -285,11 +301,11 @@ msgstr "W³a¶ciwo¶ci kopii faksowej" msgid "Please choose a FAX G3 file to open..." msgstr "Wska¿ plik FAX G3, który chcesz otworzyæ..." -#: src/errors.c:130 +#: src/errors.c:112 msgid "Something strange happened..." msgstr "Sta³o siê co¶ dziwnego..." -#: src/errors.c:132 +#: src/errors.c:114 #, c-format msgid "" "The specified file, %s, could not be opened\n" @@ -300,77 +316,73 @@ msgstr "" "a powodem jest %s.\n" "Usuñ problem i spróbuj ponownie." -#: src/errors.c:136 +#: src/errors.c:118 msgid "I am sorry" msgstr "Bardzo mi przykro" -#: src/progress.c:56 -msgid "Processing" -msgstr "Przetwarzanie..." - -#: src/progress.c:73 src/ps_print.c:914 +#: src/progress.c:94 src/ps_print.c:940 msgid "Cancel" msgstr "Anuluj" -#: src/progress.c:188 +#: src/progress.c:216 #, c-format msgid "%s (done)" msgstr "%s (ukoñczono)" -#: src/winprint.c:139 +#: src/winprint.c:141 msgid "Printer cannot display bitmaps." msgstr "To drukarka wy³±cznie alfanumeryczna." -#: src/winprint.c:140 +#: src/winprint.c:142 msgid "Device Error" msgstr "B³±d urz±dzenia" -#: src/ps_print.c:592 src/ps_print.c:594 src/winprint.c:155 +#: src/ps_print.c:618 src/ps_print.c:620 src/winprint.c:157 msgid "The GNU HaliFAX Viewer" msgstr "Przegl±darka plików faksowych GNU HaliFAX" -#: src/ps_print.c:621 src/winprint.c:174 +#: src/gn_print.c:118 src/gn_print.c:152 src/ps_print.c:647 src/winprint.c:176 #, c-format msgid "Printing page %d (%d left)" msgstr "Drukowanie strony %d (pozosta³o %d)" -#: src/ps_print.c:289 +#: src/ps_print.c:315 msgid "Output to" msgstr "Wydruk skierowaæ do:" -#: src/ps_print.c:298 +#: src/ps_print.c:324 msgid "Printer" msgstr "Drukarki" -#: src/ps_print.c:312 +#: src/ps_print.c:338 msgid "Command" msgstr "Polecenie" -#: src/ps_print.c:322 +#: src/ps_print.c:348 msgid "Fax Output.ps" msgstr "Odebrany_faks.ps" -#: src/ps_print.c:392 +#: src/ps_print.c:418 msgid "Page selection" msgstr "Wybór stron do druku" -#: src/ps_print.c:400 +#: src/ps_print.c:426 msgid "All pages" msgstr "Wszystkie strony" -#: src/ps_print.c:413 +#: src/ps_print.c:439 msgid "From" msgstr "Od" -#: src/ps_print.c:435 +#: src/ps_print.c:461 msgid "to" msgstr "do" -#: src/gn_print.c:236 src/ps_print.c:452 +#: src/gn_print.c:298 src/ps_print.c:478 msgid "Current page only" msgstr "Tylko bie¿±ca strona" -#: src/ps_print.c:736 +#: src/ps_print.c:762 #, c-format msgid "" "%s already exists.\n" @@ -379,55 +391,33 @@ msgstr "" "%s ju¿ istnieje.\n" "Czy chcesz go przekasowaæ?" -#: src/ps_print.c:741 +#: src/ps_print.c:767 msgid "Please answer..." msgstr "Podejmij decyzjê..." -#: src/ps_print.c:758 +#: src/ps_print.c:784 msgid "Yes, please do" msgstr "Owszem" -#: src/ps_print.c:764 +#: src/ps_print.c:790 msgid "No thanks" msgstr "Nie, jednak nie" -#: src/gn_print.c:225 src/ps_print.c:890 +#: src/gn_print.c:287 src/ps_print.c:916 msgid "Print..." msgstr "Drukujê..." -#: src/ps_print.c:906 +#: src/ps_print.c:932 msgid "Print" msgstr "Drukuj" -#: src/gn_print.c:185 +#: src/gn_print.c:246 msgid "Print preview..." msgstr "Podgl±d wydruku" -#: src/gn_print.c:237 +#: src/gn_print.c:299 msgid "Range" msgstr "Zakres" -#, fuzzy -#~ msgid "Rotate 90° clockwise" -#~ msgstr "Obrót o 90° w prawo" - -#, fuzzy -#~ msgid "Rotate 90° counter-clockwise" -#~ msgstr "Obrót o 90° w lewo" - -#~ msgid "This program displays image files received on a HylaFAX system." -#~ msgstr "" -#~ "Niniejszy program umo¿liwia przegl±danie plików odebranych przezserwer " -#~ "faksów HylaFAX." - -#~ msgid "" -#~ "This program is free software, you are welcome to use it, modify it and " -#~ "redistribute it under certain conditions. See the file COPYING for " -#~ "further informations. There is NO warranty; not even for MERCHANTABILITY " -#~ "or FITNESS FOR A PARTICULAR PURPOSE." -#~ msgstr "" -#~ "Program ten jest wolny od op³at, mo¿na go u¿ywaæ, modyfikowaæ i " -#~ "przekazywaæ dalej dotrzymuj±c okre¶lonych zasad i warunków. Szczegó³y w " -#~ "pliku COPYING Nie udziela siê ¿adnej gwarancji na poprawno¶æ jego " -#~ "dzia³ania; w szczególno¶ci gdy chodzi o ZASTOSOWANIA KOMERCYJNE lub " -#~ "DOPASOWANIE DO ¦CI¦LE OKRE¦LONEGO PRZEZNACZENIA." +#~ msgid "Processing" +#~ msgstr "Przetwarzanie..." Binary files ghfaxviewer-0.21.0/po/zh_TW.Big5.gmo and ghfaxviewer-0.21.1/po/zh_TW.Big5.gmo differ diff -durpN ghfaxviewer-0.21.0/po/zh_TW.Big5.po ghfaxviewer-0.21.1/po/zh_TW.Big5.po --- ghfaxviewer-0.21.0/po/zh_TW.Big5.po Wed Apr 11 10:48:15 2001 +++ ghfaxviewer-0.21.1/po/zh_TW.Big5.po Fri Apr 27 17:14:51 2001 @@ -2,11 +2,10 @@ # Copyright (C) 2000-2001 Wolfgang Sourdeau. # Wolfgang Sourdeau , 2000-2001. # -#, fuzzy msgid "" msgstr "" "Project-Id-Version: gfaxviewer 0.9.9\n" -"POT-Creation-Date: 2000-10-21 05:03-0400\n" +"POT-Creation-Date: 2001-04-27 13:53-0400\n" "PO-Revision-Date: 2001-02-08 18:21-05:00\n" "Last-Translator: Kevin Chen \n" "Language-Team: none\n" @@ -14,162 +13,169 @@ msgstr "" "Content-Type: text/plain; charset=big5-0\n" "Content-Transfer-Encoding: 8-bit\n" -#: src/draw_page.c:169 src/ps_print.c:577 src/thumbnails.c:133 -#: src/winprint.c:187 +#: src/thumbnails.c:191 +#, c-format +msgid "Page %d" +msgstr "²Ä %d ­¶" + +#: src/gn_print.c:189 src/ps_print.c:643 src/thumbnails.c:215 +#: src/winprint.c:167 msgid "Please wait..." msgstr "½Ðµy«á..." -#: src/thumbnails.c:163 +#: src/thumbnails.c:229 #, c-format msgid "Computing index for page %d of %d..." msgstr "­pºâ²Ä %d ¤§ %d ­¶..." -#: src/thumbnails.c:209 +#: src/tiffimages.c:89 #, c-format -msgid "Page %d" -msgstr "²Ä %d ­¶" - -#: src/tiffimages.c:119 msgid "%s is not a G3/G4 Fax File" msgstr "%s ¤£¬O G3/G4 ¶Ç¯uÀÉ®×" -#: src/tiffimages.c:120 +#: src/tiffimages.c:93 +#, c-format msgid "%s is not a TIFF file" msgstr "%s ¤£¬O¤@­Ó TIFF ÀÉ®×" -#: src/tiffimages.c:121 +#: src/tiffimages.c:97 +#, c-format msgid "%s seems corrupted or incomplete" msgstr "%s ¦ü¥G¤w¸g¯}·l©Î¬O¤£§¹¾ã" -#: src/tiffimages.c:122 +#: src/tiffimages.c:101 +#, c-format msgid "%s could not be found" msgstr "µLªk§ä¨ì %s" -#: src/tiffimages.c:123 +#: src/tiffimages.c:106 +#, c-format msgid "permission to read %s is missing" msgstr "¨S¦³Åª¨ú %s ªºÅv­­" -#: src/viewer.c:364 +#: src/about.c:82 src/viewer.c:266 src/viewer.c:445 src/viewer.c:450 +msgid "GNU HaliFAX - Viewer" +msgstr "GNU HaliFAX - ¶Ç¯u¬d¾\\¤u¨ã" + +#: src/menu.c:70 src/menu.c:168 src/toolbar.c:69 src/toolbar.c:182 msgid "Go to previous page" msgstr "¦^¤W­¶" -#: src/viewer.c:388 +#: src/menu.c:64 src/menu.c:167 src/toolbar.c:75 src/toolbar.c:189 msgid "Go to next page" msgstr "¨ì¤U­¶" -#: src/viewer.c:413 +#: src/menu.c:77 src/menu.c:170 src/toolbar.c:82 src/toolbar.c:198 msgid "Zoom in" msgstr "©ñ¤j" -#: src/viewer.c:436 +#: src/menu.c:83 src/menu.c:171 src/toolbar.c:88 src/toolbar.c:205 msgid "Zoom out" msgstr "ÁY¤p" -#: src/viewer.c:429 -msgid "Reverse image" -msgstr "¤W¤UÄA­Ë" +#: src/menu.c:96 src/menu.c:175 src/toolbar.c:95 src/toolbar.c:214 +msgid "Rotate 90 degrees counter-clockwise" +msgstr "°f®ÉÄÁ±ÛÂà 90 «×" -#: src/viewer.c:484 +#: src/menu.c:102 src/menu.c:177 src/toolbar.c:101 src/toolbar.c:221 msgid "Reverse image" msgstr "¤W¤UÄA¨ì" -#: src/viewer.c:504 -msgid "Rotate 90° clockwise" -msgstr "¶¶®ÉÄÁ±ÛÂà 90 «×" - -#: src/viewer.c:506 -msgid "Rotate 90° clockwise" +#: src/menu.c:90 src/menu.c:173 src/toolbar.c:107 src/toolbar.c:228 +msgid "Rotate 90 degrees clockwise" msgstr "¶¶®ÉÄÁ±ÛÂà 90 «×" -#: src/viewer.c:504 -msgid "Rotate 90° counter-clockwise" -msgstr "°f®ÉÄÁ±ÛÂà 90 «×" - -#: src/viewer.c:506 -msgid "Rotate 90° counter-clockwise" -msgstr "°f®ÉÄÁ±ÛÂà 90 «×" - -#: src/viewer.c:529 +#: src/menu.c:149 src/toolbar.c:114 src/toolbar.c:237 msgid "Print fax" msgstr "¦C¦L¶Ç¯u" -#: src/ps_print.c:229 src/ps_print.c:246 src/viewer.c:617 +#: src/menu.c:151 src/toolbar.c:121 src/toolbar.c:247 +msgid "Properties..." +msgstr "¯S©Ê..." + +#: src/menu.c:142 src/ps_print.c:329 src/ps_print.c:340 msgid "File" msgstr "ÀÉ®×" -#: src/viewer.c:621 +#: src/menu.c:146 msgid "Open..." msgstr "¶}±Ò..." -#: src/viewer.c:572 +#: src/about.c:189 src/info.c:327 src/menu.c:147 msgid "Close" msgstr "Ãö³¬" -#: src/viewer.c:576 -msgid "Properties..." -msgstr "¯S©Ê..." - -#: src/viewer.c:625 +#: src/menu.c:153 msgid "Quit" msgstr "Â÷¶}" -#: src/viewer.c:635 +#: src/menu.c:163 msgid "View" msgstr "Æ[¬Ý" -#: src/viewer.c:660 +#: src/menu.c:188 msgid "Settings" msgstr "³]©w" -#: src/viewer.c:664 +#: src/menu.c:192 msgid "Preferences..." msgstr "­Ó¤H³ß¦n..." -#: src/viewer.c:674 +#: src/menu.c:202 msgid "Help" msgstr "¨D§U" -#: src/viewer.c:678 +#: src/about.c:185 src/menu.c:206 msgid "About..." msgstr "Ãö©ó..." -#: src/viewer.c:683 -msgid "GNU HaliFAX - Viewer" -msgstr "GNU HaliFAX - ¶Ç¯u¬d¾\\¤u¨ã" +#: src/about.c:47 +msgid "Copyright (C) 2000,2001 Wolfgang Sourdeau" +msgstr "" -#: src/about.c:88 +#: src/about.c:49 +msgid "This program displays image files received on a HylaFAX system." +msgstr "³o­Óµ{¦¡¬O¥Î¨ÓÅã¥Ü¸g¥Ñ HylaFAX ¨t²Î©Ò±µ¦¬¨ìªº¶Ç¯u¼v¹³ÀÉ." + +#: src/about.c:51 +msgid "" +"This program is free software, you are welcome to use it, modify it and " +"redistribute it under certain conditions. See the file COPYING for further " +"informations. There is NO warranty; not even for MERCHANTABILITY or FITNESS " +"FOR A PARTICULAR PURPOSE." +msgstr "³o¬O¤@­Ó§K¶Oªº³nÅé, Åwªï¨Ï¥Î, ­×§ï, ¦³±ø¥óªº´²§G¦¹³nÅé. ½Ð¬Ý COPYING ³o­ÓÀÉ®×¥HÀò±o§ó¦h¸ê°T. ¨Ã¤£ªþ±a«OÃÒ, §ó¤£¬O¥i¾P°â©Î¬O¯S§O¥Øªºªº¾A¥Î©Ê." + +#: src/about.c:110 msgid "About the GNU HaliFAX - Viewer..." msgstr "Ãö©ó GNU HaliFAX ¶Ç¯u¬d¾\\¤u¨ã..." -#: src/about.c:95 +#: src/about.c:118 msgid "Version :" msgstr "ª©¥» :" -#: src/about.c:98 +#: src/about.c:121 msgid "The GNU HaliFAX team :" msgstr "GNU HaliFAX ¹Î¶¤:" -#: src/about.c:101 +#: src/about.c:124 msgid "" -"The GNU HaliFAX - Viewer was enhanced in various ways thanks to those" -" people :" -msgstr "" -"GNU HaliFAX ¶Ç¯u¬d¾\\¤u¨ã¦]¤U¦C¤H­ûªº§V¤O¦Ó¼W¦â¤£¤Ö, ·PÁÂ" -" °Ñ»P¤H¤h :" +"The GNU HaliFAX - Viewer was enhanced in various ways thanks to those " +"people :" +msgstr "GNU HaliFAX ¶Ç¯u¬d¾\\¤u¨ã¦]¤U¦C¤H­ûªº§V¤O¦Ó¼W¦â¤£¤Ö, ·PÁ °Ñ»P¤H¤h :" -#: src/about.c:107 +#: src/about.c:130 msgid "What is the GNU HaliFAX - Viewer ?" msgstr "GNU HaliFAX ¶Ç¯u¬d¾\\¤u¨ã¬O¤°»ò ?" -#: src/about.c:110 +#: src/about.c:133 msgid "Copyright :" msgstr "ª©Åv :" -#: src/about.c:113 +#: src/about.c:136 msgid "Licensing :" msgstr "³\\¥i : " -#: src/about.c:128 +#: src/about.c:152 msgid "" "Thomas Bartschies, German translation\n" "Kevin Chen, Traditional Chinese translation\n" @@ -179,137 +185,119 @@ msgstr "" "³¯¦°¤§, ÁcÅ餤¤å½Ķ\n" "Zbigniew Baniewski, ªiÄõ¤å½Ķ" -#: src/info.c:47 +#: src/info.c:49 msgid "this fax is clean" msgstr "¦¹«Ê¬°²M·¡ªº¶Ç¯u" -#: src/info.c:50 +#: src/info.c:52 msgid "some lines have been regenerated" msgstr "¦³¼Æ±ø½u¤w­«·s³B²z" -#: src/info.c:53 +#: src/info.c:55 msgid "this fax is not clean" msgstr "³o«Ê¶Ç¯u¨Ã¤£²M·¡" -#: src/info.c:56 src/info.c:82 src/info.c:108 src/info.c:149 src/info.c:184 +#: src/info.c:58 src/info.c:84 src/info.c:110 src/info.c:151 src/info.c:186 msgid "invalid data" msgstr "µL®Äªº¸ê®Æ" -#: src/info.c:73 +#: src/info.c:75 msgid "low resolution (204 dpi x 98 dpi)" msgstr "§C¸ÑªR«× (204 dpi x 98 dpi)" -#: src/info.c:76 +#: src/info.c:78 msgid "high resolution (204 dpi x 196 dpi)" msgstr "°ª¸ÑªR«× (204 dpi x 196 dpi)" -#: src/info.c:79 +#: src/info.c:81 msgid "strange resolution" msgstr "©_©Çªº¸ÑªR«×" -#: src/info.c:105 +#: src/info.c:107 msgid "strange compression type" msgstr "©_©ÇªºÀ£ÁY§Î¦¡" -#: src/info.c:153 +#: src/info.c:155 msgid "2D encoding" msgstr "2D ½s½X" -#: src/info.c:156 +#: src/info.c:158 msgid "uncompressed" msgstr "¸ÑÀ£ÁY" -#: src/info.c:159 +#: src/info.c:161 msgid "fill bits" msgstr "¶ñ¤J bits" -#: src/info.c:178 +#: src/info.c:180 msgid "least to most significant bit (big endian)" msgstr "¥Ñ³Ì§C¦ì¦Ü³Ì°ª¦ì (big endian)" -#: src/info.c:181 +#: src/info.c:183 msgid "most to least significant bit (little endian)" msgstr "¥Ñ³Ì°ª¦ì¦Ü³Ì§C¦ì (little endian)" -#: src/info.c:230 +#. label = gtk_label_new (_("Fax properties")); +#. gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0); +#. gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 0, 1); +#: src/info.c:232 msgid "Sender ID" msgstr "µo°eªÌªº ID" -#: src/info.c:233 +#: src/info.c:235 msgid "Destination subaddress" msgstr "¥Øªº¦aªº¤l¦a§}" -#: src/info.c:236 +#: src/info.c:238 msgid "Date & time of reception" msgstr "±µ¦¬ªº®É¶¡¤Î¤é´Á" -#: src/info.c:239 +#: src/info.c:241 msgid "Fax data cleanliness" msgstr "¶Ç¯u¸ê®Æªº²M¼ä«×" -#: src/info.c:242 +#: src/info.c:244 msgid "Resolution" msgstr "¸ÑªR«×" -#: src/info.c:245 +#: src/info.c:247 msgid "Compression type" msgstr "À£ÁY§Î¦¡" -#: src/info.c:248 +#: src/info.c:250 msgid "G3/G4 Options" msgstr "G3/G4 ¿ï¶µ" -#: src/info.c:251 +#: src/info.c:253 msgid "Pixel fill order" msgstr "¹Ï¤¸¶ñ¥R¶¶§Ç" -#: src/info.c:254 +#: src/info.c:256 msgid "Make and model of receiving fax" msgstr "­«²Õ¨Ã²£¥Í¦¬¨ìªº¶Ç¯u" -#: src/info.c:257 +#: src/info.c:259 msgid "Software" msgstr "³nÅé" -#: src/info.c:260 +#: src/info.c:262 msgid "Receiving computer hostname" msgstr "±µ¦¬¹q¸£¥D¾÷¦WºÙ" -#: src/info.c:318 +#: src/info.c:320 msgid "Fax properties" msgstr "¶Ç¯u©Ê½è" -#: src/viewer.c:743 +#: src/fileopen.c:72 msgid "Please choose a FAX G3 file to open..." msgstr "½Ð¿ï¾Ü¤@­Ó G3 ªº¶Ç¯uÀÉ®×..." -#: src/about.c:38 -msgid "" -"This program displays image files received on a HylaFAX system." -msgstr "" -"³o­Óµ{¦¡¬O¥Î¨ÓÅã¥Ü¸g¥Ñ HylaFAX ¨t²Î©Ò±µ¦¬¨ìªº¶Ç¯u¼v¹³ÀÉ." - -#: src/about.c:40 -msgid "" -"This program is free software, you" -" are welcome to use it, modify it" -" and redistribute it under certain" -" conditions. See the file COPYING" -" for further informations. There is" -" NO warranty; not even for" -" MERCHANTABILITY or FITNESS FOR A" -" PARTICULAR PURPOSE." -msgstr "" -"³o¬O¤@­Ó§K¶Oªº³nÅé, Åwªï¨Ï¥Î, ­×§ï, ¦³±ø¥óªº´²§G¦¹³nÅé." -" ½Ð¬Ý COPYING ³o­ÓÀÉ®×¥HÀò±o§ó¦h¸ê°T." -" ¨Ã¤£ªþ±a«OÃÒ, §ó¤£¬O¥i¾P°â©Î¬O¯S§O¥Øªºªº¾A¥Î©Ê." - - -#: src/errors.c:178 +#: src/errors.c:112 msgid "Something strange happened..." msgstr "µo¥Í¤@¨Ç©_©Çªºª¬ªp..." -#: src/errors.c:179 +#: src/errors.c:114 +#, c-format msgid "" "The specified file, %s, could not be opened\n" "because %s.\n" @@ -319,78 +307,73 @@ msgstr "" "¦]¬° %s.\n" "½Ð³B²z¦n³o­Ó°ÝÃD¦A¸Õ¸Õ." -#: src/errors.c:182 +#: src/errors.c:118 msgid "I am sorry" msgstr "«Ü©êºp" -#: src/progress.c:53 -msgid "Processing" -msgstr "³B²z¤¤" - -#: src/ps_print.c:887 src/progress.c:69 +#: src/progress.c:94 src/ps_print.c:940 msgid "Cancel" msgstr "¨ú®ø" -#: src/progress.c:174 +#: src/progress.c:216 #, c-format msgid "%s (done)" msgstr "%s (¤w§¹¦¨)" -#: src/winprint.c:164 +#: src/winprint.c:141 msgid "Printer cannot display bitmaps." msgstr "¦Lªí¾÷µLªkÅã¥Ü bitmaps." -#: src/winprint.c:165 +#: src/winprint.c:142 msgid "Device Error" msgstr "¸Ë¸m¥X¿ù" -#: src/ps_print.c:553 src/ps_print.c:555 -#: src/winprint.c:178 +#: src/ps_print.c:618 src/ps_print.c:620 src/winprint.c:157 msgid "The GNU HaliFAX Viewer" msgstr "GNU HaliFAX ¶Ç¯u¬d¾\\¤u¨ã" -#: src/ps_print.c:581 src/winprint.c:196 +#: src/gn_print.c:118 src/gn_print.c:152 src/ps_print.c:647 src/winprint.c:176 #, c-format msgid "Printing page %d (%d left)" msgstr "¥¿¦b¦L²Ä %d ­¶ (³Ñ %d ­¶)" -#: src/ps_print.c:213 +#: src/ps_print.c:315 msgid "Output to" msgstr "¿é¥X¦Ü" -#: src/ps_print.c:222 +#: src/ps_print.c:324 msgid "Printer" msgstr "¦Lªí¾÷" -#: src/ps_print.c:242 +#: src/ps_print.c:338 msgid "Command" msgstr "«ü¥O" -#: src/ps_print.c:254 +#: src/ps_print.c:348 msgid "Fax Output.ps" msgstr "Fax ¿é¥X.ps" -#: src/ps_print.c:333 +#: src/ps_print.c:418 msgid "Page selection" msgstr "­¶­±¿ï¾Ü" -#: src/ps_print.c:344 +#: src/ps_print.c:426 msgid "All pages" msgstr "©Ò¦³­¶­±" -#: src/ps_print.c:359 +#: src/ps_print.c:439 msgid "From" msgstr "±q" -#: src/ps_print.c:388 +#: src/ps_print.c:461 msgid "to" msgstr "¨ì" -#: src/ps_print.c:410 +#: src/gn_print.c:298 src/ps_print.c:478 msgid "Current page only" msgstr "¶È¥Ø«e­¶­±" -#: src/ps_print.c:700 +#: src/ps_print.c:762 #, c-format msgid "" "%s already exists.\n" @@ -399,31 +382,33 @@ msgstr "" "%s ¤w¸g¦s¦b.\n" "±z·Q­n½Æ¼g¥H¦s¦bªºÀɮ׶Ü?" -#: src/ps_print.c:707 +#: src/ps_print.c:767 msgid "Please answer..." msgstr "½Ð¦^µª..." -#: src/ps_print.c:730 +#: src/ps_print.c:784 msgid "Yes, please do" msgstr "¬Oªº, ³Â·Ð¤F" -#: src/ps_print.c:737 +#: src/ps_print.c:790 msgid "No thanks" msgstr "ÁÂÁÂ, ¤£¥Î¤F" -#: src/ps_print.c:857 +#: src/gn_print.c:287 src/ps_print.c:916 msgid "Print..." msgstr "¦C¦L..." -#: src/ps_print.c:878 +#: src/ps_print.c:932 msgid "Print" msgstr "¦C¦L" -#: src/gn_print.c:181 +#: src/gn_print.c:246 msgid "Print preview..." msgstr "¹wÄý¦C¦L..." -#: src/gn_print.c:231 +#: src/gn_print.c:299 msgid "Range" msgstr "½d³ò" +#~ msgid "Processing" +#~ msgstr "³B²z¤¤" diff -durpN ghfaxviewer-0.21.0/src/Makefile.in ghfaxviewer-0.21.1/src/Makefile.in --- ghfaxviewer-0.21.0/src/Makefile.in Wed Apr 18 15:05:24 2001 +++ ghfaxviewer-0.21.1/src/Makefile.in Fri Apr 27 17:14:52 2001 @@ -59,13 +59,11 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ -AS = @AS@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ DATADIRNAME = @DATADIRNAME@ -DLLTOOL = @DLLTOOL@ EXEEXT = @EXEEXT@ GCONF_CFLAGS = @GCONF_CFLAGS@ GCONF_CONFIG = @GCONF_CONFIG@ @@ -100,7 +98,6 @@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ LIBICONV = @LIBICONV@ LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ LPC_COMMAND = @LPC_COMMAND@ LPSTAT_COMMAND = @LPSTAT_COMMAND@ MAINT = @MAINT@ @@ -108,7 +105,6 @@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ -OBJDUMP = @OBJDUMP@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ ORBIT_CONFIG = @ORBIT_CONFIG@ ORBIT_IDL = @ORBIT_IDL@ diff -durpN ghfaxviewer-0.21.0/src/about.c ghfaxviewer-0.21.1/src/about.c --- ghfaxviewer-0.21.0/src/about.c Sun Apr 15 00:09:53 2001 +++ ghfaxviewer-0.21.1/src/about.c Fri Apr 27 13:33:35 2001 @@ -35,32 +35,45 @@ #include "gtkutils.h" #include "i18n.h" -const gchar *copyright = -"Copyright (C) 2000,2001 Wolfgang Sourdeau"; -const gchar *description = -"This program displays image files received on a HylaFAX system."; -const gchar *licensing = -"This program is free software, you" -" are welcome to use it, modify it" -" and redistribute it under certain" -" conditions. See the file COPYING" -" for further informations. There is" -" NO warranty; not even for" -" MERCHANTABILITY or FITNESS FOR A" -" PARTICULAR PURPOSE."; +static gchar *copyright, *description, *licensing; +static gboolean i18n_initted = FALSE; + +static +void about_i18n_init () +{ + if (!i18n_initted) + { + copyright = + _("Copyright (C) 2000,2001 Wolfgang Sourdeau"); + description = + _("This program displays image files received on a HylaFAX system."); + licensing = + _("This program is free software, you" + " are welcome to use it, modify it" + " and redistribute it under certain" + " conditions. See the file COPYING" + " for further informations. There is" + " NO warranty; not even for" + " MERCHANTABILITY or FITNESS FOR A" + " PARTICULAR PURPOSE."); + i18n_initted = TRUE; + } +} #ifdef NEED_GNOMESUPPORT_H void about_cb (GtkWidget *irrelevant, gpointer viewer_window) { gchar *message; - const gchar *authors[] = {"Wolfgang Sourdeau ", + const gchar *authors[] = {"Wolfgang Sourdeau ", "George Farris", "Tilman Bubeck", "Thomas Bartschies", "Kevin Chen", "Zbigniew Baniewski", NULL}; GtkWidget *about_dialog; + about_i18n_init (); + message = g_strdup_printf ("%s %s", _(description), _(licensing)); @@ -165,23 +178,20 @@ void about_cb (GtkWidget *irrelevant, gpointer viewer_window) { DialogWindow *about_dialog; - GtkWidget *content, *button_box, *ok_button; + GtkWidget *content, *ok_button; + + about_i18n_init (); about_dialog = dialog_window_new (_("About...")); content = about_content (viewer_window); dialog_window_set_content (about_dialog, content); - button_box = gtk_hbutton_box_new (); - ok_button = gtk_button_new_with_label (_("Close")); gtk_signal_connect (GTK_OBJECT (ok_button), "clicked", dialog_window_destroy_from_signal, about_dialog); - gtk_box_pack_start (GTK_BOX (button_box), ok_button, - TRUE, FALSE, 5); - dialog_window_set_button_box (about_dialog, - GTK_HBUTTON_BOX (button_box)); + dialog_window_set_button (about_dialog, ok_button); dialog_window_show (about_dialog, GTK_WINDOW (viewer_window)); } diff -durpN ghfaxviewer-0.21.0/src/draw_page.c ghfaxviewer-0.21.1/src/draw_page.c --- ghfaxviewer-0.21.0/src/draw_page.c Sun Apr 15 00:11:00 2001 +++ ghfaxviewer-0.21.1/src/draw_page.c Fri Apr 27 01:55:11 2001 @@ -34,7 +34,7 @@ #include "viewer.h" #include "draw_page.h" #include "errors.h" -#include "progress.h" +#include "gtkutils.h" static gfloat zoom_factor[] = {0.25, 0.37, 0.50, 0.75, 1.0, 1.5, 2.0, 3.0, 4.0}; @@ -107,7 +107,6 @@ refresh_widgets (ViewerData *viewer_data { int bcounter; -#ifndef NEED_GNOMESUPPORT_H if (viewer_data->current_page->next == NULL) gtk_widget_set_sensitive(viewer_data->bb_buttons[NEXT_PAGE], FALSE); @@ -136,7 +135,6 @@ refresh_widgets (ViewerData *viewer_data gtk_widget_set_sensitive (viewer_data->bb_buttons[ZOOM_IN], TRUE); } -#endif /* NEED_GNOMESUPPORT_H */ for (bcounter = 0; bcounter < viewer_data->fax_file->nbr_pages + 1; diff -durpN ghfaxviewer-0.21.0/src/errors.c ghfaxviewer-0.21.1/src/errors.c --- ghfaxviewer-0.21.0/src/errors.c Wed Apr 11 10:48:17 2001 +++ ghfaxviewer-0.21.1/src/errors.c Fri Apr 27 03:03:38 2001 @@ -19,6 +19,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. */ +/* This file contains functions to display error messages. */ + #ifdef HAVE_CONFIG_H #include #endif @@ -28,6 +30,7 @@ #include "tiffimages.h" #include "viewer.h" +#include "gtkutils.h" /* static gchar* */ /* list_to_text (GSList *string_list) */ @@ -71,59 +74,38 @@ /* return ret_str; */ /* } */ -static gint -fail_win_destroy_cb (GtkWidget* window, gpointer null) -{ - decrease_win_count (); - - return FALSE; -} - static void -display_failure (gchar *title, gchar *message, gchar *but_text) +display_failure (GtkWidget *window, + gchar *title, gchar *message, gchar *but_text) { - GtkWidget *fail_window, *vbox, *msg_lbl, *ok_but; - - fail_window = gtk_window_new (GTK_WINDOW_DIALOG); - gtk_window_set_modal (GTK_WINDOW (fail_window), TRUE); - gtk_window_set_title (GTK_WINDOW (fail_window), title); - gtk_window_set_policy (GTK_WINDOW (fail_window), - FALSE, FALSE, TRUE); + DialogWindow *fail_window; + GtkWidget *vbox, *msg_lbl, *ok_but; - gtk_container_set_border_width (GTK_CONTAINER (fail_window), - 10); + fail_window = dialog_window_new (title); vbox = gtk_vbox_new (FALSE, 5); - gtk_container_add (GTK_CONTAINER (fail_window), vbox); - gtk_widget_show (vbox); + gtk_container_set_border_width (GTK_CONTAINER (vbox), 5); msg_lbl = gtk_label_new (message); gtk_label_set_justify (GTK_LABEL (msg_lbl), GTK_JUSTIFY_LEFT); gtk_box_pack_start (GTK_BOX (vbox), msg_lbl, FALSE, FALSE, 0); - gtk_widget_show (msg_lbl); - ok_but = gtk_button_new_with_label (but_text); - gtk_box_pack_start (GTK_BOX (vbox), ok_but, - FALSE, FALSE, 2); - - gtk_signal_connect_object (GTK_OBJECT (ok_but), "clicked", - GTK_SIGNAL_FUNC - (gtk_widget_destroy), - GTK_OBJECT (fail_window)); - gtk_widget_show (ok_but); + ok_but = gtk_button_new_with_label (but_text); + gtk_signal_connect (GTK_OBJECT (ok_but), "clicked", + dialog_window_destroy_from_signal, + fail_window); - increase_win_count (); - gtk_signal_connect (GTK_OBJECT (fail_window), "destroy", - GTK_SIGNAL_FUNC (fail_win_destroy_cb), - NULL); + dialog_window_set_content (fail_window, vbox); + dialog_window_set_button (fail_window, ok_but); - gtk_widget_show (fail_window); + dialog_window_show (fail_window, + GTK_WINDOW (window)); } static void -error_dialog (gchar *file_name, gchar *error_string) +error_dialog (GtkWidget *window, gchar *file_name, gchar *error_string) { gchar *title, *message, *but_text; @@ -135,15 +117,15 @@ error_dialog (gchar *file_name, gchar *e file_name, error_string);; but_text = _("I am sorry"); - display_failure (title, message, but_text); + display_failure (window, title, message, but_text); } void -file_open_error (gchar *file_name) +file_open_error (GtkWidget *window, gchar *file_name) { gchar *error_str; error_str = ti_error_string (file_name); - error_dialog (file_name, error_str); + error_dialog (window, file_name, error_str); g_free (error_str); } diff -durpN ghfaxviewer-0.21.0/src/errors.h ghfaxviewer-0.21.1/src/errors.h --- ghfaxviewer-0.21.0/src/errors.h Wed Apr 11 10:48:18 2001 +++ ghfaxviewer-0.21.1/src/errors.h Thu Apr 26 16:41:59 2001 @@ -22,6 +22,6 @@ #ifndef ERRORS_H #define ERRORS_H -void file_open_error (gchar *file_name); +void file_open_error (GtkWidget *window, gchar *file_name); #endif diff -durpN ghfaxviewer-0.21.0/src/ghfaxviewer-res.rc ghfaxviewer-0.21.1/src/ghfaxviewer-res.rc --- ghfaxviewer-0.21.0/src/ghfaxviewer-res.rc Wed Apr 18 15:05:20 2001 +++ ghfaxviewer-0.21.1/src/ghfaxviewer-res.rc Fri Apr 27 17:04:13 2001 @@ -17,7 +17,7 @@ VS_VERSION_INFO VERSIONINFO BEGIN VALUE "CompanyName", "The GNU HaliFAX team" VALUE "FileDescription", "The GNU HaliFAX - Viewer" - VALUE "FileVersion", "0.21.0" + VALUE "FileVersion", "0.21.1" VALUE "InternalName", "ghfaxviewer" VALUE "LegalCopyright", "Copyright © 2000, 2001 Wolfgang Sourdeau" VALUE "OriginalFilename", "ghfaxviewer.exe" diff -durpN ghfaxviewer-0.21.0/src/gn_print.c ghfaxviewer-0.21.1/src/gn_print.c --- ghfaxviewer-0.21.0/src/gn_print.c Sun Apr 15 00:04:00 2001 +++ ghfaxviewer-0.21.1/src/gn_print.c Fri Apr 27 03:41:16 2001 @@ -36,6 +36,7 @@ #include "tiffimages.h" #include "zoom.h" #include "viewer.h" +#include "progress.h" #include "gtkutils.h" /* Damn, I hate those @@ -90,33 +91,54 @@ print_page (GnomePrintContext *context, g_free (page_name); } -static void +static gboolean send_pages_to_pc (GnomePrintContext *context, FaxFile *fax_file, gint from, gint to, - gint copies, gint collate) + gint copies, gint collate, + GfvProgressData *p_data) { FaxPage *orig_page, *gray_page; - gint page_nbr, copy_nbr; + gint page_nbr, copy_nbr, count, max_page_nbr; + gboolean aborted; + gchar *p_action; ti_set_draw_func (NULL); + aborted = FALSE; + count = 0; + max_page_nbr = copies * (to - from + 1); if (collate) for (copy_nbr = 0; copy_nbr < copies; copy_nbr++) for (page_nbr = from - 1; page_nbr < to; page_nbr++) { - orig_page = ti_seek_fax_page (fax_file, page_nbr); - ti_load_fax_page (fax_file, orig_page); - gray_page = ti_zoomed_fax_page (orig_page, - orig_page->width, - orig_page->height, - ROT_NONE); - print_page (context, fax_file, gray_page); - ti_destroy_fax_page (gray_page); - ti_unload_fax_page (orig_page); + while (!aborted) + { + count++; + p_action = g_strdup_printf (_("Printing page" + " %d (%d left)"), + count, + max_page_nbr + - count); + gfv_progress_set_action (p_data, p_action); + g_free (p_action); + + orig_page = ti_seek_fax_page (fax_file, page_nbr); + ti_load_fax_page (fax_file, orig_page); + gray_page = ti_zoomed_fax_page (orig_page, + orig_page->width, + orig_page->height, + ROT_NONE); + print_page (context, fax_file, gray_page); + ti_destroy_fax_page (gray_page); + ti_unload_fax_page (orig_page); + + aborted = gfv_progress_update_with_value (count, max_page_nbr, + 0, p_data); + } } else - for (page_nbr = from - 1; page_nbr < to; page_nbr++) + for (page_nbr = from - 1; page_nbr < to && !aborted; page_nbr++) { orig_page = ti_seek_fax_page (fax_file, page_nbr); ti_load_fax_page (fax_file, orig_page); @@ -124,11 +146,30 @@ send_pages_to_pc (GnomePrintContext *con orig_page->width, orig_page->height, ROT_NONE); - for (copy_nbr = 0; copy_nbr < copies; copy_nbr++) - print_page (context, fax_file, gray_page); + for (copy_nbr = 0; copy_nbr < copies && !aborted; copy_nbr++) + { + count++; + p_action = g_strdup_printf (_("Printing page" + " %d (%d left)"), + count, + max_page_nbr + - count); + gfv_progress_set_action (p_data, p_action); + g_free (p_action); + + print_page (context, fax_file, gray_page); + aborted = gfv_progress_update_with_value (count, max_page_nbr, + 0, p_data); + + } ti_destroy_fax_page (gray_page); ti_unload_fax_page (orig_page); } + + if (!aborted) + gfv_progress_set_done (p_data); + + return aborted; } static GnomePrintMaster * @@ -139,8 +180,13 @@ prepare_print_master (GtkWidget *print_d GnomePrintContext *print_context; GnomePrintMaster *print_master; GnomeFont *def_font; - gint copies, collate, range; + gint copies, collate, range, aborted; gint from, to; + GfvProgressData *p_data; + + p_data = gfv_progress_new + (GTK_WINDOW (print_dlg), + _("Please wait..."), NULL, ABORT_BTN); print_master = gnome_print_master_new_from_dialog (GPD (print_dlg)); @@ -161,9 +207,19 @@ prepare_print_master (GtkWidget *print_d to = fax_file->nbr_pages + 1; } - send_pages_to_pc (print_context, fax_file, from, to, copies, collate); + aborted = send_pages_to_pc (print_context, fax_file, + from, to, copies, collate, + p_data); gnome_print_context_close (print_context); + if (aborted) + { + gnome_print_master_close (print_master); + print_master = NULL; + } + + gfv_progress_destroy (p_data); + return print_master; } @@ -179,22 +235,25 @@ print_or_preview (GtkWidget *print_dlg, viewer_data->fax_file, viewer_data->current_page); - if (button == GNOME_PRINT_PRINT) - gnome_print_master_print (print_master); - else + if (print_master) { - preview = - GTK_WIDGET (gnome_print_master_preview_new (print_master, - _("Print" - " preview..."))); - - transient_window_show (GTK_WINDOW (preview), - GTK_WINDOW (print_dlg)); + if (button == GNOME_PRINT_PRINT) + gnome_print_master_print (print_master); + else + { + preview = + GTK_WIDGET (gnome_print_master_preview_new (print_master, + _("Print" + " preview..."))); + + transient_window_show (GTK_WINDOW (preview), + GTK_WINDOW (print_dlg)); + + gtk_widget_show (preview); + } - gtk_widget_show (preview); + gnome_print_master_close (print_master); } - - gnome_print_master_close (print_master); } static void diff -durpN ghfaxviewer-0.21.0/src/gtkutils.c ghfaxviewer-0.21.1/src/gtkutils.c --- ghfaxviewer-0.21.0/src/gtkutils.c Sun Apr 15 00:11:58 2001 +++ ghfaxviewer-0.21.1/src/gtkutils.c Fri Apr 27 13:33:56 2001 @@ -107,7 +107,8 @@ window_set_icon (GtkWidget* ref_widget, /* transient windows */ -static void transient_destroy_cb (GtkWidget *window, gpointer data) +static void +transient_destroy_cb (GtkWidget *window, gpointer data) { GtkWindow *parent; @@ -155,6 +156,7 @@ dialog_window_new (gchar *title) dialog_win = g_malloc (sizeof (DialogWindow)); dialog_win->window = gtk_window_new (GTK_WINDOW_DIALOG); gtk_window_set_title (GTK_WINDOW (dialog_win->window), title); + gtk_window_set_position (GTK_WINDOW (dialog_win->window), GTK_WIN_POS_CENTER); dialog_win->vbox = gtk_vbox_new (FALSE, 5); gtk_container_add (GTK_CONTAINER (dialog_win->window), @@ -184,8 +186,9 @@ dialog_window_set_content (DialogWindow (int) window, (int) window->content); } -void dialog_window_set_button_box (DialogWindow *window, GtkHButtonBox - *button_box) +void +dialog_window_set_button_box (DialogWindow *window, + GtkHButtonBox *button_box) { if (!window->button_box) { @@ -196,6 +199,22 @@ void dialog_window_set_button_box (Dialo else g_print ("DialogWindow->button_box (%x->%x) is not free\n", (int) window, (int) window->button_box); +} + +void +dialog_window_set_button (DialogWindow *window, + GtkWidget *button) +{ + GtkWidget *button_box; + + button_box = gtk_hbutton_box_new (); + gtk_box_pack_start (GTK_BOX (button_box), button, + FALSE, FALSE, 5); + dialog_window_set_button_box (window, + GTK_HBUTTON_BOX (button_box)); + + GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT | GTK_HAS_DEFAULT); + gtk_widget_grab_default (button); } void diff -durpN ghfaxviewer-0.21.0/src/gtkutils.h ghfaxviewer-0.21.1/src/gtkutils.h --- ghfaxviewer-0.21.0/src/gtkutils.h Wed Apr 11 10:48:19 2001 +++ ghfaxviewer-0.21.1/src/gtkutils.h Fri Apr 27 01:52:35 2001 @@ -25,12 +25,7 @@ #ifndef GTKUTILS_H #define GTKUTILS_H -typedef struct _DialogWindow DialogWindow; - -struct _DialogWindow -{ - gpointer private; -}; +typedef gpointer DialogWindow; /* private */ GtkWidget* menu_separator_new (GtkWidget *menu); void menu_item_new (GtkWidget *menu, gchar *label, @@ -38,8 +33,10 @@ void menu_item_new (GtkWidget *menu, gch DialogWindow *dialog_window_new (gchar *title); void dialog_window_set_content (DialogWindow *window, GtkWidget *content); -void dialog_window_set_button_box (DialogWindow *window, GtkHButtonBox - *button_box); +void dialog_window_set_button_box (DialogWindow *window, + GtkHButtonBox *button_box); +void dialog_window_set_button (DialogWindow *window, + GtkWidget *button); void dialog_window_show (DialogWindow *dialog, GtkWindow *parent); void dialog_window_destroy (DialogWindow *dialog); void dialog_window_destroy_from_signal (GtkWidget *widget, gpointer dialog); diff -durpN ghfaxviewer-0.21.0/src/info.c ghfaxviewer-0.21.1/src/info.c --- ghfaxviewer-0.21.0/src/info.c Sun Apr 15 00:14:48 2001 +++ ghfaxviewer-0.21.1/src/info.c Fri Apr 27 02:48:16 2001 @@ -315,26 +315,22 @@ static DialogWindow * create_info_window (GtkWidget *viewer_window, TiffInfo *file_info) { DialogWindow *info_window; - GtkWidget *table, *button_box, *ok_button; + GtkWidget *table, *ok_button; info_window = dialog_window_new (_("Fax properties")); table = create_info_table (viewer_window, file_info); dialog_window_set_content (info_window, table); - button_box = gtk_hbutton_box_new (); - #ifdef NEED_GNOMESUPPORT_H - ok_button = gnome_stock_button (GNOME_STOCK_BUTTON_CLOSE); + ok_button = gnome_stock_button (GNOME_STOCK_BUTTON_OK); #else /* NEED_GNOMESUPPORT_H */ ok_button = gtk_button_new_with_label (_("Close")); #endif gtk_signal_connect (GTK_OBJECT (ok_button), "clicked", dialog_window_destroy_from_signal, info_window); - gtk_box_pack_start (GTK_BOX (button_box), ok_button, - TRUE, FALSE, 5); - dialog_window_set_button_box (info_window, - GTK_HBUTTON_BOX (button_box)); + dialog_window_set_button (info_window, + ok_button); return info_window; } diff -durpN ghfaxviewer-0.21.0/src/menu.c ghfaxviewer-0.21.1/src/menu.c --- ghfaxviewer-0.21.0/src/menu.c Sun Apr 15 00:06:16 2001 +++ ghfaxviewer-0.21.1/src/menu.c Fri Apr 27 13:38:25 2001 @@ -29,10 +29,8 @@ #include #ifdef NEED_GNOMESUPPORT_H -#include "pixmaps/stock-zoom-in-menu.xpm" -#include "pixmaps/stock-zoom-out-menu.xpm" - #include +#include "setup.h" #else /* NEED_GNOMESUPPORT_H */ #include #endif /* NEED_GNOMESUPPORT_H */ @@ -78,24 +76,24 @@ gnome_menu_bar_new (ViewerData *viewer_d { GNOME_APP_UI_ITEM, N_("Zoom in"), NULL, (gpointer) zoomin_cb, viewer_data, NULL, - GNOME_APP_PIXMAP_DATA, stock_zoom_in_menu_xpm, + GNOME_APP_PIXMAP_STOCK, STOCK_ZOOM_IN_MENU, 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_ITEM, N_("Zoom out"), NULL, (gpointer) zoomout_cb, viewer_data, NULL, - GNOME_APP_PIXMAP_DATA, stock_zoom_out_menu_xpm, + GNOME_APP_PIXMAP_STOCK, STOCK_ZOOM_OUT_MENU, 0, (GdkModifierType) 0, NULL }, GNOMEUIINFO_SEPARATOR, { - GNOME_APP_UI_ITEM, N_("Rotate 90" DEGREES " clockwise"), + GNOME_APP_UI_ITEM, N_("Rotate 90 degrees clockwise"), NULL, (gpointer) right90_cb, viewer_data, NULL, GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_REDO, 0, (GdkModifierType) 0, NULL }, { - GNOME_APP_UI_ITEM, N_("Rotate 90" DEGREES " counter-clockwise"), + GNOME_APP_UI_ITEM, N_("Rotate 90 degrees counter-clockwise"), NULL, (gpointer) left90_cb, viewer_data, NULL, GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_MENU_UNDO, 0, (GdkModifierType) 0, NULL @@ -172,9 +170,9 @@ view_menu_new (ViewerData *viewer_data) menu_item_new (view_menu, _("Zoom in"), zoomin_cb, viewer_data); menu_item_new (view_menu, _("Zoom out"), zoomout_cb, viewer_data); menu_separator_new (view_menu); - menu_item_new (view_menu, _("Rotate 90" DEGREES " clockwise"), + menu_item_new (view_menu, _("Rotate 90 degrees clockwise"), right90_cb, viewer_data); - menu_item_new (view_menu, _("Rotate 90" DEGREES " counter-clockwise"), + menu_item_new (view_menu, _("Rotate 90 degrees counter-clockwise"), left90_cb, viewer_data); menu_item_new (view_menu, _("Reverse image"), reverse_cb, viewer_data); diff -durpN ghfaxviewer-0.21.0/src/pixmaps/Makefile.in ghfaxviewer-0.21.1/src/pixmaps/Makefile.in --- ghfaxviewer-0.21.0/src/pixmaps/Makefile.in Wed Apr 18 15:05:25 2001 +++ ghfaxviewer-0.21.1/src/pixmaps/Makefile.in Fri Apr 27 17:14:53 2001 @@ -57,13 +57,11 @@ PRE_UNINSTALL = : POST_UNINSTALL = : host_alias = @host_alias@ host_triplet = @host@ -AS = @AS@ BUILD_INCLUDED_LIBINTL = @BUILD_INCLUDED_LIBINTL@ CATALOGS = @CATALOGS@ CATOBJEXT = @CATOBJEXT@ CC = @CC@ DATADIRNAME = @DATADIRNAME@ -DLLTOOL = @DLLTOOL@ EXEEXT = @EXEEXT@ GCONF_CFLAGS = @GCONF_CFLAGS@ GCONF_CONFIG = @GCONF_CONFIG@ @@ -98,7 +96,6 @@ INTLOBJS = @INTLOBJS@ INTL_LIBTOOL_SUFFIX_PREFIX = @INTL_LIBTOOL_SUFFIX_PREFIX@ LIBICONV = @LIBICONV@ LIBTOOL = @LIBTOOL@ -LN_S = @LN_S@ LPC_COMMAND = @LPC_COMMAND@ LPSTAT_COMMAND = @LPSTAT_COMMAND@ MAINT = @MAINT@ @@ -106,7 +103,6 @@ MAKEINFO = @MAKEINFO@ MKINSTALLDIRS = @MKINSTALLDIRS@ MSGFMT = @MSGFMT@ MSGMERGE = @MSGMERGE@ -OBJDUMP = @OBJDUMP@ ORBIT_CFLAGS = @ORBIT_CFLAGS@ ORBIT_CONFIG = @ORBIT_CONFIG@ ORBIT_IDL = @ORBIT_IDL@ diff -durpN ghfaxviewer-0.21.0/src/pixmaps/ghfaxviewer-icon.xpm ghfaxviewer-0.21.1/src/pixmaps/ghfaxviewer-icon.xpm --- ghfaxviewer-0.21.0/src/pixmaps/ghfaxviewer-icon.xpm Wed Apr 11 10:48:30 2001 +++ ghfaxviewer-0.21.1/src/pixmaps/ghfaxviewer-icon.xpm Wed Apr 25 03:21:02 2001 @@ -1,571 +1,48 @@ /* XPM */ static char * ghfaxviewer_icon_xpm[] = { -"32 32 536 2", -" c None", -". c #0018F7", -"+ c #0017EE", -"@ c #0017ED", -"# c #0018F3", -"$ c #0018F0", -"% c #0018EF", -"& c #0019F8", -"* c #0019F9", -"= c #0019FC", -"- c #2B334A", -"; c #333B55", -"> c #2B377A", -", c #1B2BA5", -"' c #353E59", -") c #343D57", -"! c #1224B9", -"~ c #0119F5", -"{ c #5260ED", -"] c #0C20D4", -"^ c #031BF4", -"/ c #60699A", -"( c #ACB0BB", -"_ c #5C6BF8", -": c #172DD6", -"< c #041CF1", -"[ c #38415D", -"} c #DAD8D3", -"| c #D7D6D2", -"1 c #D6D5D0", -"2 c #192AAD", -"3 c #6C728E", -"4 c #3043F1", -"5 c #2539F6", -"6 c #DFE0EA", -"7 c #F2F2F2", -"8 c #CACFEA", -"9 c #7E8EE1", -"0 c #CCDACC", -"a c #CAD5C6", -"b c #5B6BF2", -"c c #061EFC", -"d c #445071", -"e c #353D58", -"f c #0018F6", -"g c #9EA0CC", -"h c #9096CE", -"i c #9196CF", -"j c #9C9DBF", -"k c #3C445B", -"l c #495BC9", -"m c #C5D2CA", -"n c #CAD5E7", -"o c #182EF9", -"p c #5161F8", -"q c #F5F8F5", -"r c #D7DCF1", -"s c #97A3F5", -"t c #EEF4EF", -"u c #C6D3C2", -"v c #546BD3", -"w c #0D25FB", -"x c #39425F", -"y c #CFCAC8", -"z c #2E41EC", -"A c #3546EB", -"B c #5F6373", -"C c #AAB5BB", -"D c #7886EC", -"E c #F8FAFB", -"F c #D3DED5", -"G c #7988B3", -"H c #031CF8", -"I c #4D61BD", -"J c #798490", -"K c #7685D3", -"L c #F7F9F8", -"M c #F5F8F7", -"N c #576FD1", -"O c #0F27F9", -"P c #021AF2", -"Q c #D5D4CE", -"R c #3D4EEB", -"S c #2C3EDB", -"T c #9599A1", -"U c #CBD9CA", -"V c #828EF6", -"W c #DAE3DA", -"X c #8C9785", -"Y c #90988E", -"Z c #5E6CC7", -"` c #021BF9", -" . c #6D7DCA", -".. c #6B79CA", -"+. c #BDCAB9", -"@. c #C8D6CC", -"#. c #5269CC", -"$. c #132AF9", -"%. c #0F22C7", -"&. c #3C4DEA", -"*. c #1A2DCD", -"=. c #D6DDDB", -"-. c #BFCFC1", -";. c #7685EB", -">. c #AAB5AA", -",. c #DBDED9", -"'. c #C8D6CB", -"). c #F1F5F5", -"!. c #5365F4", -"~. c #041DF9", -"{. c #8E9BED", -"]. c #E7EFE4", -"^. c #ACC19C", -"/. c #7288D6", -"(. c #0D25F9", -"_. c #1D2EAA", -":. c #0019FA", -"<. c #2B3DE2", -"[. c #2C3DD9", -"}. c #DFE7E2", -"|. c #AAC1A3", -"1. c #3B51D0", -"2. c #DADEE2", -"3. c #F6F9F9", -"4. c #EDF3F2", -"5. c #C7D1C7", -"6. c #D6DEE3", -"7. c #3044F6", -"8. c #7485D3", -"9. c #FCFEFE", -"0. c #D9E4DC", -"a. c #DBE2F0", -"b. c #132AFA", -"c. c #6472F0", -"d. c #142AF1", -"e. c #2E364E", -"f. c #0018F5", -"g. c #061DF1", -"h. c #3C49BA", -"i. c #A9ABBE", -"j. c #EBECEC", -"k. c #98AADC", -"l. c #445AE6", -"m. c #919BF2", -"n. c #F1F2FA", -"o. c #F4F9F8", -"p. c #EDF0ED", -"q. c #F8F9FB", -"r. c #DADDF9", -"s. c #AAB6F2", -"t. c #E4EBE5", -"u. c #EFF2F0", -"v. c #E9F0E6", -"w. c #D0D4F9", -"x. c #3346F3", -"y. c #3649F2", -"z. c #4E5EF2", -"A. c #4456F4", -"B. c #595E6E", -"C. c #D3D3D1", -"D. c #EAEAEA", -"E. c #F9FAF8", -"F. c #E6EDE5", -"G. c #FCFCFC", -"H. c #F9FAF9", -"I. c #ECF6F6", -"J. c #FFFEFE", -"K. c #F4F6F4", -"L. c #E7F1F0", -"M. c #F1F7F2", -"N. c #ECF3ED", -"O. c #EEF4F1", -"P. c #FDFDFD", -"Q. c #FEFEFE", -"R. c #343C57", -"S. c #D6D2CA", -"T. c #D9D5CD", -"U. c #D0CBC3", -"V. c #4F5465", -"W. c #D4D1CC", -"X. c #EBEAEA", -"Y. c #FFFFFF", -"Z. c #F5F9F9", -"`. c #F0F3F0", -" + c #E1EBE7", -".+ c #FCFCFB", -"++ c #F9FCFE", -"@+ c #EEF3F0", -"#+ c #D4DFD1", -"$+ c #EDF6F4", -"%+ c #FBFCFC", -"&+ c #EAF2F0", -"*+ c #EDEDEC", -"=+ c #333C56", -"-+ c #CFC9C0", -";+ c #D5CFC6", -">+ c #D7D0C8", -",+ c #585C6C", -"'+ c #D0CECC", -")+ c #E1E1E1", -"!+ c #E1EAE4", -"~+ c #E0E9E1", -"{+ c #EFF4F3", -"]+ c #F9FBFB", -"^+ c #FCFDFE", -"/+ c #EFF6F7", -"(+ c #EDF2ED", -"_+ c #EAF2EB", -":+ c #F1EFED", -"<+ c #2E354D", -"[+ c #BFBBB3", -"}+ c #C9C4BC", -"|+ c #D5CFC7", -"1+ c #DBD4CC", -"2+ c #70737E", -"3+ c #A2A2A3", -"4+ c #D6D6D4", -"5+ c #F7FAFA", -"6+ c #F9FAFB", -"7+ c #EAF1F1", -"8+ c #F8FAFA", -"9+ c #FCFDFC", -"0+ c #E5EEE1", -"a+ c #E4EAE1", -"b+ c #E9EEED", -"c+ c #EDF2F2", -"d+ c #ECECEB", -"e+ c #EAE8E4", -"f+ c #EEEDE9", -"g+ c #FDFDFC", -"h+ c #2B3249", -"i+ c #E4E2DB", -"j+ c #DAD8D1", -"k+ c #C3C0B8", -"l+ c #95948C", -"m+ c #C6C2BA", -"n+ c #A3A4A7", -"o+ c #7B7D88", -"p+ c #E0DFDD", -"q+ c #F7F9F9", -"r+ c #FCFDFD", -"s+ c #E3EEF0", -"t+ c #F9FBFA", -"u+ c #D9DFD9", -"v+ c #C7CFC4", -"w+ c #F5F9F8", -"x+ c #F5F4F4", -"y+ c #EDEAE7", -"z+ c #F0EEEB", -"A+ c #CCCBC4", -"B+ c #E0DED8", -"C+ c #EAE6DE", -"D+ c #EEE8E1", -"E+ c #707168", -"F+ c #6F7067", -"G+ c #DFDAD3", -"H+ c #535869", -"I+ c #D1D0CF", -"J+ c #F3F6F3", -"K+ c #F1F6F6", -"L+ c #EDF3F3", -"M+ c #F9FCFC", -"N+ c #EAF0ED", -"O+ c #E3EDE7", -"P+ c #F9F9F8", -"Q+ c #E9E8E5", -"R+ c #E7E4DE", -"S+ c #EDECE8", -"T+ c #A7A7A0", -"U+ c #CAC7BF", -"V+ c #E9E6DF", -"W+ c #F1EBE3", -"X+ c #CDC8C1", -"Y+ c #5B5D53", -"Z+ c #918F84", -"`+ c #9E9EA5", -" @ c #777A86", -".@ c #FAFAFA", -"+@ c #F1F6F5", -"@@ c #EEF6F6", -"#@ c #E6F0F0", -"$@ c #E6F0ED", -"%@ c #E5F0EE", -"&@ c #FBFDFD", -"*@ c #FBFBFA", -"=@ c #E4E3E0", -"-@ c #EAE7E2", -";@ c #E9E7E2", -">@ c #B6B5B6", -",@ c #B3B1A9", -"'@ c #E3DDD5", -")@ c #EFE8E2", -"!@ c #F0EAE3", -"~@ c #CBC8BF", -"{@ c #73746B", -"]@ c #646977", -"^@ c #ADAEB4", -"/@ c #FDFEFE", -"(@ c #F3FBFC", -"_@ c #E4ECED", -":@ c #CCDBDC", -"<@ c #B1BEB7", -"[@ c #FAF9F9", -"}@ c #FAF7F5", -"|@ c #F7F5F3", -"1@ c #EEEBE7", -"2@ c #E9E5E0", -"3@ c #D2CDC9", -"4@ c #5C606F", -"5@ c #D2CFC8", -"6@ c #CEC8C0", -"7@ c #EBE6DE", -"8@ c #EDE8E2", -"9@ c #ECE5DE", -"0@ c #BAB5AB", -"a@ c #6A6B62", -"b@ c #DBD6D2", -"c@ c #AAABB3", -"d@ c #AAACB3", -"e@ c #FDFCFC", -"f@ c #FAF9F7", -"g@ c #F4F3F0", -"h@ c #E8E9E7", -"i@ c #E5E7E4", -"j@ c #EDEBE7", -"k@ c #E1E0DC", -"l@ c #C9C8C5", -"m@ c #BDBFBB", -"n@ c #C8C5C3", -"o@ c #5A5E6D", -"p@ c #C0BEBC", -"q@ c #DFDBD3", -"r@ c #EFE8E3", -"s@ c #D0CAC4", -"t@ c #3A3A3B", -"u@ c #6E6F71", -"v@ c #DDD9D5", -"w@ c #707481", -"x@ c #717582", -"y@ c #DEDCDC", -"z@ c #EBEAE7", -"A@ c #DCDCD9", -"B@ c #D1D2D0", -"C@ c #C4C6C4", -"D@ c #BEBFBC", -"E@ c #B0B2B0", -"F@ c #A2A6A3", -"G@ c #8F928F", -"H@ c #929693", -"I@ c #A3A5A2", -"J@ c #9A9AA1", -"K@ c #5D616F", -"L@ c #C9C9C5", -"M@ c #DFDDD6", -"N@ c #C8C5BE", -"O@ c #C9C5BD", -"P@ c #EBE5DE", -"Q@ c #C8C2BE", -"R@ c #404044", -"S@ c #2D3039", -"T@ c #43464B", -"U@ c #CFC7BF", -"V@ c #E1DCD5", -"W@ c #B1B0B3", -"X@ c #54596A", -"Y@ c #6C717E", -"Z@ c #888D92", -"`@ c #989E9F", -" # c #9CA09F", -".# c #9EA19E", -"+# c #9DA19E", -"@# c #9DA2A1", -"## c #8E9396", -"$# c #6E727C", -"%# c #555A6A", -"&# c #929398", -"*# c #BDBAB2", -"=# c #AEABA1", -"-# c #C6C5BE", -";# c #BFBAB1", -"># c #A9A5A0", -",# c #35373D", -"'# c #303440", -")# c #77787B", -"!# c #585C53", -"~# c #A7A49A", -"{# c #C9C2B7", -"]# c #B2ADA4", -"^# c #DAD4CD", -"/# c #BBB9BA", -"(# c #838691", -"_# c #585D6E", -":# c #4E5465", -"<# c #4B5062", -"[# c #4C5162", -"}# c #5B606F", -"|# c #71747E", -"1# c #A5A3A4", -"2# c #D6CFC9", -"3# c #D9D3CB", -"4# c #A6A399", -"5# c #C0BBB2", -"6# c #9A9992", -"7# c #777775", -"8# c #2E3139", -"9# c #383B48", -"0# c #7D7E7F", -"a# c #CBC4BB", -"b# c #61645C", -"c# c #8C8A80", -"d# c #C8C1B9", -"e# c #B8B3A9", -"f# c #D4CEC5", -"g# c #D6CFC7", -"h# c #D6D1C9", -"i# c #D7D1C8", -"j# c #D8D0C7", -"k# c #D6D0C8", -"l# c #D7D1C9", -"m# c #D7D2C9", -"n# c #D8D2CA", -"o# c #CDCBC3", -"p# c #A8A69C", -"q# c #565658", -"r# c #2F323D", -"s# c #3E4250", -"t# c #7F7F7E", -"u# c #828179", -"v# c #A29E94", -"w# c #7A7B72", -"x# c #939086", -"y# c #C9C2B9", -"z# c #C4BCB3", -"A# c #D2CAC0", -"B# c #D2C9BF", -"C# c #D3CABF", -"D# c #D3CBC0", -"E# c #D3CCC1", -"F# c #D3CCC3", -"G# c #A6A39A", -"H# c #8C8C83", -"I# c #6E6F66", -"J# c #959489", -"K# c #DBD7CE", -"L# c #2D303A", -"M# c #313643", -"N# c #434856", -"O# c #A4A2A0", -"P# c #B8B2A9", -"Q# c #9C998F", -"R# c #C7BFB7", -"S# c #969389", -"T# c #A6A198", -"U# c #D2CBC1", -"V# c #D0C8BE", -"W# c #CEC8BE", -"X# c #D2CBC0", -"Y# c #D4CBC0", -"Z# c #D0C9BF", -"`# c #C1BAB0", -" $ c #918F85", -".$ c #828177", -"+$ c #87867C", -"@$ c #949288", -"#$ c #A19C92", -"$$ c #B2ADA5", -"%$ c #CCC7BF", -"&$ c #2F333E", -"*$ c #343949", -"=$ c #393F52", -"-$ c #A6A4A0", -";$ c #9F9B94", -">$ c #BCB8B0", -",$ c #B0ACA4", -"'$ c #B1ADA4", -")$ c #818075", -"!$ c #BBB4AA", -"~$ c #CEC6BD", -"{$ c #C3BCB3", -"]$ c #78786E", -"^$ c #AAA79E", -"/$ c #929188", -"($ c #828176", -"_$ c #818178", -":$ c #908E85", -"<$ c #9A988F", -"[$ c #A29F95", -"}$ c #AEA99F", -"|$ c #BAB6AD", -"1$ c #D1CDC6", -"2$ c #373D4E", -"3$ c #3A4256", -"4$ c #C4BFB7", -"5$ c #ACA9A0", -"6$ c #C9C1B8", -"7$ c #CBC3BA", -"8$ c #B3ACA2", -"9$ c #828279", -"0$ c #86857C", -"a$ c #98958C", -"b$ c #A49F94", -"c$ c #ABA69C", -"d$ c #B1AEA5", -"e$ c #ABA79D", -"f$ c #9D9B93", -"g$ c #99978E", -"h$ c #A9A59C", -"i$ c #343948", -"j$ c #394054", -"k$ c #BEB8B0", -"l$ c #B2AEA4", -"m$ c #D0C9BE", -"n$ c #AAA69C", -"o$ c #939187", -"p$ c #AEAAA1", -"q$ c #BCB5AD", -"r$ c #C6BFB7", -"s$ c #CCC5BD", -"t$ c #CDC7BF", -"u$ c #9A9890", -"v$ c #A3A097", -"w$ c #BEB7AE", -"x$ c #CBC5BD", -"y$ c #CFC8BF", -"z$ c #3C4359", -"A$ c #BBB7B0", -"B$ c #D0CAC1", -"C$ c #D1CCC4", -"D$ c #D8D2C9", -"E$ c #D0CCC3", -"F$ c #CCC8C0", -"G$ c #D4D0C7", -"H$ c #DCD8D0", -"I$ c #E2DED7", -"J$ c #E0DAD2", -"K$ c #E4DFD8", -" . + @ # # $ % # # ", -" # & * & = - ; > , ' ) ! ~ & ", -" = { ] ^ / ( _ : < [ = ", -" . * } | 1 2 3 4 5 6 7 8 9 0 a b c d e = ", -" . f g h i j k l m n o p q r s t u v w x = ", -" . f y z A B C D E F G H I J K L M N O x P ", -" * * Q R S T U V W X Y Z ` ...+.@.#.$. %. ", -" = &.*.=.-.;.>.,.'.).!.~.{.].^./.(. _. ", -" f :. <.[.}.|.1.2.3.4.5.6.7.8.9.0.a.b.c. d. e. ", -" f.% @ g.h.i.j.k.l.m.n.o.p.q.r.s.t.u.v.w.x.y.z.A. e ", -" B.C.D.E.F.G.H.I.J.K.L.M.N.O.P.Q.D. R. ", -" S.T.U.V.W.X.Y.Z.`. +.+++@+#+$+%+&+Y.Y.*+ =+ ", -" -+;+>+,+'+)+Q.!+~+{+]+^+/+%+^+(+_+J.Y.*+:+.+ <+ ", -" [+}+|+1+2+3+4+Y.G.5+6+7+8+9+0+a+b+c+Y.Y.d+e+f+g+ h+ ", -" i+j+k+l+m+n+o+p+Y.Y.q+3.r+s+P.t+u+v+w+Y.Y.x+y+e+z+ h+ ", -" A+B+C+D+E+F+G+H+I+P.Y.Q.J+9+K+L+M+N+O+Y.Y.Y.P+Q+R+S+ h+ ", -" T+U+V+W+X+Y+Z+`+ @.@Y.Y.G.+@%+@@#@$@%@&@Y.Y.*@=@-@;@>@h+ ", -" ,@'@)@!@~@{@~@]@^@Y.Y.Y.Q./@(@_@:@<@3.[@}@|@1@2@3@4@ ", -" 5@6@7@8@9@0@a@b@c@d@Q.e@.+[@f@g@h@i@j@k@l@m@-@n@o@p@ ", -" U+q@8@r@s@t@u@v@w@x@y@z@A@B@C@D@E@F@G@H@I@J@K@L@M@ ", -" N@O@P@Q@R@S@T@U@V@W@X@Y@Z@`@ #.#+#@###$#%#&#*#=# ", -" -#;#>#,#'#)#!#~#{#]#^#/#(#_#:#<#[#}#|#1#2#3#4#5# ", -" 6#7#8#9#0#a#b#c#d#e#f#g#h#i#j#>+k#g#l#m#n#o#p#n# ", -" q#r#s#t#u#v#w#x#y#z#A#A#B#C#D#E#f#F#;#G#H#I#J#K# ", -" L#M#N#O#P#Q#R#S#T#U#V#W#X#Y#Z#`#~# $.$+$@$#$$$%$ ", -" &$*$=$-$;$>$,$'$)$!$~${$]$^$/$($_$:$<$[$}$|$1$ ", -" M#2$3$ ,@4$5$.$#$6$7$8$9$0$a$b$c$d$e$f$g$h$ ", -"i$j$ k$l$m$n$o$p$q$r$s$t$u$v$w$x$y$m# ", -"z$ A$B$B$C$ D$E$F$G$H$I$ ", -" J$K$ ", -" ", -" "}; +"32 32 13 1", +" c None", +". c #E5E5E5", +"+ c #CCCCCC", +"@ c #FFFFFF", +"# c #B2B2B2", +"$ c #999999", +"% c #333333", +"& c #0000FF", +"* c #7F7F7F", +"= c #4C4C4C", +"- c #666667", +"; c #007F7F", +"> c #7F7F00", +" &&&& & & && & ", +" && & && %%%&%=%& & ", +" & & &%&-# & %&= & ", +" && +.+ &*=&.@+&.+*& =% & ", +" && $$$$=&++&-..&@+;& = & ", +" && +&&-#&@+$&;*&@@*& =& ", +" && +=&$+&.*$-&*&++;& & ", +" & =&.+&#..@;&&.#$& & ", +" && &%.#&...+.=&@..&* & % ", +" &&&&;#.#&$@@.@.&...+&&&& % ", +" -+.@.@@.@@.@@@@@. % ", +" +++=+.@@..@@...@.@@. % ", +" +++-+.@..@@@.@@..@@.@@ % ", +" #+++*$+@@.@.@@..@.@@...@ % ", +" ..+$+$*.@@@@@.@..+@@@@... % ", +" +...--.=+@@@.@@.@..@@@@... % ", +" $+..+-$$*@@@@.@....@@@@...#% ", +" #...+-+-$@@@@@@..#@@@.@.+- ", +" ++...#-.##@@.@@.....+#.+-# ", +" +...+%-+--...++###*$#$-+. ", +" ++.+=%=+.#=-$$$#$$$-=$## ", +" +#$%%*-$+#.#*;===-*#++## ", +" $*%%*#-*+#+++++.++++++$+ ", +" =%=**$*$+#++++++++##**$. ", +" %%=$#$+$$++++++##$**$$#+ ", +" %%%#$###*#+###$***$$##+ ", +" %=% #+$#$++#**$$###$$$ ", +"%% ##+$$###++$$#+++ ", +"= #+++ ++++.. ", +" .. ", +" ", +" "}; diff -durpN ghfaxviewer-0.21.0/src/progress.c ghfaxviewer-0.21.1/src/progress.c --- ghfaxviewer-0.21.0/src/progress.c Sun Apr 15 00:13:48 2001 +++ ghfaxviewer-0.21.1/src/progress.c Fri Apr 27 03:35:10 2001 @@ -26,12 +26,33 @@ #include #endif +#ifdef NEED_GNOMESUPPORT_H +#include +#else #include +#endif #include "i18n.h" -#include "progress.h" #include "gtkutils.h" +typedef struct _GfvProgressData GfvProgressData; + +typedef enum +{ + ABORT_BTN = 1, + DISPLAY_WHEN_NEEDED = 2, +} GfvProgressTag; + +struct _GfvProgressData +{ + gboolean aborted, done, is_visible; + gchar *action_string; + GfvProgressTag tag; + GtkWidget *label, *progress_bar, *abort_btn; + DialogWindow *progress_win; + GtkWindow *parent_window; +}; + static void progress_abort (GtkWidget *widget, GfvProgressData *progress_data) { @@ -43,26 +64,20 @@ gfv_progress_new (GtkWindow *parent_wind gchar *title, gchar *action_string, GfvProgressTag tag) { - GtkWidget *window, *frame, *vbox, *progress, *abort_btn, *label; + DialogWindow *dlg_window; + GtkWidget *vbox, *progress, *abort_btn, *label; GtkObject *adjustment; GfvProgressData *prog_data; prog_data = g_malloc (sizeof (GfvProgressData)); - adjustment = gtk_adjustment_new(0.0, 0.0, 1.0, 0.1, 0.1, 1.0); - - window = gtk_window_new (GTK_WINDOW_TOPLEVEL); - gtk_window_set_title (GTK_WINDOW (window), title); - gtk_window_set_modal (GTK_WINDOW (window), TRUE); - gtk_window_set_position (GTK_WINDOW (window), GTK_WIN_POS_CENTER); + adjustment = gtk_adjustment_new (0.0, 0.0, 1.0, 0.1, 0.1, 1.0); - frame = gtk_frame_new (_("Processing")); - gtk_container_set_border_width (GTK_CONTAINER (frame), 5); - gtk_container_add (GTK_CONTAINER (window), frame); + dlg_window = dialog_window_new (title); vbox = gtk_vbox_new (FALSE, 3); gtk_container_set_border_width (GTK_CONTAINER (vbox), 5); - gtk_container_add (GTK_CONTAINER (frame), vbox); + dialog_window_set_content (dlg_window, vbox); label = gtk_label_new (action_string); gtk_box_pack_start (GTK_BOX (vbox), label, TRUE, FALSE, 3); @@ -73,18 +88,25 @@ gfv_progress_new (GtkWindow *parent_wind if (tag & ABORT_BTN) { +#ifdef NEED_GNOMESUPPORT_H + abort_btn = gnome_stock_button (GNOME_STOCK_BUTTON_CANCEL); +#else abort_btn = gtk_button_new_with_label (_("Cancel")); +#endif gtk_signal_connect (GTK_OBJECT (abort_btn), "clicked", (GtkSignalFunc) progress_abort, prog_data); - gtk_box_pack_start (GTK_BOX (vbox), abort_btn, FALSE, - FALSE, 3); + dialog_window_set_button (dlg_window, abort_btn); prog_data->abort_btn = abort_btn; } if (!(tag & DISPLAY_WHEN_NEEDED)) - transient_window_show (GTK_WINDOW (window), - parent_window); + { + dialog_window_show (dlg_window, parent_window); + prog_data->is_visible = TRUE; + } + else + prog_data->is_visible = FALSE; prog_data->aborted = FALSE; prog_data->done = FALSE; @@ -95,7 +117,7 @@ gfv_progress_new (GtkWindow *parent_wind prog_data->label = label; prog_data->tag = tag; prog_data->progress_bar = progress; - prog_data->progress_win = window; + prog_data->progress_win = dlg_window; prog_data->parent_window = parent_window; return prog_data; @@ -130,9 +152,12 @@ gfv_progress_update_with_percentage (gui prog_data = data; if ((prog_data->tag & DISPLAY_WHEN_NEEDED) - && !GTK_WIDGET_VISIBLE (prog_data->progress_win)) - transient_window_show (GTK_WINDOW (prog_data->progress_win), - prog_data->parent_window); + && !(prog_data->is_visible)) + { + dialog_window_show (prog_data->progress_win, + prog_data->parent_window); + prog_data->is_visible = TRUE; + } if (!prog_data->done) { @@ -176,7 +201,7 @@ gfv_progress_update_with_value (guint va void gfv_progress_destroy (GfvProgressData *prog_data) { - gtk_widget_destroy (prog_data->progress_win); + dialog_window_destroy (prog_data->progress_win); if (prog_data->action_string) g_free (prog_data->action_string); g_free (prog_data); diff -durpN ghfaxviewer-0.21.0/src/progress.h ghfaxviewer-0.21.1/src/progress.h --- ghfaxviewer-0.21.0/src/progress.h Wed Apr 11 10:48:20 2001 +++ ghfaxviewer-0.21.1/src/progress.h Fri Apr 27 01:53:27 2001 @@ -19,25 +19,18 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307, USA. */ +/* Functions to create progress and manage dialogs easily */ + #ifndef PROGRESS_H #define PROGRESS_H -typedef struct _GfvProgressData GfvProgressData; +typedef gpointer GfvProgressData; /* private */ typedef enum { ABORT_BTN = 1, DISPLAY_WHEN_NEEDED = 2, } GfvProgressTag; - -struct _GfvProgressData -{ - gboolean aborted, done; - gchar *action_string; - GfvProgressTag tag; - GtkWidget *label, *progress_bar, *abort_btn, *progress_win; - GtkWindow *parent_window; -}; GfvProgressData *gfv_progress_new (GtkWindow *parent_window, gchar *title, diff -durpN ghfaxviewer-0.21.0/src/setup.c ghfaxviewer-0.21.1/src/setup.c --- ghfaxviewer-0.21.0/src/setup.c Thu Apr 12 04:28:44 2001 +++ ghfaxviewer-0.21.1/src/setup.c Fri Apr 27 04:13:30 2001 @@ -26,6 +26,11 @@ #ifdef NEED_GNOMESUPPORT_H #include #include + +#include "pixmaps/stock-zoom-in.xpm" +#include "pixmaps/stock-zoom-out.xpm" +#include "pixmaps/stock-zoom-in-menu.xpm" +#include "pixmaps/stock-zoom-out-menu.xpm" #else #include #endif @@ -44,7 +49,7 @@ static gint windows_count; #ifdef NEED_GNOMESUPPORT_H -#define CONFIG_KEY "/apps/ghfaxviewer/viewer" +#define CONFIG_KEY "/apps/ghfaxviewer/viewer/" GConfClient *gc_client; #else #ifdef __WIN32__ @@ -53,8 +58,15 @@ GConfClient *gc_client; #endif /* NEED_GNOMESUPPORT_H */ #ifdef CAN_SAVE_CONFIG +#define KEY_DEF_DIR "default_dir" + +#define KEY_DEF_X "viewer_def_x" +#define KEY_DEF_Y "viewer_def_y" +#define KEY_DEF_WIDTH "viewer_def_width" +#define KEY_DEF_HEIGHT "viewer_def_height" + static gint viewer_def_x, viewer_def_y; -#endif +#endif /* CAN_SAVE_CONFIG */ static gint viewer_def_width, viewer_def_height; @@ -82,6 +94,7 @@ static void gtk_screen_setup () { gint scr_width, scr_height; + /* Not a perfect mechanism, but acceptable for now. */ scr_width = gdk_screen_width (); scr_height = gdk_screen_height (); @@ -128,23 +141,25 @@ save_window_coords (GdkWindow *window) gint x, y, width, height; GError *gerror; + gerror = NULL; + gdk_window_get_root_origin (window, &x, &y); gdk_window_get_size (window, &width, &height); gconf_client_set_int (gc_client, - CONFIG_KEY "viewer_def_x", + CONFIG_KEY KEY_DEF_X, x, &gerror); gconf_client_set_int (gc_client, - CONFIG_KEY "viewer_def_y", + CONFIG_KEY KEY_DEF_Y, y, &gerror); gconf_client_set_int (gc_client, - CONFIG_KEY "viewer_def_width", + CONFIG_KEY KEY_DEF_WIDTH, width, &gerror); gconf_client_set_int (gc_client, - CONFIG_KEY "viewer_def_height", + CONFIG_KEY KEY_DEF_HEIGHT, height, &gerror); } @@ -154,8 +169,10 @@ gchar *load_last_directory () GError *gerror; gchar *last_dir, *last_dir_slash; + gerror = NULL; + last_dir = gconf_client_get_string (gc_client, - CONFIG_KEY "default_dir", + CONFIG_KEY KEY_DEF_DIR, &gerror); if (!last_dir) @@ -172,28 +189,67 @@ void save_last_directory (gchar *path) { GError *gerror; + gerror = NULL; + gconf_client_set_string (gc_client, - CONFIG_KEY "default_dir", + CONFIG_KEY KEY_DEF_DIR, path, &gerror); } +void +stock_init (void) +{ + static GnomeStockPixmapEntry entries[4]; + + entries[0].data.type = GNOME_STOCK_PIXMAP_TYPE_DATA; + entries[0].data.width = 24; + entries[0].data.height = 24; + entries[0].data.xpm_data = stock_zoom_in_xpm; + + entries[1].data.type = GNOME_STOCK_PIXMAP_TYPE_DATA; + entries[1].data.width = 24; + entries[1].data.height = 24; + entries[1].data.xpm_data = stock_zoom_out_xpm; + + entries[2].data.type = GNOME_STOCK_PIXMAP_TYPE_DATA; + entries[2].data.width = 16; + entries[2].data.height = 16; + entries[2].data.xpm_data = stock_zoom_in_menu_xpm; + + entries[3].data.type = GNOME_STOCK_PIXMAP_TYPE_DATA; + entries[3].data.width = 16; + entries[3].data.height = 16; + entries[3].data.xpm_data = stock_zoom_out_menu_xpm; + + gnome_stock_pixmap_register (STOCK_ZOOM_IN, GNOME_STOCK_PIXMAP_REGULAR, + &entries[0]); + gnome_stock_pixmap_register (STOCK_ZOOM_OUT, GNOME_STOCK_PIXMAP_REGULAR, + &entries[1]); + gnome_stock_pixmap_register (STOCK_ZOOM_IN_MENU, GNOME_STOCK_PIXMAP_REGULAR, + &entries[2]); + gnome_stock_pixmap_register (STOCK_ZOOM_OUT_MENU, GNOME_STOCK_PIXMAP_REGULAR, + &entries[3]); +} + static void gnome_screen_setup () { GError *gerror; + gerror = NULL; + viewer_def_x = gconf_client_get_int (gc_client, - CONFIG_KEY "viewer_def_x", + CONFIG_KEY KEY_DEF_X, &gerror); viewer_def_y = gconf_client_get_int (gc_client, - CONFIG_KEY "viewer_def_y", + CONFIG_KEY KEY_DEF_Y, &gerror); viewer_def_width = gconf_client_get_int (gc_client, - CONFIG_KEY "viewer_def_width", + CONFIG_KEY KEY_DEF_WIDTH, &gerror); viewer_def_height = gconf_client_get_int (gc_client, - CONFIG_KEY "viewer_def_height", + CONFIG_KEY KEY_DEF_HEIGHT, &gerror); if (viewer_def_width == 0 && viewer_def_height == 0) @@ -218,19 +274,19 @@ save_window_coords (GdkWindow *window) CONFIG_KEY, ®_key); RegSetValueEx (reg_key, - "viewer_def_x", 0, + KEY_DEF_X, 0, reg_vtype, (LPBYTE) &x, buf_size); RegSetValueEx (reg_key, - "viewer_def_y", 0, + KEY_DEF_Y, 0, reg_vtype, (LPBYTE) &y, buf_size); RegSetValueEx (reg_key, - "viewer_def_width", 0, + KEY_DEF_WIDTH, 0, reg_vtype, (LPBYTE) &width, buf_size); RegSetValueEx (reg_key, - "viewer_def_height", 0, + KEY_DEF_HEIGHT, 0, reg_vtype, (LPBYTE) &height, buf_size); RegCloseKey (reg_key); @@ -244,7 +300,7 @@ void save_last_directory (gchar *path) CONFIG_KEY, ®_key); RegSetValueEx (reg_key, - "default_dir", 0, + KEY_DEF_DIR, 0, REG_SZ, (LPBYTE) path, strlen (path)); RegCloseKey (reg_key); @@ -268,7 +324,7 @@ gchar *load_last_directory () key_vtype = REG_SZ; RegQueryValueEx (reg_key, - "default_dir", 0, + KEY_DEF_DIR, 0, &key_vtype, NULL, &buf_size); @@ -277,7 +333,7 @@ gchar *load_last_directory () { last_dir = g_malloc (buf_size + 1); RegQueryValueEx (reg_key, - "default_dir", 0, + KEY_DEF_DIR, 0, &key_vtype, last_dir, &buf_size); } @@ -342,7 +398,7 @@ win32_screen_setup () key_vtype = REG_DWORD; /* I just don't understand the absurdity in this API */ rc = RegQueryValueEx (reg_key, - "viewer_def_x", 0, + KEY_DEF_X, 0, &key_vtype, (LPBYTE) &viewer_def_x, &buf_size); if (rc) @@ -350,15 +406,15 @@ win32_screen_setup () else { RegQueryValueEx (reg_key, - "viewer_def_y", 0, + KEY_DEF_Y, 0, &key_vtype, (LPBYTE) &viewer_def_y, &buf_size); RegQueryValueEx (reg_key, - "viewer_def_width", 0, + KEY_DEF_WIDTH, 0, &key_vtype, (LPBYTE) &viewer_def_width, &buf_size); RegQueryValueEx (reg_key, - "viewer_def_height", 0, + KEY_DEF_HEIGHT, 0, &key_vtype, (LPBYTE) &viewer_def_height, &buf_size); } @@ -432,6 +488,7 @@ app_setup (gint *argc, gchar **argv[]) #ifdef NEED_GNOMESUPPORT_H gconf_init (*argc, *argv, NULL); gnome_init (PACKAGE, VERSION, *argc, *argv); + stock_init (); gc_client = gconf_client_get_default (); gconf_client_set_error_handling (gc_client, diff -durpN ghfaxviewer-0.21.0/src/setup.h ghfaxviewer-0.21.1/src/setup.h --- ghfaxviewer-0.21.0/src/setup.h Wed Apr 11 10:48:23 2001 +++ ghfaxviewer-0.21.1/src/setup.h Thu Apr 26 03:33:12 2001 @@ -41,3 +41,8 @@ void save_window_coords (GdkWindow *wind gchar *load_last_directory (); void save_last_directory (gchar *path); #endif + +#define STOCK_ZOOM_IN "GHFV_stock_zoom_in" +#define STOCK_ZOOM_OUT "GHFV_stock_zoom_out" +#define STOCK_ZOOM_IN_MENU "GHFV_stock_zoom_in_menu" +#define STOCK_ZOOM_OUT_MENU "GHFV_stock_zoom_out_menu" diff -durpN ghfaxviewer-0.21.0/src/toolbar.c ghfaxviewer-0.21.1/src/toolbar.c --- ghfaxviewer-0.21.0/src/toolbar.c Sun Apr 15 00:06:46 2001 +++ ghfaxviewer-0.21.1/src/toolbar.c Fri Apr 27 13:38:05 2001 @@ -27,10 +27,9 @@ #endif #ifdef NEED_GNOMESUPPORT_H -#include "pixmaps/stock-zoom-in.xpm" -#include "pixmaps/stock-zoom-out.xpm" - #include + +#include "setup.h" #else /* NEED_GNOMESUPPORT_H */ #include #endif /* NEED_GNOMESUPPORT_H */ @@ -45,6 +44,20 @@ #include "setup.h" #ifdef NEED_GNOMESUPPORT_H +static void +remember_widgets (ViewerData *viewer_data, GnomeUIInfo uiinfo[]) +{ + viewer_data->bb_buttons[PREV_PAGE] = uiinfo[0].widget; + viewer_data->bb_buttons[NEXT_PAGE] = uiinfo[1].widget; + viewer_data->bb_buttons[ZOOM_IN] = uiinfo[3].widget; + viewer_data->bb_buttons[ZOOM_OUT] = uiinfo[4].widget; + + viewer_data->ut_buttons[LEFT90] = uiinfo[6].widget; + viewer_data->ut_buttons[REVERSE] = uiinfo[7].widget; + viewer_data->ut_buttons[RIGHT90] = uiinfo[8].widget; + viewer_data->ut_buttons[PRINT] = uiinfo[10].widget; + viewer_data->ut_buttons[INFO] = uiinfo[12].widget; +} void gnome_toolbar_new (ViewerData *viewer_data) @@ -68,18 +81,18 @@ gnome_toolbar_new (ViewerData *viewer_da { GNOME_APP_UI_ITEM, NULL, N_("Zoom in"), (gpointer) zoomin_cb, viewer_data, NULL, - GNOME_APP_PIXMAP_DATA, stock_zoom_in_xpm, + GNOME_APP_PIXMAP_STOCK, STOCK_ZOOM_IN, 0, (GdkModifierType) 0, NULL }, { GNOME_APP_UI_ITEM, NULL, N_("Zoom out"), (gpointer) zoomout_cb, viewer_data, NULL, - GNOME_APP_PIXMAP_DATA, stock_zoom_out_xpm, + GNOME_APP_PIXMAP_STOCK, STOCK_ZOOM_OUT, 0, (GdkModifierType) 0, NULL }, GNOMEUIINFO_SEPARATOR, { - GNOME_APP_UI_ITEM, NULL, N_("Rotate 90" DEGREES " counter-clockwise"), + GNOME_APP_UI_ITEM, NULL, N_("Rotate 90 degrees counter-clockwise"), (gpointer) left90_cb, viewer_data, NULL, GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_PIXMAP_UNDO, 0, (GdkModifierType) 0, NULL @@ -91,7 +104,7 @@ gnome_toolbar_new (ViewerData *viewer_da 0, (GdkModifierType) 0, NULL }, { - GNOME_APP_UI_ITEM, NULL, N_("Rotate 90" DEGREES " clockwise"), + GNOME_APP_UI_ITEM, NULL, N_("Rotate 90 degrees clockwise"), (gpointer) right90_cb, viewer_data, NULL, GNOME_APP_PIXMAP_STOCK, GNOME_STOCK_PIXMAP_REDO, 0, (GdkModifierType) 0, NULL @@ -121,6 +134,8 @@ gnome_toolbar_new (ViewerData *viewer_da gnome_app_set_toolbar (GNOME_APP (viewer_data->viewer_window), GTK_TOOLBAR (toolbar)); + + remember_widgets (viewer_data, toolbar_uiinfo); } #else /* NEED_GNOMESUPPORT_H */ @@ -196,7 +211,7 @@ toolbar_new (ViewerData *viewer_data) left90_cb, viewer_data); gtk_toolbar_append_widget (GTK_TOOLBAR (new_bbar), viewer_data->ut_buttons[LEFT90], - _("Rotate 90" DEGREES " counter-clockwise"), NULL); + _("Rotate 90 degrees counter-clockwise"), NULL); viewer_data->ut_buttons[REVERSE] = toolbar_button_new (viewer_data->viewer_window, PIXMAP ("reverse.xpm"), @@ -210,7 +225,7 @@ toolbar_new (ViewerData *viewer_data) right90_cb, viewer_data); gtk_toolbar_append_widget (GTK_TOOLBAR (new_bbar), viewer_data->ut_buttons[RIGHT90], - _("Rotate 90" DEGREES " clockwise"), NULL); + _("Rotate 90 degrees clockwise"), NULL); gtk_toolbar_append_space (GTK_TOOLBAR (new_bbar)); diff -durpN ghfaxviewer-0.21.0/src/viewer.c ghfaxviewer-0.21.1/src/viewer.c --- ghfaxviewer-0.21.0/src/viewer.c Mon Apr 16 11:04:29 2001 +++ ghfaxviewer-0.21.1/src/viewer.c Fri Apr 27 03:58:36 2001 @@ -260,10 +260,8 @@ fax_viewer_open_file (ViewerData *viewer { FaxFile *fax_file; gchar *title, *app_title; -#ifndef NEED_GNOMESUPPORT_H gint ut_but_cnt, bb_but_cnt; gboolean set_ut_button_sensitive; -#endif app_title = _("GNU HaliFAX - Viewer"); @@ -273,14 +271,13 @@ fax_viewer_open_file (ViewerData *viewer if (!fax_file) { -#ifndef NEED_GNOMESUPPORT_H if (viewer_data->fax_file) set_ut_button_sensitive = TRUE; else set_ut_button_sensitive = FALSE; -#endif - file_open_error (g_basename (file_name)); + file_open_error (viewer_data->viewer_window, + g_basename (file_name)); } else { @@ -296,9 +293,7 @@ fax_viewer_open_file (ViewerData *viewer add_thumbs (viewer_data); draw_page (viewer_data); -#ifndef NEED_GNOMESUPPORT_H set_ut_button_sensitive = TRUE; -#endif } } else @@ -311,20 +306,16 @@ fax_viewer_open_file (ViewerData *viewer title); g_free (title); -#ifndef NEED_GNOMESUPPORT_H set_ut_button_sensitive = FALSE; for (bb_but_cnt = 0; bb_but_cnt < 4; bb_but_cnt++) gtk_widget_set_sensitive (viewer_data->bb_buttons [bb_but_cnt], FALSE); -#endif } -#ifndef NEED_GNOMESUPPORT_H for (ut_but_cnt = 0; ut_but_cnt < 5; ut_but_cnt++) gtk_widget_set_sensitive (viewer_data->ut_buttons [ut_but_cnt], set_ut_button_sensitive); -#endif } static void @@ -333,8 +324,6 @@ page_area_realize_cb (GtkWidget *drawing { gtk_drawing_area_size (GTK_DRAWING_AREA (drawing_area), 0, 0); - -/* cursor_set (drawing_area->window, CURSOR_HAND_OPEN); */ gdk_window_set_events (drawing_area->window, diff -durpN ghfaxviewer-0.21.0/src/viewer.h ghfaxviewer-0.21.1/src/viewer.h --- ghfaxviewer-0.21.0/src/viewer.h Wed Apr 11 10:48:27 2001 +++ ghfaxviewer-0.21.1/src/viewer.h Fri Apr 27 13:38:41 2001 @@ -24,12 +24,6 @@ #include "i18n.h" -#ifdef __WIN32__ -#define DEGREES "°" -#else -#define DEGREES "°" -#endif - #define MAX_ZOOM_INDEX 8 typedef struct _ViewerData ViewerData; @@ -46,11 +40,9 @@ struct _ViewerData GtkWidget *page_area; int rotation; -#ifndef NEED_GNOMESUPPORT_H /* button bar */ GtkWidget *bb_buttons[4]; GtkWidget *ut_buttons[5]; -#endif /* NEED_GNOMESUPPORT_H */ /* print dialog */ GtkWidget *zoom_entry; @@ -68,7 +60,7 @@ struct _ViewerData struct _MotionData { - guint dragging:1; + gboolean dragging; guint orig_x, orig_y; gfloat orig_adj_x, orig_adj_y; };