--- a/patches/javahelp-convert-01-gettextize.diff Thu Oct 28 16:44:35 2004 +0000
+++ b/patches/javahelp-convert-01-gettextize.diff Thu Oct 28 18:39:33 2004 +0000
@@ -1,6 +1,6 @@
-diff -ruNa javahelp-convert-0.13/Makefile.am javahelp-convert-0.13.newtar/Makefile.am
+diff -ruNa javahelp-convert-0.13/Makefile.am javahelp-convert-0.13.new/Makefile.am
--- javahelp-convert-0.13/Makefile.am 2004-06-10 18:45:09.000000000 +0900
-+++ javahelp-convert-0.13.newtar/Makefile.am 2004-10-14 15:13:09.000000000 +0900
++++ javahelp-convert-0.13.new/Makefile.am 2004-10-29 02:29:41.091415000 +0900
@@ -1,4 +1,4 @@
-SUBDIRS = category stylesheet
+SUBDIRS = category stylesheet po
@@ -19,332 +19,10 @@
CLEANFILES = \
$(BUILD_SOURCES)
-diff -ruNa javahelp-convert-0.13/aclocal/intltool.m4 javahelp-convert-0.13.newtar/aclocal/intltool.m4
---- javahelp-convert-0.13/aclocal/intltool.m4 1970-01-01 09:00:00.000000000 +0900
-+++ javahelp-convert-0.13.newtar/aclocal/intltool.m4 2004-10-14 16:59:38.000000000 +0900
-@@ -0,0 +1,179 @@
-+## intltool.m4 - Configure intltool for the target system. -*-Shell-script-*-
-+## Copyright (C) 2001 Eazel, Inc.
-+## Author: Maciej Stachowiak <[email protected]>
-+## Kenneth Christiansen <[email protected]>
-+##
-+## 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
-+## the Free Software Foundation; either version 2 of the License, or
-+## (at your option) any later version.
-+##
-+## This program is distributed in the hope that it will be useful, but
-+## WITHOUT ANY WARRANTY; without even the implied warranty of
-+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+## General Public License for more details.
-+##
-+## You should have received a copy of the GNU General Public License
-+## along with this program; if not, write to the Free Software
-+## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+##
-+## As a special exception to the GNU General Public License, if you
-+## distribute this file as part of a program that contains a
-+## configuration script generated by Autoconf, you may include it under
-+## the same distribution terms that you use for the rest of that program.
-+
-+dnl AC_PROG_INTLTOOL([MINIMUM-VERSION], [no-xml])
-+# serial 1 AC_PROG_INTLTOOL
-+AC_DEFUN([AC_PROG_INTLTOOL],
-+[
-+
-+if test -n "$1"; then
-+ AC_MSG_CHECKING(for intltool >= $1)
-+
-+ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo $1 | awk -F. '{ printf "%d", $[1] * 100 + $[2]; }'`
-+ INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { printf $[2]; }' < ${ac_aux_dir}/intltool-update.in`
-+ changequote({{,}})
-+ INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split(${{2}}, VERSION, "."); printf "%d\n", VERSION[1] * 100 + VERSION[2];}' < ${ac_aux_dir}/intltool-update.in`
-+ changequote([,])
-+
-+ if test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT"; then
-+ AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found])
-+ else
-+ AC_MSG_RESULT([$INTLTOOL_APPLIED_VERSION found. Your intltool is too old. You need intltool $1 or later.])
-+ exit 1
-+ fi
-+fi
-+
-+ INTLTOOL_DESKTOP_RULE='%.desktop: %.desktop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+INTLTOOL_DIRECTORY_RULE='%.directory: %.directory.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+ INTLTOOL_KEYS_RULE='%.keys: %.keys.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -k -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+ INTLTOOL_PROP_RULE='%.prop: %.prop.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+ INTLTOOL_OAF_RULE='%.oaf: %.oaf.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -p $(top_srcdir)/po $< [$]@'
-+ INTLTOOL_PONG_RULE='%.pong: %.pong.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+ INTLTOOL_SERVER_RULE='%.server: %.server.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -o -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+ INTLTOOL_SHEET_RULE='%.sheet: %.sheet.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+INTLTOOL_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+ INTLTOOL_UI_RULE='%.ui: %.ui.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+ INTLTOOL_XML_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+ INTLTOOL_XAM_RULE='%.xam: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+ INTLTOOL_KBD_RULE='%.kbd: %.kbd.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u -m -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+ INTLTOOL_CAVES_RULE='%.caves: %.caves.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+ INTLTOOL_SCHEMAS_RULE='%.schemas: %.schemas.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -s -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+ INTLTOOL_THEME_RULE='%.theme: %.theme.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) -d -u -c $(top_builddir)/po/.intltool-merge-cache $(top_srcdir)/po $< [$]@'
-+
-+AC_SUBST(INTLTOOL_DESKTOP_RULE)
-+AC_SUBST(INTLTOOL_DIRECTORY_RULE)
-+AC_SUBST(INTLTOOL_KEYS_RULE)
-+AC_SUBST(INTLTOOL_PROP_RULE)
-+AC_SUBST(INTLTOOL_OAF_RULE)
-+AC_SUBST(INTLTOOL_PONG_RULE)
-+AC_SUBST(INTLTOOL_SERVER_RULE)
-+AC_SUBST(INTLTOOL_SHEET_RULE)
-+AC_SUBST(INTLTOOL_SOUNDLIST_RULE)
-+AC_SUBST(INTLTOOL_UI_RULE)
-+AC_SUBST(INTLTOOL_XAM_RULE)
-+AC_SUBST(INTLTOOL_KBD_RULE)
-+AC_SUBST(INTLTOOL_XML_RULE)
-+AC_SUBST(INTLTOOL_CAVES_RULE)
-+AC_SUBST(INTLTOOL_SCHEMAS_RULE)
-+AC_SUBST(INTLTOOL_THEME_RULE)
-+
-+# Use the tools built into the package, not the ones that are installed.
-+
-+INTLTOOL_EXTRACT='$(top_builddir)/intltool-extract'
-+INTLTOOL_MERGE='$(top_builddir)/intltool-merge'
-+INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
-+
-+AC_SUBST(INTLTOOL_EXTRACT)
-+AC_SUBST(INTLTOOL_MERGE)
-+AC_SUBST(INTLTOOL_UPDATE)
-+
-+AC_PATH_PROG(INTLTOOL_PERL, perl)
-+if test -z "$INTLTOOL_PERL"; then
-+ AC_MSG_ERROR([perl not found; required for intltool])
-+fi
-+if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
-+ AC_MSG_ERROR([perl 5.x required for intltool])
-+fi
-+if test "x$2" != "xno-xml"; then
-+ AC_MSG_CHECKING([for XML::Parser])
-+ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
-+ AC_MSG_RESULT([ok])
-+ else
-+ AC_MSG_ERROR([XML::Parser perl module is required for intltool])
-+ fi
-+fi
-+
-+AC_PATH_PROG(ICONV, iconv, iconv)
-+AC_PATH_PROG(MSGFMT, msgfmt, msgfmt)
-+AC_PATH_PROG(MSGMERGE, msgmerge, msgmerge)
-+AC_PATH_PROG(XGETTEXT, xgettext, xgettext)
-+
-+# Remove file type tags (using []) from po/POTFILES.
-+
-+ifdef([AC_DIVERSION_ICMDS],[
-+ AC_DIVERT_PUSH(AC_DIVERSION_ICMDS)
-+ changequote(,)
-+ mv -f po/POTFILES po/POTFILES.tmp
-+ sed -e '/\[encoding.*\]/d' -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES
-+ rm -f po/POTFILES.tmp
-+ changequote([,])
-+ AC_DIVERT_POP()
-+],[
-+ ifdef([AC_CONFIG_COMMANDS_PRE],[
-+ AC_CONFIG_COMMANDS_PRE([
-+ changequote(,)
-+ mv -f po/POTFILES po/POTFILES.tmp
-+ sed -e '/\[encoding.*\]/d' -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES
-+ rm -f po/POTFILES.tmp
-+ changequote([,])
-+ ])
-+ ])
-+])
-+
-+# Manually sed perl in so people don't have to put the intltool scripts in AC_OUTPUT.
-+
-+AC_OUTPUT_COMMANDS([
-+
-+intltool_edit="-e \"s:@INTLTOOL_EXTRACT@:${INTLTOOL_EXTRACT}:g\" \
-+ -e \"s:@INTLTOOL_ICONV@:${ICONV}:g\" \
-+ -e \"s:@INTLTOOL_MSGFMT@:${MSGFMT}:g\" \
-+ -e \"s:@INTLTOOL_MSGMERGE@:${MSGMERGE}:g\" \
-+ -e \"s:@INTLTOOL_XGETTEXT@:${XGETTEXT}:g\" \
-+ -e \"s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:g\""
-+
-+eval sed ${intltool_edit} < ${ac_aux_dir}/intltool-extract.in \
-+ > intltool-extract.out
-+if cmp -s intltool-extract intltool-extract.out 2>/dev/null; then
-+ rm -f intltool-extract.out
-+else
-+ mv -f intltool-extract.out intltool-extract
-+fi
-+chmod ugo+x intltool-extract
-+chmod u+w intltool-extract
-+
-+eval sed ${intltool_edit} < ${ac_aux_dir}/intltool-merge.in \
-+ > intltool-merge.out
-+if cmp -s intltool-merge intltool-merge.out 2>/dev/null; then
-+ rm -f intltool-merge.out
-+else
-+ mv -f intltool-merge.out intltool-merge
-+fi
-+chmod ugo+x intltool-merge
-+chmod u+w intltool-merge
-+
-+eval sed ${intltool_edit} < ${ac_aux_dir}/intltool-update.in \
-+ > intltool-update.out
-+if cmp -s intltool-update intltool-update.out 2>/dev/null; then
-+ rm -f intltool-update.out
-+else
-+ mv -f intltool-update.out intltool-update
-+fi
-+chmod ugo+x intltool-update
-+chmod u+w intltool-update
-+
-+], INTLTOOL_PERL=${INTLTOOL_PERL} ac_aux_dir=${ac_aux_dir}
-+INTLTOOL_EXTRACT=${INTLTOOL_EXTRACT} ICONV=${ICONV}
-+MSGFMT=${MSGFMT} MSGMERGE=${MSGMERGE} XGETTEXT=${XGETTEXT})
-+
-+])
-diff -ruNa javahelp-convert-0.13/aclocal/xml-i18n-tools.m4 javahelp-convert-0.13.newtar/aclocal/xml-i18n-tools.m4
---- javahelp-convert-0.13/aclocal/xml-i18n-tools.m4 1970-01-01 09:00:00.000000000 +0900
-+++ javahelp-convert-0.13.newtar/aclocal/xml-i18n-tools.m4 2004-10-14 16:59:38.000000000 +0900
-@@ -0,0 +1,135 @@
-+## xml-i18n-tools.m4 - Configure xml-i18n-tools for the target system. -*-Shell-script-*-
-+## Copyright (C) 2001 Eazel, Inc.
-+## Author: Maciej Stachowiak <[email protected]>
-+##
-+## 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
-+## the Free Software Foundation; either version 2 of the License, or
-+## (at your option) any later version.
-+##
-+## This program is distributed in the hope that it will be useful, but
-+## WITHOUT ANY WARRANTY; without even the implied warranty of
-+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+## General Public License for more details.
-+##
-+## You should have received a copy of the GNU General Public License
-+## along with this program; if not, write to the Free Software
-+## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-+##
-+## As a special exception to the GNU General Public License, if you
-+## distribute this file as part of a program that contains a
-+## configuration script generated by Autoconf, you may include it under
-+## the same distribution terms that you use for the rest of that program.
-+
-+AC_DEFUN([XML_I18N_TOOLS_NEWER_THAN_0_9],[ true ])
-+
-+dnl AC_PROG_XML_I18N_TOOLS([MINIMUM-VERSION [,"G2" if always using --utf8] ])
-+# serial 1 AC_PROG_XML_I18N_TOOLS
-+AC_DEFUN([AC_PROG_XML_I18N_TOOLS],
-+[
-+ AC_DEFUN([X18T_PFORG1], dnl and -u for G2
-+ ifelse([$2],[G2],[ -u ], [ -p ]))
-+ AC_DEFUN([X18T_XML_KIND],
-+ ifelse([$2],[G2],[ -u ],[ $(XML_I18N_XML_KIND) ]))
-+ AC_DEFUN([X18T_KEYS_KIND],
-+ ifelse([$2],[G2],[ -u ],[ $(XML_I18N_KEYS_KIND) ]))
-+
-+ XML_I18N_MERGE_DESKTOP_RULE='%.desktop: %.desktop.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -d X18T_PFORG1'
-+XML_I18N_MERGE_DIRECTORY_RULE='%.directory: %.directory.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -d X18T_PFORG1'
-+ XML_I18N_MERGE_KEYS_RULE='%.keys: %.keys.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -k X18T_KEYS_KIND'
-+ XML_I18N_MERGE_OAF_RULE='%.oaf: %.oaf.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -o -p'
-+ XML_I18N_MERGE_PONG_RULE='%.pong: %.pong.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -x X18T_PFORG1'
-+ XML_I18N_MERGE_SERVER_RULE='%.server: %.server.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -o -u'
-+ XML_I18N_MERGE_SHEET_RULE='%.sheet: %.sheet.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -x -u'
-+XML_I18N_MERGE_SOUNDLIST_RULE='%.soundlist: %.soundlist.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -d X18T_PFORG1'
-+ XML_I18N_MERGE_XML_RULE='%.xml: %.xml.in $(top_builddir)/xml-i18n-merge $(wildcard $(top_srcdir)/po/*.po) ; $(top_builddir)/xml-i18n-merge $(top_srcdir)/po $< [$]@ -x X18T_XML_KIND'
-+
-+AC_SUBST(XML_I18N_MERGE_DESKTOP_RULE)
-+AC_SUBST(XML_I18N_MERGE_DIRECTORY_RULE)
-+AC_SUBST(XML_I18N_MERGE_KEYS_RULE)
-+AC_SUBST(XML_I18N_MERGE_OAF_RULE)
-+AC_SUBST(XML_I18N_MERGE_PONG_RULE)
-+AC_SUBST(XML_I18N_MERGE_SERVER_RULE)
-+AC_SUBST(XML_I18N_MERGE_SHEET_RULE)
-+AC_SUBST(XML_I18N_MERGE_SOUNDLIST_RULE)
-+AC_SUBST(XML_I18N_MERGE_XML_RULE)
-+
-+# Use the tools built into the package, not the ones that are installed.
-+
-+XML_I18N_EXTRACT='$(top_builddir)/xml-i18n-extract'
-+AC_SUBST(XML_I18N_EXTRACT)dnl
-+
-+XML_I18N_MERGE='$(top_builddir)/xml-i18n-merge'
-+AC_SUBST(XML_I18N_MERGE)dnl
-+
-+XML_I18N_UPDATE='$(top_builddir)/xml-i18n-update'
-+AC_SUBST(XML_I18N_UPDATE)dnl
-+
-+AC_PATH_PROG(INTLTOOL_PERL, perl)
-+if test -z "$INTLTOOL_PERL"; then
-+ AC_MSG_ERROR([perl not found; required for xml-i18n-tools])
-+fi
-+if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
-+ AC_MSG_ERROR([perl 5.x required for xml-i18n-tools])
-+fi
-+
-+dnl Remove Intltool [] tags from po/POTFILES
-+dnl
-+ifdef([AC_DIVERSION_ICMDS],[
-+ AC_DIVERT_PUSH(AC_DIVERSION_ICMDS)
-+ changequote(,)
-+ mv -f po/POTFILES po/POTFILES.tmp
-+ sed -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES
-+ rm -f po/POTFILES.tmp
-+ changequote([,])
-+ AC_DIVERT_POP()
-+],[
-+ ifdef([AC_CONFIG_COMMANDS_PRE],[
-+ AC_CONFIG_COMMANDS_PRE([
-+ changequote(,)
-+ mv -f po/POTFILES po/POTFILES.tmp
-+ sed -e 's/\[.*\] *//' < po/POTFILES.tmp > po/POTFILES
-+ rm -f po/POTFILES.tmp
-+ changequote([,])
-+ ])
-+ ])
-+])
-+
-+dnl manually sed perl in so people don't have to put the xml-i18n-tools scripts in their
-+dnl AC_OUTPUT
-+AC_OUTPUT_COMMANDS([
-+sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" < ${srcdir}/xml-i18n-extract.in > xml-i18n-extract.out
-+if cmp -s xml-i18n-extract xml-i18n-extract.out 2>/dev/null; then
-+ rm -f xml-i18n-extract.out
-+else
-+ mv -f xml-i18n-extract.out xml-i18n-extract
-+fi
-+chmod ugo+x xml-i18n-extract
-+chmod u+w xml-i18n-extract
-+
-+sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" < ${srcdir}/xml-i18n-merge.in > xml-i18n-merge.out
-+if cmp -s xml-i18n-merge xml-i18n-merge.out 2>/dev/null; then
-+ rm -f xml-i18n-merge.out
-+else
-+ mv -f xml-i18n-merge.out xml-i18n-merge
-+fi
-+chmod ugo+x xml-i18n-merge
-+chmod u+w xml-i18n-merge
-+
-+sed -e "s:@INTLTOOL_PERL@:${INTLTOOL_PERL}:;" < ${srcdir}/xml-i18n-update.in > xml-i18n-update.out
-+if cmp -s xml-i18n-update xml-i18n-update.out 2>/dev/null; then
-+ rm -f xml-i18n-update.out
-+else
-+ mv -f xml-i18n-update.out xml-i18n-update
-+fi
-+chmod ugo+x xml-i18n-update
-+chmod u+w xml-i18n-update
-+], INTLTOOL_PERL=${INTLTOOL_PERL})
-+
-+# Redirect the config.log output again, so that the ltconfig log is not
-+# clobbered by the next message.
-+exec 5>>./config.log
-+])
-+
-+dnl old names
-+AC_DEFUN([AM_PROG_XML_I18N_TOOLS], [indir([AC_PROG_XML_I18N_TOOLS])])dnl
-diff -ruNa javahelp-convert-0.13/category/C/Makefile.am javahelp-convert-0.13.newtar/category/C/Makefile.am
+diff -ruNa javahelp-convert-0.13/category/C/Makefile.am javahelp-convert-0.13.new/category/C/Makefile.am
--- javahelp-convert-0.13/category/C/Makefile.am 2004-05-28 18:07:18.000000000 +0900
-+++ javahelp-convert-0.13.newtar/category/C/Makefile.am 2004-10-14 21:41:18.000000000 +0900
-@@ -25,3 +25,37 @@
++++ javahelp-convert-0.13.new/category/C/Makefile.am 2004-10-29 02:29:41.105943000 +0900
+@@ -25,3 +25,43 @@
echo " rm -f $(DESTDIR)$(catdatadir)/$$f"; \
rm -f $(DESTDIR)$(catdatadir)/$$f; \
done
@@ -365,6 +43,9 @@
+ fi ; \
+ done | sed 's|\|$$||' > $@
+
++../javahelpcustom.cat.xml : ../javahelpcustom.cat.xml.in
++ (cd ../; make javahelpcustom.cat.xml)
++
+# To use gettextize, convert xml file to original file
+javahelpcustom.section: ../javahelpcustom.section.xml
+ cat $< | egrep -v '^<\?xml|top>' \
@@ -381,27 +62,25 @@
+ fi ; \
+ done | sed 's|\|$$||' > $@
+
++../javahelpcustom.section.xml : ../javahelpcustom.section.xml.in
++ (cd ../; make javahelpcustom.section.xml)
++
+CLEANFILES=javahelpcustom.cat.xml javahelpcustom.cat
-diff -ruNa javahelp-convert-0.13/category/Makefile.am javahelp-convert-0.13.newtar/category/Makefile.am
+diff -ruNa javahelp-convert-0.13/category/Makefile.am javahelp-convert-0.13.new/category/Makefile.am
--- javahelp-convert-0.13/category/Makefile.am 2004-09-30 17:21:40.000000000 +0900
-+++ javahelp-convert-0.13.newtar/category/Makefile.am 2004-10-13 23:37:56.000000000 +0900
-@@ -1 +1,12 @@
++++ javahelp-convert-0.13.new/category/Makefile.am 2004-10-29 02:29:41.106254000 +0900
+@@ -1 +1,7 @@
-SUBDIRS = C de es fr it sv ja ko zh_CN zh_TW zh_HK
-+SUBDIRS = . C de es fr it sv ja ko zh_CN zh_TW zh_HK
-+
-+utilsdir = $(datadir)/gnome/apps/Utilities
-+utils_in_files = javahelpcustom.cat.xml.in javahelpcustom.section.xml.in
-+utils_DATA = $(utils_in_files:.xml.in=.xml)
-+EXTRA_DIST = javahelpcustom.cat.xml javahelpcustom.section.xml
++SUBDIRS = C de es fr it sv ja ko zh_CN zh_TW zh_HK pt_BR
+
+# For multipul output by each lang, use '-m' option instead of normal INTLTOOL_MERGE
+%.xml: %.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po) ; LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -m -x -u -c $(top_builddir)/po/.intltool-merge-cache
+
+CLEANFILES=javahelpcustom.cat.xml javahelpcustom.section.xml
+
-diff -ruNa javahelp-convert-0.13/category/de/Makefile.am javahelp-convert-0.13.newtar/category/de/Makefile.am
+diff -ruNa javahelp-convert-0.13/category/de/Makefile.am javahelp-convert-0.13.new/category/de/Makefile.am
--- javahelp-convert-0.13/category/de/Makefile.am 2004-09-30 17:21:40.000000000 +0900
-+++ javahelp-convert-0.13.newtar/category/de/Makefile.am 2004-10-14 21:39:35.000000000 +0900
++++ javahelp-convert-0.13.new/category/de/Makefile.am 2004-10-29 02:29:41.106565000 +0900
@@ -9,8 +9,6 @@
catdatadir=$(pkgdatadir)/$(lang)
@@ -411,7 +90,7 @@
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(catdatadir)
@list='$(pkgdata_DATA)'; for p in $$list; do \
-@@ -27,3 +25,37 @@
+@@ -27,3 +25,43 @@
echo " rm -f $(DESTDIR)$(catdatadir)/$$f"; \
rm -f $(DESTDIR)$(catdatadir)/$$f; \
done
@@ -432,6 +111,9 @@
+ fi ; \
+ done | sed 's|\|$$||' > $@
+
++javahelpcustom.cat.xml : ../javahelpcustom.cat.xml.in
++ ( cd ../; make javahelpcustom.cat.xml)
++
+# To use gettextize, convert xml file to original file
+javahelpcustom.section: javahelpcustom.section.xml
+ cat $< | egrep -v '^<\?xml|top>' \
@@ -448,10 +130,13 @@
+ fi ; \
+ done | sed 's|\|$$||' > $@
+
++javahelpcustom.section.xml : ../javahelpcustom.section.xml.in
++ ( cd ../; make javahelpcustom.section.xml)
++
+CLEANFILES=javahelpcustom.cat.xml javahelpcustom.cat
-diff -ruNa javahelp-convert-0.13/category/es/Makefile.am javahelp-convert-0.13.newtar/category/es/Makefile.am
+diff -ruNa javahelp-convert-0.13/category/es/Makefile.am javahelp-convert-0.13.new/category/es/Makefile.am
--- javahelp-convert-0.13/category/es/Makefile.am 2004-09-30 17:21:40.000000000 +0900
-+++ javahelp-convert-0.13.newtar/category/es/Makefile.am 2004-10-14 21:39:45.000000000 +0900
++++ javahelp-convert-0.13.new/category/es/Makefile.am 2004-10-29 02:29:41.106876000 +0900
@@ -9,8 +9,6 @@
catdatadir=$(pkgdatadir)/$(lang)
@@ -461,7 +146,7 @@
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(catdatadir)
@list='$(pkgdata_DATA)'; for p in $$list; do \
-@@ -27,3 +25,37 @@
+@@ -27,3 +25,43 @@
echo " rm -f $(DESTDIR)$(catdatadir)/$$f"; \
rm -f $(DESTDIR)$(catdatadir)/$$f; \
done
@@ -482,6 +167,9 @@
+ fi ; \
+ done | sed 's|\|$$||' > $@
+
++javahelpcustom.cat.xml : ../javahelpcustom.cat.xml.in
++ ( cd ../; make javahelpcustom.cat.xml)
++
+# To use gettextize, convert xml file to original file
+javahelpcustom.section: javahelpcustom.section.xml
+ cat $< | egrep -v '^<\?xml|top>' \
@@ -498,10 +186,13 @@
+ fi ; \
+ done | sed 's|\|$$||' > $@
+
++javahelpcustom.section.xml : ../javahelpcustom.section.xml.in
++ ( cd ../; make javahelpcustom.section.xml)
++
+CLEANFILES=javahelpcustom.cat.xml javahelpcustom.cat
-diff -ruNa javahelp-convert-0.13/category/fr/Makefile.am javahelp-convert-0.13.newtar/category/fr/Makefile.am
+diff -ruNa javahelp-convert-0.13/category/fr/Makefile.am javahelp-convert-0.13.new/category/fr/Makefile.am
--- javahelp-convert-0.13/category/fr/Makefile.am 2004-09-30 17:21:41.000000000 +0900
-+++ javahelp-convert-0.13.newtar/category/fr/Makefile.am 2004-10-14 21:40:01.000000000 +0900
++++ javahelp-convert-0.13.new/category/fr/Makefile.am 2004-10-29 02:29:41.107186000 +0900
@@ -9,8 +9,6 @@
catdatadir=$(pkgdatadir)/$(lang)
@@ -511,7 +202,7 @@
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(catdatadir)
@list='$(pkgdata_DATA)'; for p in $$list; do \
-@@ -27,3 +25,37 @@
+@@ -27,3 +25,43 @@
echo " rm -f $(DESTDIR)$(catdatadir)/$$f"; \
rm -f $(DESTDIR)$(catdatadir)/$$f; \
done
@@ -532,6 +223,9 @@
+ fi ; \
+ done | sed 's|\|$$||' > $@
+
++javahelpcustom.cat.xml : ../javahelpcustom.cat.xml.in
++ ( cd ../; make javahelpcustom.cat.xml)
++
+# To use gettextize, convert xml file to original file
+javahelpcustom.section: javahelpcustom.section.xml
+ cat $< | egrep -v '^<\?xml|top>' \
@@ -548,10 +242,13 @@
+ fi ; \
+ done | sed 's|\|$$||' > $@
+
++javahelpcustom.section.xml : ../javahelpcustom.section.xml.in
++ ( cd ../; make javahelpcustom.section.xml)
++
+CLEANFILES=javahelpcustom.cat.xml javahelpcustom.cat
-diff -ruNa javahelp-convert-0.13/category/it/Makefile.am javahelp-convert-0.13.newtar/category/it/Makefile.am
+diff -ruNa javahelp-convert-0.13/category/it/Makefile.am javahelp-convert-0.13.new/category/it/Makefile.am
--- javahelp-convert-0.13/category/it/Makefile.am 2004-09-30 17:21:41.000000000 +0900
-+++ javahelp-convert-0.13.newtar/category/it/Makefile.am 2004-10-14 21:40:11.000000000 +0900
++++ javahelp-convert-0.13.new/category/it/Makefile.am 2004-10-29 02:29:41.107496000 +0900
@@ -9,8 +9,6 @@
catdatadir=$(pkgdatadir)/$(lang)
@@ -561,7 +258,7 @@
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(catdatadir)
@list='$(pkgdata_DATA)'; for p in $$list; do \
-@@ -27,3 +25,37 @@
+@@ -27,3 +25,43 @@
echo " rm -f $(DESTDIR)$(catdatadir)/$$f"; \
rm -f $(DESTDIR)$(catdatadir)/$$f; \
done
@@ -582,6 +279,9 @@
+ fi ; \
+ done | sed 's|\|$$||' > $@
+
++javahelpcustom.cat.xml : ../javahelpcustom.cat.xml.in
++ ( cd ../; make javahelpcustom.cat.xml)
++
+# To use gettextize, convert xml file to original file
+javahelpcustom.section: javahelpcustom.section.xml
+ cat $< | egrep -v '^<\?xml|top>' \
@@ -598,10 +298,13 @@
+ fi ; \
+ done | sed 's|\|$$||' > $@
+
++javahelpcustom.section.xml : ../javahelpcustom.section.xml.in
++ ( cd ../; make javahelpcustom.section.xml)
++
+CLEANFILES=javahelpcustom.cat.xml javahelpcustom.cat
-diff -ruNa javahelp-convert-0.13/category/ja/Makefile.am javahelp-convert-0.13.newtar/category/ja/Makefile.am
+diff -ruNa javahelp-convert-0.13/category/ja/Makefile.am javahelp-convert-0.13.new/category/ja/Makefile.am
--- javahelp-convert-0.13/category/ja/Makefile.am 2004-09-30 17:21:41.000000000 +0900
-+++ javahelp-convert-0.13.newtar/category/ja/Makefile.am 2004-10-14 21:37:42.000000000 +0900
++++ javahelp-convert-0.13.new/category/ja/Makefile.am 2004-10-29 02:29:41.107807000 +0900
@@ -9,8 +9,6 @@
catdatadir=$(pkgdatadir)/$(lang)
@@ -611,7 +314,7 @@
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(catdatadir)
@list='$(pkgdata_DATA)'; for p in $$list; do \
-@@ -27,3 +25,37 @@
+@@ -27,3 +25,43 @@
echo " rm -f $(DESTDIR)$(catdatadir)/$$f"; \
rm -f $(DESTDIR)$(catdatadir)/$$f; \
done
@@ -632,6 +335,9 @@
+ fi ; \
+ done | sed 's|\|$$||' > $@
+
++javahelpcustom.cat.xml : ../javahelpcustom.cat.xml.in
++ ( cd ../; make javahelpcustom.cat.xml)
++
+# To use gettextize, convert xml file to original file
+javahelpcustom.section: javahelpcustom.section.xml
+ cat $< | egrep -v '^<\?xml|top>' \
@@ -648,10 +354,13 @@
+ fi ; \
+ done | sed 's|\|$$||' > $@
+
++javahelpcustom.section.xml : ../javahelpcustom.section.xml.in
++ ( cd ../; make javahelpcustom.section.xml)
++
+CLEANFILES=javahelpcustom.cat.xml javahelpcustom.cat
-diff -ruNa javahelp-convert-0.13/category/javahelpcustom.cat.xml.in javahelp-convert-0.13.newtar/category/javahelpcustom.cat.xml.in
+diff -ruNa javahelp-convert-0.13/category/javahelpcustom.cat.xml.in javahelp-convert-0.13.new/category/javahelpcustom.cat.xml.in
--- javahelp-convert-0.13/category/javahelpcustom.cat.xml.in 1970-01-01 09:00:00.000000000 +0900
-+++ javahelp-convert-0.13.newtar/category/javahelpcustom.cat.xml.in 2004-10-13 23:32:22.000000000 +0900
++++ javahelp-convert-0.13.new/category/javahelpcustom.cat.xml.in 2004-10-29 02:29:41.094051000 +0900
@@ -0,0 +1,65 @@
+<?xml version="1.0"?>
+<top><!-- please keep one line by item. -->
@@ -718,9 +427,9 @@
+<item appl="zenity"><_t>Developer</_t></item>
+<item appl="system-admin-guide"><_t>System</_t></item>
+</top>
-diff -ruNa javahelp-convert-0.13/category/javahelpcustom.section.xml.in javahelp-convert-0.13.newtar/category/javahelpcustom.section.xml.in
+diff -ruNa javahelp-convert-0.13/category/javahelpcustom.section.xml.in javahelp-convert-0.13.new/category/javahelpcustom.section.xml.in
--- javahelp-convert-0.13/category/javahelpcustom.section.xml.in 1970-01-01 09:00:00.000000000 +0900
-+++ javahelp-convert-0.13.newtar/category/javahelpcustom.section.xml.in 2004-10-14 15:19:14.000000000 +0900
++++ javahelp-convert-0.13.new/category/javahelpcustom.section.xml.in 2004-10-29 02:29:41.094336000 +0900
@@ -0,0 +1,6 @@
+<?xml version="1.0"?>
+<top><!-- please keep one line by item. -->
@@ -728,9 +437,9 @@
+<item appl="Index"><_t>Index</_t></item>
+<item appl="Search"><_t>Search</_t></item>
+</top>
-diff -ruNa javahelp-convert-0.13/category/ko/Makefile.am javahelp-convert-0.13.newtar/category/ko/Makefile.am
+diff -ruNa javahelp-convert-0.13/category/ko/Makefile.am javahelp-convert-0.13.new/category/ko/Makefile.am
--- javahelp-convert-0.13/category/ko/Makefile.am 2004-09-30 17:21:41.000000000 +0900
-+++ javahelp-convert-0.13.newtar/category/ko/Makefile.am 2004-10-14 21:38:01.000000000 +0900
++++ javahelp-convert-0.13.new/category/ko/Makefile.am 2004-10-29 02:29:41.108110000 +0900
@@ -9,8 +9,6 @@
catdatadir=$(pkgdatadir)/$(lang)
@@ -740,57 +449,7 @@
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(catdatadir)
@list='$(pkgdata_DATA)'; for p in $$list; do \
-@@ -27,3 +25,37 @@
- echo " rm -f $(DESTDIR)$(catdatadir)/$$f"; \
- rm -f $(DESTDIR)$(catdatadir)/$$f; \
- done
-+
-+# To use gettextize, convert xml file to original file
-+javahelpcustom.cat: javahelpcustom.cat.xml
-+ cat $< | egrep -v '^<\?xml|top>' \
-+ | sed -e 's|<t xml:lang=[^>]*>|\||g' \
-+ | sed -e 's|^<item appl="\([^"]*\)">|\1|' \
-+ | sed -e 's|<t>|\||g' -e 's|</t>||g' -e 's|</item>|\||' | egrep -v '^$$' | \
-+ while read line ; do \
-+ if \
-+ echo "$$line" | egrep '\|$$' > /dev/null ; \
-+ then \
-+ echo "$$line" ; \
-+ else \
-+ printf "$$line" ; \
-+ fi ; \
-+ done | sed 's|\|$$||' > $@
-+
-+# To use gettextize, convert xml file to original file
-+javahelpcustom.section: javahelpcustom.section.xml
-+ cat $< | egrep -v '^<\?xml|top>' \
-+ | sed -e 's|<t xml:lang=[^>]*>|\||g' \
-+ | sed -e 's|^<item appl="\([^"]*\)">|\1|' \
-+ | sed -e 's|<t>|\||g' -e 's|</t>||g' -e 's|</item>|\||' | egrep -v '^$$' | \
-+ while read line ; do \
-+ if \
-+ echo "$$line" | egrep '\|$$' > /dev/null ; \
-+ then \
-+ echo "$$line" ; \
-+ else \
-+ printf "$$line" ; \
-+ fi ; \
-+ done | sed 's|\|$$||' > $@
-+
-+CLEANFILES=javahelpcustom.cat.xml javahelpcustom.cat
-diff -ruNa javahelp-convert-0.13/category/sv/Makefile.am javahelp-convert-0.13.newtar/category/sv/Makefile.am
---- javahelp-convert-0.13/category/sv/Makefile.am 2004-09-30 17:21:41.000000000 +0900
-+++ javahelp-convert-0.13.newtar/category/sv/Makefile.am 2004-10-14 21:38:14.000000000 +0900
-@@ -9,8 +9,6 @@
- catdatadir=$(pkgdatadir)/$(lang)
-
- install-pkgdataDATA: $(pkgdata_DATA)
-- sed -e '/^$$/d' $< > .tmp.$<
-- mv .tmp.$< $<
- @$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(catdatadir)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
-@@ -27,3 +25,37 @@
+@@ -27,3 +25,43 @@
echo " rm -f $(DESTDIR)$(catdatadir)/$$f"; \
rm -f $(DESTDIR)$(catdatadir)/$$f; \
done
@@ -811,6 +470,80 @@
+ fi ; \
+ done | sed 's|\|$$||' > $@
+
++javahelpcustom.cat.xml : ../javahelpcustom.cat.xml.in
++ ( cd ../; make javahelpcustom.cat.xml)
++
++# To use gettextize, convert xml file to original file
++javahelpcustom.section: javahelpcustom.section.xml
++ cat $< | egrep -v '^<\?xml|top>' \
++ | sed -e 's|<t xml:lang=[^>]*>|\||g' \
++ | sed -e 's|^<item appl="\([^"]*\)">|\1|' \
++ | sed -e 's|<t>|\||g' -e 's|</t>||g' -e 's|</item>|\||' | egrep -v '^$$' | \
++ while read line ; do \
++ if \
++ echo "$$line" | egrep '\|$$' > /dev/null ; \
++ then \
++ echo "$$line" ; \
++ else \
++ printf "$$line" ; \
++ fi ; \
++ done | sed 's|\|$$||' > $@
++
++javahelpcustom.section.xml : ../javahelpcustom.section.xml.in
++ ( cd ../; make javahelpcustom.section.xml)
++
++CLEANFILES=javahelpcustom.cat.xml javahelpcustom.cat
+diff -ruNa javahelp-convert-0.13/category/pt_BR/Makefile.am javahelp-convert-0.13.new/category/pt_BR/Makefile.am
+--- javahelp-convert-0.13/category/pt_BR/Makefile.am 1970-01-01 09:00:00.000000000 +0900
++++ javahelp-convert-0.13.new/category/pt_BR/Makefile.am 2004-10-29 02:29:41.108519000 +0900
+@@ -0,0 +1,67 @@
++lang = pt_BR
++pkgdata_DATA = \
++ javahelpcustom.cat \
++ javahelpcustom.section
++
++EXTRA_DIST = \
++ $(pkgdata_DATA)
++
++catdatadir=$(pkgdatadir)/$(lang)
++
++install-pkgdataDATA: $(pkgdata_DATA)
++ @$(NORMAL_INSTALL)
++ $(mkinstalldirs) $(DESTDIR)$(catdatadir)
++ @list='$(pkgdata_DATA)'; for p in $$list; do \
++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(catdatadir)/$$f"; \
++ $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(catdatadir)/$$f; \
++ done
++
++uninstall-pkgdataDATA:
++ @$(NORMAL_UNINSTALL)
++ @list='$(pkgdata_DATA)'; for p in $$list; do \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " rm -f $(DESTDIR)$(catdatadir)/$$f"; \
++ rm -f $(DESTDIR)$(catdatadir)/$$f; \
++ done
++
++# To use gettextize, convert xml file to original file
++javahelpcustom.cat: javahelpcustom.cat.xml
++ cat $< | egrep -v '^<\?xml|top>' \
++ | sed -e 's|<t xml:lang=[^>]*>|\||g' \
++ | sed -e 's|^<item appl="\([^"]*\)">|\1|' \
++ | sed -e 's|<t>|\||g' -e 's|</t>||g' -e 's|</item>|\||' | egrep -v '^$$' | \
++ while read line ; do \
++ if \
++ echo "$$line" | egrep '\|$$' > /dev/null ; \
++ then \
++ echo "$$line" ; \
++ else \
++ printf "$$line" ; \
++ fi ; \
++ done | sed 's|\|$$||' > $@
++
++javahelpcustom.cat.xml : ../javahelpcustom.cat.xml.in
++ ( cd ../; make javahelpcustom.cat.xml)
++
+# To use gettextize, convert xml file to original file
+javahelpcustom.section: javahelpcustom.section.xml
+ cat $< | egrep -v '^<\?xml|top>' \
@@ -827,10 +560,411 @@
+ fi ; \
+ done | sed 's|\|$$||' > $@
+
++javahelpcustom.section.xml : ../javahelpcustom.section.xml.in
++ ( cd ../; make javahelpcustom.section.xml)
++
+CLEANFILES=javahelpcustom.cat.xml javahelpcustom.cat
-diff -ruNa javahelp-convert-0.13/category/zh_CN/Makefile.am javahelp-convert-0.13.newtar/category/zh_CN/Makefile.am
---- javahelp-convert-0.13/category/zh_CN/Makefile.am 2004-09-30 17:21:42.000000000 +0900
-+++ javahelp-convert-0.13.newtar/category/zh_CN/Makefile.am 2004-10-14 21:38:29.000000000 +0900
+diff -ruNa javahelp-convert-0.13/category/pt_BR/Makefile.in javahelp-convert-0.13.new/category/pt_BR/Makefile.in
+--- javahelp-convert-0.13/category/pt_BR/Makefile.in 1970-01-01 09:00:00.000000000 +0900
++++ javahelp-convert-0.13.new/category/pt_BR/Makefile.in 2004-10-29 02:29:41.109141000 +0900
+@@ -0,0 +1,321 @@
++# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# @configure_input@
++
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004 Free Software Foundation, Inc.
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++@SET_MAKE@
++
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
++VPATH = @srcdir@
++pkgdatadir = $(datadir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
++install_sh_DATA = $(install_sh) -c -m 644
++install_sh_PROGRAM = $(install_sh) -c
++install_sh_SCRIPT = $(install_sh) -c
++INSTALL_HEADER = $(INSTALL_DATA)
++transform = $(program_transform_name)
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++host_triplet = @host@
++subdir = category/pt_BR
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(mkdir_p)
++CONFIG_CLEAN_FILES =
++SOURCES =
++DIST_SOURCES =
++am__installdirs = "$(DESTDIR)$(pkgdatadir)"
++pkgdataDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(pkgdata_DATA)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
++AMTAR = @AMTAR@
++AUTOCONF = @AUTOCONF@
++AUTOHEADER = @AUTOHEADER@
++AUTOMAKE = @AUTOMAKE@
++AWK = @AWK@
++CC = @CC@
++CCDEPMODE = @CCDEPMODE@
++CFLAGS = @CFLAGS@
++CPPFLAGS = @CPPFLAGS@
++CYGPATH_W = @CYGPATH_W@
++DEFS = @DEFS@
++DEPDIR = @DEPDIR@
++DOCBOOK_XSL_STYLESHEET_DIR = @DOCBOOK_XSL_STYLESHEET_DIR@
++ECHO_C = @ECHO_C@
++ECHO_N = @ECHO_N@
++ECHO_T = @ECHO_T@
++EXEEXT = @EXEEXT@
++GNOME_CFLAGS = @GNOME_CFLAGS@
++GNOME_LIBS = @GNOME_LIBS@
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++JAVAHELP_CONVERT_VERSION = @JAVAHELP_CONVERT_VERSION@
++LDFLAGS = @LDFLAGS@
++LIBOBJS = @LIBOBJS@
++LIBS = @LIBS@
++LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
++MAKEINFO = @MAKEINFO@
++OBJEXT = @OBJEXT@
++PACKAGE = @PACKAGE@
++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
++PACKAGE_NAME = @PACKAGE_NAME@
++PACKAGE_STRING = @PACKAGE_STRING@
++PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_VERSION = @PACKAGE_VERSION@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++PKG_CONFIG = @PKG_CONFIG@
++SET_MAKE = @SET_MAKE@
++SHELL = @SHELL@
++STRIP = @STRIP@
++VERSION = @VERSION@
++ac_ct_CC = @ac_ct_CC@
++ac_ct_STRIP = @ac_ct_STRIP@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__include = @am__include@
++am__leading_dot = @am__leading_dot@
++am__quote = @am__quote@
++bindir = @bindir@
++build = @build@
++build_alias = @build_alias@
++build_cpu = @build_cpu@
++build_os = @build_os@
++build_vendor = @build_vendor@
++datadir = @datadir@
++exec_prefix = @exec_prefix@
++host = @host@
++host_alias = @host_alias@
++host_cpu = @host_cpu@
++host_os = @host_os@
++host_vendor = @host_vendor@
++includedir = @includedir@
++infodir = @infodir@
++install_sh = @install_sh@
++jhindexer = @jhindexer@
++libdir = @libdir@
++libexecdir = @libexecdir@
++localstatedir = @localstatedir@
++mandir = @mandir@
++mkdir_p = @mkdir_p@
++oldincludedir = @oldincludedir@
++prefix = @prefix@
++program_transform_name = @program_transform_name@
++sbindir = @sbindir@
++sharedstatedir = @sharedstatedir@
++sysconfdir = @sysconfdir@
++target_alias = @target_alias@
++xsltproc = @xsltproc@
++lang = pt_BR
++pkgdata_DATA = \
++ javahelpcustom.cat \
++ javahelpcustom.section
++
++EXTRA_DIST = \
++ $(pkgdata_DATA)
++
++catdatadir = $(pkgdatadir)/$(lang)
++all: all-am
++
++.SUFFIXES:
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++ @for dep in $?; do \
++ case '$(am__configure_deps)' in \
++ *$$dep*) \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
++ exit 1;; \
++ esac; \
++ done; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu category/ja/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --gnu category/ja/Makefile
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++ @case '$?' in \
++ *config.status*) \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++ *) \
++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++ esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++uninstall-info-am:
++tags: TAGS
++TAGS:
++
++ctags: CTAGS
++CTAGS:
++
++
++distdir: $(DISTFILES)
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
++ if test -d $$d/$$file; then \
++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
++ fi; \
++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
++ else \
++ test -f $(distdir)/$$file \
++ || cp -p $$d/$$file $(distdir)/$$file \
++ || exit 1; \
++ fi; \
++ done
++check-am: all-am
++check: check-am
++all-am: Makefile $(DATA)
++installdirs:
++ for dir in "$(DESTDIR)$(pkgdatadir)"; do \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
++ done
++install: install-am
++install-exec: install-exec-am
++install-data: install-data-am
++uninstall: uninstall-am
++
++install-am: all-am
++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++
++installcheck: installcheck-am
++install-strip:
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ `test -z '$(STRIP)' || \
++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++mostlyclean-generic:
++
++clean-generic:
++
++distclean-generic:
++ -rm -f $(CONFIG_CLEAN_FILES)
++
++maintainer-clean-generic:
++ @echo "This command is intended for maintainers to use"
++ @echo "it deletes files that may require special tools to rebuild."
++clean: clean-am
++
++clean-am: clean-generic mostlyclean-am
++
++distclean: distclean-am
++ -rm -f Makefile
++distclean-am: clean-am distclean-generic
++
++dvi: dvi-am
++
++dvi-am:
++
++html: html-am
++
++info: info-am
++
++info-am:
++
++install-data-am: install-pkgdataDATA
++
++install-exec-am:
++
++install-info: install-info-am
++
++install-man:
++
++installcheck-am:
++
++maintainer-clean: maintainer-clean-am
++ -rm -f Makefile
++maintainer-clean-am: distclean-am maintainer-clean-generic
++
++mostlyclean: mostlyclean-am
++
++mostlyclean-am: mostlyclean-generic
++
++pdf: pdf-am
++
++pdf-am:
++
++ps: ps-am
++
++ps-am:
++
++uninstall-am: uninstall-info-am uninstall-pkgdataDATA
++
++.PHONY: all all-am check check-am clean clean-generic distclean \
++ distclean-generic distdir dvi dvi-am html html-am info info-am \
++ install install-am install-data install-data-am install-exec \
++ install-exec-am install-info install-info-am install-man \
++ install-pkgdataDATA install-strip installcheck installcheck-am \
++ installdirs maintainer-clean maintainer-clean-generic \
++ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
++ uninstall-am uninstall-info-am uninstall-pkgdataDATA
++
++
++install-pkgdataDATA: $(pkgdata_DATA)
++ sed -e '/^$$/d' $< > .tmp.$<
++ mv .tmp.$< $<
++ @$(NORMAL_INSTALL)
++ $(mkinstalldirs) $(DESTDIR)$(catdatadir)
++ @list='$(pkgdata_DATA)'; for p in $$list; do \
++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(catdatadir)/$$f"; \
++ $(pkgdataDATA_INSTALL) $$d$$p $(DESTDIR)$(catdatadir)/$$f; \
++ done
++
++uninstall-pkgdataDATA:
++ @$(NORMAL_UNINSTALL)
++ @list='$(pkgdata_DATA)'; for p in $$list; do \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " rm -f $(DESTDIR)$(catdatadir)/$$f"; \
++ rm -f $(DESTDIR)$(catdatadir)/$$f; \
++ done
++# Tell versions [3.59,3.63) of GNU make to not export all variables.
++# Otherwise a system limit (for SysV at least) may be exceeded.
++.NOEXPORT:
+diff -ruNa javahelp-convert-0.13/category/pt_BR/javahelpcustom.cat javahelp-convert-0.13.new/category/pt_BR/javahelpcustom.cat
+--- javahelp-convert-0.13/category/pt_BR/javahelpcustom.cat 1970-01-01 09:00:00.000000000 +0900
++++ javahelp-convert-0.13.new/category/pt_BR/javahelpcustom.cat 2004-10-29 02:29:41.109487000 +0900
+@@ -0,0 +1,62 @@
++gnome-access-guide|Desktop
++jdsoverview|Desktop
++user-guide|Desktop
++gok|Applications|Accessibility
++gnopernicus|Applications|Accessibility
++file-roller|Applications|Accessories
++gcalctool|Applications|Accessories
++gucharmap|Applications|Accessories
++sample_apps_info|Applications|Accessories
++gedit|Applications|Accessories
++sample_apps_info|Applications|Games
++sample_apps_info|Applications|Graphics
++sample_apps_info|Applications|Graphics
++sample_apps_info|Applications|Graphics
++eog|Applications|Graphics
++gpdf|Applications|Graphics
++ggv|Applications|Graphics
++evolution-1.4|Applications|Internet
++gaim|Applications|Internet
++sample_apps_info|Applications|Internet
++mozilla_info|Applications|Internet
++gnome-cd|Applications|Multimedia
++sample_apps_info|Applications|Multimedia
++sample_apps_info|Applications|Multimedia
++gnome-sound-recorder|Applications|Multimedia
++gnome-volume-control|Applications|Multimedia
++sample_apps_info|Applications|Office
++office_info|Applications|Office
++sample_apps_info|Applications|Office
++gdm|Applications|Utilities|Administration
++fsexam|Applications|Utilities
++gconf-editor|Applications|Utilities
++sample_apps_info|Applications|Utilities
++gnome-terminal|Applications|Utilities
++now|Panel Applications|Accessories
++clock|Panel Applications|Accessories
++gnome-dictionary|Panel Applications|Accessories
++stickynotes_applet|Panel Applications|Accessories
++gtik2_applet2|Panel Applications|Accessories
++sample_apps_info|Panel Applications|Accessories
++gnome-search-tool|Applications|Actions
++fish-applet-2|Panel Applications|Amusements
++geyes|Panel Applications|Amusements
++mailcheck|Panel Applications|Internet
++webeyes|Panel Applications|Internet
++gnome-netstatus|Panel Applications|Internet
++cdplayer|Panel Applications|Multimedia
++mixer_applet2|Panel Applications|Multimedia
++char-palette|Panel Applications|Utility
++command-line|Panel Applications|Utility
++imswitcher|Panel Applications|Utility
++gkb|Panel Applications|Utility
++gswitchit|Panel Applications|Utility
++quick-lounge|Panel Applications|Utility
++window-list|Panel Applications|Utility
++workspace-switcher|Panel Applications|Utility
++bug-buddy|Developer
++sample_apps_info|Developer
++javadevelop|Developer
++sample_apps_info|Developer
++zenity|Developer
++system-admin-guide|System
+diff -ruNa javahelp-convert-0.13/category/pt_BR/javahelpcustom.section javahelp-convert-0.13.new/category/pt_BR/javahelpcustom.section
+--- javahelp-convert-0.13/category/pt_BR/javahelpcustom.section 1970-01-01 09:00:00.000000000 +0900
++++ javahelp-convert-0.13.new/category/pt_BR/javahelpcustom.section 2004-10-29 02:29:41.109730000 +0900
+@@ -0,0 +1,3 @@
++Contents|Contents
++Index|Index
++Search|Search
+diff -ruNa javahelp-convert-0.13/category/sv/Makefile.am javahelp-convert-0.13.new/category/sv/Makefile.am
+--- javahelp-convert-0.13/category/sv/Makefile.am 2004-09-30 17:21:41.000000000 +0900
++++ javahelp-convert-0.13.new/category/sv/Makefile.am 2004-10-29 02:29:41.110031000 +0900
@@ -9,8 +9,6 @@
catdatadir=$(pkgdatadir)/$(lang)
@@ -840,7 +974,7 @@
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(catdatadir)
@list='$(pkgdata_DATA)'; for p in $$list; do \
-@@ -27,3 +25,37 @@
+@@ -27,3 +25,43 @@
echo " rm -f $(DESTDIR)$(catdatadir)/$$f"; \
rm -f $(DESTDIR)$(catdatadir)/$$f; \
done
@@ -861,54 +995,8 @@
+ fi ; \
+ done | sed 's|\|$$||' > $@
+
-+# To use gettextize, convert xml file to original file
-+javahelpcustom.section: javahelpcustom.section.xml
-+ cat $< | egrep -v '^<\?xml|top>' \
-+ | sed -e 's|<t xml:lang=[^>]*>|\||g' \
-+ | sed -e 's|^<item appl="\([^"]*\)">|\1|' \
-+ | sed -e 's|<t>|\||g' -e 's|</t>||g' -e 's|</item>|\||' | egrep -v '^$$' | \
-+ while read line ; do \
-+ if \
-+ echo "$$line" | egrep '\|$$' > /dev/null ; \
-+ then \
-+ echo "$$line" ; \
-+ else \
-+ printf "$$line" ; \
-+ fi ; \
-+ done | sed 's|\|$$||' > $@
-+
-+CLEANFILES=javahelpcustom.cat.xml javahelpcustom.cat
-diff -ruNa javahelp-convert-0.13/category/zh_HK/Makefile.am javahelp-convert-0.13.newtar/category/zh_HK/Makefile.am
---- javahelp-convert-0.13/category/zh_HK/Makefile.am 2004-09-30 17:21:42.000000000 +0900
-+++ javahelp-convert-0.13.newtar/category/zh_HK/Makefile.am 2004-10-14 21:38:42.000000000 +0900
-@@ -9,8 +9,6 @@
- catdatadir=$(pkgdatadir)/$(lang)
-
- install-pkgdataDATA: $(pkgdata_DATA)
-- sed -e '/^$$/d' $< > .tmp.$<
-- mv .tmp.$< $<
- @$(NORMAL_INSTALL)
- $(mkinstalldirs) $(DESTDIR)$(catdatadir)
- @list='$(pkgdata_DATA)'; for p in $$list; do \
-@@ -28,3 +26,36 @@
- rm -f $(DESTDIR)$(catdatadir)/$$f; \
- done
-
-+# To use gettextize, convert xml file to original file
-+javahelpcustom.cat: javahelpcustom.cat.xml
-+ cat $< | egrep -v '^<\?xml|top>' \
-+ | sed -e 's|<t xml:lang=[^>]*>|\||g' \
-+ | sed -e 's|^<item appl="\([^"]*\)">|\1|' \
-+ | sed -e 's|<t>|\||g' -e 's|</t>||g' -e 's|</item>|\||' | egrep -v '^$$' | \
-+ while read line ; do \
-+ if \
-+ echo "$$line" | egrep '\|$$' > /dev/null ; \
-+ then \
-+ echo "$$line" ; \
-+ else \
-+ printf "$$line" ; \
-+ fi ; \
-+ done | sed 's|\|$$||' > $@
++javahelpcustom.cat.xml : ../javahelpcustom.cat.xml.in
++ ( cd ../; make javahelpcustom.cat.xml)
+
+# To use gettextize, convert xml file to original file
+javahelpcustom.section: javahelpcustom.section.xml
@@ -926,10 +1014,13 @@
+ fi ; \
+ done | sed 's|\|$$||' > $@
+
++javahelpcustom.section.xml : ../javahelpcustom.section.xml.in
++ ( cd ../; make javahelpcustom.section.xml)
++
+CLEANFILES=javahelpcustom.cat.xml javahelpcustom.cat
-diff -ruNa javahelp-convert-0.13/category/zh_TW/Makefile.am javahelp-convert-0.13.newtar/category/zh_TW/Makefile.am
---- javahelp-convert-0.13/category/zh_TW/Makefile.am 2004-09-30 17:21:42.000000000 +0900
-+++ javahelp-convert-0.13.newtar/category/zh_TW/Makefile.am 2004-10-14 21:38:59.000000000 +0900
+diff -ruNa javahelp-convert-0.13/category/zh_CN/Makefile.am javahelp-convert-0.13.new/category/zh_CN/Makefile.am
+--- javahelp-convert-0.13/category/zh_CN/Makefile.am 2004-09-30 17:21:42.000000000 +0900
++++ javahelp-convert-0.13.new/category/zh_CN/Makefile.am 2004-10-29 02:29:41.110335000 +0900
@@ -9,8 +9,6 @@
catdatadir=$(pkgdatadir)/$(lang)
@@ -939,7 +1030,7 @@
@$(NORMAL_INSTALL)
$(mkinstalldirs) $(DESTDIR)$(catdatadir)
@list='$(pkgdata_DATA)'; for p in $$list; do \
-@@ -27,3 +25,37 @@
+@@ -27,3 +25,43 @@
echo " rm -f $(DESTDIR)$(catdatadir)/$$f"; \
rm -f $(DESTDIR)$(catdatadir)/$$f; \
done
@@ -960,6 +1051,64 @@
+ fi ; \
+ done | sed 's|\|$$||' > $@
+
++javahelpcustom.cat.xml : ../javahelpcustom.cat.xml.in
++ ( cd ../; make javahelpcustom.cat.xml)
++
++# To use gettextize, convert xml file to original file
++javahelpcustom.section: javahelpcustom.section.xml
++ cat $< | egrep -v '^<\?xml|top>' \
++ | sed -e 's|<t xml:lang=[^>]*>|\||g' \
++ | sed -e 's|^<item appl="\([^"]*\)">|\1|' \
++ | sed -e 's|<t>|\||g' -e 's|</t>||g' -e 's|</item>|\||' | egrep -v '^$$' | \
++ while read line ; do \
++ if \
++ echo "$$line" | egrep '\|$$' > /dev/null ; \
++ then \
++ echo "$$line" ; \
++ else \
++ printf "$$line" ; \
++ fi ; \
++ done | sed 's|\|$$||' > $@
++
++javahelpcustom.section.xml : ../javahelpcustom.section.xml.in
++ ( cd ../; make javahelpcustom.section.xml)
++
++CLEANFILES=javahelpcustom.cat.xml javahelpcustom.cat
+diff -ruNa javahelp-convert-0.13/category/zh_HK/Makefile.am javahelp-convert-0.13.new/category/zh_HK/Makefile.am
+--- javahelp-convert-0.13/category/zh_HK/Makefile.am 2004-09-30 17:21:42.000000000 +0900
++++ javahelp-convert-0.13.new/category/zh_HK/Makefile.am 2004-10-29 02:29:41.110644000 +0900
+@@ -9,8 +9,6 @@
+ catdatadir=$(pkgdatadir)/$(lang)
+
+ install-pkgdataDATA: $(pkgdata_DATA)
+- sed -e '/^$$/d' $< > .tmp.$<
+- mv .tmp.$< $<
+ @$(NORMAL_INSTALL)
+ $(mkinstalldirs) $(DESTDIR)$(catdatadir)
+ @list='$(pkgdata_DATA)'; for p in $$list; do \
+@@ -28,3 +26,42 @@
+ rm -f $(DESTDIR)$(catdatadir)/$$f; \
+ done
+
++# To use gettextize, convert xml file to original file
++javahelpcustom.cat: javahelpcustom.cat.xml
++ cat $< | egrep -v '^<\?xml|top>' \
++ | sed -e 's|<t xml:lang=[^>]*>|\||g' \
++ | sed -e 's|^<item appl="\([^"]*\)">|\1|' \
++ | sed -e 's|<t>|\||g' -e 's|</t>||g' -e 's|</item>|\||' | egrep -v '^$$' | \
++ while read line ; do \
++ if \
++ echo "$$line" | egrep '\|$$' > /dev/null ; \
++ then \
++ echo "$$line" ; \
++ else \
++ printf "$$line" ; \
++ fi ; \
++ done | sed 's|\|$$||' > $@
++
++javahelpcustom.cat.xml : ../javahelpcustom.cat.xml.in
++ ( cd ../; make javahelpcustom.cat.xml)
++
+# To use gettextize, convert xml file to original file
+javahelpcustom.section: javahelpcustom.section.xml
+ cat $< | egrep -v '^<\?xml|top>' \
@@ -976,11 +1125,70 @@
+ fi ; \
+ done | sed 's|\|$$||' > $@
+
++javahelpcustom.section.xml : ../javahelpcustom.section.xml.in
++ ( cd ../; make javahelpcustom.section.xml)
++
+CLEANFILES=javahelpcustom.cat.xml javahelpcustom.cat
-diff -ruNa javahelp-convert-0.13/configure.in javahelp-convert-0.13.newtar/configure.in
+diff -ruNa javahelp-convert-0.13/category/zh_TW/Makefile.am javahelp-convert-0.13.new/category/zh_TW/Makefile.am
+--- javahelp-convert-0.13/category/zh_TW/Makefile.am 2004-09-30 17:21:42.000000000 +0900
++++ javahelp-convert-0.13.new/category/zh_TW/Makefile.am 2004-10-29 02:29:41.110952000 +0900
+@@ -9,8 +9,6 @@
+ catdatadir=$(pkgdatadir)/$(lang)
+
+ install-pkgdataDATA: $(pkgdata_DATA)
+- sed -e '/^$$/d' $< > .tmp.$<
+- mv .tmp.$< $<
+ @$(NORMAL_INSTALL)
+ $(mkinstalldirs) $(DESTDIR)$(catdatadir)
+ @list='$(pkgdata_DATA)'; for p in $$list; do \
+@@ -27,3 +25,43 @@
+ echo " rm -f $(DESTDIR)$(catdatadir)/$$f"; \
+ rm -f $(DESTDIR)$(catdatadir)/$$f; \
+ done
++
++# To use gettextize, convert xml file to original file
++javahelpcustom.cat: javahelpcustom.cat.xml
++ cat $< | egrep -v '^<\?xml|top>' \
++ | sed -e 's|<t xml:lang=[^>]*>|\||g' \
++ | sed -e 's|^<item appl="\([^"]*\)">|\1|' \
++ | sed -e 's|<t>|\||g' -e 's|</t>||g' -e 's|</item>|\||' | egrep -v '^$$' | \
++ while read line ; do \
++ if \
++ echo "$$line" | egrep '\|$$' > /dev/null ; \
++ then \
++ echo "$$line" ; \
++ else \
++ printf "$$line" ; \
++ fi ; \
++ done | sed 's|\|$$||' > $@
++
++javahelpcustom.cat.xml : ../javahelpcustom.cat.xml.in
++ ( cd ../; make javahelpcustom.cat.xml)
++
++# To use gettextize, convert xml file to original file
++javahelpcustom.section: javahelpcustom.section.xml
++ cat $< | egrep -v '^<\?xml|top>' \
++ | sed -e 's|<t xml:lang=[^>]*>|\||g' \
++ | sed -e 's|^<item appl="\([^"]*\)">|\1|' \
++ | sed -e 's|<t>|\||g' -e 's|</t>||g' -e 's|</item>|\||' | egrep -v '^$$' | \
++ while read line ; do \
++ if \
++ echo "$$line" | egrep '\|$$' > /dev/null ; \
++ then \
++ echo "$$line" ; \
++ else \
++ printf "$$line" ; \
++ fi ; \
++ done | sed 's|\|$$||' > $@
++
++javahelpcustom.section.xml : ../javahelpcustom.section.xml.in
++ ( cd ../; make javahelpcustom.section.xml)
++
++CLEANFILES=javahelpcustom.cat.xml javahelpcustom.cat
+diff -ruNa javahelp-convert-0.13/configure.in javahelp-convert-0.13.new/configure.in
--- javahelp-convert-0.13/configure.in 2004-09-30 21:14:13.000000000 +0900
-+++ javahelp-convert-0.13.newtar/configure.in 2004-10-14 18:28:58.000000000 +0900
-@@ -56,6 +56,14 @@
++++ javahelp-convert-0.13.new/configure.in 2004-10-29 02:29:41.111290000 +0900
+@@ -56,6 +56,16 @@
AC_MSG_RESULT([$DOCBOOK_XSL_STYLESHEET_DIR])
AC_SUBST(DOCBOOK_XSL_STYLESHEET_DIR)
@@ -989,15 +1197,19 @@
+GETTEXT_PACKAGE=javahelp-convert
+AC_SUBST(GETTEXT_PACKAGE)
+AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE,"$GETTEXT_PACKAGE", [Gettext package])
-+ALL_LINGUAS="de es fr it sv ja ko zh_CN zh_TW zh_HK"
++ALL_LINGUAS="de es fr it sv ja ko zh_CN zh_TW zh_HK pt_BR"
+AM_GLIB_GNU_GETTEXT
++USE_NLS=no
++AC_SUBST(USE_NLS)
+
AC_OUTPUT([
Makefile
javahelpconvert
-@@ -75,26 +83,17 @@
+@@ -74,27 +84,20 @@
+ category/zh_CN/Makefile
category/zh_TW/Makefile
category/zh_HK/Makefile
++category/pt_BR/Makefile
stylesheet/Makefile
+stylesheet/javahelpcustom.xsl.xml.in
stylesheet/C/Makefile
@@ -1022,2932 +1234,12 @@
-stylesheet/zh_TW/javahelpcustom.xsl
stylesheet/zh_HK/Makefile
-stylesheet/zh_HK/javahelpcustom.xsl
++stylesheet/pt_BR/Makefile
+po/Makefile.in
])
-diff -ruNa javahelp-convert-0.13/intltool-extract.in javahelp-convert-0.13.newtar/intltool-extract.in
---- javahelp-convert-0.13/intltool-extract.in 1970-01-01 09:00:00.000000000 +0900
-+++ javahelp-convert-0.13.newtar/intltool-extract.in 2004-10-14 17:33:19.000000000 +0900
-@@ -0,0 +1,473 @@
-+#!@INTLTOOL_PERL@ -w
-+# -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-+
-+#
-+# The Intltool Message Extractor
-+#
-+# Copyright (C) 2000-2001, 2003 Free Software Foundation.
-+#
-+# Intltool is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License as
-+# published by the Free Software Foundation; either version 2 of the
-+# License, or (at your option) any later version.
-+#
-+# Intltool is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+#
-+# Authors: Kenneth Christiansen <[email protected]>
-+# Darin Adler <[email protected]>
-+#
-+
-+## Release information
-+my $PROGRAM = "intltool-extract";
-+my $PACKAGE = "intltool";
-+my $VERSION = "0.31.3";
-+
-+## Loaded modules
-+use strict;
-+use File::Basename;
-+use Getopt::Long;
-+
-+## Scalars used by the option stuff
-+my $TYPE_ARG = "0";
-+my $LOCAL_ARG = "0";
-+my $HELP_ARG = "0";
-+my $VERSION_ARG = "0";
-+my $UPDATE_ARG = "0";
-+my $QUIET_ARG = "0";
-+my $SRCDIR_ARG = ".";
-+
-+my $FILE;
-+my $OUTFILE;
-+
-+my $gettext_type = "";
-+my $input;
-+my %messages = ();
-+my %loc = ();
-+my %count = ();
-+my %comments = ();
-+my $strcount = 0;
-+
-+## Use this instead of \w for XML files to handle more possible characters.
-+my $w = "[-A-Za-z0-9._:]";
-+
-+## Always print first
-+$| = 1;
-+
-+## Handle options
-+GetOptions (
-+ "type=s" => \$TYPE_ARG,
-+ "local|l" => \$LOCAL_ARG,
-+ "help|h" => \$HELP_ARG,
-+ "version|v" => \$VERSION_ARG,
-+ "update" => \$UPDATE_ARG,
-+ "quiet|q" => \$QUIET_ARG,
-+ "srcdir=s" => \$SRCDIR_ARG,
-+ ) or &error;
-+
-+&split_on_argument;
-+
-+
-+## Check for options.
-+## This section will check for the different options.
-+
-+sub split_on_argument {
-+
-+ if ($VERSION_ARG) {
-+ &version;
-+
-+ } elsif ($HELP_ARG) {
-+ &help;
-+
-+ } elsif ($LOCAL_ARG) {
-+ &place_local;
-+ &extract;
-+
-+ } elsif ($UPDATE_ARG) {
-+ &place_normal;
-+ &extract;
-+
-+ } elsif (@ARGV > 0) {
-+ &place_normal;
-+ &message;
-+ &extract;
-+
-+ } else {
-+ &help;
-+
-+ }
-+}
-+
-+sub place_normal {
-+ $FILE = $ARGV[0];
-+ $OUTFILE = "$FILE.h";
-+}
-+
-+sub place_local {
-+ $OUTFILE = fileparse($FILE, ());
-+ if (!-e "tmp/") {
-+ system("mkdir tmp/");
-+ }
-+ $OUTFILE = "./tmp/$OUTFILE.h"
-+}
-+
-+sub determine_type {
-+ if ($TYPE_ARG =~ /^gettext\/(.*)/) {
-+ $gettext_type=$1
-+ }
-+}
-+
-+## Sub for printing release information
-+sub version{
-+ print <<_EOF_;
-+${PROGRAM} (${PACKAGE}) $VERSION
-+Copyright (C) 2000, 2003 Free Software Foundation, Inc.
-+Written by Kenneth Christiansen, 2000.
-+
-+This is free software; see the source for copying conditions. There is NO
-+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-+_EOF_
-+ exit;
-+}
-+
-+## Sub for printing usage information
-+sub help {
-+ print <<_EOF_;
-+Usage: ${PROGRAM} [OPTION]... [FILENAME]
-+Generates a header file from an XML source file.
-+
-+It grabs all strings between <_translatable_node> and its end tag in
-+XML files. Read manpage (man ${PROGRAM}) for more info.
-+
-+ --type=TYPE Specify the file type of FILENAME. Currently supports:
-+ "gettext/glade", "gettext/ini", "gettext/keys"
-+ "gettext/rfc822deb", "gettext/schemas",
-+ "gettext/scheme", "gettext/xml"
-+ -l, --local Writes output into current working directory
-+ (conflicts with --update)
-+ --update Writes output into the same directory the source file
-+ reside (conflicts with --local)
-+ --srcdir Root of the source tree
-+ -v, --version Output version information and exit
-+ -h, --help Display this help and exit
-+ -q, --quiet Quiet mode
-+
-+Report bugs to http://bugzilla.gnome.org/ (product name "$PACKAGE")
-+or send email to <xml-i18n-tools\@gnome.org>.
-+_EOF_
-+ exit;
-+}
-+
-+## Sub for printing error messages
-+sub error{
-+ print STDERR "Try `${PROGRAM} --help' for more information.\n";
-+ exit;
-+}
-+
-+sub message {
-+ print "Generating C format header file for translation.\n" unless $QUIET_ARG;
-+}
-+
-+sub extract {
-+ &determine_type;
-+
-+ &convert;
-+
-+ open OUT, ">$OUTFILE";
-+ &msg_write;
-+ close OUT;
-+
-+ print "Wrote $OUTFILE\n" unless $QUIET_ARG;
-+}
-+
-+sub convert {
-+
-+ ## Reading the file
-+ {
-+ local (*IN);
-+ local $/; #slurp mode
-+ open (IN, "<$SRCDIR_ARG/$FILE") || die "can't open $SRCDIR_ARG/$FILE: $!";
-+ $input = <IN>;
-+ }
-+
-+ &type_ini if $gettext_type eq "ini";
-+ &type_keys if $gettext_type eq "keys";
-+ &type_xml if $gettext_type eq "xml";
-+ &type_glade if $gettext_type eq "glade";
-+ &type_scheme if $gettext_type eq "scheme";
-+ &type_schemas if $gettext_type eq "schemas";
-+ &type_rfc822deb if $gettext_type eq "rfc822deb";
-+}
-+
-+sub entity_decode_minimal
-+{
-+ local ($_) = @_;
-+
-+ s/'/'/g; # '
-+ s/"/"/g; # "
-+ s/&/&/g;
-+
-+ return $_;
-+}
-+
-+sub entity_decode
-+{
-+ local ($_) = @_;
-+
-+ s/'/'/g; # '
-+ s/"/"/g; # "
-+ s/&/&/g;
-+ s/</</g;
-+ s/>/>/g;
-+
-+ return $_;
-+}
-+
-+sub escape_char
-+{
-+ return '\"' if $_ eq '"';
-+ return '\n' if $_ eq "\n";
-+ return '\\' if $_ eq '\\';
-+
-+ return $_;
-+}
-+
-+sub escape
-+{
-+ my ($string) = @_;
-+ return join "", map &escape_char, split //, $string;
-+}
-+
-+sub type_ini {
-+ ### For generic translatable desktop files ###
-+ while ($input =~ /^_.*=(.*)$/mg) {
-+ $messages{$1} = [];
-+ }
-+}
-+
-+sub type_keys {
-+ ### For generic translatable mime/keys files ###
-+ while ($input =~ /^\s*_\w+=(.*)$/mg) {
-+ $messages{$1} = [];
-+ }
-+}
-+
-+sub type_xml {
-+ ### For generic translatable XML files ###
-+
-+ while ($input =~ /(?:<!--([^>]*?)-->[^\n]*\n?[^\n]*)?\s_$w+\s*=\s*\"([^"]+)\"/sg) { # "
-+ $messages{entity_decode_minimal($2)} = [];
-+ $comments{entity_decode_minimal($2)} = $1 if (defined($1));
-+ }
-+
-+ while ($input =~ /(?:<!--([^>]*?)-->\s*)?<_($w+)(?: xml:space="($w+)")?[^>]*>(.+?)<\/_\2>/sg) {
-+ $_ = $4;
-+ if (!defined($3) || $3 ne "preserve") {
-+ s/\s+/ /g;
-+ s/^ //;
-+ s/ $//;
-+ }
-+ $messages{$_} = [];
-+ $comments{$_} = $1 if (defined($1));
-+ }
-+}
-+
-+sub type_schemas {
-+ ### For schemas XML files ###
-+
-+ # FIXME: We should handle escaped < (less than)
-+ while ($input =~ /
-+ <locale\ name="C">\s*
-+ (<default>\s*(?:<!--([^>]*?)-->\s*)?(.*?)\s*<\/default>\s*)?
-+ (<short>\s*(?:<!--([^>]*?)-->\s*)?(.*?)\s*<\/short>\s*)?
-+ (<long>\s*(?:<!--([^>]*?)-->\s*)?(.*?)\s*<\/long>\s*)?
-+ <\/locale>
-+ /sgx) {
-+ my @totranslate = ($3,$6,$9);
-+ my @eachcomment = ($2,$5,$8);
-+ foreach (@totranslate) {
-+ my $currentcomment = shift @eachcomment;
-+ next if !$_;
-+ s/\s+/ /g;
-+ $messages{entity_decode_minimal($_)} = [];
-+ $comments{entity_decode_minimal($_)} = $currentcomment if (defined($currentcomment));
-+ }
-+ }
-+}
-+
-+sub type_rfc822deb {
-+ ### For rfc822-style Debian configuration files ###
-+
-+ my $lineno = 1;
-+ my $type = '';
-+ while ($input =~ /\G(.*?)(^|\n)(_+)([^:]+):[ \t]*(.*?)(?=\n\S|$)/sg)
-+ {
-+ my ($pre, $newline, $underscore, $tag, $text) = ($1, $2, $3, $4, $5);
-+ while ($pre =~ m/\n/g)
-+ {
-+ $lineno ++;
-+ }
-+ $lineno += length($newline);
-+ my @str_list = rfc822deb_split(length($underscore), $text);
-+ for my $str (@str_list)
-+ {
-+ $strcount++;
-+ $messages{$str} = [];
-+ $loc{$str} = $lineno;
-+ $count{$str} = $strcount;
-+ my $usercomment = '';
-+ while($pre =~ s/(^|\n)#([^\n]*)$//s)
-+ {
-+ $usercomment = "\n" . $2 . $usercomment;
-+ }
-+ $comments{$str} = $tag . $usercomment;
-+ }
-+ $lineno += ($text =~ s/\n//g);
-+ }
-+}
-+
-+sub rfc822deb_split {
-+ # Debian defines a special way to deal with rfc822-style files:
-+ # when a value contain newlines, it consists of
-+ # 1. a short form (first line)
-+ # 2. a long description, all lines begin with a space,
-+ # and paragraphs are separated by a single dot on a line
-+ # This routine returns an array of all paragraphs, and reformat
-+ # them.
-+ # When first argument is 2, the string is a comma separated list of
-+ # values.
-+ my $type = shift;
-+ my $text = shift;
-+ $text =~ s/^[ \t]//mg;
-+ return (split(/, */, $text, 0)) if $type ne 1;
-+ return ($text) if $text !~ /\n/;
-+
-+ $text =~ s/([^\n]*)\n//;
-+ my @list = ($1);
-+ my $str = '';
-+ for my $line (split (/\n/, $text))
-+ {
-+ chomp $line;
-+ if ($line =~ /^\.\s*$/)
-+ {
-+ # New paragraph
-+ $str =~ s/\s*$//;
-+ push(@list, $str);
-+ $str = '';
-+ }
-+ elsif ($line =~ /^\s/)
-+ {
-+ # Line which must not be reformatted
-+ $str .= "\n" if length ($str) && $str !~ /\n$/;
-+ $line =~ s/\s+$//;
-+ $str .= $line."\n";
-+ }
-+ else
-+ {
-+ # Continuation line, remove newline
-+ $str .= " " if length ($str) && $str !~ /\n$/;
-+ $str .= $line;
-+ }
-+ }
-+ $str =~ s/\s*$//;
-+ push(@list, $str) if length ($str);
-+ return @list;
-+}
-+
-+sub type_glade {
-+ ### For translatable Glade XML files ###
-+
-+ my $tags = "label|title|text|format|copyright|comments|preview_text|tooltip|message";
-+
-+ while ($input =~ /<($tags)>([^<]+)<\/($tags)>/sg) {
-+ # Glade sometimes uses tags that normally mark translatable things for
-+ # little bits of non-translatable content. We work around this by not
-+ # translating strings that only includes something like label4 or window1.
-+ $messages{entity_decode($2)} = [] unless $2 =~ /^(window|label)[0-9]+$/;
-+ }
-+
-+ while ($input =~ /<items>(..[^<]*)<\/items>/sg) {
-+ for my $item (split (/\n/, $1)) {
-+ $messages{entity_decode($item)} = [];
-+ }
-+ }
-+
-+ ## handle new glade files
-+ while ($input =~ /<(property|atkproperty)\s+[^>]*translatable\s*=\s*"yes"[^>]*>([^<]+)<\/\1>/sg) {
-+ $messages{entity_decode($2)} = [] unless $2 =~ /^(window|label)[0-9]+$/;
-+ }
-+ while ($input =~ /<atkaction\s+action_name="([^>]*)"\s+description="([^>]+)"\/>/sg) {
-+ $messages{entity_decode_minimal($2)} = [];
-+ }
-+}
-+
-+sub type_scheme {
-+ while ($input =~ /_\w*\(?"((?:[^"\\]+|\\.)*)"\)?/sg) {
-+ $messages{$1} = [];
-+ }
-+}
-+
-+sub msg_write {
-+ my @msgids;
-+ if (%count)
-+ {
-+ @msgids = sort { $count{$a} <=> $count{$b} } keys %count;
-+ }
-+ else
-+ {
-+ @msgids = sort keys %messages;
-+ }
-+ for my $message (@msgids)
-+ {
-+ my $offsetlines = 1;
-+ $offsetlines++ if $message =~ /%/;
-+ if (defined ($comments{$message}))
-+ {
-+ while ($comments{$message} =~ m/\n/g)
-+ {
-+ $offsetlines++;
-+ }
-+ }
-+ print OUT "# ".($loc{$message} - $offsetlines). " \"$FILE\"\n"
-+ if defined $loc{$message};
-+ print OUT "/* ".$comments{$message}." */\n"
-+ if defined $comments{$message};
-+ print OUT "/* xgettext:no-c-format */\n" if $message =~ /%/;
-+
-+ my @lines = split (/\n/, $message, -1);
-+ for (my $n = 0; $n < @lines; $n++)
-+ {
-+ if ($n == 0)
-+ {
-+ print OUT "char *s = N_(\"";
-+ }
-+ else
-+ {
-+ print OUT " \"";
-+ }
-+
-+ print OUT escape($lines[$n]);
-+
-+ if ($n < @lines - 1)
-+ {
-+ print OUT "\\n\"\n";
-+ }
-+ else
-+ {
-+ print OUT "\");\n";
-+ }
-+ }
-+ }
-+}
-+
-diff -ruNa javahelp-convert-0.13/intltool-merge.in javahelp-convert-0.13.newtar/intltool-merge.in
---- javahelp-convert-0.13/intltool-merge.in 1970-01-01 09:00:00.000000000 +0900
-+++ javahelp-convert-0.13.newtar/intltool-merge.in 2004-10-14 17:33:19.000000000 +0900
-@@ -0,0 +1,1255 @@
-+#!@INTLTOOL_PERL@ -w
-+# -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-+
-+#
-+# The Intltool Message Merger
-+#
-+# Copyright (C) 2000, 2003 Free Software Foundation.
-+# Copyright (C) 2000, 2001 Eazel, Inc
-+#
-+# Intltool is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License
-+# version 2 published by the Free Software Foundation.
-+#
-+# Intltool is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+#
-+# Authors: Maciej Stachowiak <[email protected]>
-+# Kenneth Christiansen <[email protected]>
-+# Darin Adler <[email protected]>
-+#
-+# Proper XML UTF-8'ification written by Cyrille Chepelov <[email protected]>
-+#
-+
-+## Release information
-+my $PROGRAM = "intltool-merge";
-+my $PACKAGE = "intltool";
-+my $VERSION = "0.31.3";
-+
-+## Loaded modules
-+use strict;
-+use Getopt::Long;
-+use Text::Wrap;
-+use File::Basename;
-+
-+my $must_end_tag = -1;
-+my $last_depth = -1;
-+my $translation_depth = -1;
-+my @tag_stack = ();
-+my @entered_tag = ();
-+my @translation_strings = ();
-+my $leading_space = "";
-+
-+## Scalars used by the option stuff
-+my $HELP_ARG = 0;
-+my $VERSION_ARG = 0;
-+my $BA_STYLE_ARG = 0;
-+my $XML_STYLE_ARG = 0;
-+my $KEYS_STYLE_ARG = 0;
-+my $DESKTOP_STYLE_ARG = 0;
-+my $SCHEMAS_STYLE_ARG = 0;
-+my $RFC822DEB_STYLE_ARG = 0;
-+my $QUIET_ARG = 0;
-+my $PASS_THROUGH_ARG = 0;
-+my $UTF8_ARG = 0;
-+my $MULTIPLE_OUTPUT = 0;
-+my $cache_file;
-+
-+## Handle options
-+GetOptions
-+(
-+ "help" => \$HELP_ARG,
-+ "version" => \$VERSION_ARG,
-+ "quiet|q" => \$QUIET_ARG,
-+ "oaf-style|o" => \$BA_STYLE_ARG, ## for compatibility
-+ "ba-style|b" => \$BA_STYLE_ARG,
-+ "xml-style|x" => \$XML_STYLE_ARG,
-+ "keys-style|k" => \$KEYS_STYLE_ARG,
-+ "desktop-style|d" => \$DESKTOP_STYLE_ARG,
-+ "schemas-style|s" => \$SCHEMAS_STYLE_ARG,
-+ "rfc822deb-style|r" => \$RFC822DEB_STYLE_ARG,
-+ "pass-through|p" => \$PASS_THROUGH_ARG,
-+ "utf8|u" => \$UTF8_ARG,
-+ "multiple-output|m" => \$MULTIPLE_OUTPUT,
-+ "cache|c=s" => \$cache_file
-+ ) or &error;
-+
-+my $PO_DIR;
-+my $FILE;
-+my $OUTFILE;
-+
-+my %po_files_by_lang = ();
-+my %translations = ();
-+my $iconv = $ENV{"ICONV"} || $ENV{"INTLTOOL_ICONV"} || "@INTLTOOL_ICONV@";
-+
-+# Use this instead of \w for XML files to handle more possible characters.
-+my $w = "[-A-Za-z0-9._:]";
-+
-+# XML quoted string contents
-+my $q = "[^\\\"]*";
-+
-+## Check for options.
-+
-+if ($VERSION_ARG)
-+{
-+ &print_version;
-+}
-+elsif ($HELP_ARG)
-+{
-+ &print_help;
-+}
-+elsif ($BA_STYLE_ARG && @ARGV > 2)
-+{
-+ &preparation;
-+ &print_message;
-+ &ba_merge_translations;
-+ &finalize;
-+}
-+elsif ($XML_STYLE_ARG && @ARGV > 2)
-+{
-+ &utf8_sanity_check;
-+ &preparation;
-+ &print_message;
-+
-+ &xml_merge_output;
-+
-+ &finalize;
-+}
-+elsif ($KEYS_STYLE_ARG && @ARGV > 2)
-+{
-+ &utf8_sanity_check;
-+ &preparation;
-+ &print_message;
-+ &keys_merge_translations;
-+ &finalize;
-+}
-+elsif ($DESKTOP_STYLE_ARG && @ARGV > 2)
-+{
-+ &preparation;
-+ &print_message;
-+ &desktop_merge_translations;
-+ &finalize;
-+}
-+elsif ($SCHEMAS_STYLE_ARG && @ARGV > 2)
-+{
-+ &preparation;
-+ &print_message;
-+ &schemas_merge_translations;
-+ &finalize;
-+}
-+elsif ($RFC822DEB_STYLE_ARG && @ARGV > 2)
-+{
-+ &preparation;
-+ &print_message;
-+ &rfc822deb_merge_translations;
-+ &finalize;
-+}
-+else
-+{
-+ &print_help;
-+}
-+
-+exit;
-+
-+## Sub for printing release information
-+sub print_version
-+{
-+ print <<_EOF_;
-+${PROGRAM} (${PACKAGE}) ${VERSION}
-+Written by Maciej Stachowiak, Darin Adler and Kenneth Christiansen.
-+
-+Copyright (C) 2000-2003 Free Software Foundation, Inc.
-+Copyright (C) 2000-2001 Eazel, Inc.
-+This is free software; see the source for copying conditions. There is NO
-+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-+_EOF_
-+ exit;
-+}
-+
-+## Sub for printing usage information
-+sub print_help
-+{
-+ print <<_EOF_;
-+Usage: ${PROGRAM} [OPTION]... PO_DIRECTORY FILENAME OUTPUT_FILE
-+Generates an output file that includes some localized attributes from an
-+untranslated source file.
-+
-+Mandatory options: (exactly one must be specified)
-+ -b, --ba-style includes translations in the bonobo-activation style
-+ -d, --desktop-style includes translations in the desktop style
-+ -k, --keys-style includes translations in the keys style
-+ -s, --schemas-style includes translations in the schemas style
-+ -r, --rfc822deb-style includes translations in the RFC822 style
-+ -x, --xml-style includes translations in the standard xml style
-+
-+Other options:
-+ -u, --utf8 convert all strings to UTF-8 before merging
-+ -p, --pass-through use strings as found in .po files, without
-+ conversion (STRONGLY unrecommended with -x)
-+ -m, --multiple-output output one localized file per locale, instead of
-+ a single file containing all localized elements
-+ -c, --cache=FILE specify cache file name
-+ (usually \$top_builddir/po/.intltool-merge-cache)
-+ -q, --quiet suppress most messages
-+ --help display this help and exit
-+ --version output version information and exit
-+
-+Report bugs to http://bugzilla.gnome.org/ (product name "$PACKAGE")
-+or send email to <xml-i18n-tools\@gnome.org>.
-+_EOF_
-+ exit;
-+}
-+
-+
-+## Sub for printing error messages
-+sub print_error
-+{
-+ print STDERR "Try `${PROGRAM} --help' for more information.\n";
-+ exit;
-+}
-+
-+
-+sub print_message
-+{
-+ print "Merging translations into $OUTFILE.\n" unless $QUIET_ARG;
-+}
-+
-+
-+sub preparation
-+{
-+ $PO_DIR = $ARGV[0];
-+ $FILE = $ARGV[1];
-+ $OUTFILE = $ARGV[2];
-+
-+ &gather_po_files;
-+ &get_translation_database;
-+}
-+
-+# General-purpose code for looking up translations in .po files
-+
-+sub po_file2lang
-+{
-+ my ($tmp) = @_;
-+ $tmp =~ s/^.*\/(.*)\.po$/$1/;
-+ return $tmp;
-+}
-+
-+sub gather_po_files
-+{
-+ for my $po_file (glob "$PO_DIR/*.po") {
-+ $po_files_by_lang{po_file2lang($po_file)} = $po_file;
-+ }
-+}
-+
-+sub get_local_charset
-+{
-+ my ($encoding) = @_;
-+ my $alias_file = $ENV{"G_CHARSET_ALIAS"} || "/opt/intltool/lib/charset.alias";
-+
-+ # seek character encoding aliases in charset.alias (glib)
-+
-+ if (open CHARSET_ALIAS, $alias_file)
-+ {
-+ while (<CHARSET_ALIAS>)
-+ {
-+ next if /^\#/;
-+ return $1 if (/^\s*([-._a-zA-Z0-9]+)\s+$encoding\b/i)
-+ }
-+
-+ close CHARSET_ALIAS;
-+ }
-+
-+ # if not found, return input string
-+
-+ return $encoding;
-+}
-+
-+sub get_po_encoding
-+{
-+ my ($in_po_file) = @_;
-+ my $encoding = "";
-+
-+ open IN_PO_FILE, $in_po_file or die;
-+ while (<IN_PO_FILE>)
-+ {
-+ ## example: "Content-Type: text/plain; charset=ISO-8859-1\n"
-+ if (/Content-Type\:.*charset=([-a-zA-Z0-9]+)\\n/)
-+ {
-+ $encoding = $1;
-+ last;
-+ }
-+ }
-+ close IN_PO_FILE;
-+
-+ if (!$encoding)
-+ {
-+ print STDERR "Warning: no encoding found in $in_po_file. Assuming ISO-8859-1\n" unless $QUIET_ARG;
-+ $encoding = "ISO-8859-1";
-+ }
-+
-+ system ("$iconv -f $encoding -t UTF-8 </dev/null 2>/dev/null");
-+ if ($?) {
-+ $encoding = get_local_charset($encoding);
-+ }
-+
-+ return $encoding
-+}
-+
-+sub utf8_sanity_check
-+{
-+ if (!$UTF8_ARG)
-+ {
-+ if (!$PASS_THROUGH_ARG)
-+ {
-+ $PASS_THROUGH_ARG="1";
-+ }
-+ }
-+}
-+
-+sub get_translation_database
-+{
-+ if ($cache_file) {
-+ &get_cached_translation_database;
-+ } else {
-+ &create_translation_database;
-+ }
-+}
-+
-+sub get_newest_po_age
-+{
-+ my $newest_age;
-+
-+ foreach my $file (values %po_files_by_lang)
-+ {
-+ my $file_age = -M $file;
-+ $newest_age = $file_age if !$newest_age || $file_age < $newest_age;
-+ }
-+
-+ $newest_age = 0 if !$newest_age;
-+
-+ return $newest_age;
-+}
-+
-+sub create_cache
-+{
-+ print "Generating and caching the translation database\n" unless $QUIET_ARG;
-+
-+ &create_translation_database;
-+
-+ open CACHE, ">$cache_file" || die;
-+ print CACHE join "\x01", %translations;
-+ close CACHE;
-+}
-+
-+sub load_cache
-+{
-+ print "Found cached translation database\n" unless $QUIET_ARG;
-+
-+ my $contents;
-+ open CACHE, "<$cache_file" || die;
-+ {
-+ local $/;
-+ $contents = <CACHE>;
-+ }
-+ close CACHE;
-+ %translations = split "\x01", $contents;
-+}
-+
-+sub get_cached_translation_database
-+{
-+ my $cache_file_age = -M $cache_file;
-+ if (defined $cache_file_age)
-+ {
-+ if ($cache_file_age <= &get_newest_po_age)
-+ {
-+ &load_cache;
-+ return;
-+ }
-+ print "Found too-old cached translation database\n" unless $QUIET_ARG;
-+ }
-+
-+ &create_cache;
-+}
-+
-+sub create_translation_database
-+{
-+ for my $lang (keys %po_files_by_lang)
-+ {
-+ my $po_file = $po_files_by_lang{$lang};
-+
-+ if ($UTF8_ARG)
-+ {
-+ my $encoding = get_po_encoding ($po_file);
-+
-+ if (lc $encoding eq "utf-8")
-+ {
-+ open PO_FILE, "<$po_file";
-+ }
-+ else
-+ {
-+ print STDERR "WARNING: $po_file is not in UTF-8 but $encoding, converting...\n" unless $QUIET_ARG;;
-+
-+ open PO_FILE, "$iconv -f $encoding -t UTF-8 $po_file|";
-+ }
-+ }
-+ else
-+ {
-+ open PO_FILE, "<$po_file";
-+ }
-+
-+ my $nextfuzzy = 0;
-+ my $inmsgid = 0;
-+ my $inmsgstr = 0;
-+ my $msgid = "";
-+ my $msgstr = "";
-+
-+ while (<PO_FILE>)
-+ {
-+ $nextfuzzy = 1 if /^#, fuzzy/;
-+
-+ if (/^msgid "((\\.|[^\\])*)"/ )
-+ {
-+ $translations{$lang, $msgid} = $msgstr if $inmsgstr && $msgid && $msgstr;
-+ $msgid = "";
-+ $msgstr = "";
-+
-+ if ($nextfuzzy) {
-+ $inmsgid = 0;
-+ } else {
-+ $msgid = unescape_po_string($1);
-+ $inmsgid = 1;
-+ }
-+ $inmsgstr = 0;
-+ $nextfuzzy = 0;
-+ }
-+
-+ if (/^msgstr "((\\.|[^\\])*)"/)
-+ {
-+ $msgstr = unescape_po_string($1);
-+ $inmsgstr = 1;
-+ $inmsgid = 0;
-+ }
-+
-+ if (/^"((\\.|[^\\])*)"/)
-+ {
-+ $msgid .= unescape_po_string($1) if $inmsgid;
-+ $msgstr .= unescape_po_string($1) if $inmsgstr;
-+ }
-+ }
-+ $translations{$lang, $msgid} = $msgstr if $inmsgstr && $msgid && $msgstr;
-+ }
-+}
-+
-+sub finalize
-+{
-+}
-+
-+sub unescape_one_sequence
-+{
-+ my ($sequence) = @_;
-+
-+ return "\\" if $sequence eq "\\\\";
-+ return "\"" if $sequence eq "\\\"";
-+ return "\n" if $sequence eq "\\n";
-+
-+ # gettext also handles \n, \t, \b, \r, \f, \v, \a, \xxx (octal),
-+ # \xXX (hex) and has a comment saying they want to handle \u and \U.
-+
-+ return $sequence;
-+}
-+
-+sub unescape_po_string
-+{
-+ my ($string) = @_;
-+
-+ $string =~ s/(\\.)/unescape_one_sequence($1)/eg;
-+
-+ return $string;
-+}
-+
-+## NOTE: deal with < - < but not > - > because it seems its ok to have
-+## > in the entity. For further info please look at #84738.
-+sub entity_decode
-+{
-+ local ($_) = @_;
-+
-+ s/'/'/g; # '
-+ s/"/"/g; # "
-+ s/&/&/g;
-+ s/</</g;
-+
-+ return $_;
-+}
-+
-+# entity_encode: (string)
-+#
-+# Encode the given string to XML format (encode '<' etc). It also
-+# encodes high bit if not in UTF-8 mode.
-+
-+sub entity_encode
-+{
-+ my ($pre_encoded) = @_;
-+
-+ my @list_of_chars = unpack ('C*', $pre_encoded);
-+
-+ if ($PASS_THROUGH_ARG)
-+ {
-+ return join ('', map (&entity_encode_int_even_high_bit, @list_of_chars));
-+ }
-+ else
-+ {
-+ # with UTF-8 we only encode minimalistic
-+ return join ('', map (&entity_encode_int_minimalist, @list_of_chars));
-+ }
-+}
-+
-+sub entity_encode_int_minimalist
-+{
-+ return """ if $_ == 34;
-+ return "&" if $_ == 38;
-+ return "'" if $_ == 39;
-+ return "<" if $_ == 60;
-+ return chr $_;
-+}
-+
-+sub entity_encode_int_even_high_bit
-+{
-+ if ($_ > 127 || $_ == 34 || $_ == 38 || $_ == 39 || $_ == 60)
-+ {
-+ # the ($_ > 127) should probably be removed
-+ return "&#" . $_ . ";";
-+ }
-+ else
-+ {
-+ return chr $_;
-+ }
-+}
-+
-+sub entity_encoded_translation
-+{
-+ my ($lang, $string) = @_;
-+
-+ my $translation = $translations{$lang, $string};
-+ return $string if !$translation;
-+ return entity_encode ($translation);
-+}
-+
-+## XML (bonobo-activation specific) merge code
-+
-+sub ba_merge_translations
-+{
-+ my $source;
-+
-+ {
-+ local $/; # slurp mode
-+ open INPUT, "<$FILE" or die "can't open $FILE: $!";
-+ $source = <INPUT>;
-+ close INPUT;
-+ }
-+
-+ open OUTPUT, ">$OUTFILE" or die "can't open $OUTFILE: $!";
-+
-+ while ($source =~ s|^(.*?)([ \t]*<\s*$w+\s+($w+\s*=\s*"$q"\s*)+/?>)([ \t]*\n)?||s)
-+ {
-+ print OUTPUT $1;
-+
-+ my $node = $2 . "\n";
-+
-+ my @strings = ();
-+ $_ = $node;
-+ while (s/(\s)_($w+\s*=\s*"($q)")/$1$2/s) {
-+ push @strings, entity_decode($3);
-+ }
-+ print OUTPUT;
-+
-+ my %langs;
-+ for my $string (@strings)
-+ {
-+ for my $lang (keys %po_files_by_lang)
-+ {
-+ $langs{$lang} = 1 if $translations{$lang, $string};
-+ }
-+ }
-+
-+ for my $lang (sort keys %langs)
-+ {
-+ $_ = $node;
-+ s/(\sname\s*=\s*)"($q)"/$1"$2-$lang"/s;
-+ s/(\s)_($w+\s*=\s*")($q)"/$1 . $2 . entity_encoded_translation($lang, $3) . '"'/seg;
-+ print OUTPUT;
-+ }
-+ }
-+
-+ print OUTPUT $source;
-+
-+ close OUTPUT;
-+}
-+
-+
-+## XML (non-bonobo-activation) merge code
-+
-+
-+# Process tag attributes
-+# Only parameter is a HASH containing attributes -> values mapping
-+sub getAttributeString
-+{
-+ my $sub = shift;
-+ my $do_translate = shift || 0;
-+ my $language = shift || "";
-+ my $result = "";
-+ foreach my $e (reverse(sort(keys %{ $sub }))) {
-+ my $key = $e;
-+ my $string = $sub->{$e};
-+ my $quote = '"';
-+
-+ $string =~ s/^[\s]+//;
-+ $string =~ s/[\s]+$//;
-+
-+ if ($string =~ /^'.*'$/)
-+ {
-+ $quote = "'";
-+ }
-+ $string =~ s/^['"]//g;
-+ $string =~ s/['"]$//g;
-+
-+ if ($do_translate && $key =~ /^_/) {
-+ $key =~ s|^_||g;
-+ if ($language) {
-+
-+ # Handle translation
-+ #
-+ my $decode_string = entity_decode($string);
-+ my $translation = $translations{$language, $decode_string};
-+ if ($translation) {
-+ $translation = entity_encode($translation);
-+ $string = $translation;
-+ }
-+ }
-+ }
-+
-+ $result .= " $key=$quote$string$quote";
-+ }
-+ return $result;
-+}
-+
-+# Returns a translatable string from XML node, it works on contents of every node in XML::Parser tree
-+# doesn't support nesting of translatable tags (i.e. <_blah>this <_doh>doesn't</_doh> work</_blah> -- besides
-+# can you define the correct semantics for this?)
-+#
-+
-+sub getXMLstring
-+{
-+ my $ref = shift;
-+ my @list = @{ $ref };
-+ my $result = "";
-+
-+ my $count = scalar(@list);
-+ my $attrs = $list[0];
-+ my $index = 1;
-+ while ($index < $count) {
-+ my $type = $list[$index];
-+ my $content = $list[$index+1];
-+ if (! $type ) {
-+ # We've got CDATA
-+ if ($content) {
-+ # lets strip the whitespace here, and *ONLY* here
-+ $content =~ s/\s+/ /gs;
-+ $result .= ($content);
-+ } else {
-+ #print "no cdata content when expected it\n"; # is this possible, is this ok?
-+ # what to do if this happens?
-+ # Did I mention that I hate XML::Parser tree style?
-+ }
-+ } else {
-+ # We've got another element
-+ $result .= "<$type";
-+ $result .= getAttributeString($attrs, 0); # no nested translatable elements
-+ if ($content) {
-+ my $subresult = getXMLstring($content);
-+ if ($subresult) {
-+ $result .= ">".$subresult . "</$type>";
-+ } else {
-+ $result .= "/>";
-+ }
-+ } else {
-+ $result .= "/>";
-+ }
-+ }
-+ $index += 2;
-+ }
-+ return $result;
-+}
-+
-+sub traverse
-+{
-+ my $fh = shift;
-+ my $nodename = shift;
-+ my $content = shift;
-+ my $language = shift || "";
-+
-+ if (!$nodename) {
-+ if ($content =~ /^[\s]*$/) {
-+ $leading_space .= $content;
-+ }
-+ print $fh $content;
-+ } else {
-+ # element
-+ my @all = @{ $content };
-+ my $attrs = shift @all;
-+ my $outattr = getAttributeString($attrs, 1, $language);
-+ my $translate = 0;
-+
-+ if ($nodename =~ /^_/) {
-+ $translate = 1;
-+ $nodename =~ s/^_//;
-+ }
-+ my $lookup = '';
-+ print $fh "<$nodename$outattr";
-+ if ($translate) {
-+ $lookup = getXMLstring($content);
-+ $lookup =~ s/^\s+//s;
-+ $lookup =~ s/\s+$//s;
-+
-+ if ($lookup) {
-+ my $translation = $translations{$language, $lookup};
-+ if ($MULTIPLE_OUTPUT && $translation) {
-+ print $fh " xml:lang=\"", $language, "\"";
-+ print $fh ">", $translation, "</$nodename>";
-+ return; # this means there will be no same translation with xml:lang="$language"...
-+ # if we want them both, just remove this "return"
-+ } else {
-+ print $fh ">$lookup</$nodename>";
-+ }
-+ } else {
-+ print $fh "/>";
-+ }
-+
-+
-+ for my $lang (sort keys %po_files_by_lang) {
-+ if ($MULTIPLE_OUTPUT && $lang ne "$language") {
-+ next;
-+ }
-+ if ($lang) {
-+
-+ # Handle translation
-+ #
-+ my $localattrs = getAttributeString($attrs, 1, $lang);
-+ my $decode_string = ($lookup); #entity_decode($lookup);
-+ my $translation = $translations{$lang, $decode_string};
-+ if ($translation) {
-+ $translation = ($translation);
-+ print $fh "\n";
-+ $leading_space =~ s/.*\n//g;
-+ print $fh $leading_space;
-+ print $fh "<", $nodename, " xml:lang=\"", $lang, "\"", $localattrs;
-+ print $fh ">", $translation , "</$nodename>";
-+ }
-+ }
-+ }
-+
-+ } else {
-+ my $count = scalar(@all);
-+ if ($count > 0) {
-+ print $fh ">";
-+ } else {
-+ print $fh "/>";
-+ }
-+ my $index = 0;
-+ while ($index < $count) {
-+ my $type = $all[$index];
-+ my $rest = $all[$index+1];
-+ traverse($fh, $type, $rest, $language);
-+ $index += 2;
-+ }
-+ if ($count > 0) {
-+ print $fh "</$nodename>";
-+ }
-+ }
-+ }
-+}
-+
-+sub intltool_tree_char
-+{
-+ my $expat = shift;
-+ my $text = shift;
-+ my $clist = $expat->{Curlist};
-+ my $pos = $#$clist;
-+
-+ # Use original_string so that we retain escaped entities
-+ # in CDATA sections.
-+ #
-+ if ($pos > 0 and $clist->[$pos - 1] eq '0') {
-+ $clist->[$pos] .= $expat->original_string();
-+ } else {
-+ push @$clist, 0 => $expat->original_string();
-+ }
-+}
-+
-+sub intltool_tree_start
-+{
-+ my $expat = shift;
-+ my $tag = shift;
-+ my @origlist = ();
-+
-+ # Use original_string so that we retain escaped entities
-+ # in attribute values. We must convert the string to an
-+ # @origlist array to conform to the structure of the Tree
-+ # Style.
-+ #
-+ my @original_array = split /\x/, $expat->original_string();
-+ my $source = $expat->original_string();
-+
-+ # Remove leading tag.
-+ #
-+ $source =~ s|^\s*<\s*(\S+)||s;
-+
-+ # Grab attribute key/value pairs and push onto @origlist array.
-+ #
-+ while ($source)
-+ {
-+ if ($source =~ /^\s*([\w:-]+)\s*[=]\s*["]/)
-+ {
-+ $source =~ s|^\s*([\w:-]+)\s*[=]\s*["]([^"]*)["]||s;
-+ push @origlist, $1;
-+ push @origlist, '"' . $2 . '"';
-+ }
-+ elsif ($source =~ /^\s*([\w:-]+)\s*[=]\s*[']/)
-+ {
-+ $source =~ s|^\s*([\w:-]+)\s*[=]\s*[']([^']*)[']||s;
-+ push @origlist, $1;
-+ push @origlist, "'" . $2 . "'";
-+ }
-+ else
-+ {
-+ last;
-+ }
-+ }
-+
-+ my $ol = [ { @origlist } ];
-+
-+ push @{ $expat->{Lists} }, $expat->{Curlist};
-+ push @{ $expat->{Curlist} }, $tag => $ol;
-+ $expat->{Curlist} = $ol;
-+}
-+
-+sub readXml
-+{
-+ my $filename = shift || return;
-+ if(!-f $filename) {
-+ die "ERROR Cannot find filename: $filename\n";
-+ }
-+
-+ my $ret = eval 'require XML::Parser';
-+ if(!$ret) {
-+ die "You must have XML::Parser installed to run $0\n\n";
-+ }
-+ my $xp = new XML::Parser(Style => 'Tree');
-+ $xp->setHandlers(Char => \&intltool_tree_char);
-+ $xp->setHandlers(Start => \&intltool_tree_start);
-+ my $tree = $xp->parsefile($filename);
-+
-+# <foo><head id="a">Hello <em>there</em></head><bar>Howdy<ref/></bar>do</foo>
-+# would be:
-+# [foo, [{}, head, [{id => "a"}, 0, "Hello ", em, [{}, 0, "there"]], bar, [{},
-+# 0, "Howdy", ref, [{}]], 0, "do" ] ]
-+
-+ return $tree;
-+}
-+
-+sub print_header
-+{
-+ my $infile = shift;
-+ my $fh = shift;
-+ my $source;
-+
-+ if(!-f $infile) {
-+ die "ERROR Cannot find filename: $infile\n";
-+ }
-+
-+ print $fh qq{<?xml version="1.0" encoding="UTF-8"?>\n};
-+ {
-+ local $/;
-+ open DOCINPUT, "<${FILE}" or die;
-+ $source = <DOCINPUT>;
-+ close DOCINPUT;
-+ }
-+ if ($source =~ /(<!DOCTYPE.*\[.*\]\s*>)/s)
-+ {
-+ print $fh "$1\n";
-+ }
-+ elsif ($source =~ /(<!DOCTYPE[^>]*>)/s)
-+ {
-+ print $fh "$1\n";
-+ }
-+}
-+
-+sub parseTree
-+{
-+ my $fh = shift;
-+ my $ref = shift;
-+ my $language = shift || "";
-+
-+ my $name = shift @{ $ref };
-+ my $cont = shift @{ $ref };
-+ traverse($fh, $name, $cont, $language);
-+}
-+
-+sub xml_merge_output
-+{
-+ my $source;
-+
-+ if ($MULTIPLE_OUTPUT) {
-+ for my $lang (sort keys %po_files_by_lang) {
-+ if ( ! -e $lang ) {
-+ mkdir $lang or die "Cannot create subdirectory $lang: $!\n";
-+ }
-+ open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
-+ my $tree = readXml($FILE);
-+ print_header($FILE, \*OUTPUT);
-+ parseTree(\*OUTPUT, $tree, $lang);
-+ close OUTPUT;
-+ print "CREATED $lang/$OUTFILE\n" unless $QUIET_ARG;
-+ }
-+ }
-+ open OUTPUT, ">$OUTFILE" or die "Cannot open $OUTFILE: $!\n";
-+ my $tree = readXml($FILE);
-+ print_header($FILE, \*OUTPUT);
-+ parseTree(\*OUTPUT, $tree);
-+ close OUTPUT;
-+ print "CREATED $OUTFILE\n" unless $QUIET_ARG;
-+}
-+
-+sub keys_merge_translations
-+{
-+ open INPUT, "<${FILE}" or die;
-+ open OUTPUT, ">${OUTFILE}" or die;
-+
-+ while (<INPUT>)
-+ {
-+ if (s/^(\s*)_(\w+=(.*))/$1$2/)
-+ {
-+ my $string = $3;
-+
-+ print OUTPUT;
-+
-+ my $non_translated_line = $_;
-+
-+ for my $lang (sort keys %po_files_by_lang)
-+ {
-+ my $translation = $translations{$lang, $string};
-+ next if !$translation;
-+
-+ $_ = $non_translated_line;
-+ s/(\w+)=.*/[$lang]$1=$translation/;
-+ print OUTPUT;
-+ }
-+ }
-+ else
-+ {
-+ print OUTPUT;
-+ }
-+ }
-+
-+ close OUTPUT;
-+ close INPUT;
-+}
-+
-+sub desktop_merge_translations
-+{
-+ open INPUT, "<${FILE}" or die;
-+ open OUTPUT, ">${OUTFILE}" or die;
-+
-+ while (<INPUT>)
-+ {
-+ if (s/^(\s*)_(\w+=(.*))/$1$2/)
-+ {
-+ my $string = $3;
-+
-+ print OUTPUT;
-+
-+ my $non_translated_line = $_;
-+
-+ for my $lang (sort keys %po_files_by_lang)
-+ {
-+ my $translation = $translations{$lang, $string};
-+ next if !$translation;
-+
-+ $_ = $non_translated_line;
-+ s/(\w+)=.*/${1}[$lang]=$translation/;
-+ print OUTPUT;
-+ }
-+ }
-+ else
-+ {
-+ print OUTPUT;
-+ }
-+ }
-+
-+ close OUTPUT;
-+ close INPUT;
-+}
-+
-+sub schemas_merge_translations
-+{
-+ my $source;
-+
-+ {
-+ local $/; # slurp mode
-+ open INPUT, "<$FILE" or die "can't open $FILE: $!";
-+ $source = <INPUT>;
-+ close INPUT;
-+ }
-+
-+ open OUTPUT, ">$OUTFILE" or die;
-+
-+ # FIXME: support attribute translations
-+
-+ # Empty nodes never need translation, so unmark all of them.
-+ # For example, <_foo/> is just replaced by <foo/>.
-+ $source =~ s|<\s*_($w+)\s*/>|<$1/>|g;
-+
-+ while ($source =~ s/
-+ (.*?)
-+ (\s+)(<locale\ name="C">(\s*)
-+ (<default>\s*(?:<!--[^>]*?-->\s*)?(.*?)\s*<\/default>)?(\s*)
-+ (<short>\s*(?:<!--[^>]*?-->\s*)?(.*?)\s*<\/short>)?(\s*)
-+ (<long>\s*(?:<!--[^>]*?-->\s*)?(.*?)\s*<\/long>)?(\s*)
-+ <\/locale>)
-+ //sx)
-+ {
-+ print OUTPUT $1;
-+
-+ my $locale_start_spaces = $2 ? $2 : '';
-+ my $default_spaces = $4 ? $4 : '';
-+ my $short_spaces = $7 ? $7 : '';
-+ my $long_spaces = $10 ? $10 : '';
-+ my $locale_end_spaces = $13 ? $13 : '';
-+ my $c_default_block = $3 ? $3 : '';
-+ my $default_string = $6 ? $6 : '';
-+ my $short_string = $9 ? $9 : '';
-+ my $long_string = $12 ? $12 : '';
-+
-+ print OUTPUT "$locale_start_spaces$c_default_block";
-+
-+ $default_string =~ s/\s+/ /g;
-+ $default_string = entity_decode($default_string);
-+ $short_string =~ s/\s+/ /g;
-+ $short_string = entity_decode($short_string);
-+ $long_string =~ s/\s+/ /g;
-+ $long_string = entity_decode($long_string);
-+
-+ for my $lang (sort keys %po_files_by_lang)
-+ {
-+ my $default_translation = $translations{$lang, $default_string};
-+ my $short_translation = $translations{$lang, $short_string};
-+ my $long_translation = $translations{$lang, $long_string};
-+
-+ next if (!$default_translation && !$short_translation &&
-+ !$long_translation);
-+
-+ print OUTPUT "\n$locale_start_spaces<locale name=\"$lang\">";
-+
-+ print OUTPUT "$default_spaces";
-+
-+ if ($default_translation)
-+ {
-+ $default_translation = entity_encode($default_translation);
-+ print OUTPUT "<default>$default_translation</default>";
-+ }
-+
-+ print OUTPUT "$short_spaces";
-+
-+ if ($short_translation)
-+ {
-+ $short_translation = entity_encode($short_translation);
-+ print OUTPUT "<short>$short_translation</short>";
-+ }
-+
-+ print OUTPUT "$long_spaces";
-+
-+ if ($long_translation)
-+ {
-+ $long_translation = entity_encode($long_translation);
-+ print OUTPUT "<long>$long_translation</long>";
-+ }
-+
-+ print OUTPUT "$locale_end_spaces</locale>";
-+ }
-+ }
-+
-+ print OUTPUT $source;
-+
-+ close OUTPUT;
-+}
-+
-+sub rfc822deb_merge_translations
-+{
-+ my %encodings = ();
-+ for my $lang (keys %po_files_by_lang) {
-+ $encodings{$lang} = ($UTF8_ARG ? 'UTF-8' : get_po_encoding($po_files_by_lang{$lang}));
-+ }
-+
-+ my $source;
-+
-+ $Text::Wrap::huge = 'overflow';
-+ $Text::Wrap::break = qr/\n|\s(?=\S)/;
-+
-+ {
-+ local $/; # slurp mode
-+ open INPUT, "<$FILE" or die "can't open $FILE: $!";
-+ $source = <INPUT>;
-+ close INPUT;
-+ }
-+
-+ open OUTPUT, ">${OUTFILE}" or die;
-+
-+ while ($source =~ /(^|\n+)(_*)([^:\s]+)(:[ \t]*)(.*?)(?=\n[\S\n]|$)/sg)
-+ {
-+ my $sep = $1;
-+ my $non_translated_line = $3.$4;
-+ my $string = $5;
-+ my $underscore = length($2);
-+ next if $underscore eq 0 && $non_translated_line =~ /^#/;
-+ # Remove [] dummy strings
-+ my $stripped = $string;
-+ $stripped =~ s/\[\s[^\[\]]*\],/,/g if $underscore eq 2;
-+ $stripped =~ s/\[\s[^\[\]]*\]$//;
-+ $non_translated_line .= $stripped;
-+
-+ print OUTPUT $sep.$non_translated_line;
-+
-+ if ($underscore)
-+ {
-+ my @str_list = rfc822deb_split($underscore, $string);
-+
-+ for my $lang (sort keys %po_files_by_lang)
-+ {
-+ my $is_translated = 1;
-+ my $str_translated = '';
-+ my $first = 1;
-+
-+ for my $str (@str_list)
-+ {
-+ my $translation = $translations{$lang, $str};
-+
-+ if (!$translation)
-+ {
-+ $is_translated = 0;
-+ last;
-+ }
-+
-+ # $translation may also contain [] dummy
-+ # strings, mostly to indicate an empty string
-+ $translation =~ s/\[\s[^\[\]]*\]$//;
-+
-+ if ($first)
-+ {
-+ if ($underscore eq 2)
-+ {
-+ $str_translated .= $translation;
-+ }
-+ else
-+ {
-+ $str_translated .=
-+ Text::Tabs::expand($translation) .
-+ "\n";
-+ }
-+ }
-+ else
-+ {
-+ if ($underscore eq 2)
-+ {
-+ $str_translated .= ', ' . $translation;
-+ }
-+ else
-+ {
-+ $str_translated .= Text::Tabs::expand(
-+ Text::Wrap::wrap(' ', ' ', $translation)) .
-+ "\n .\n";
-+ }
-+ }
-+ $first = 0;
-+
-+ # To fix some problems with Text::Wrap::wrap
-+ $str_translated =~ s/(\n )+\n/\n .\n/g;
-+ }
-+ next unless $is_translated;
-+
-+ $str_translated =~ s/\n \.\n$//;
-+ $str_translated =~ s/\s+$//;
-+
-+ $_ = $non_translated_line;
-+ s/^(\w+):\s*.*/$sep${1}-$lang.$encodings{$lang}: $str_translated/s;
-+ print OUTPUT;
-+ }
-+ }
-+ }
-+ print OUTPUT "\n";
-+
-+ close OUTPUT;
-+ close INPUT;
-+}
-+
-+sub rfc822deb_split
-+{
-+ # Debian defines a special way to deal with rfc822-style files:
-+ # when a value contain newlines, it consists of
-+ # 1. a short form (first line)
-+ # 2. a long description, all lines begin with a space,
-+ # and paragraphs are separated by a single dot on a line
-+ # This routine returns an array of all paragraphs, and reformat
-+ # them.
-+ # When first argument is 2, the string is a comma separated list of
-+ # values.
-+ my $type = shift;
-+ my $text = shift;
-+ $text =~ s/^[ \t]//mg;
-+ return (split(/, */, $text, 0)) if $type ne 1;
-+ return ($text) if $text !~ /\n/;
-+
-+ $text =~ s/([^\n]*)\n//;
-+ my @list = ($1);
-+ my $str = '';
-+
-+ for my $line (split (/\n/, $text))
-+ {
-+ chomp $line;
-+ if ($line =~ /^\.\s*$/)
-+ {
-+ # New paragraph
-+ $str =~ s/\s*$//;
-+ push(@list, $str);
-+ $str = '';
-+ }
-+ elsif ($line =~ /^\s/)
-+ {
-+ # Line which must not be reformatted
-+ $str .= "\n" if length ($str) && $str !~ /\n$/;
-+ $line =~ s/\s+$//;
-+ $str .= $line."\n";
-+ }
-+ else
-+ {
-+ # Continuation line, remove newline
-+ $str .= " " if length ($str) && $str !~ /\n$/;
-+ $str .= $line;
-+ }
-+ }
-+
-+ $str =~ s/\s*$//;
-+ push(@list, $str) if length ($str);
-+
-+ return @list;
-+}
-+
-diff -ruNa javahelp-convert-0.13/intltool-update.in javahelp-convert-0.13.newtar/intltool-update.in
---- javahelp-convert-0.13/intltool-update.in 1970-01-01 09:00:00.000000000 +0900
-+++ javahelp-convert-0.13.newtar/intltool-update.in 2004-10-14 17:33:19.000000000 +0900
-@@ -0,0 +1,1034 @@
-+#!@INTLTOOL_PERL@ -w
-+# -*- Mode: perl; indent-tabs-mode: nil; c-basic-offset: 4 -*-
-+
-+#
-+# The Intltool Message Updater
-+#
-+# Copyright (C) 2000-2003 Free Software Foundation.
-+#
-+# Intltool is free software; you can redistribute it and/or
-+# modify it under the terms of the GNU General Public License
-+# version 2 published by the Free Software Foundation.
-+#
-+# Intltool is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-+# General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with this program; if not, write to the Free Software
-+# Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-+#
-+# As a special exception to the GNU General Public License, if you
-+# distribute this file as part of a program that contains a
-+# configuration script generated by Autoconf, you may include it under
-+# the same distribution terms that you use for the rest of that program.
-+#
-+# Authors: Kenneth Christiansen <[email protected]>
-+# Maciej Stachowiak
-+# Darin Adler <[email protected]>
-+
-+## Release information
-+my $PROGRAM = "intltool-update";
-+my $VERSION = "0.31.3";
-+my $PACKAGE = "intltool";
-+
-+## Loaded modules
-+use strict;
-+use Getopt::Long;
-+use Cwd;
-+use File::Copy;
-+use File::Find;
-+
-+## Scalars used by the option stuff
-+my $HELP_ARG = 0;
-+my $VERSION_ARG = 0;
-+my $DIST_ARG = 0;
-+my $POT_ARG = 0;
-+my $HEADERS_ARG = 0;
-+my $MAINTAIN_ARG = 0;
-+my $REPORT_ARG = 0;
-+my $VERBOSE = 0;
-+my $GETTEXT_PACKAGE = "";
-+my $OUTPUT_FILE = "";
-+
-+my @languages;
-+my %varhash = ();
-+my %po_files_by_lang = ();
-+
-+# Regular expressions to categorize file types.
-+# FIXME: Please check if the following is correct
-+
-+my $xml_support =
-+"xml(?:\\.in)*|". # http://www.w3.org/XML/ (Note: .in is not required)
-+"ui|". # Bonobo specific - User Interface desc. files
-+"lang|". # ?
-+"glade2?(?:\\.in)*|". # Glade specific - User Interface desc. files (Note: .in is not required)
-+"scm(?:\\.in)*|". # ? (Note: .in is not required)
-+"oaf(?:\\.in)+|". # DEPRECATED: Replaces by Bonobo .server files
-+"etspec|". # ?
-+"server(?:\\.in)+|". # Bonobo specific
-+"sheet(?:\\.in)+|". # ?
-+"schemas(?:\\.in)+|". # GConf specific
-+"pong(?:\\.in)+|". # DEPRECATED: PONG is not used [by GNOME] any longer.
-+"kbd(?:\\.in)+"; # GOK specific.
-+
-+my $ini_support =
-+"desktop(?:\\.in)+|". # http://www.freedesktop.org/Standards/menu-spec
-+"caves(?:\\.in)+|". # GNOME Games specific
-+"directory(?:\\.in)+|". # http://www.freedesktop.org/Standards/menu-spec
-+"soundlist(?:\\.in)+|". # GNOME specific
-+"keys(?:\\.in)+|". # GNOME Mime database specific
-+"theme(?:\\.in)+"; # http://www.freedesktop.org/Standards/icon-theme-spec
-+
-+my $buildin_gettext_support =
-+"c|y|cs|cc|cpp|c\\+\\+|h|hh|gob|py";
-+
-+## Always flush buffer when printing
-+$| = 1;
-+
-+## Sometimes the source tree will be rooted somewhere else.
-+my $SRCDIR = ".";
-+my $POTFILES_in;
-+
-+$SRCDIR = $ENV{"srcdir"} if $ENV{"srcdir"};
-+$POTFILES_in = "<$SRCDIR/POTFILES.in";
-+
-+## Handle options
-+GetOptions
-+(
-+ "help" => \$HELP_ARG,
-+ "version" => \$VERSION_ARG,
-+ "dist|d" => \$DIST_ARG,
-+ "pot|p" => \$POT_ARG,
-+ "headers|s" => \$HEADERS_ARG,
-+ "maintain|m" => \$MAINTAIN_ARG,
-+ "report|r" => \$REPORT_ARG,
-+ "verbose|x" => \$VERBOSE,
-+ "gettext-package|g=s" => \$GETTEXT_PACKAGE,
-+ "output-file|o=s" => \$OUTPUT_FILE,
-+ ) or &Console_WriteError_InvalidOption;
-+
-+&Console_Write_IntltoolHelp if $HELP_ARG;
-+&Console_Write_IntltoolVersion if $VERSION_ARG;
-+
-+my $arg_count = ($DIST_ARG > 0)
-+ + ($POT_ARG > 0)
-+ + ($HEADERS_ARG > 0)
-+ + ($MAINTAIN_ARG > 0)
-+ + ($REPORT_ARG > 0);
-+
-+&Console_Write_IntltoolHelp if $arg_count > 1;
-+
-+# --version and --help don't require a module name
-+my $MODULE = $GETTEXT_PACKAGE || &FindPackageName;
-+
-+if ($POT_ARG)
-+{
-+ &GenerateHeaders;
-+ &GeneratePOTemplate;
-+}
-+elsif ($HEADERS_ARG)
-+{
-+ &GenerateHeaders;
-+}
-+elsif ($MAINTAIN_ARG)
-+{
-+ &FindLeftoutFiles;
-+}
-+elsif ($REPORT_ARG)
-+{
-+ &GenerateHeaders;
-+ &GeneratePOTemplate;
-+ &Console_Write_CoverageReport;
-+}
-+elsif ((defined $ARGV[0]) && $ARGV[0] =~ /^[a-z]/)
-+{
-+ my $lang = $ARGV[0];
-+
-+ ## Report error if the language file supplied
-+ ## to the command line is non-existent
-+ &Console_WriteError_NotExisting("$lang.po") if ! -s "$lang.po";
-+
-+ if (!$DIST_ARG)
-+ {
-+ print "Working, please wait..." if $VERBOSE;
-+ &GenerateHeaders;
-+ &GeneratePOTemplate;
-+ }
-+ &POFile_Update ($lang, $OUTPUT_FILE);
-+ &Console_Write_TranslationStatus ($lang, $OUTPUT_FILE);
-+}
-+else
-+{
-+ &Console_Write_IntltoolHelp;
-+}
-+
-+exit;
-+
-+#########
-+
-+sub Console_Write_IntltoolVersion
-+{
-+ print <<_EOF_;
-+${PROGRAM} (${PACKAGE}) $VERSION
-+Written by Kenneth Christiansen, Maciej Stachowiak, and Darin Adler.
-+
-+Copyright (C) 2000-2003 Free Software Foundation, Inc.
-+This is free software; see the source for copying conditions. There is NO
-+warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-+_EOF_
-+ exit;
-+}
-+
-+sub Console_Write_IntltoolHelp
-+{
-+ print <<_EOF_;
-+Usage: ${PROGRAM} [OPTION]... LANGCODE
-+Updates PO template files and merge them with the translations.
-+
-+Mode of operation (only one is allowed):
-+ -p, --pot generate the PO template only
-+ -s, --headers generate the header files in POTFILES.in
-+ -m, --maintain search for left out files from POTFILES.in
-+ -r, --report display a status report for the module
-+ -d, --dist merge LANGCODE.po with existing PO template
-+
-+Extra options:
-+ -g, --gettext-package=NAME override PO template name, useful with --pot
-+ -o, --output-file=FILE write merged translation to FILE
-+ -x, --verbose display lots of feedback
-+ --help display this help and exit
-+ --version output version information and exit
-+
-+Examples of use:
-+${PROGRAM} --pot just create a new PO template
-+${PROGRAM} xy create new PO template and merge xy.po with it
-+
-+Report bugs to http://bugzilla.gnome.org/ (product name "$PACKAGE")
-+or send email to <xml-i18n-tools\@gnome.org>.
-+_EOF_
-+ exit;
-+}
-+
-+sub POFile_DetermineType ($)
-+{
-+ my $type = $_;
-+ my $gettext_type;
-+
-+ my $xml_regex = "(?:" . $xml_support . ")";
-+ my $ini_regex = "(?:" . $ini_support . ")";
-+ my $buildin_regex = "(?:" . $buildin_gettext_support . ")";
-+
-+ if ($type =~ /\[type: gettext\/([^\]].*)]/)
-+ {
-+ $gettext_type=$1;
-+ }
-+ elsif ($type =~ /schemas(\.in)+$/)
-+ {
-+ $gettext_type="schemas";
-+ }
-+ elsif ($type =~ /glade2?(\.in)*$/)
-+ {
-+ $gettext_type="glade";
-+ }
-+ elsif ($type =~ /scm(\.in)*$/)
-+ {
-+ $gettext_type="scheme";
-+ }
-+ elsif ($type =~ /keys(\.in)+$/)
-+ {
-+ $gettext_type="keys";
-+ }
-+
-+ # bucket types
-+
-+ elsif ($type =~ /$xml_regex$/)
-+ {
-+ $gettext_type="xml";
-+ }
-+ elsif ($type =~ /$ini_regex$/)
-+ {
-+ $gettext_type="ini";
-+ }
-+ elsif ($type =~ /$buildin_regex$/)
-+ {
-+ $gettext_type="buildin";
-+ }
-+ else
-+ {
-+ $gettext_type="unknown";
-+ }
-+
-+ return "gettext\/$gettext_type";
-+}
-+
-+sub TextFile_DetermineEncoding ($)
-+{
-+ my $gettext_code="ASCII"; # All files are ASCII by default
-+ my $filetype=`file $_ | cut -d ' ' -f 2`;
-+
-+ if ($? eq "0")
-+ {
-+ if ($filetype =~ /^(ISO|UTF)/)
-+ {
-+ chomp ($gettext_code = $filetype);
-+ }
-+ elsif ($filetype =~ /^XML/)
-+ {
-+ $gettext_code="UTF-8"; # We asume that .glade and other .xml files are UTF-8
-+ }
-+ }
-+
-+ return $gettext_code;
-+}
-+
-+
-+sub FindLeftoutFiles
-+{
-+ my (@buf_i18n_plain,
-+ @buf_i18n_xml,
-+ @buf_i18n_xml_unmarked,
-+ @buf_i18n_ini,
-+ @buf_potfiles,
-+ @buf_potfiles_ignore,
-+ @buf_allfiles,
-+ @buf_allfiles_sorted,
-+ @buf_potfiles_sorted
-+ );
-+
-+ ## Search and find all translatable files
-+ find sub {
-+ push @buf_i18n_plain, "$File::Find::name" if /\.($buildin_gettext_support)$/;
-+ push @buf_i18n_xml, "$File::Find::name" if /\.($xml_support)$/;
-+ push @buf_i18n_ini, "$File::Find::name" if /\.($ini_support)$/;
-+ push @buf_i18n_xml_unmarked, "$File::Find::name" if /\.(schemas(\.in)+)$/;
-+ }, "..";
-+
-+
-+ open POTFILES, $POTFILES_in or die "$PROGRAM: there's no POTFILES.in!\n";
-+ @buf_potfiles = grep !/^(#|\s*$)/, <POTFILES>;
-+ close POTFILES;
-+
-+ foreach (@buf_potfiles) {
-+ s/^\[.*]\s*//;
-+ }
-+
-+ print "Searching for missing translatable files...\n" if $VERBOSE;
-+
-+ ## Check if we should ignore some found files, when
-+ ## comparing with POTFILES.in
-+ foreach my $ignore ("POTFILES.skip", "POTFILES.ignore")
-+ {
-+ (-s $ignore) or next;
-+
-+ if ("$ignore" eq "POTFILES.ignore")
-+ {
-+ print "The usage of POTFILES.ignore is deprecated. Please consider moving the\n".
-+ "content of this file to POTFILES.skip.\n";
-+ }
-+
-+ print "Found $ignore: Ignoring files...\n" if $VERBOSE;
-+ open FILE, "<$ignore" or die "ERROR: Failed to open $ignore!\n";
-+
-+ while (<FILE>)
-+ {
-+ push @buf_potfiles_ignore, $_ unless /^(#|\s*$)/;
-+ }
-+ close FILE;
-+
-+ @buf_potfiles = (@buf_potfiles_ignore, @buf_potfiles);
-+ }
-+
-+ foreach my $file (@buf_i18n_plain)
-+ {
-+ my $in_comment = 0;
-+ my $in_macro = 0;
-+
-+ open FILE, "<$file";
-+ while (<FILE>)
-+ {
-+ # Handle continued multi-line comment.
-+ if ($in_comment)
-+ {
-+ next unless s-.*\*/--;
-+ $in_comment = 0;
-+ }
-+
-+ # Handle continued macro.
-+ if ($in_macro)
-+ {
-+ $in_macro = 0 unless /\\$/;
-+ next;
-+ }
-+
-+ # Handle start of macro (or any preprocessor directive).
-+ if (/^\s*\#/)
-+ {
-+ $in_macro = 1 if /^([^\\]|\\.)*\\$/;
-+ next;
-+ }
-+
-+ # Handle comments and quoted text.
-+ while (m-(/\*|//|\'|\")-) # \' and \" keep emacs perl mode happy
-+ {
-+ my $match = $1;
-+ if ($match eq "/*")
-+ {
-+ if (!s-/\*.*?\*/--)
-+ {
-+ s-/\*.*--;
-+ $in_comment = 1;
-+ }
-+ }
-+ elsif ($match eq "//")
-+ {
-+ s-//.*--;
-+ }
-+ else # ' or "
-+ {
-+ if (!s-$match([^\\]|\\.)*?$match-QUOTEDTEXT-)
-+ {
-+ warn "mismatched quotes at line $. in $file\n";
-+ s-$match.*--;
-+ }
-+ }
-+ }
-+
-+ if (/\.GetString ?\(QUOTEDTEXT/)
-+ {
-+ ## Remove the first 3 chars and add newline
-+ push @buf_allfiles, unpack("x3 A*", $file) . "\n";
-+ last;
-+ }
-+
-+ if (/_\(QUOTEDTEXT/)
-+ {
-+ ## Remove the first 3 chars and add newline
-+ push @buf_allfiles, unpack("x3 A*", $file) . "\n";
-+ last;
-+ }
-+ }
-+ close FILE;
-+ }
-+
-+ foreach my $file (@buf_i18n_xml)
-+ {
-+ open FILE, "<$file";
-+
-+ while (<FILE>)
-+ {
-+ # FIXME: share the pattern matching code with intltool-extract
-+ if (/\s_(.*)=\"/ || /<_[^>]+>/ || /translatable=\"yes\"/)
-+ {
-+ push @buf_allfiles, unpack("x3 A*", $file) . "\n";
-+ last;
-+ }
-+ }
-+ close FILE;
-+ }
-+
-+ foreach my $file (@buf_i18n_ini)
-+ {
-+ open FILE, "<$file";
-+ while (<FILE>)
-+ {
-+ if (/_(.*)=/)
-+ {
-+ push @buf_allfiles, unpack("x3 A*", $file) . "\n";
-+ last;
-+ }
-+ }
-+ close FILE;
-+ }
-+
-+ foreach my $file (@buf_i18n_xml_unmarked)
-+ {
-+ push @buf_allfiles, unpack("x3 A*", $file) . "\n";
-+ }
-+
-+
-+ @buf_allfiles_sorted = sort (@buf_allfiles);
-+ @buf_potfiles_sorted = sort (@buf_potfiles);
-+
-+ my %in2;
-+ foreach (@buf_potfiles_sorted)
-+ {
-+ $in2{$_} = 1;
-+ }
-+
-+ my @result;
-+
-+ foreach (@buf_allfiles_sorted)
-+ {
-+ if (!exists($in2{$_}))
-+ {
-+ push @result, $_
-+ }
-+ }
-+
-+ my @buf_potfiles_notexist;
-+
-+ foreach (@buf_potfiles_sorted)
-+ {
-+ chomp (my $dummy = $_);
-+ if ("$dummy" ne "" and ! -f "../$dummy")
-+ {
-+ push @buf_potfiles_notexist, $_;
-+ }
-+ }
-+
-+ ## Save file with information about the files missing
-+ ## if any, and give information about this procedure.
-+ if (@result + @buf_potfiles_notexist > 0)
-+ {
-+ if (@result)
-+ {
-+ print "\n" if $VERBOSE;
-+ unlink "missing";
-+ open OUT, ">missing";
-+ print OUT @result;
-+ close OUT;
-+ warn "\e[1mThe following files contain translations and are currently not in use. Please\e[0m\n".
-+ "\e[1mconsider adding these to the POTFILES.in file, located in the po/ directory.\e[0m\n\n";
-+ print STDERR @result, "\n";
-+ warn "If some of these files are left out on purpose then please add them to\n".
-+ "POTFILES.skip instead of POTFILES.in. A file \e[1m'missing'\e[0m containing this list\n".
-+ "of left out files has been written in the current directory.\n";
-+ }
-+ if (@buf_potfiles_notexist)
-+ {
-+ unlink "notexist";
-+ open OUT, ">notexist";
-+ print OUT @buf_potfiles_notexist;
-+ close OUT;
-+ warn "\n" if ($VERBOSE or @result);
-+ warn "\e[1mThe following files do not exist anymore:\e[0m\n\n";
-+ warn @buf_potfiles_notexist, "\n";
-+ warn "Please remove them from POTFILES.in or POTFILES.skip. A file \e[1m'notexist'\e[0m\n".
-+ "containing this list of absent files has been written in the current directory.\n";
-+ }
-+ }
-+
-+ ## If there is nothing to complain about, notify the user
-+ else {
-+ print "\nAll files containing translations are present in POTFILES.in.\n" if $VERBOSE;
-+ }
-+}
-+
-+sub Console_WriteError_InvalidOption
-+{
-+ ## Handle invalid arguments
-+ print STDERR "Try `${PROGRAM} --help' for more information.\n";
-+ exit 1;
-+}
-+
-+sub GenerateHeaders
-+{
-+ my $EXTRACT = "@INTLTOOL_EXTRACT@";
-+ chomp $EXTRACT;
-+
-+ $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} if $ENV{"INTLTOOL_EXTRACT"};
-+
-+ ## Generate the .h header files, so we can allow glade and
-+ ## xml translation support
-+ if (! -x "$EXTRACT")
-+ {
-+ print STDERR "\n *** The intltool-extract script wasn't found!"
-+ ."\n *** Without it, intltool-update can not generate files.\n";
-+ exit;
-+ }
-+ else
-+ {
-+ open (FILE, $POTFILES_in) or die "$PROGRAM: POTFILES.in not found.\n";
-+
-+ while (<FILE>)
-+ {
-+ chomp;
-+ next if /^\[\s*encoding/;
-+
-+ ## Find xml files in POTFILES.in and generate the
-+ ## files with help from the extract script
-+
-+ my $gettext_type= &POFile_DetermineType ($1);
-+
-+ if (/\.($xml_support|$ini_support)$/ || /^\[/)
-+ {
-+ s/^\[[^\[].*]\s*//;
-+
-+ my $filename = "../$_";
-+
-+ if ($VERBOSE)
-+ {
-+ system ($EXTRACT, "--update", "--srcdir=$SRCDIR",
-+ "--type=$gettext_type", $filename);
-+ }
-+ else
-+ {
-+ system ($EXTRACT, "--update", "--type=$gettext_type",
-+ "--srcdir=$SRCDIR", "--quiet", $filename);
-+ }
-+ }
-+ }
-+ close FILE;
-+ }
-+}
-+
-+#
-+# Generate .pot file from POTFILES.in
-+#
-+sub GeneratePOTemplate
-+{
-+ my $XGETTEXT = $ENV{"XGETTEXT"} || "@INTLTOOL_XGETTEXT@";
-+ my $XGETTEXT_ARGS = $ENV{"XGETTEXT_ARGS"} || '';
-+ chomp $XGETTEXT;
-+
-+ if (! -x $XGETTEXT)
-+ {
-+ print STDERR " *** xgettext is not found on this system!\n".
-+ " *** Without it, intltool-update can not extract strings.\n";
-+ exit;
-+ }
-+
-+ print "Building $MODULE.pot...\n" if $VERBOSE;
-+
-+ open INFILE, $POTFILES_in;
-+ unlink "POTFILES.in.temp";
-+ open OUTFILE, ">POTFILES.in.temp" or die("Cannot open POTFILES.in.temp for writing");
-+
-+ my $gettext_support_nonascii = 0;
-+
-+ # checks for GNU gettext >= 0.12
-+ my $dummy = `$XGETTEXT --version --from-code=UTF-8 >/dev/null 2>/dev/null`;
-+ if ($? == 0)
-+ {
-+ $gettext_support_nonascii = 1;
-+ }
-+ else
-+ {
-+ # urge everybody to upgrade gettext
-+ print STDERR "WARNING: This version of gettext does not support extracting non-ASCII\n".
-+ " strings. That means you should install a version of gettext\n".
-+ " that supports non-ASCII strings (such as GNU gettext >= 0.12),\n".
-+ " or have to let non-ASCII strings untranslated. (If there is any)\n";
-+ }
-+
-+ my $encoding = "ASCII";
-+ my $forced_gettext_code;
-+ my @temp_headers;
-+ my $encoding_problem_is_reported = 0;
-+
-+ while (<INFILE>)
-+ {
-+ next if (/^#/ or /^\s*$/);
-+
-+ chomp;
-+
-+ my $gettext_code;
-+
-+ if (/^\[\s*encoding:\s*(.*)\s*\]/)
-+ {
-+ $forced_gettext_code=$1;
-+ }
-+ elsif (/\.($xml_support|$ini_support)$/ || /^\[/)
-+ {
-+ s/^\[.*]\s*//;
-+ print OUTFILE "$_.h\n";
-+ push @temp_headers, "../$_.h";
-+ $gettext_code = &TextFile_DetermineEncoding ("../$_.h") if ($gettext_support_nonascii and not defined $forced_gettext_code);
-+ }
-+ else
-+ {
-+ if ($SRCDIR eq ".") {
-+ print OUTFILE "$_\n";
-+ } else {
-+ print OUTFILE "$SRCDIR/../$_\n";
-+ }
-+ $gettext_code = &TextFile_DetermineEncoding ("../$_") if ($gettext_support_nonascii and not defined $forced_gettext_code);
-+ }
-+
-+ next if (! $gettext_support_nonascii);
-+
-+ if (defined $forced_gettext_code)
-+ {
-+ $encoding=$forced_gettext_code;
-+ }
-+ elsif (defined $gettext_code and "$encoding" ne "$gettext_code")
-+ {
-+ if ($encoding eq "ASCII")
-+ {
-+ $encoding=$gettext_code;
-+ }
-+ elsif ($gettext_code ne "ASCII")
-+ {
-+ # Only report once because the message is quite long
-+ if (! $encoding_problem_is_reported)
-+ {
-+ print STDERR "WARNING: You should use the same file encoding for all your project files,\n".
-+ " but $PROGRAM thinks that most of the source files are in\n".
-+ " $encoding encoding, while \"$_\" is (likely) in\n".
-+ " $gettext_code encoding. If you are sure that all translatable strings\n".
-+ " are in same encoding (say UTF-8), please \e[1m*prepend*\e[0m the following\n".
-+ " line to POTFILES.in:\n\n".
-+ " [encoding: UTF-8]\n\n".
-+ " and make sure that configure.in/ac checks for $PACKAGE >= 0.27 .\n".
-+ "(such warning message will only be reported once.)\n";
-+ $encoding_problem_is_reported = 1;
-+ }
-+ }
-+ }
-+ }
-+
-+ close OUTFILE;
-+ close INFILE;
-+
-+ unlink "$MODULE.pot";
-+ my @xgettext_argument=("$XGETTEXT",
-+ "--add-comments",
-+ "--directory\=\.\.",
-+ "--output\=$MODULE\.pot",
-+ "--files-from\=\.\/POTFILES\.in\.temp");
-+ my $XGETTEXT_KEYWORDS = &FindPOTKeywords;
-+ push @xgettext_argument, $XGETTEXT_KEYWORDS;
-+ push @xgettext_argument, "--from-code\=$encoding" if ($gettext_support_nonascii);
-+ push @xgettext_argument, $XGETTEXT_ARGS if $XGETTEXT_ARGS;
-+ my $xgettext_command = join ' ', @xgettext_argument;
-+
-+ # intercept xgettext error message
-+ print "Running $xgettext_command\n" if $VERBOSE;
-+ my $xgettext_error_msg = `$xgettext_command 2>\&1`;
-+ my $command_failed = $?;
-+
-+ unlink "POTFILES.in.temp";
-+
-+ print "Removing generated header (.h) files..." if $VERBOSE;
-+ unlink foreach (@temp_headers);
-+ print "done.\n" if $VERBOSE;
-+
-+ if (! $command_failed)
-+ {
-+ if (! -e "$MODULE.pot")
-+ {
-+ print "None of the files in POTFILES.in contain strings marked for translation.\n" if $VERBOSE;
-+ }
-+ else
-+ {
-+ print "Wrote $MODULE.pot\n" if $VERBOSE;
-+ }
-+ }
-+ else
-+ {
-+ if ($xgettext_error_msg =~ /--from-code/)
-+ {
-+ # replace non-ASCII error message with a more useful one.
-+ print STDERR "ERROR: xgettext failed to generate PO template file because there is non-ASCII\n".
-+ " string marked for translation. Please make sure that all strings marked\n".
-+ " for translation are in uniform encoding (say UTF-8), then \e[1m*prepend*\e[0m the\n".
-+ " following line to POTFILES.in and rerun $PROGRAM:\n\n".
-+ " [encoding: UTF-8]\n\n";
-+ }
-+ else
-+ {
-+ print STDERR "$xgettext_error_msg";
-+ if (-e "$MODULE.pot")
-+ {
-+ # is this possible?
-+ print STDERR "ERROR: xgettext failed but still managed to generate PO template file.\n".
-+ " Please consult error message above if there is any.\n";
-+ }
-+ else
-+ {
-+ print STDERR "ERROR: xgettext failed to generate PO template file. Please consult\n".
-+ " error message above if there is any.\n";
-+ }
-+ }
-+ exit (1);
-+ }
-+}
-+
-+sub POFile_Update
-+{
-+ -f "$MODULE.pot" or die "$PROGRAM: $MODULE.pot does not exist.\n";
-+
-+ my $MSGMERGE = $ENV{"MSGMERGE"} || "@INTLTOOL_MSGMERGE@";
-+ my ($lang, $outfile) = @_;
-+
-+ print "Merging $lang.po with $MODULE.pot..." if $VERBOSE;
-+
-+ my $infile = "$lang.po";
-+ $outfile = "$lang.po" if ($outfile eq "");
-+
-+ # I think msgmerge won't overwrite old file if merge is not successful
-+ system ("$MSGMERGE", "-o", $outfile, $infile, "$MODULE.pot");
-+}
-+
-+sub Console_WriteError_NotExisting
-+{
-+ my ($file) = @_;
-+
-+ ## Report error if supplied language file is non-existing
-+ print STDERR "$PROGRAM: $file does not exist!\n";
-+ print STDERR "Try '$PROGRAM --help' for more information.\n";
-+ exit;
-+}
-+
-+sub GatherPOFiles
-+{
-+ my @po_files = glob ("./*.po");
-+
-+ @languages = map (&POFile_GetLanguage, @po_files);
-+
-+ foreach my $lang (@languages)
-+ {
-+ $po_files_by_lang{$lang} = shift (@po_files);
-+ }
-+}
-+
-+sub POFile_GetLanguage ($)
-+{
-+ s/^(.*\/)?(.+)\.po$/$2/;
-+ return $_;
-+}
-+
-+sub Console_Write_TranslationStatus
-+{
-+ my ($lang, $output_file) = @_;
-+ my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@";
-+
-+ $output_file = "$lang.po" if ($output_file eq "");
-+
-+ system ("$MSGFMT", "-o", "/dev/null", "--statistics", $output_file);
-+}
-+
-+sub Console_Write_CoverageReport
-+{
-+ my $MSGFMT = $ENV{"MSGFMT"} || "@INTLTOOL_MSGFMT@";
-+
-+ &GatherPOFiles;
-+
-+ foreach my $lang (@languages)
-+ {
-+ print "$lang: ";
-+ &POFile_Update ($lang, "");
-+ }
-+
-+ print "\n\n * Current translation support in $MODULE \n\n";
-+
-+ foreach my $lang (@languages)
-+ {
-+ print "$lang: ";
-+ system ("$MSGFMT", "-o", "/dev/null", "--statistics", "$lang.po");
-+ }
-+}
-+
-+sub SubstituteVariable
-+{
-+ my ($str) = @_;
-+
-+ # always need to rewind file whenever it has been accessed
-+ seek (CONF, 0, 0);
-+
-+ # cache each variable. varhash is global to we can add
-+ # variables elsewhere.
-+ while (<CONF>)
-+ {
-+ if (/^(\w+)=(.*)$/)
-+ {
-+ ($varhash{$1} = $2) =~ s/^["'](.*)["']$/$1/;
-+ }
-+ }
-+
-+ if ($str =~ /^(.*)\${?([A-Z_]+)}?(.*)$/)
-+ {
-+ my $rest = $3;
-+ my $untouched = $1;
-+ my $sub = $varhash{$2};
-+
-+ return SubstituteVariable ("$untouched$sub$rest");
-+ }
-+
-+ # We're using Perl backticks ` and "echo -n" here in order to
-+ # expand any shell escapes (such as backticks themselves) in every variable
-+ return `echo -n "$str"`;
-+}
-+
-+sub CONF_Handle_Open
-+{
-+ my $base_dirname = getcwd();
-+ $base_dirname =~ s@.*/@@;
-+
-+ my ($conf_in, $src_dir);
-+
-+ if ($base_dirname =~ /^po(-.+)?$/)
-+ {
-+ if (-f "Makevars")
-+ {
-+ my $makefile_source;
-+
-+ local (*IN);
-+ open (IN, "<Makevars") || die "can't open Makevars: $!";
-+
-+ while (<IN>)
-+ {
-+ if (/^top_builddir[ \t]*=/)
-+ {
-+ $src_dir = $_;
-+ $src_dir =~ s/^top_builddir[ \t]*=[ \t]*([^ \t\n\r]*)/$1/;
-+
-+ chomp $src_dir;
-+ if (-f "$src_dir" . "/configure.ac") {
-+ $conf_in = "$src_dir" . "/configure.ac" . "\n";
-+ } else {
-+ $conf_in = "$src_dir" . "/configure.in" . "\n";
-+ }
-+ last;
-+ }
-+ }
-+ close IN;
-+
-+ $conf_in || die "Cannot find top_builddir in Makevars.";
-+ }
-+ elsif (-f "../configure.ac")
-+ {
-+ $conf_in = "../configure.ac";
-+ }
-+ elsif (-f "../configure.in")
-+ {
-+ $conf_in = "../configure.in";
-+ }
-+ else
-+ {
-+ my $makefile_source;
-+
-+ local (*IN);
-+ open (IN, "<Makefile") || return;
-+
-+ while (<IN>)
-+ {
-+ if (/^top_srcdir[ \t]*=/)
-+ {
-+ $src_dir = $_;
-+ $src_dir =~ s/^top_srcdir[ \t]*=[ \t]*([^ \t\n\r]*)/$1/;
-+
-+ chomp $src_dir;
-+ $conf_in = "$src_dir" . "/configure.in" . "\n";
-+
-+ last;
-+ }
-+ }
-+ close IN;
-+
-+ $conf_in || die "Cannot find top_srcdir in Makefile.";
-+ }
-+
-+ open (CONF, "<$conf_in");
-+ }
-+ else
-+ {
-+ print STDERR "$PROGRAM: Unable to proceed.\n" .
-+ "Make sure to run this script inside the po directory.\n";
-+ exit;
-+ }
-+}
-+
-+sub FindPackageName
-+{
-+ my $version;
-+ my $domain = &FindMakevarsDomain;
-+ my $name = $domain || "untitled";
-+
-+ &CONF_Handle_Open;
-+
-+ my $conf_source; {
-+ local (*IN);
-+ open (IN, "<&CONF") || return $name;
-+ seek (IN, 0, 0);
-+ local $/; # slurp mode
-+ $conf_source = <IN>;
-+ close IN;
-+ }
-+
-+ # priority for getting package name:
-+ # 1. GETTEXT_PACKAGE
-+ # 2. first argument of AC_INIT (with >= 2 arguments)
-+ # 3. first argument of AM_INIT_AUTOMAKE (with >= 2 argument)
-+
-+ # /^AM_INIT_AUTOMAKE\([\s\[]*([^,\)\s\]]+)/m
-+ # the \s makes this not work, why?
-+ if ($conf_source =~ /^AM_INIT_AUTOMAKE\(([^,\)]+),([^,\)]+)/m)
-+ {
-+ ($name, $version) = ($1, $2);
-+ $name =~ s/[\[\]\s]//g;
-+ $version =~ s/[\[\]\s]//g;
-+ $varhash{"AC_PACKAGE_NAME"} = $name;
-+ $varhash{"PACKAGE"} = $name;
-+ $varhash{"AC_PACKAGE_VERSION"} = $version;
-+ $varhash{"VERSION"} = $version;
-+ }
-+
-+ if ($conf_source =~ /^AC_INIT\(([^,\)]+),([^,\)]+)/m)
-+ {
-+ ($name, $version) = ($1, $2);
-+ $name =~ s/[\[\]\s]//g;
-+ $version =~ s/[\[\]\s]//g;
-+ $varhash{"AC_PACKAGE_NAME"} = $name;
-+ $varhash{"PACKAGE"} = $name;
-+ $varhash{"AC_PACKAGE_VERSION"} = $version;
-+ $varhash{"VERSION"} = $version;
-+ }
-+
-+ # \s makes this not work, why?
-+ $name = $1 if $conf_source =~ /^GETTEXT_PACKAGE=\[?([^\n\]]+)/m;
-+
-+ # prepend '$' to auto* internal variables, usually they are
-+ # used in configure.in/ac without the '$'
-+ $name =~ s/AC_/\$AC_/g;
-+ $name =~ s/\$\$/\$/g;
-+
-+ $name = $domain if $domain;
-+
-+ $name = SubstituteVariable ($name);
-+ $name =~ s/^["'](.*)["']$/$1/;
-+
-+ return $name if $name;
-+}
-+
-+
-+sub FindPOTKeywords
-+{
-+
-+ my $keywords = "--keyword\=\_ --keyword\=N\_ --keyword\=U\_";
-+ my $varname = "XGETTEXT_OPTIONS";
-+ my $make_source; {
-+ local (*IN);
-+ open (IN, "<Makevars") || (open(IN, "<Makefile.in.in") && ($varname = "XGETTEXT_KEYWORDS")) || return $keywords;
-+ seek (IN, 0, 0);
-+ local $/; # slurp mode
-+ $make_source = <IN>;
-+ close IN;
-+ }
-+
-+ $keywords = $1 if $make_source =~ /^$varname[ ]*=\[?([^\n\]]+)/m;
-+
-+ return $keywords;
-+}
-+
-+sub FindMakevarsDomain
-+{
-+
-+ my $domain = "";
-+ my $makevars_source; {
-+ local (*IN);
-+ open (IN, "<Makevars") || return $domain;
-+ seek (IN, 0, 0);
-+ local $/; # slurp mode
-+ $makevars_source = <IN>;
-+ close IN;
-+ }
-+
-+ $domain = $1 if $makevars_source =~ /^DOMAIN[ ]*=\[?([^\n\]\$]+)/m;
-+ $domain =~ s/^\s+//;
-+ $domain =~ s/\s+$//;
-+
-+ return $domain;
-+}
-diff -ruNa javahelp-convert-0.13/mkinstalldirs javahelp-convert-0.13.newtar/mkinstalldirs
---- javahelp-convert-0.13/mkinstalldirs 1970-01-01 09:00:00.000000000 +0900
-+++ javahelp-convert-0.13.newtar/mkinstalldirs 2004-10-14 15:33:23.000000000 +0900
-@@ -0,0 +1,143 @@
-+#! /bin/sh
-+# mkinstalldirs --- make directory hierarchy
-+
-+scriptversion=2003-11-08.23
-+
-+# Original author: Noah Friedman <[email protected]>
-+# Created: 1993-05-16
-+# Public domain.
-+#
-+# This file is maintained in Automake, please report
-+# bugs to <[email protected]> or send patches to
-+# <[email protected]>.
-+
-+errstatus=0
-+dirmode=""
-+
-+usage="\
-+Usage: mkinstalldirs [-h] [--help] [--version] [-m MODE] DIR ...
-+
-+Create each directory DIR (with mode MODE, if specified), including all
-+leading file name components.
-+
-+Report bugs to <[email protected]>."
-+
-+# process command line arguments
-+while test $# -gt 0 ; do
-+ case $1 in
-+ -h | --help | --h*) # -h for help
-+ echo "$usage"
-+ exit 0
-+ ;;
-+ -m) # -m PERM arg
-+ shift
-+ test $# -eq 0 && { echo "$usage" 1>&2; exit 1; }
-+ dirmode=$1
-+ shift
-+ ;;
-+ --version)
-+ echo "$0 $scriptversion"
-+ exit 0
-+ ;;
-+ --) # stop option processing
-+ shift
-+ break
-+ ;;
-+ -*) # unknown option
-+ echo "$usage" 1>&2
-+ exit 1
-+ ;;
-+ *) # first non-opt arg
-+ break
-+ ;;
-+ esac
-+done
-+
-+for file
-+do
-+ if test -d "$file"; then
-+ shift
-+ else
-+ break
-+ fi
-+done
-+
-+case $# in
-+ 0) exit 0 ;;
-+esac
-+
-+case $dirmode in
-+ '')
-+ if mkdir -p -- . 2>/dev/null; then
-+ echo "mkdir -p -- $*"
-+ exec mkdir -p -- "$@"
-+ else
-+ # On NextStep and OpenStep, the `mkdir' command does not
-+ # recognize any option. It will interpret all options as
-+ # directories to create, and then abort because `.' already
-+ # exists.
-+ test -d ./-p && rmdir ./-p
-+ test -d ./-- && rmdir ./--
-+ fi
-+ ;;
-+ *)
-+ if mkdir -m "$dirmode" -p -- . 2>/dev/null; then
-+ echo "mkdir -m $dirmode -p -- $*"
-+ exec mkdir -m "$dirmode" -p -- "$@"
-+ else
-+ # Clean up after NextStep and OpenStep mkdir.
-+ for d in ./-m ./-p ./-- "./$dirmode";
-+ do
-+ test -d $d && rmdir $d
-+ done
-+ fi
-+ ;;
-+esac
-+
-+for file
-+do
-+ set fnord `echo ":$file" | sed -ne 's/^:\//#/;s/^://;s/\// /g;s/^#/\//;p'`
-+ shift
-+
-+ pathcomp=
-+ for d
-+ do
-+ pathcomp="$pathcomp$d"
-+ case $pathcomp in
-+ -*) pathcomp=./$pathcomp ;;
-+ esac
-+
-+ if test ! -d "$pathcomp"; then
-+ echo "mkdir $pathcomp"
-+
-+ mkdir "$pathcomp" || lasterr=$?
-+
-+ if test ! -d "$pathcomp"; then
-+ errstatus=$lasterr
-+ else
-+ if test ! -z "$dirmode"; then
-+ echo "chmod $dirmode $pathcomp"
-+ lasterr=""
-+ chmod "$dirmode" "$pathcomp" || lasterr=$?
-+
-+ if test ! -z "$lasterr"; then
-+ errstatus=$lasterr
-+ fi
-+ fi
-+ fi
-+ fi
-+
-+ pathcomp="$pathcomp/"
-+ done
-+done
-+
-+exit $errstatus
-+
-+# Local Variables:
-+# mode: shell-script
-+# sh-indentation: 2
-+# eval: (add-hook 'write-file-hooks 'time-stamp)
-+# time-stamp-start: "scriptversion="
-+# time-stamp-format: "%:y-%02m-%02d.%02H"
-+# time-stamp-end: "$"
-+# End:
-diff -ruNa javahelp-convert-0.13/po/Makefile.in.in javahelp-convert-0.13.newtar/po/Makefile.in.in
+diff -ruNa javahelp-convert-0.13/po/Makefile.in.in javahelp-convert-0.13.new/po/Makefile.in.in
--- javahelp-convert-0.13/po/Makefile.in.in 1970-01-01 09:00:00.000000000 +0900
-+++ javahelp-convert-0.13.newtar/po/Makefile.in.in 2004-10-13 19:35:01.000000000 +0900
++++ javahelp-convert-0.13.new/po/Makefile.in.in 2004-10-29 02:29:41.097238000 +0900
@@ -0,0 +1,254 @@
+# Makefile for program source directory in GNU NLS utilities package.
+# Copyright (C) 1995, 1996, 1997 by Ulrich Drepper <[email protected]>
@@ -4203,16 +1495,16 @@
+# Tell versions [3.59,3.63) of GNU make not to export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
-diff -ruNa javahelp-convert-0.13/po/POTFILES.in javahelp-convert-0.13.newtar/po/POTFILES.in
+diff -ruNa javahelp-convert-0.13/po/POTFILES.in javahelp-convert-0.13.new/po/POTFILES.in
--- javahelp-convert-0.13/po/POTFILES.in 1970-01-01 09:00:00.000000000 +0900
-+++ javahelp-convert-0.13.newtar/po/POTFILES.in 2004-10-14 18:30:20.000000000 +0900
++++ javahelp-convert-0.13.new/po/POTFILES.in 2004-10-29 02:29:41.097459000 +0900
@@ -0,0 +1,3 @@
+category/javahelpcustom.cat.xml.in
+category/javahelpcustom.section.xml.in
+stylesheet/javahelpcustom.xsl.xml.in.in
-diff -ruNa javahelp-convert-0.13/po/de.po javahelp-convert-0.13.newtar/po/de.po
+diff -ruNa javahelp-convert-0.13/po/de.po javahelp-convert-0.13.new/po/de.po
--- javahelp-convert-0.13/po/de.po 1970-01-01 09:00:00.000000000 +0900
-+++ javahelp-convert-0.13.newtar/po/de.po 2004-10-14 20:40:11.000000000 +0900
++++ javahelp-convert-0.13.new/po/de.po 2004-10-29 02:29:41.111606000 +0900
@@ -0,0 +1,103 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -4237,7 +1529,7 @@
+
+#: category/javahelpcustom.cat.xml.in.h:2
+msgid "Accessories"
-+msgstr "Systemwerkzeuge"
++msgstr ""
+
+#: category/javahelpcustom.cat.xml.in.h:3
+msgid "Actions"
@@ -4293,7 +1585,7 @@
+
+#: category/javahelpcustom.cat.xml.in.h:16
+msgid "Utilities"
-+msgstr "Systemwerkzeuge"
++msgstr ""
+
+#: category/javahelpcustom.cat.xml.in.h:17
+msgid "Utility"
@@ -4317,9 +1609,9 @@
+#: stylesheet/javahelpcustom.xsl.xml.in.in.h:1
+msgid "About This Document"
+msgstr ""
-diff -ruNa javahelp-convert-0.13/po/es.po javahelp-convert-0.13.newtar/po/es.po
+diff -ruNa javahelp-convert-0.13/po/es.po javahelp-convert-0.13.new/po/es.po
--- javahelp-convert-0.13/po/es.po 1970-01-01 09:00:00.000000000 +0900
-+++ javahelp-convert-0.13.newtar/po/es.po 2004-10-14 20:41:48.000000000 +0900
++++ javahelp-convert-0.13.new/po/es.po 2004-10-29 02:29:41.111921000 +0900
@@ -0,0 +1,103 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -4344,7 +1636,7 @@
+
+#: category/javahelpcustom.cat.xml.in.h:2
+msgid "Accessories"
-+msgstr "Herramientas del sistema"
++msgstr ""
+
+#: category/javahelpcustom.cat.xml.in.h:3
+msgid "Actions"
@@ -4400,7 +1692,7 @@
+
+#: category/javahelpcustom.cat.xml.in.h:16
+msgid "Utilities"
-+msgstr "Herramientas del sistema"
++msgstr ""
+
+#: category/javahelpcustom.cat.xml.in.h:17
+msgid "Utility"
@@ -4424,9 +1716,9 @@
+#: stylesheet/javahelpcustom.xsl.xml.in.in.h:1
+msgid "About This Document"
+msgstr ""
-diff -ruNa javahelp-convert-0.13/po/fr.po javahelp-convert-0.13.newtar/po/fr.po
+diff -ruNa javahelp-convert-0.13/po/fr.po javahelp-convert-0.13.new/po/fr.po
--- javahelp-convert-0.13/po/fr.po 1970-01-01 09:00:00.000000000 +0900
-+++ javahelp-convert-0.13.newtar/po/fr.po 2004-10-14 20:42:00.000000000 +0900
++++ javahelp-convert-0.13.new/po/fr.po 2004-10-29 02:29:41.112233000 +0900
@@ -0,0 +1,103 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -4451,7 +1743,7 @@
+
+#: category/javahelpcustom.cat.xml.in.h:2
+msgid "Accessories"
-+msgstr "Outils système"
++msgstr ""
+
+#: category/javahelpcustom.cat.xml.in.h:3
+msgid "Actions"
@@ -4507,7 +1799,7 @@
+
+#: category/javahelpcustom.cat.xml.in.h:16
+msgid "Utilities"
-+msgstr "Outils système"
++msgstr ""
+
+#: category/javahelpcustom.cat.xml.in.h:17
+msgid "Utility"
@@ -4531,9 +1823,9 @@
+#: stylesheet/javahelpcustom.xsl.xml.in.in.h:1
+msgid "About This Document"
+msgstr ""
-diff -ruNa javahelp-convert-0.13/po/it.po javahelp-convert-0.13.newtar/po/it.po
+diff -ruNa javahelp-convert-0.13/po/it.po javahelp-convert-0.13.new/po/it.po
--- javahelp-convert-0.13/po/it.po 1970-01-01 09:00:00.000000000 +0900
-+++ javahelp-convert-0.13.newtar/po/it.po 2004-10-14 20:40:14.000000000 +0900
++++ javahelp-convert-0.13.new/po/it.po 2004-10-29 02:29:41.112548000 +0900
@@ -0,0 +1,103 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -4558,7 +1850,7 @@
+
+#: category/javahelpcustom.cat.xml.in.h:2
+msgid "Accessories"
-+msgstr "Sistema"
++msgstr ""
+
+#: category/javahelpcustom.cat.xml.in.h:3
+msgid "Actions"
@@ -4614,7 +1906,7 @@
+
+#: category/javahelpcustom.cat.xml.in.h:16
+msgid "Utilities"
-+msgstr "Sistema"
++msgstr ""
+
+#: category/javahelpcustom.cat.xml.in.h:17
+msgid "Utility"
@@ -4638,9 +1930,9 @@
+#: stylesheet/javahelpcustom.xsl.xml.in.in.h:1
+msgid "About This Document"
+msgstr ""
-diff -ruNa javahelp-convert-0.13/po/ja.po javahelp-convert-0.13.newtar/po/ja.po
+diff -ruNa javahelp-convert-0.13/po/ja.po javahelp-convert-0.13.new/po/ja.po
--- javahelp-convert-0.13/po/ja.po 1970-01-01 09:00:00.000000000 +0900
-+++ javahelp-convert-0.13.newtar/po/ja.po 2004-10-14 20:40:16.000000000 +0900
++++ javahelp-convert-0.13.new/po/ja.po 2004-10-29 02:29:41.112920000 +0900
@@ -0,0 +1,103 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -4665,15 +1957,15 @@
+
+#: category/javahelpcustom.cat.xml.in.h:2
+msgid "Accessories"
-+msgstr "システムツール"
++msgstr "アクセサリ"
+
+#: category/javahelpcustom.cat.xml.in.h:3
+msgid "Actions"
-+msgstr ""
++msgstr "アクション"
+
+#: category/javahelpcustom.cat.xml.in.h:4
+msgid "Administration"
-+msgstr ""
++msgstr "管理"
+
+#: category/javahelpcustom.cat.xml.in.h:5
+msgid "Amusements"
@@ -4689,7 +1981,7 @@
+
+#: category/javahelpcustom.cat.xml.in.h:8
+msgid "Developer"
-+msgstr ""
++msgstr "開発"
+
+#: category/javahelpcustom.cat.xml.in.h:9
+msgid "Games"
@@ -4721,7 +2013,7 @@
+
+#: category/javahelpcustom.cat.xml.in.h:16
+msgid "Utilities"
-+msgstr "システムツール"
++msgstr "ユーティリティ"
+
+#: category/javahelpcustom.cat.xml.in.h:17
+msgid "Utility"
@@ -4744,10 +2036,10 @@
+
+#: stylesheet/javahelpcustom.xsl.xml.in.in.h:1
+msgid "About This Document"
-+msgstr ""
-diff -ruNa javahelp-convert-0.13/po/javahelp-convert.pot javahelp-convert-0.13.newtar/po/javahelp-convert.pot
++msgstr "このドキュメントについて"
+diff -ruNa javahelp-convert-0.13/po/javahelp-convert.pot javahelp-convert-0.13.new/po/javahelp-convert.pot
--- javahelp-convert-0.13/po/javahelp-convert.pot 1970-01-01 09:00:00.000000000 +0900
-+++ javahelp-convert-0.13.newtar/po/javahelp-convert.pot 2004-10-14 18:46:30.000000000 +0900
++++ javahelp-convert-0.13.new/po/javahelp-convert.pot 2004-10-29 02:29:41.099379000 +0900
@@ -0,0 +1,104 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -4853,9 +2145,9 @@
+#: stylesheet/javahelpcustom.xsl.xml.in.in.h:1
+msgid "About This Document"
+msgstr ""
-diff -ruNa javahelp-convert-0.13/po/ko.po javahelp-convert-0.13.newtar/po/ko.po
+diff -ruNa javahelp-convert-0.13/po/ko.po javahelp-convert-0.13.new/po/ko.po
--- javahelp-convert-0.13/po/ko.po 1970-01-01 09:00:00.000000000 +0900
-+++ javahelp-convert-0.13.newtar/po/ko.po 2004-10-14 20:40:17.000000000 +0900
++++ javahelp-convert-0.13.new/po/ko.po 2004-10-29 02:29:41.113235000 +0900
@@ -0,0 +1,103 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -4880,7 +2172,7 @@
+
+#: category/javahelpcustom.cat.xml.in.h:2
+msgid "Accessories"
-+msgstr "시스템 도구"
++msgstr ""
+
+#: category/javahelpcustom.cat.xml.in.h:3
+msgid "Actions"
@@ -4936,7 +2228,7 @@
+
+#: category/javahelpcustom.cat.xml.in.h:16
+msgid "Utilities"
-+msgstr "시스템 도구"
++msgstr ""
+
+#: category/javahelpcustom.cat.xml.in.h:17
+msgid "Utility"
@@ -4960,9 +2252,117 @@
+#: stylesheet/javahelpcustom.xsl.xml.in.in.h:1
+msgid "About This Document"
+msgstr ""
-diff -ruNa javahelp-convert-0.13/po/sv.po javahelp-convert-0.13.newtar/po/sv.po
+diff -ruNa javahelp-convert-0.13/po/pt_BR.po javahelp-convert-0.13.new/po/pt_BR.po
+--- javahelp-convert-0.13/po/pt_BR.po 1970-01-01 09:00:00.000000000 +0900
++++ javahelp-convert-0.13.new/po/pt_BR.po 2004-10-29 02:29:41.113548000 +0900
+@@ -0,0 +1,104 @@
++# SOME DESCRIPTIVE TITLE.
++# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
++# This file is distributed under the same license as the PACKAGE package.
++# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
++#
++#, fuzzy
++msgid ""
++msgstr ""
++"Project-Id-Version: PACKAGE VERSION\n"
++"Report-Msgid-Bugs-To: \n"
++"POT-Creation-Date: 2004-10-14 18:46+0900\n"
++"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
++"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
++"Language-Team: LANGUAGE <[email protected]>\n"
++"MIME-Version: 1.0\n"
++"Content-Type: text/plain; charset=UTF-8\n"
++"Content-Transfer-Encoding: 8bit\n"
++
++#: category/javahelpcustom.cat.xml.in.h:1
++msgid "Accessibility"
++msgstr ""
++
++#: category/javahelpcustom.cat.xml.in.h:2
++msgid "Accessories"
++msgstr ""
++
++#: category/javahelpcustom.cat.xml.in.h:3
++msgid "Actions"
++msgstr ""
++
++#: category/javahelpcustom.cat.xml.in.h:4
++msgid "Administration"
++msgstr ""
++
++#: category/javahelpcustom.cat.xml.in.h:5
++msgid "Amusements"
++msgstr ""
++
++#: category/javahelpcustom.cat.xml.in.h:6
++msgid "Applications"
++msgstr ""
++
++#: category/javahelpcustom.cat.xml.in.h:7
++msgid "Desktop"
++msgstr ""
++
++#: category/javahelpcustom.cat.xml.in.h:8
++msgid "Developer"
++msgstr ""
++
++#: category/javahelpcustom.cat.xml.in.h:9
++msgid "Games"
++msgstr ""
++
++#: category/javahelpcustom.cat.xml.in.h:10
++msgid "Graphics"
++msgstr ""
++
++#: category/javahelpcustom.cat.xml.in.h:11
++msgid "Internet"
++msgstr ""
++
++#: category/javahelpcustom.cat.xml.in.h:12
++msgid "Multimedia"
++msgstr ""
++
++#: category/javahelpcustom.cat.xml.in.h:13
++msgid "Office"
++msgstr ""
++
++#: category/javahelpcustom.cat.xml.in.h:14
++msgid "Panel Applications"
++msgstr ""
++
++#: category/javahelpcustom.cat.xml.in.h:15
++msgid "System"
++msgstr ""
++
++#: category/javahelpcustom.cat.xml.in.h:16
++msgid "Utilities"
++msgstr ""
++
++#: category/javahelpcustom.cat.xml.in.h:17
++msgid "Utility"
++msgstr ""
++
++#: category/javahelpcustom.section.xml.in.h:1
++#: stylesheet/javahelpcustom.xsl.xml.in.in.h:2
++msgid "Contents"
++msgstr ""
++
++#: category/javahelpcustom.section.xml.in.h:2
++#: stylesheet/javahelpcustom.xsl.xml.in.in.h:3
++msgid "Index"
++msgstr ""
++
++#: category/javahelpcustom.section.xml.in.h:3
++#: stylesheet/javahelpcustom.xsl.xml.in.in.h:4
++msgid "Search"
++msgstr ""
++
++#: stylesheet/javahelpcustom.xsl.xml.in.in.h:1
++msgid "About This Document"
++msgstr ""
+diff -ruNa javahelp-convert-0.13/po/sv.po javahelp-convert-0.13.new/po/sv.po
--- javahelp-convert-0.13/po/sv.po 1970-01-01 09:00:00.000000000 +0900
-+++ javahelp-convert-0.13.newtar/po/sv.po 2004-10-14 20:40:15.000000000 +0900
++++ javahelp-convert-0.13.new/po/sv.po 2004-10-29 02:29:41.113867000 +0900
@@ -0,0 +1,103 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -4987,7 +2387,7 @@
+
+#: category/javahelpcustom.cat.xml.in.h:2
+msgid "Accessories"
-+msgstr "Systemverktyg"
++msgstr ""
+
+#: category/javahelpcustom.cat.xml.in.h:3
+msgid "Actions"
@@ -5043,7 +2443,7 @@
+
+#: category/javahelpcustom.cat.xml.in.h:16
+msgid "Utilities"
-+msgstr "Systemverktyg"
++msgstr ""
+
+#: category/javahelpcustom.cat.xml.in.h:17
+msgid "Utility"
@@ -5067,9 +2467,9 @@
+#: stylesheet/javahelpcustom.xsl.xml.in.in.h:1
+msgid "About This Document"
+msgstr ""
-diff -ruNa javahelp-convert-0.13/po/zh_CN.po javahelp-convert-0.13.newtar/po/zh_CN.po
+diff -ruNa javahelp-convert-0.13/po/zh_CN.po javahelp-convert-0.13.new/po/zh_CN.po
--- javahelp-convert-0.13/po/zh_CN.po 1970-01-01 09:00:00.000000000 +0900
-+++ javahelp-convert-0.13.newtar/po/zh_CN.po 2004-10-14 20:40:17.000000000 +0900
++++ javahelp-convert-0.13.new/po/zh_CN.po 2004-10-29 02:29:41.114185000 +0900
@@ -0,0 +1,103 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -5094,7 +2494,7 @@
+
+#: category/javahelpcustom.cat.xml.in.h:2
+msgid "Accessories"
-+msgstr "系统工具"
++msgstr ""
+
+#: category/javahelpcustom.cat.xml.in.h:3
+msgid "Actions"
@@ -5150,7 +2550,7 @@
+
+#: category/javahelpcustom.cat.xml.in.h:16
+msgid "Utilities"
-+msgstr "系统工具"
++msgstr ""
+
+#: category/javahelpcustom.cat.xml.in.h:17
+msgid "Utility"
@@ -5174,9 +2574,9 @@
+#: stylesheet/javahelpcustom.xsl.xml.in.in.h:1
+msgid "About This Document"
+msgstr ""
-diff -ruNa javahelp-convert-0.13/po/zh_HK.po javahelp-convert-0.13.newtar/po/zh_HK.po
+diff -ruNa javahelp-convert-0.13/po/zh_HK.po javahelp-convert-0.13.new/po/zh_HK.po
--- javahelp-convert-0.13/po/zh_HK.po 1970-01-01 09:00:00.000000000 +0900
-+++ javahelp-convert-0.13.newtar/po/zh_HK.po 2004-10-14 20:40:19.000000000 +0900
++++ javahelp-convert-0.13.new/po/zh_HK.po 2004-10-29 02:29:41.114503000 +0900
@@ -0,0 +1,103 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -5201,7 +2601,7 @@
+
+#: category/javahelpcustom.cat.xml.in.h:2
+msgid "Accessories"
-+msgstr "系統工具"
++msgstr ""
+
+#: category/javahelpcustom.cat.xml.in.h:3
+msgid "Actions"
@@ -5257,7 +2657,7 @@
+
+#: category/javahelpcustom.cat.xml.in.h:16
+msgid "Utilities"
-+msgstr "系統工具"
++msgstr ""
+
+#: category/javahelpcustom.cat.xml.in.h:17
+msgid "Utility"
@@ -5281,9 +2681,9 @@
+#: stylesheet/javahelpcustom.xsl.xml.in.in.h:1
+msgid "About This Document"
+msgstr ""
-diff -ruNa javahelp-convert-0.13/po/zh_TW.po javahelp-convert-0.13.newtar/po/zh_TW.po
+diff -ruNa javahelp-convert-0.13/po/zh_TW.po javahelp-convert-0.13.new/po/zh_TW.po
--- javahelp-convert-0.13/po/zh_TW.po 1970-01-01 09:00:00.000000000 +0900
-+++ javahelp-convert-0.13.newtar/po/zh_TW.po 2004-10-14 20:40:18.000000000 +0900
++++ javahelp-convert-0.13.new/po/zh_TW.po 2004-10-29 02:29:41.114823000 +0900
@@ -0,0 +1,103 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
@@ -5308,7 +2708,7 @@
+
+#: category/javahelpcustom.cat.xml.in.h:2
+msgid "Accessories"
-+msgstr "系統工具"
++msgstr ""
+
+#: category/javahelpcustom.cat.xml.in.h:3
+msgid "Actions"
@@ -5364,7 +2764,7 @@
+
+#: category/javahelpcustom.cat.xml.in.h:16
+msgid "Utilities"
-+msgstr "系統工具"
++msgstr ""
+
+#: category/javahelpcustom.cat.xml.in.h:17
+msgid "Utility"
@@ -5388,37 +2788,84 @@
+#: stylesheet/javahelpcustom.xsl.xml.in.in.h:1
+msgid "About This Document"
+msgstr ""
-diff -ruNa javahelp-convert-0.13/stylesheet/C/Makefile.am javahelp-convert-0.13.newtar/stylesheet/C/Makefile.am
+diff -ruNa javahelp-convert-0.13/stylesheet/C/Makefile.am javahelp-convert-0.13.new/stylesheet/C/Makefile.am
--- javahelp-convert-0.13/stylesheet/C/Makefile.am 2004-06-02 01:30:55.000000000 +0900
-+++ javahelp-convert-0.13.newtar/stylesheet/C/Makefile.am 2004-10-14 15:22:53.000000000 +0900
-@@ -13,3 +13,6 @@
++++ javahelp-convert-0.13.new/stylesheet/C/Makefile.am 2004-10-29 02:29:41.115121000 +0900
+@@ -13,3 +13,9 @@
install-data-local:
@$(NORMAL_INSTALL)
+
+javahelpcustom.xsl: ../javahelpcustom.xsl
+ cp $< $@
-diff -ruNa javahelp-convert-0.13/stylesheet/Makefile.am javahelp-convert-0.13.newtar/stylesheet/Makefile.am
++
++../javahelpcustom.xsl: ../javahelpcustom.xsl.xml.in
++ ( cd ../; make javahelpcustom.xsl)
+diff -ruNa javahelp-convert-0.13/stylesheet/Makefile.am javahelp-convert-0.13.new/stylesheet/Makefile.am
--- javahelp-convert-0.13/stylesheet/Makefile.am 2004-09-30 17:21:42.000000000 +0900
-+++ javahelp-convert-0.13.newtar/stylesheet/Makefile.am 2004-10-14 20:47:15.000000000 +0900
-@@ -1 +1,13 @@
++++ javahelp-convert-0.13.new/stylesheet/Makefile.am 2004-10-29 02:29:41.115387000 +0900
+@@ -1 +1,7 @@
-SUBDIRS = C de es fr it ja ko sv zh_CN zh_TW zh_HK
-+SUBDIRS = . C de es fr it ja ko sv zh_CN zh_TW zh_HK
-+
-+# pick up po mesages by intltool-update, .xml suffix is needed.
-+utilsdir = $(datadir)/gnome/apps/Utilities
-+utils_in_files = javahelpcustom.xsl.xml.in
-+utils_DATA = $(utils_in_files:.xsl.xml.in=.xsl)
-+EXTRA_DIST = javahelpcustom.xsl.in
++SUBDIRS = . C de es fr it ja ko sv zh_CN zh_TW zh_HK pt_BR
+
+# For multipul output by each lang, use '-m' option instead of normal INTLTOOL_MERGE
+%.xsl: %.xsl.xml.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*.po); LC_ALL=C $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -m -x -u -c $(top_builddir)/po/.intltool-merge-cache
+
+CLEANFILES = javahelpcustom.xsl
+
-diff -ruNa javahelp-convert-0.13/stylesheet/javahelpcustom.xsl.xml.in.in javahelp-convert-0.13.newtar/stylesheet/javahelpcustom.xsl.xml.in.in
+diff -ruNa javahelp-convert-0.13/stylesheet/de/Makefile.am javahelp-convert-0.13.new/stylesheet/de/Makefile.am
+--- javahelp-convert-0.13/stylesheet/de/Makefile.am 2004-06-02 01:30:55.000000000 +0900
++++ javahelp-convert-0.13.new/stylesheet/de/Makefile.am 2004-10-29 02:29:41.115664000 +0900
+@@ -13,3 +13,6 @@
+
+ install-data-local:
+ @$(NORMAL_INSTALL)
++
++javahelpcustom.xsl: ../javahelpcustom.xsl.xml.in
++ (cd ../ ; make javahelpcustom.xsl)
+diff -ruNa javahelp-convert-0.13/stylesheet/es/Makefile.am javahelp-convert-0.13.new/stylesheet/es/Makefile.am
+--- javahelp-convert-0.13/stylesheet/es/Makefile.am 2004-06-02 01:30:55.000000000 +0900
++++ javahelp-convert-0.13.new/stylesheet/es/Makefile.am 2004-10-29 02:29:41.115935000 +0900
+@@ -13,3 +13,6 @@
+
+ install-data-local:
+ @$(NORMAL_INSTALL)
++
++javahelpcustom.xsl: ../javahelpcustom.xsl.xml.in
++ (cd ../ ; make javahelpcustom.xsl)
+diff -ruNa javahelp-convert-0.13/stylesheet/fr/Makefile.am javahelp-convert-0.13.new/stylesheet/fr/Makefile.am
+--- javahelp-convert-0.13/stylesheet/fr/Makefile.am 2004-06-02 01:30:56.000000000 +0900
++++ javahelp-convert-0.13.new/stylesheet/fr/Makefile.am 2004-10-29 02:29:41.116233000 +0900
+@@ -13,3 +13,6 @@
+
+ install-data-local:
+ @$(NORMAL_INSTALL)
++
++javahelpcustom.xsl: ../javahelpcustom.xsl.xml.in
++ (cd ../ ; make javahelpcustom.xsl)
+diff -ruNa javahelp-convert-0.13/stylesheet/it/Makefile.am javahelp-convert-0.13.new/stylesheet/it/Makefile.am
+--- javahelp-convert-0.13/stylesheet/it/Makefile.am 2004-06-02 01:30:56.000000000 +0900
++++ javahelp-convert-0.13.new/stylesheet/it/Makefile.am 2004-10-29 02:29:41.116982000 +0900
+@@ -13,3 +13,6 @@
+
+ install-data-local:
+ @$(NORMAL_INSTALL)
++
++javahelpcustom.xsl: ../javahelpcustom.xsl.xml.in
++ (cd ../ ; make javahelpcustom.xsl)
+diff -ruNa javahelp-convert-0.13/stylesheet/ja/Makefile.am javahelp-convert-0.13.new/stylesheet/ja/Makefile.am
+--- javahelp-convert-0.13/stylesheet/ja/Makefile.am 2004-06-02 01:30:56.000000000 +0900
++++ javahelp-convert-0.13.new/stylesheet/ja/Makefile.am 2004-10-29 02:29:41.117255000 +0900
+@@ -13,3 +13,6 @@
+
+ install-data-local:
+ @$(NORMAL_INSTALL)
++
++javahelpcustom.xsl: ../javahelpcustom.xsl.xml.in
++ (cd ../ ; make javahelpcustom.xsl)
+diff -ruNa javahelp-convert-0.13/stylesheet/javahelpcustom.xsl.xml.in.in javahelp-convert-0.13.new/stylesheet/javahelpcustom.xsl.xml.in.in
--- javahelp-convert-0.13/stylesheet/javahelpcustom.xsl.xml.in.in 1970-01-01 09:00:00.000000000 +0900
-+++ javahelp-convert-0.13.newtar/stylesheet/javahelpcustom.xsl.xml.in.in 2004-10-14 18:34:30.000000000 +0900
++++ javahelp-convert-0.13.new/stylesheet/javahelpcustom.xsl.xml.in.in 2004-10-29 02:29:41.102100000 +0900
@@ -0,0 +1,259 @@
+<?xml version="1.0"?>
+<xsl:stylesheet
@@ -5679,3 +3126,688 @@
+<!-- </xsl:template> -->
+
+</xsl:stylesheet>
+diff -ruNa javahelp-convert-0.13/stylesheet/ko/Makefile.am javahelp-convert-0.13.new/stylesheet/ko/Makefile.am
+--- javahelp-convert-0.13/stylesheet/ko/Makefile.am 2004-06-02 01:30:56.000000000 +0900
++++ javahelp-convert-0.13.new/stylesheet/ko/Makefile.am 2004-10-29 02:29:41.117532000 +0900
+@@ -13,3 +13,6 @@
+
+ install-data-local:
+ @$(NORMAL_INSTALL)
++
++javahelpcustom.xsl: ../javahelpcustom.xsl.xml.in
++ (cd ../ ; make javahelpcustom.xsl)
+diff -ruNa javahelp-convert-0.13/stylesheet/pt_BR/Makefile.am javahelp-convert-0.13.new/stylesheet/pt_BR/Makefile.am
+--- javahelp-convert-0.13/stylesheet/pt_BR/Makefile.am 1970-01-01 09:00:00.000000000 +0900
++++ javahelp-convert-0.13.new/stylesheet/pt_BR/Makefile.am 2004-10-29 02:29:41.117884000 +0900
+@@ -0,0 +1,18 @@
++stylesheetdir=$(datadir)/sgml/docbook/javahelp/pt_BR
++
++stylesheet_DATA = javahelpcustom.xsl
++
++EXTRA_DIST = \
++ javahelpcustom.xsl.in
++
++CLEANFILES = \
++ $(BUILD_SOURCES)
++
++dist-hook:
++ cd $(distdir) ; rm -f $(CLEANFILES)
++
++install-data-local:
++ @$(NORMAL_INSTALL)
++
++javahelpcustom.xsl: ../javahelpcustom.xsl.xml.in
++ (cd ../ ; make javahelpcustom.xsl)
+diff -ruNa javahelp-convert-0.13/stylesheet/pt_BR/Makefile.in javahelp-convert-0.13.new/stylesheet/pt_BR/Makefile.in
+--- javahelp-convert-0.13/stylesheet/pt_BR/Makefile.in 1970-01-01 09:00:00.000000000 +0900
++++ javahelp-convert-0.13.new/stylesheet/pt_BR/Makefile.in 2004-10-29 02:29:41.118472000 +0900
+@@ -0,0 +1,331 @@
++# Makefile.in generated by automake 1.8.3 from Makefile.am.
++# @configure_input@
++
++# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
++# 2003, 2004 Free Software Foundation, Inc.
++# This Makefile.in is free software; the Free Software Foundation
++# gives unlimited permission to copy and/or distribute it,
++# with or without modifications, as long as this notice is preserved.
++
++# This program is distributed in the hope that it will be useful,
++# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
++# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
++# PARTICULAR PURPOSE.
++
++@SET_MAKE@
++
++srcdir = @srcdir@
++top_srcdir = @top_srcdir@
++VPATH = @srcdir@
++pkgdatadir = $(datadir)/@PACKAGE@
++pkglibdir = $(libdir)/@PACKAGE@
++pkgincludedir = $(includedir)/@PACKAGE@
++top_builddir = ../..
++am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
++INSTALL = @INSTALL@
++install_sh_DATA = $(install_sh) -c -m 644
++install_sh_PROGRAM = $(install_sh) -c
++install_sh_SCRIPT = $(install_sh) -c
++INSTALL_HEADER = $(INSTALL_DATA)
++transform = $(program_transform_name)
++NORMAL_INSTALL = :
++PRE_INSTALL = :
++POST_INSTALL = :
++NORMAL_UNINSTALL = :
++PRE_UNINSTALL = :
++POST_UNINSTALL = :
++host_triplet = @host@
++subdir = stylesheet/pt_BR
++DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in \
++ $(srcdir)/javahelpcustom.xsl.in
++ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
++am__aclocal_m4_deps = $(top_srcdir)/configure.in
++am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
++ $(ACLOCAL_M4)
++mkinstalldirs = $(mkdir_p)
++CONFIG_CLEAN_FILES = javahelpcustom.xsl
++SOURCES =
++DIST_SOURCES =
++am__installdirs = "$(DESTDIR)$(stylesheetdir)"
++stylesheetDATA_INSTALL = $(INSTALL_DATA)
++DATA = $(stylesheet_DATA)
++DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
++ACLOCAL = @ACLOCAL@
++AMDEP_FALSE = @AMDEP_FALSE@
++AMDEP_TRUE = @AMDEP_TRUE@
++AMTAR = @AMTAR@
++AUTOCONF = @AUTOCONF@
++AUTOHEADER = @AUTOHEADER@
++AUTOMAKE = @AUTOMAKE@
++AWK = @AWK@
++CC = @CC@
++CCDEPMODE = @CCDEPMODE@
++CFLAGS = @CFLAGS@
++CPPFLAGS = @CPPFLAGS@
++CYGPATH_W = @CYGPATH_W@
++DEFS = @DEFS@
++DEPDIR = @DEPDIR@
++DOCBOOK_XSL_STYLESHEET_DIR = @DOCBOOK_XSL_STYLESHEET_DIR@
++ECHO_C = @ECHO_C@
++ECHO_N = @ECHO_N@
++ECHO_T = @ECHO_T@
++EXEEXT = @EXEEXT@
++GNOME_CFLAGS = @GNOME_CFLAGS@
++GNOME_LIBS = @GNOME_LIBS@
++INSTALL_DATA = @INSTALL_DATA@
++INSTALL_PROGRAM = @INSTALL_PROGRAM@
++INSTALL_SCRIPT = @INSTALL_SCRIPT@
++INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
++JAVAHELP_CONVERT_VERSION = @JAVAHELP_CONVERT_VERSION@
++LDFLAGS = @LDFLAGS@
++LIBOBJS = @LIBOBJS@
++LIBS = @LIBS@
++LTLIBOBJS = @LTLIBOBJS@
++MAINT = @MAINT@
++MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
++MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
++MAKEINFO = @MAKEINFO@
++OBJEXT = @OBJEXT@
++PACKAGE = @PACKAGE@
++PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
++PACKAGE_NAME = @PACKAGE_NAME@
++PACKAGE_STRING = @PACKAGE_STRING@
++PACKAGE_TARNAME = @PACKAGE_TARNAME@
++PACKAGE_VERSION = @PACKAGE_VERSION@
++PATH_SEPARATOR = @PATH_SEPARATOR@
++PKG_CONFIG = @PKG_CONFIG@
++SET_MAKE = @SET_MAKE@
++SHELL = @SHELL@
++STRIP = @STRIP@
++VERSION = @VERSION@
++ac_ct_CC = @ac_ct_CC@
++ac_ct_STRIP = @ac_ct_STRIP@
++am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
++am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
++am__include = @am__include@
++am__leading_dot = @am__leading_dot@
++am__quote = @am__quote@
++bindir = @bindir@
++build = @build@
++build_alias = @build_alias@
++build_cpu = @build_cpu@
++build_os = @build_os@
++build_vendor = @build_vendor@
++datadir = @datadir@
++exec_prefix = @exec_prefix@
++host = @host@
++host_alias = @host_alias@
++host_cpu = @host_cpu@
++host_os = @host_os@
++host_vendor = @host_vendor@
++includedir = @includedir@
++infodir = @infodir@
++install_sh = @install_sh@
++jhindexer = @jhindexer@
++libdir = @libdir@
++libexecdir = @libexecdir@
++localstatedir = @localstatedir@
++mandir = @mandir@
++mkdir_p = @mkdir_p@
++oldincludedir = @oldincludedir@
++prefix = @prefix@
++program_transform_name = @program_transform_name@
++sbindir = @sbindir@
++sharedstatedir = @sharedstatedir@
++sysconfdir = @sysconfdir@
++target_alias = @target_alias@
++xsltproc = @xsltproc@
++stylesheetdir = $(datadir)/sgml/docbook/javahelp/pt_BR
++stylesheet_DATA = javahelpcustom.xsl
++EXTRA_DIST = \
++ javahelpcustom.xsl.in
++
++CLEANFILES = \
++ $(BUILD_SOURCES)
++
++all: all-am
++
++.SUFFIXES:
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
++ @for dep in $?; do \
++ case '$(am__configure_deps)' in \
++ *$$dep*) \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
++ && exit 0; \
++ exit 1;; \
++ esac; \
++ done; \
++ echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu stylesheet/pt_BR/Makefile'; \
++ cd $(top_srcdir) && \
++ $(AUTOMAKE) --gnu stylesheet/pt_BR/Makefile
++.PRECIOUS: Makefile
++Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
++ @case '$?' in \
++ *config.status*) \
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
++ *) \
++ echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
++ esac;
++
++$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++
++$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
++ cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
++javahelpcustom.xsl: $(top_builddir)/config.status $(srcdir)/javahelpcustom.xsl.in
++ cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
++uninstall-info-am:
++install-stylesheetDATA: $(stylesheet_DATA)
++ @$(NORMAL_INSTALL)
++ test -z "$(stylesheetdir)" || $(mkdir_p) "$(DESTDIR)$(stylesheetdir)"
++ @list='$(stylesheet_DATA)'; for p in $$list; do \
++ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " $(stylesheetDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(stylesheetdir)/$$f'"; \
++ $(stylesheetDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(stylesheetdir)/$$f"; \
++ done
++
++uninstall-stylesheetDATA:
++ @$(NORMAL_UNINSTALL)
++ @list='$(stylesheet_DATA)'; for p in $$list; do \
++ f="`echo $$p | sed -e 's|^.*/||'`"; \
++ echo " rm -f '$(DESTDIR)$(stylesheetdir)/$$f'"; \
++ rm -f "$(DESTDIR)$(stylesheetdir)/$$f"; \
++ done
++tags: TAGS
++TAGS:
++
++ctags: CTAGS
++CTAGS:
++
++
++distdir: $(DISTFILES)
++ @srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
++ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
++ list='$(DISTFILES)'; for file in $$list; do \
++ case $$file in \
++ $(srcdir)/*) file=`echo "$$file" | sed "s|^$$srcdirstrip/||"`;; \
++ $(top_srcdir)/*) file=`echo "$$file" | sed "s|^$$topsrcdirstrip/|$(top_builddir)/|"`;; \
++ esac; \
++ if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
++ dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
++ if test "$$dir" != "$$file" && test "$$dir" != "."; then \
++ dir="/$$dir"; \
++ $(mkdir_p) "$(distdir)$$dir"; \
++ else \
++ dir=''; \
++ fi; \
++ if test -d $$d/$$file; then \
++ if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
++ cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
++ fi; \
++ cp -pR $$d/$$file $(distdir)$$dir || exit 1; \
++ else \
++ test -f $(distdir)/$$file \
++ || cp -p $$d/$$file $(distdir)/$$file \
++ || exit 1; \
++ fi; \
++ done
++ $(MAKE) $(AM_MAKEFLAGS) \
++ top_distdir="$(top_distdir)" distdir="$(distdir)" \
++ dist-hook
++check-am: all-am
++check: check-am
++all-am: Makefile $(DATA)
++installdirs:
++ for dir in "$(DESTDIR)$(stylesheetdir)"; do \
++ test -z "$$dir" || $(mkdir_p) "$$dir"; \
++ done
++install: install-am
++install-exec: install-exec-am
++install-data: install-data-am
++uninstall: uninstall-am
++
++install-am: all-am
++ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
++
++installcheck: installcheck-am
++install-strip:
++ $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
++ install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
++ `test -z '$(STRIP)' || \
++ echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
++mostlyclean-generic:
++
++clean-generic:
++ -test -z "$(CLEANFILES)" || rm -f $(CLEANFILES)
++
++distclean-generic:
++ -rm -f $(CONFIG_CLEAN_FILES)
++
++maintainer-clean-generic:
++ @echo "This command is intended for maintainers to use"
++ @echo "it deletes files that may require special tools to rebuild."
++clean: clean-am
++
++clean-am: clean-generic mostlyclean-am
++
++distclean: distclean-am
++ -rm -f Makefile
++distclean-am: clean-am distclean-generic
++
++dvi: dvi-am
++
++dvi-am:
++
++html: html-am
++
++info: info-am
++
++info-am:
++
++install-data-am: install-data-local install-stylesheetDATA
++
++install-exec-am:
++
++install-info: install-info-am
++
++install-man:
++
++installcheck-am:
++
++maintainer-clean: maintainer-clean-am
++ -rm -f Makefile
++maintainer-clean-am: distclean-am maintainer-clean-generic
++
++mostlyclean: mostlyclean-am
++
++mostlyclean-am: mostlyclean-generic
++
++pdf: pdf-am
++
++pdf-am:
++
++ps: ps-am
++
++ps-am:
++
++uninstall-am: uninstall-info-am uninstall-stylesheetDATA
++
++.PHONY: all all-am check check-am clean clean-generic distclean \
++ distclean-generic distdir dvi dvi-am html html-am info info-am \
++ install install-am install-data install-data-am \
++ install-data-local install-exec install-exec-am install-info \
++ install-info-am install-man install-strip \
++ install-stylesheetDATA installcheck installcheck-am \
++ installdirs maintainer-clean maintainer-clean-generic \
++ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am uninstall \
++ uninstall-am uninstall-info-am uninstall-stylesheetDATA
++
++
++dist-hook:
++ cd $(distdir) ; rm -f $(CLEANFILES)
++
++install-data-local:
++ @$(NORMAL_INSTALL)
++# Tell versions [3.59,3.63) of GNU make to not export all variables.
++# Otherwise a system limit (for SysV at least) may be exceeded.
++.NOEXPORT:
+diff -ruNa javahelp-convert-0.13/stylesheet/pt_BR/javahelpcustom.xsl.in javahelp-convert-0.13.new/stylesheet/pt_BR/javahelpcustom.xsl.in
+--- javahelp-convert-0.13/stylesheet/pt_BR/javahelpcustom.xsl.in 1970-01-01 09:00:00.000000000 +0900
++++ javahelp-convert-0.13.new/stylesheet/pt_BR/javahelpcustom.xsl.in 2004-10-29 02:29:41.119037000 +0900
+@@ -0,0 +1,274 @@
++<?xml version="1.0"?>
++<xsl:stylesheet
++ xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
++ version="1.0">
++<xsl:import href="@DOCBOOK_XSL_STYLESHEET_DIR@/javahelp/javahelp.xsl"/>
++
++<!-- Need These Paramaters -->
++
++<!-- Set Encoding -->
++<xsl:param name="javahelp.encoding" select="'UTF-8'"/>
++<xsl:param name="chunker.first.encoding" select="'UTF-8'"/>
++
++<!-- chunk.first.sections : Splits first section into separate page -->
++<xsl:param name="chunk.first.sections" select="1"/>
++
++<!-- chunk.section.depth : set depth of chunking -->
++<xsl:param name="chunk.section.depth" select="5"/>
++
++<!-- section.autolabel : Turn on section numbering, default is off -->
++<xsl:param name="section.autolabel" select="0"/>
++
++<!-- toc.section.depth : only include as far as sect1 in table of contentx -->
++<xsl:param name="toc.section.depth">1</xsl:param>
++
++<!-- generate.section.toc.level : Do not generate TOC's in sections -->
++<xsl:param name="generate.section.toc.level">0</xsl:param>
++
++<!-- guibutton/guilabel/application formatting so that they are bold -->
++<xsl:template match="guibutton">
++ <xsl:call-template name="inline.boldseq"/>
++</xsl:template>
++<xsl:template match="guilabel">
++ <xsl:call-template name="inline.boldseq"/>
++</xsl:template>
++<xsl:template match="application">
++ <xsl:call-template name="inline.italicseq"/>
++</xsl:template>
++
++<!-- use id as filename for html generated files -->
++<xsl:param name="use.id.as.filename" select="1"></xsl:param>
++
++<!-- Generate separate TOC file -->
++<xsl:param name="chunk.tocs.and.lots" select="1"></xsl:param>
++
++<!-- Generate Separate file for TOC -->
++<xsl:param name="chunk.toc" select="'index.html-toc.html'"></xsl:param>
++
++<!-- Chunk along quietly -->
++<xsl:param name="chunk.quietly" select="1"></xsl:param>
++
++<!-- Overwrite helpmap section to ensure we have a top element -->
++<xsl:template name="helpmap.content">
++ <map version="1.0" xml:lang="pt_BR">
++ <mapID target="top" url="index.html-toc.html"/>
++ <mapID target="contents" url="index.html-toc.html"/>
++ <xsl:choose>
++ <xsl:when test="$rootid != ''">
++ <xsl:apply-templates select="key('id',$rootid)//set
++ | key('id',$rootid)//book
++ | key('id',$rootid)//part
++ | key('id',$rootid)//reference
++ | key('id',$rootid)//preface
++ | key('id',$rootid)//chapter
++ | key('id',$rootid)//appendix
++ | key('id',$rootid)//article
++ | key('id',$rootid)//colophon
++ | key('id',$rootid)//refentry
++ | key('id',$rootid)//section
++ | key('id',$rootid)//sect1
++ | key('id',$rootid)//sect2
++ | key('id',$rootid)//sect3
++ | key('id',$rootid)//sect4
++ | key('id',$rootid)//sect5
++ | key('id',$rootid)//indexterm"
++ mode="map"/>
++ </xsl:when>
++ <xsl:otherwise>
++ <xsl:apply-templates select="//set
++ | //book
++ | //part
++ | //reference
++ | //preface
++ | //chapter
++ | //appendix
++ | //article
++ | //colophon
++ | //refentry
++ | //section
++ | //sect1
++ | //sect2
++ | //sect3
++ | //sect4
++ | //sect5
++ | //indexterm"
++ mode="map"/>
++ </xsl:otherwise>
++ </xsl:choose>
++ </map>
++</xsl:template>
++
++<!-- Helptoc content setting the language -->
++<xsl:template name="helptoc.content">
++ <toc version="1.0" xml:lang="pt_BR">
++ <xsl:choose>
++ <xsl:when test="$rootid != ''">
++ <xsl:apply-templates select="key('id',$rootid)" mode="jhtoc"/>
++ </xsl:when>
++ <xsl:otherwise>
++ <xsl:apply-templates select="." mode="jhtoc"/>
++ </xsl:otherwise>
++ </xsl:choose>
++ </toc>
++</xsl:template>
++
++<!-- Adding in the "contents", link to the table of contents -->
++<xsl:template match="part|reference|preface|chapter|appendix|article"
++ mode="jhtoc">
++ <xsl:variable name="id">
++ <xsl:call-template name="object.id"/>
++ </xsl:variable>
++ <xsl:variable name="title">
++ <xsl:apply-templates select="." mode="title.markup"/>
++ </xsl:variable>
++
++ <tocitem target="{$id}">
++ <xsl:attribute name="text">
++ <xsl:value-of select="$title"/>
++ </xsl:attribute>
++ <xsl:attribute name="expand">
++ <xsl:text>false</xsl:text>
++ </xsl:attribute>
++ <xsl:apply-templates
++ select="preface|chapter|appendix|refentry|section|sect1"
++ mode="jhtoc"/>
++ </tocitem>
++</xsl:template>
++
++<!-- Customization view section, add mergetype tag in index/ssearch -->
++<xsl:template name="helpset.content">
++ <xsl:variable name="title">
++ <xsl:apply-templates select="." mode="title.markup"/>
++ </xsl:variable>
++
++ <helpset version="1.0" xml:lang="pt_BR">
++ <title>
++ <xsl:value-of select="$title"/>
++ </title>
++
++ <!-- maps -->
++ <maps>
++ <homeID>top</homeID>
++ <mapref location="jhelpmap.jhm"/>
++ </maps>
++
++ <!-- views -->
++ <view xml:lang="pt_BR">
++ <name>TOC</name>
++ <label>Contents</label>
++ <type>javax.help.TOCView</type>
++ <data>jhelptoc.xml</data>
++ </view>
++
++ <view xml:lang="pt_BR" mergetype="javax.help.SortMerge">
++ <name>Index</name>
++ <label>Index</label>
++ <type>javax.help.IndexView</type>
++ <data>jhelpidx.xml</data>
++ </view>
++
++ <view xml:lang="pt_BR" mergetype="javax.help.SortMerge">
++ <name>Search</name>
++ <label>Search</label>
++ <type>javax.help.SearchView</type>
++ <data engine="com.sun.java.help.search.DefaultSearchEngine">JavaHelpSearch</data>
++ </view>
++
++ <presentation default="true" displayviewimages="false">
++ <name>Default</name>
++ </presentation>
++ </helpset>
++</xsl:template>
++
++<!-- Customization TOC : Add About This Document link pointing to legal info for each doc -->
++<xsl:template name="make.toc">
++ <xsl:param name="toc-context" select="."/>
++ <xsl:param name="toc.title.p" select="true()"/>
++ <xsl:param name="nodes" select="/NOT-AN-ELEMENT"/>
++
++ <xsl:variable name="toc.title">
++ <xsl:if test="$toc.title.p">
++ <p>
++ <b>
++ <xsl:call-template name="gentext">
++ <xsl:with-param name="key">TableofContents</xsl:with-param>
++ </xsl:call-template>
++ </b>
++ </p>
++ <p>
++ <a href="legal.html">
++ <xsl:text>About This Document</xsl:text>
++ </a>
++ </p>
++ </xsl:if>
++ </xsl:variable>
++
++
++ <xsl:choose>
++ <xsl:when test="$manual.toc != ''">
++ <xsl:variable name="id">
++ <xsl:call-template name="object.id"/>
++ </xsl:variable>
++ <xsl:variable name="toc" select="document($manual.toc, .)"/>
++ <xsl:variable name="tocentry" select="$toc//tocentry[@linkend=$id]"/>
++ <xsl:if test="$tocentry and $tocentry/*">
++ <div class="toc">
++ <xsl:copy-of select="$toc.title"/>
++ <xsl:element name="{$toc.list.type}">
++ <xsl:call-template name="manual-toc">
++ <xsl:with-param name="tocentry" select="$tocentry/*[1]"/>
++ </xsl:call-template>
++ </xsl:element>
++ </div>
++ </xsl:if>
++ </xsl:when>
++ <xsl:otherwise>
++ <xsl:if test="$nodes">
++ <div class="toc">
++ <xsl:copy-of select="$toc.title"/>
++ <xsl:element name="{$toc.list.type}">
++ <xsl:apply-templates select="$nodes" mode="toc">
++ <xsl:with-param name="toc-context" select="$toc-context"/>
++ </xsl:apply-templates>
++ </xsl:element>
++ </div>
++ </xsl:if>
++ </xsl:otherwise>
++ </xsl:choose>
++</xsl:template>
++
++<!-- Customization TOC : Remove erroneous lists from end of all TOC e.g List of Table etc.. -->
++<xsl:template name="list.of.titles">
++ <xsl:param name="toc-context" select="."/>
++ <xsl:param name="titles" select="'table'"/>
++ <xsl:param name="nodes" select=".//table"/>
++</xsl:template>
++
++<!-- <xsl:param name="generate.index" select="0"></xsl:param> -->
++<!-- <xsl:param name="annotate.toc" select="1"></xsl:param> -->
++<!-- <xsl:param name="process.source.toc" select="1"></xsl:param> -->
++
++<!-- <xsl:param name="html.cleanup" select="1"></xsl:param> -->
++<!-- <xsl:param name="spacing.paras" select="0"></xsl:param> -->
++<!-- <xsl:param name="chunker.output.indent" select="yes"></xsl:param> -->
++<!-- <xsl:message><xsl:value-of select="@valign"/></xsl:message> -->
++<!-- <xsl:param name="table.cell.border.style">none</xsl:param> -->
++<!-- <xsl:param name="table.frame.border.style">none</xsl:param> -->
++<!-- <xsl:param name="table.cell.border.thickness">thick</xsl:param> -->
++<!-- <xsl:param name="table.frame.border.thickness">thick</xsl:param> -->
++<!-- FOLLOWING DONT APPEAR TO DO ANYTHING :( -->
++<!-- <xsl:param name="default.table.width" select="20"></xsl:param> -->
++<!-- <xsl:param name="table.borders.with.css" select="0"></xsl:param> -->
++<!-- <xsl:param name="table.cell.border.style" select="none"></xsl:param> -->
++<!-- <xsl:param name="title.font.family" select="sansserif"/> -->
++<!-- <xsl:param name="body.font.family" select="sansserif"/> -->
++<!-- <xsl:param name="title.font.master" select="14"/> -->
++<!-- <xsl:param name="body.font.family" select="'Arial Black'"/> -->
++<!-- <xsl:param name="body.font.master" select="12"/> -->
++
++<!-- adds copyright footer to all pages -->
++<!-- <xsl:template name="user.footer.content"> -->
++<!-- <HR/><p class="copyright">© 2004 Sun Microsystems Inc.</p> -->
++<!-- </xsl:template> -->
++
++</xsl:stylesheet>
+diff -ruNa javahelp-convert-0.13/stylesheet/sv/Makefile.am javahelp-convert-0.13.new/stylesheet/sv/Makefile.am
+--- javahelp-convert-0.13/stylesheet/sv/Makefile.am 2004-06-02 01:30:57.000000000 +0900
++++ javahelp-convert-0.13.new/stylesheet/sv/Makefile.am 2004-10-29 02:29:41.119318000 +0900
+@@ -13,3 +13,6 @@
+
+ install-data-local:
+ @$(NORMAL_INSTALL)
++
++javahelpcustom.xsl: ../javahelpcustom.xsl.xml.in
++ (cd ../ ; make javahelpcustom.xsl)
+diff -ruNa javahelp-convert-0.13/stylesheet/zh_CN/Makefile.am javahelp-convert-0.13.new/stylesheet/zh_CN/Makefile.am
+--- javahelp-convert-0.13/stylesheet/zh_CN/Makefile.am 2004-06-02 01:30:57.000000000 +0900
++++ javahelp-convert-0.13.new/stylesheet/zh_CN/Makefile.am 2004-10-29 02:29:41.119578000 +0900
+@@ -13,3 +13,6 @@
+
+ install-data-local:
+ @$(NORMAL_INSTALL)
++
++javahelpcustom.xsl: ../javahelpcustom.xsl.xml.in
++ (cd ../ ; make javahelpcustom.xsl)
+diff -ruNa javahelp-convert-0.13/stylesheet/zh_HK/Makefile.am javahelp-convert-0.13.new/stylesheet/zh_HK/Makefile.am
+--- javahelp-convert-0.13/stylesheet/zh_HK/Makefile.am 2004-09-30 17:21:42.000000000 +0900
++++ javahelp-convert-0.13.new/stylesheet/zh_HK/Makefile.am 2004-10-29 02:29:41.119838000 +0900
+@@ -13,3 +13,6 @@
+
+ install-data-local:
+ @$(NORMAL_INSTALL)
++
++javahelpcustom.xsl: ../javahelpcustom.xsl.xml.in
++ (cd ../ ; make javahelpcustom.xsl)
+diff -ruNa javahelp-convert-0.13/stylesheet/zh_TW/Makefile.am javahelp-convert-0.13.new/stylesheet/zh_TW/Makefile.am
+--- javahelp-convert-0.13/stylesheet/zh_TW/Makefile.am 2004-06-02 01:30:57.000000000 +0900
++++ javahelp-convert-0.13.new/stylesheet/zh_TW/Makefile.am 2004-10-29 02:29:41.120102000 +0900
+@@ -13,3 +13,6 @@
+
+ install-data-local:
+ @$(NORMAL_INSTALL)
++
++javahelpcustom.xsl: ../javahelpcustom.xsl.xml.in
++ (cd ../ ; make javahelpcustom.xsl)