[Pkg-isocodes-devel] r838 - in trunk/iso-codes: . debian iso_3166
iso_3166/iso_3166_2 iso_4217 iso_639 iso_639/iso_639_3 notes
LI Daobing
lidaobing-guest at alioth.debian.org
Wed Mar 7 15:09:55 CET 2007
Author: lidaobing-guest
Date: 2007-03-07 14:09:52 +0000 (Wed, 07 Mar 2007)
New Revision: 838
Modified:
trunk/iso-codes/Makefile.in
trunk/iso-codes/configure
trunk/iso-codes/debian/changelog
trunk/iso-codes/iso2pot.py
trunk/iso-codes/iso_3166/Makefile.in
trunk/iso-codes/iso_3166/iso_3166_2/Makefile.in
trunk/iso-codes/iso_4217/Makefile.in
trunk/iso-codes/iso_639/Makefile.am
trunk/iso-codes/iso_639/Makefile.in
trunk/iso-codes/iso_639/iso_639_3/Makefile.in
trunk/iso-codes/iso_639/zh_CN.po
trunk/iso-codes/notes/Makefile.in
Log:
* iso2pot.py
- keep duplicate information in pot file.
- support multiple "--comments" option
* ISO-639
- keep both 639_1_code and 639_2T_code in the comment of the pot
file.
- update zh_CN
Modified: trunk/iso-codes/Makefile.in
===================================================================
--- trunk/iso-codes/Makefile.in 2007-03-07 09:47:18 UTC (rev 837)
+++ trunk/iso-codes/Makefile.in 2007-03-07 14:09:52 UTC (rev 838)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 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.
@@ -14,15 +14,11 @@
@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
@@ -44,17 +40,18 @@
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
- configure.lineno configure.status.lineno
+ configure.lineno config.status.lineno
mkinstalldirs = $(install_sh) -d
CONFIG_CLEAN_FILES = iso-codes.pc
SOURCES =
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
- install-exec-recursive install-info-recursive \
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -64,6 +61,8 @@
am__installdirs = "$(DESTDIR)$(pkgconfigdir)"
pkgconfigDATA_INSTALL = $(INSTALL_DATA)
DATA = $(pkgconfig_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
@@ -91,6 +90,7 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -99,10 +99,10 @@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
+MSGFMT_FLAGS = @MSGFMT_FLAGS@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -114,11 +114,16 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
am__leading_dot = @am__leading_dot@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -142,8 +147,11 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
SUBDIRS = iso_639 iso_3166 iso_4217 notes
pkgconfigdir = $(datadir)/pkgconfig
pkgconfig_DATA = iso-codes.pc
@@ -192,10 +200,9 @@
cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
iso-codes.pc: $(top_builddir)/config.status $(srcdir)/iso-codes.pc.in
cd $(top_builddir) && $(SHELL) ./config.status $@
-uninstall-info-am:
install-pkgconfigDATA: $(pkgconfig_DATA)
@$(NORMAL_INSTALL)
- test -z "$(pkgconfigdir)" || $(mkdir_p) "$(DESTDIR)$(pkgconfigdir)"
+ test -z "$(pkgconfigdir)" || $(MKDIR_P) "$(DESTDIR)$(pkgconfigdir)"
@list='$(pkgconfig_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -242,8 +249,7 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
@@ -345,24 +351,22 @@
distdir: $(DISTFILES)
$(am__remove_distdir)
- mkdir $(distdir)
- $(mkdir_p) $(distdir)/.
- @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; \
+ test -d $(distdir) || mkdir $(distdir)
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
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 \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -376,7 +380,7 @@
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
- || $(mkdir_p) "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -384,6 +388,8 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
distdir) \
|| exit 1; \
fi; \
@@ -391,7 +397,7 @@
-find $(distdir) -type d ! -perm -777 -exec chmod a+rwx {} \; -o \
! -type d ! -perm -444 -links 1 -exec chmod a+r {} \; -o \
! -type d ! -perm -400 -exec chmod a+r {} \; -o \
- ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
+ ! -type d ! -perm -444 -exec $(install_sh) -c -m a+r {} {} \; \
|| chmod -R a+r $(distdir)
dist-gzip: distdir
tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
@@ -466,7 +472,7 @@
$(am__remove_distdir)
@(echo "$(distdir) archives ready for distribution: "; \
list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
- sed -e '1{h;s/./=/g;p;x;}' -e '$${p;x;}'
+ sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
distuninstallcheck:
@cd $(distuninstallcheck_dir) \
&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
@@ -491,7 +497,7 @@
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(pkgconfigdir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-recursive
install-exec: install-exec-recursive
@@ -539,12 +545,20 @@
install-data-am: install-pkgconfigDATA
+install-dvi: install-dvi-recursive
+
install-exec-am:
+install-html: install-html-recursive
+
install-info: install-info-recursive
install-man:
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -565,24 +579,26 @@
ps-am:
-uninstall-am: uninstall-info-am uninstall-pkgconfigDATA
+uninstall-am: uninstall-pkgconfigDATA
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-strip
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am am--refresh check \
- check-am clean clean-generic clean-recursive ctags \
- ctags-recursive dist dist-all dist-bzip2 dist-gzip dist-shar \
- dist-tarZ dist-zip distcheck distclean distclean-generic \
- distclean-recursive distclean-tags distcleancheck distdir \
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am am--refresh check check-am clean clean-generic \
+ ctags ctags-recursive dist dist-all dist-bzip2 dist-gzip \
+ dist-shar dist-tarZ dist-zip distcheck distclean \
+ distclean-generic distclean-tags distcleancheck distdir \
distuninstallcheck 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-pkgconfigDATA install-strip installcheck \
- installcheck-am installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic maintainer-clean-recursive \
- mostlyclean mostlyclean-generic mostlyclean-recursive pdf \
+ install install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-pkgconfigDATA install-ps \
+ install-ps-am install-strip installcheck installcheck-am \
+ installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
- uninstall-info-am uninstall-pkgconfigDATA
+ uninstall-pkgconfigDATA
.PHONY: release
Modified: trunk/iso-codes/configure
===================================================================
--- trunk/iso-codes/configure 2007-03-07 09:47:18 UTC (rev 837)
+++ trunk/iso-codes/configure 2007-03-07 14:09:52 UTC (rev 838)
@@ -1,5 +1,5 @@
#! /bin/sh
-# From configure.ac Revision: 755 .
+# From configure.ac Revision: 779 .
# Guess values for system-dependent variables and create Makefiles.
# Generated by GNU Autoconf 2.61 for ISO Codes 1.0.
#
@@ -617,6 +617,7 @@
INSTALL_PROGRAM
INSTALL_SCRIPT
INSTALL_DATA
+am__isrc
CYGPATH_W
PACKAGE
VERSION
@@ -640,6 +641,7 @@
MAINT
ACLOCAL_AMFLAGS
MSGFMT
+MSGFMT_FLAGS
DOMAINS
LIBOBJS
LTLIBOBJS'
@@ -1655,7 +1657,8 @@
-am__api_version="1.9"
+am__api_version='1.10'
+
ac_aux_dir=
for ac_dir in "$srcdir" "$srcdir/.." "$srcdir/../.."; do
if test -f "$ac_dir/install-sh"; then
@@ -1838,39 +1841,54 @@
echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
fi
-if mkdir -p --version . >/dev/null 2>&1 && test ! -d ./--version; then
- # We used to keeping the `.' as first argument, in order to
- # allow $(mkdir_p) to be used without argument. As in
- # $(mkdir_p) $(somedir)
- # where $(somedir) is conditionally defined. However this is wrong
- # for two reasons:
- # 1. if the package is installed by a user who cannot write `.'
- # make install will fail,
- # 2. the above comment should most certainly read
- # $(mkdir_p) $(DESTDIR)$(somedir)
- # so it does not work when $(somedir) is undefined and
- # $(DESTDIR) is not.
- # To support the latter case, we have to write
- # test -z "$(somedir)" || $(mkdir_p) $(DESTDIR)$(somedir),
- # so the `.' trick is pointless.
- mkdir_p='mkdir -p --'
+{ echo "$as_me:$LINENO: checking for a thread-safe mkdir -p" >&5
+echo $ECHO_N "checking for a thread-safe mkdir -p... $ECHO_C" >&6; }
+if test -z "$MKDIR_P"; then
+ if test "${ac_cv_path_mkdir+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
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.
- for d in ./-p ./--version;
- do
- test -d $d && rmdir $d
- done
- # $(mkinstalldirs) is defined by Automake if mkinstalldirs exists.
- if test -f "$ac_aux_dir/mkinstalldirs"; then
- mkdir_p='$(mkinstalldirs)'
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH$PATH_SEPARATOR/opt/sfw/bin
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_prog in mkdir gmkdir; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+ case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
+ 'mkdir (GNU coreutils) '* | \
+ 'mkdir (coreutils) '* | \
+ 'mkdir (fileutils) '4.1*)
+ ac_cv_path_mkdir=$as_dir/$ac_prog$ac_exec_ext
+ break 3;;
+ esac
+ done
+ done
+done
+IFS=$as_save_IFS
+
+fi
+
+ if test "${ac_cv_path_mkdir+set}" = set; then
+ MKDIR_P="$ac_cv_path_mkdir -p"
else
- mkdir_p='$(install_sh) -d'
+ # As a last resort, use the slow shell script. Don't cache a
+ # value for MKDIR_P within a source directory, because that will
+ # break other packages using the cache if that directory is
+ # removed, or if the value is a relative name.
+ test -d ./--version && rmdir ./--version
+ MKDIR_P="$ac_install_sh -d"
fi
fi
+{ echo "$as_me:$LINENO: result: $MKDIR_P" >&5
+echo "${ECHO_T}$MKDIR_P" >&6; }
+mkdir_p="$MKDIR_P"
+case $mkdir_p in
+ [\\/$]* | ?:[\\/]*) ;;
+ */*) mkdir_p="\$(top_builddir)/$mkdir_p" ;;
+esac
+
for ac_prog in gawk mawk nawk awk
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
@@ -1952,12 +1970,16 @@
fi
rmdir .tst 2>/dev/null
-# test to see if srcdir already configured
-if test "`cd $srcdir && pwd`" != "`pwd`" &&
- test -f $srcdir/config.status; then
- { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
+if test "`cd $srcdir && pwd`" != "`pwd`"; then
+ # Use -I$(srcdir) only when $(srcdir) != ., so that make's output
+ # is not polluted with repeated "-I."
+ am__isrc=' -I$(srcdir)'
+ # test to see if srcdir already configured
+ if test -f $srcdir/config.status; then
+ { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
echo "$as_me: error: source directory already configured; run \"make distclean\" there first" >&2;}
{ (exit 1); exit 1; }; }
+ fi
fi
# test whether we have cygpath
@@ -2000,7 +2022,7 @@
MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
-install_sh=${install_sh-"$am_aux_dir/install-sh"}
+install_sh=${install_sh-"\$(SHELL) $am_aux_dir/install-sh"}
# Installed binaries are usually stripped using `strip' when the user
# run `make install-strip'. However `strip' might not be the right
@@ -2104,7 +2126,7 @@
fi
fi
-INSTALL_STRIP_PROGRAM="\${SHELL} \$(install_sh) -c -s"
+INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
# We need awk for the "check" target. The system "awk" is bad on
# some platforms.
@@ -2129,9 +2151,7 @@
{ echo "$as_me:$LINENO: result: $USE_MAINTAINER_MODE" >&5
echo "${ECHO_T}$USE_MAINTAINER_MODE" >&6; }
-
-
-if test $USE_MAINTAINER_MODE = yes; then
+ if test $USE_MAINTAINER_MODE = yes; then
MAINTAINER_MODE_TRUE=
MAINTAINER_MODE_FALSE='#'
else
@@ -2297,6 +2317,16 @@
fi
+{ echo "$as_me:$LINENO: checking if $MSGFMT is GNU msgfmt" >&5
+echo $ECHO_N "checking if $MSGFMT is GNU msgfmt... $ECHO_C" >&6; }
+gnu_msgfmt=no
+MSGFMT_FLAGS=
+if $MSGFMT --version 2>&1 | grep GNU > /dev/null; then
+ gnu_msgfmt=yes
+ MSGFMT_FLAGS="--verbose --check"
+fi
+{ echo "$as_me:$LINENO: result: $gnu_msgfmt" >&5
+echo "${ECHO_T}$gnu_msgfmt" >&6; }
DOMAINS="iso_3166 iso_639 iso_4217 iso_3166_2 iso_639_3"
@@ -2792,6 +2822,7 @@
ac_pwd='$ac_pwd'
srcdir='$srcdir'
INSTALL='$INSTALL'
+MKDIR_P='$MKDIR_P'
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
@@ -2988,6 +3019,7 @@
INSTALL_PROGRAM!$INSTALL_PROGRAM$ac_delim
INSTALL_SCRIPT!$INSTALL_SCRIPT$ac_delim
INSTALL_DATA!$INSTALL_DATA$ac_delim
+am__isrc!$am__isrc$ac_delim
CYGPATH_W!$CYGPATH_W$ac_delim
PACKAGE!$PACKAGE$ac_delim
VERSION!$VERSION$ac_delim
@@ -3011,12 +3043,13 @@
MAINT!$MAINT$ac_delim
ACLOCAL_AMFLAGS!$ACLOCAL_AMFLAGS$ac_delim
MSGFMT!$MSGFMT$ac_delim
+MSGFMT_FLAGS!$MSGFMT_FLAGS$ac_delim
DOMAINS!$DOMAINS$ac_delim
LIBOBJS!$LIBOBJS$ac_delim
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 66; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 68; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -3243,6 +3276,11 @@
[\\/$]* | ?:[\\/]* ) ac_INSTALL=$INSTALL ;;
*) ac_INSTALL=$ac_top_build_prefix$INSTALL ;;
esac
+ ac_MKDIR_P=$MKDIR_P
+ case $MKDIR_P in
+ [\\/$]* | ?:[\\/]* ) ;;
+ */*) ac_MKDIR_P=$ac_top_build_prefix$MKDIR_P ;;
+ esac
_ACEOF
cat >>$CONFIG_STATUS <<\_ACEOF
@@ -3296,6 +3334,7 @@
s&@abs_builddir@&$ac_abs_builddir&;t t
s&@abs_top_builddir@&$ac_abs_top_builddir&;t t
s&@INSTALL@&$ac_INSTALL&;t t
+s&@MKDIR_P@&$ac_MKDIR_P&;t t
$ac_datarootdir_hack
" $ac_file_inputs | sed -f "$tmp/subs-1.sed" >$tmp/out
Modified: trunk/iso-codes/debian/changelog
===================================================================
--- trunk/iso-codes/debian/changelog 2007-03-07 09:47:18 UTC (rev 837)
+++ trunk/iso-codes/debian/changelog 2007-03-07 14:09:52 UTC (rev 838)
@@ -46,6 +46,7 @@
[ ISO-639 translations ]
- French (fr) updated from the ISO-639 official names in French
+ - Simplified Chinese (zh_CN) updated.
[ ISO-3166-2 translations ]
- Serbian (sr) updated by Nikola Smolenski (from the TP)
@@ -53,9 +54,14 @@
- Simplified Chinese updated by LI Diaobing
[ LI Daobing ]
- * update iso2pot.py to keep duplicate information in pot file.
+ * iso2pot.py
+ - keep duplicate information in pot file.
+ - support multiple "--comments" option
+ * ISO-639: keep both 639_1_code and 639_2T_code in the comment of the pot
+ file.
+ *
- -- Tobias Toedter <t.toedter at gmx.net> Tue, 6 Mar 2007 21:13:36 +0100
+ -- LI Daobing <lidaobing at gmail.com> Wed, 7 Mar 2007 22:08:34 +0800
iso-codes (1.0a-1) unstable; urgency=low
Modified: trunk/iso-codes/iso2pot.py
===================================================================
--- trunk/iso-codes/iso2pot.py 2007-03-07 09:47:18 UTC (rev 837)
+++ trunk/iso-codes/iso2pot.py 2007-03-07 14:09:52 UTC (rev 838)
@@ -27,23 +27,19 @@
# Get the name attributes
for aname in self.attrnames:
n = attrs.get(aname, None)
- c = attrs.get(self.comment, None)
+ c = [attrs.get(x, None) for x in self.comment]
if type(n) == unicode:
n = n.encode('UTF-8')
- if type(c) == unicode:
- c = c.encode('UTF-8')
+ for i in range(len(c)):
+ if type(c[i]) == unicode:
+ c[i] = c[i].encode('UTF-8')
if n != None:
if not self.done.has_key(n):
self.result.append([n])
self.done[n] = len(self.result)-1
- if c != None:
- try:
- self.result[self.done[n]].append('%s for %s' % (aname, c))
- except:
- print n
- print self.done
- print result
- raise
+ comment_str = ", ".join([x for x in c if x is not None])
+ if comment_str:
+ self.result[self.done[n]].append('%s for %s' % (aname, comment_str))
def printHeader(ofile, iso_standard, report_bugs_to, version):
"""Print the file header
@@ -94,7 +90,7 @@
version = "VERSION"
report_bugs_to = "Debian iso-codes team <pkg-isocodes-devel at lists.alioth.\"\n\"debian.org>"
fields = ["name","official_name"]
-comment = "code"
+comment = []
ofile = sys.stdout
for opt, arg in opts:
@@ -103,9 +99,11 @@
elif opt in ('-f', '--fields'):
fields = arg.split(',')
elif opt in ('-c','--comments'):
- comment = arg
+ comment.append(arg)
elif opt in ('-o','--outfile'):
ofile = open(arg, 'w')
+if not comment:
+ comment = ["code"]
# derive the ISO standard from the first file's name
# e.g. iso_3166_2.xml -> 3166-2
Modified: trunk/iso-codes/iso_3166/Makefile.in
===================================================================
--- trunk/iso-codes/iso_3166/Makefile.in 2007-03-07 09:47:18 UTC (rev 837)
+++ trunk/iso-codes/iso_3166/Makefile.in 2007-03-07 14:09:52 UTC (rev 838)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 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.
@@ -14,15 +14,11 @@
@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
@@ -47,10 +43,11 @@
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
- install-exec-recursive install-info-recursive \
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -61,6 +58,8 @@
tabDATA_INSTALL = $(INSTALL_DATA)
xmlDATA_INSTALL = $(INSTALL_DATA)
DATA = $(noinst_DATA) $(tab_DATA) $(xml_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
@@ -78,6 +77,7 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -86,10 +86,10 @@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
+MSGFMT_FLAGS = @MSGFMT_FLAGS@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -101,11 +101,16 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @PACKAGE_VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
am__leading_dot = @am__leading_dot@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -129,8 +134,11 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
SUBDIRS = iso_3166_2
DOMAIN = iso_3166
xmldir = $(datadir)/xml/iso-codes
@@ -182,10 +190,9 @@
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:
install-tabDATA: $(tab_DATA)
@$(NORMAL_INSTALL)
- test -z "$(tabdir)" || $(mkdir_p) "$(DESTDIR)$(tabdir)"
+ test -z "$(tabdir)" || $(MKDIR_P) "$(DESTDIR)$(tabdir)"
@list='$(tab_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -202,7 +209,7 @@
done
install-xmlDATA: $(xml_DATA)
@$(NORMAL_INSTALL)
- test -z "$(xmldir)" || $(mkdir_p) "$(DESTDIR)$(xmldir)"
+ test -z "$(xmldir)" || $(MKDIR_P) "$(DESTDIR)$(xmldir)"
@list='$(xml_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -249,8 +256,7 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
@@ -351,23 +357,21 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- $(mkdir_p) $(distdir)/$(srcdir) $(distdir)/..
- @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; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
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 \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -381,7 +385,7 @@
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
- || $(mkdir_p) "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -389,6 +393,8 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
distdir) \
|| exit 1; \
fi; \
@@ -400,7 +406,7 @@
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(tabdir)" "$(DESTDIR)$(xmldir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-recursive
install-exec: install-exec-recursive
@@ -449,12 +455,20 @@
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+install-dvi: install-dvi-recursive
+
install-exec-am:
+install-html: install-html-recursive
+
install-info: install-info-recursive
install-man:
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -473,26 +487,27 @@
ps-am:
-uninstall-am: uninstall-info-am uninstall-tabDATA uninstall-xmlDATA
+uninstall-am: uninstall-tabDATA uninstall-xmlDATA
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-data-am install-strip uninstall-am
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
- check-local clean clean-generic clean-recursive ctags \
- ctags-recursive distclean distclean-generic \
- distclean-recursive distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-data-hook install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
- install-tabDATA install-xmlDATA installcheck installcheck-am \
- installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic maintainer-clean-recursive \
- mostlyclean mostlyclean-generic mostlyclean-recursive pdf \
- pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
- uninstall-hook uninstall-info-am uninstall-tabDATA \
- uninstall-xmlDATA
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am check-local clean clean-generic \
+ ctags ctags-recursive distclean distclean-generic \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am \
+ install-data-hook install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip install-tabDATA \
+ install-xmlDATA installcheck installcheck-am installdirs \
+ installdirs-am maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
+ tags-recursive uninstall uninstall-am uninstall-hook \
+ uninstall-tabDATA uninstall-xmlDATA
iso_3166.tab: iso_3166.xml
@@ -507,7 +522,7 @@
check-local: check-content
%.mo: %.po
- $(MSGFMT) --verbose --check $< -o $@
+ $(MSGFMT) $(MSGFMT_FLAGS) -o $@ $<
.PHONY: check-content
check-content:
Modified: trunk/iso-codes/iso_3166/iso_3166_2/Makefile.in
===================================================================
--- trunk/iso-codes/iso_3166/iso_3166_2/Makefile.in 2007-03-07 09:47:18 UTC (rev 837)
+++ trunk/iso-codes/iso_3166/iso_3166_2/Makefile.in 2007-03-07 14:09:52 UTC (rev 838)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 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.
@@ -14,15 +14,11 @@
@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
@@ -68,6 +64,7 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -76,10 +73,10 @@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
+MSGFMT_FLAGS = @MSGFMT_FLAGS@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -91,11 +88,16 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @PACKAGE_VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
am__leading_dot = @am__leading_dot@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -119,8 +121,11 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
DOMAIN = iso_3166_2
xmldir = $(datadir)/xml/iso-codes
xml_DATA = $(DOMAIN).xml
@@ -167,10 +172,9 @@
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:
install-xmlDATA: $(xml_DATA)
@$(NORMAL_INSTALL)
- test -z "$(xmldir)" || $(mkdir_p) "$(DESTDIR)$(xmldir)"
+ test -z "$(xmldir)" || $(MKDIR_P) "$(DESTDIR)$(xmldir)"
@list='$(xml_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -193,23 +197,21 @@
distdir: $(DISTFILES)
- $(mkdir_p) $(distdir)/$(srcdir) $(distdir)/../..
- @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; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
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 \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -226,7 +228,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(xmldir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -275,12 +277,20 @@
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -299,19 +309,23 @@
ps-am:
-uninstall-am: uninstall-info-am uninstall-xmlDATA
+uninstall-am: uninstall-xmlDATA
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+.MAKE: install-am install-data-am install-strip uninstall-am
+
.PHONY: all all-am check check-am check-local 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-hook install-exec install-exec-am install-info \
- install-info-am install-man install-strip install-xmlDATA \
+ install-data-hook install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip install-xmlDATA \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am uninstall uninstall-am uninstall-hook \
- uninstall-info-am uninstall-xmlDATA
+ uninstall-xmlDATA
iso_3166_2.pot: iso_3166_2.xml
@@ -321,7 +335,7 @@
check-local: check-content
%.mo: %.po
- $(MSGFMT) --verbose --check $< -o $@
+ $(MSGFMT) $(MSGFMT_FLAGS) -o $@ $<
.PHONY: check-content
check-content:
Modified: trunk/iso-codes/iso_4217/Makefile.in
===================================================================
--- trunk/iso-codes/iso_4217/Makefile.in 2007-03-07 09:47:18 UTC (rev 837)
+++ trunk/iso-codes/iso_4217/Makefile.in 2007-03-07 14:09:52 UTC (rev 838)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 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.
@@ -14,15 +14,11 @@
@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
@@ -68,6 +64,7 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -76,10 +73,10 @@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
+MSGFMT_FLAGS = @MSGFMT_FLAGS@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -91,11 +88,16 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @PACKAGE_VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
am__leading_dot = @am__leading_dot@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -119,8 +121,11 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
DOMAIN = iso_4217
xmldir = $(datadir)/xml/iso-codes
xml_DATA = $(DOMAIN).xml
@@ -167,10 +172,9 @@
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:
install-xmlDATA: $(xml_DATA)
@$(NORMAL_INSTALL)
- test -z "$(xmldir)" || $(mkdir_p) "$(DESTDIR)$(xmldir)"
+ test -z "$(xmldir)" || $(MKDIR_P) "$(DESTDIR)$(xmldir)"
@list='$(xml_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -193,23 +197,21 @@
distdir: $(DISTFILES)
- $(mkdir_p) $(distdir)/$(srcdir) $(distdir)/..
- @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; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
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 \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -226,7 +228,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(xmldir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -275,12 +277,20 @@
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -299,19 +309,23 @@
ps-am:
-uninstall-am: uninstall-info-am uninstall-xmlDATA
+uninstall-am: uninstall-xmlDATA
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+.MAKE: install-am install-data-am install-strip uninstall-am
+
.PHONY: all all-am check check-am check-local 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-hook install-exec install-exec-am install-info \
- install-info-am install-man install-strip install-xmlDATA \
+ install-data-hook install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip install-xmlDATA \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am uninstall uninstall-am uninstall-hook \
- uninstall-info-am uninstall-xmlDATA
+ uninstall-xmlDATA
iso_4217.pot: iso_4217.xml
@@ -321,7 +335,7 @@
check-local: check-content
%.mo: %.po
- $(MSGFMT) --verbose --check $< -o $@
+ $(MSGFMT) $(MSGFMT_FLAGS) -o $@ $<
.PHONY: check-content
check-content:
Modified: trunk/iso-codes/iso_639/Makefile.am
===================================================================
--- trunk/iso-codes/iso_639/Makefile.am 2007-03-07 09:47:18 UTC (rev 837)
+++ trunk/iso-codes/iso_639/Makefile.am 2007-03-07 14:09:52 UTC (rev 838)
@@ -13,8 +13,10 @@
noinst_DATA = $(mofiles) iso_639.pot
iso_639.pot: iso_639.xml
- $(top_srcdir)/iso2pot.py --is-version $(VERSION) --comments iso_639_2T_code \
- --fields name --outfile $@ iso_639.xml
+ $(top_srcdir)/iso2pot.py --is-version $(VERSION) \
+ --comments iso_639_2T_code \
+ --comments iso_639_1_code \
+ --fields name --outfile $@ iso_639.xml
iso_639_3.xml:
$(top_srcdir)/iso_639/iso-fdis-639-tab-parse.py
Modified: trunk/iso-codes/iso_639/Makefile.in
===================================================================
--- trunk/iso-codes/iso_639/Makefile.in 2007-03-07 09:47:18 UTC (rev 837)
+++ trunk/iso-codes/iso_639/Makefile.in 2007-03-07 14:09:52 UTC (rev 838)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 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.
@@ -14,15 +14,11 @@
@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
@@ -47,10 +43,11 @@
DIST_SOURCES =
RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
html-recursive info-recursive install-data-recursive \
- install-exec-recursive install-info-recursive \
- install-recursive installcheck-recursive installdirs-recursive \
- pdf-recursive ps-recursive uninstall-info-recursive \
- uninstall-recursive
+ install-dvi-recursive install-exec-recursive \
+ install-html-recursive install-info-recursive \
+ install-pdf-recursive install-ps-recursive install-recursive \
+ installcheck-recursive installdirs-recursive pdf-recursive \
+ ps-recursive uninstall-recursive
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -61,6 +58,8 @@
tabDATA_INSTALL = $(INSTALL_DATA)
xmlDATA_INSTALL = $(INSTALL_DATA)
DATA = $(noinst_DATA) $(tab_DATA) $(xml_DATA)
+RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive \
+ distclean-recursive maintainer-clean-recursive
ETAGS = etags
CTAGS = ctags
DIST_SUBDIRS = $(SUBDIRS)
@@ -78,6 +77,7 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -86,10 +86,10 @@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
+MSGFMT_FLAGS = @MSGFMT_FLAGS@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -101,11 +101,16 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @PACKAGE_VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
am__leading_dot = @am__leading_dot@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -129,8 +134,11 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
DOMAIN = iso_639
SUBDIRS = iso_639_3
xmldir = $(datadir)/xml/iso-codes
@@ -182,10 +190,9 @@
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:
install-tabDATA: $(tab_DATA)
@$(NORMAL_INSTALL)
- test -z "$(tabdir)" || $(mkdir_p) "$(DESTDIR)$(tabdir)"
+ test -z "$(tabdir)" || $(MKDIR_P) "$(DESTDIR)$(tabdir)"
@list='$(tab_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -202,7 +209,7 @@
done
install-xmlDATA: $(xml_DATA)
@$(NORMAL_INSTALL)
- test -z "$(xmldir)" || $(mkdir_p) "$(DESTDIR)$(xmldir)"
+ test -z "$(xmldir)" || $(MKDIR_P) "$(DESTDIR)$(xmldir)"
@list='$(xml_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -249,8 +256,7 @@
$(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
fi; test -z "$$fail"
-mostlyclean-recursive clean-recursive distclean-recursive \
-maintainer-clean-recursive:
+$(RECURSIVE_CLEAN_TARGETS):
@failcom='exit 1'; \
for f in x $$MAKEFLAGS; do \
case $$f in \
@@ -351,23 +357,21 @@
-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
- $(mkdir_p) $(distdir)/$(srcdir) $(distdir)/..
- @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; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
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 \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -381,7 +385,7 @@
list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
if test "$$subdir" = .; then :; else \
test -d "$(distdir)/$$subdir" \
- || $(mkdir_p) "$(distdir)/$$subdir" \
+ || $(MKDIR_P) "$(distdir)/$$subdir" \
|| exit 1; \
distdir=`$(am__cd) $(distdir) && pwd`; \
top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
@@ -389,6 +393,8 @@
$(MAKE) $(AM_MAKEFLAGS) \
top_distdir="$$top_distdir" \
distdir="$$distdir/$$subdir" \
+ am__remove_distdir=: \
+ am__skip_length_check=: \
distdir) \
|| exit 1; \
fi; \
@@ -400,7 +406,7 @@
installdirs: installdirs-recursive
installdirs-am:
for dir in "$(DESTDIR)$(tabdir)" "$(DESTDIR)$(xmldir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-recursive
install-exec: install-exec-recursive
@@ -449,12 +455,20 @@
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+install-dvi: install-dvi-recursive
+
install-exec-am:
+install-html: install-html-recursive
+
install-info: install-info-recursive
install-man:
+install-pdf: install-pdf-recursive
+
+install-ps: install-ps-recursive
+
installcheck-am:
maintainer-clean: maintainer-clean-recursive
@@ -473,34 +487,37 @@
ps-am:
-uninstall-am: uninstall-info-am uninstall-tabDATA uninstall-xmlDATA
+uninstall-am: uninstall-tabDATA uninstall-xmlDATA
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
-uninstall-info: uninstall-info-recursive
+.MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) install-am \
+ install-data-am install-strip uninstall-am
-.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
- check-local clean clean-generic clean-recursive ctags \
- ctags-recursive distclean distclean-generic \
- distclean-recursive distclean-tags distdir dvi dvi-am html \
- html-am info info-am install install-am install-data \
- install-data-am install-data-hook install-exec install-exec-am \
- install-info install-info-am install-man install-strip \
- install-tabDATA install-xmlDATA installcheck installcheck-am \
- installdirs installdirs-am maintainer-clean \
- maintainer-clean-generic maintainer-clean-recursive \
- mostlyclean mostlyclean-generic mostlyclean-recursive pdf \
- pdf-am ps ps-am tags tags-recursive uninstall uninstall-am \
- uninstall-hook uninstall-info-am uninstall-tabDATA \
- uninstall-xmlDATA
+.PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
+ all all-am check check-am check-local clean clean-generic \
+ ctags ctags-recursive distclean distclean-generic \
+ distclean-tags distdir dvi dvi-am html html-am info info-am \
+ install install-am install-data install-data-am \
+ install-data-hook install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip install-tabDATA \
+ install-xmlDATA installcheck installcheck-am installdirs \
+ installdirs-am maintainer-clean maintainer-clean-generic \
+ mostlyclean mostlyclean-generic pdf pdf-am ps ps-am tags \
+ tags-recursive uninstall uninstall-am uninstall-hook \
+ uninstall-tabDATA uninstall-xmlDATA
iso_639.pot: iso_639.xml
- $(top_srcdir)/iso2pot.py --is-version $(VERSION) --comments iso_639_2T_code \
- --fields name --outfile $@ iso_639.xml
+ $(top_srcdir)/iso2pot.py --is-version $(VERSION) \
+ --comments iso_639_2T_code \
+ --comments iso_639_1_code \
+ --fields name --outfile $@ iso_639.xml
iso_639_3.xml:
- $(top_srcdir)/iso_639/iso-dis-639-tab-parse.py
+ $(top_srcdir)/iso_639/iso-fdis-639-tab-parse.py
iso_639.tab: iso_639.xml
LC_ALL=C $(srcdir)/iso639tab.py $< > iso_639.tab
@@ -508,7 +525,7 @@
check-local: check-content
%.mo: %.po
- $(MSGFMT) --verbose --check $< -o $@
+ $(MSGFMT) $(MSGFMT_FLAGS) -o $@ $<
.PHONY: check-content
check-content:
Modified: trunk/iso-codes/iso_639/iso_639_3/Makefile.in
===================================================================
--- trunk/iso-codes/iso_639/iso_639_3/Makefile.in 2007-03-07 09:47:18 UTC (rev 837)
+++ trunk/iso-codes/iso_639/iso_639_3/Makefile.in 2007-03-07 14:09:52 UTC (rev 838)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 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.
@@ -14,15 +14,11 @@
@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
@@ -68,6 +64,7 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -76,10 +73,10 @@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
+MSGFMT_FLAGS = @MSGFMT_FLAGS@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -91,11 +88,16 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @PACKAGE_VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
am__leading_dot = @am__leading_dot@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -119,8 +121,11 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
DOMAIN = iso_639_3
xmldir = $(datadir)/xml/iso-codes
xml_DATA = $(DOMAIN).xml
@@ -167,10 +172,9 @@
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:
install-xmlDATA: $(xml_DATA)
@$(NORMAL_INSTALL)
- test -z "$(xmldir)" || $(mkdir_p) "$(DESTDIR)$(xmldir)"
+ test -z "$(xmldir)" || $(MKDIR_P) "$(DESTDIR)$(xmldir)"
@list='$(xml_DATA)'; for p in $$list; do \
if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
f=$(am__strip_dir) \
@@ -193,23 +197,21 @@
distdir: $(DISTFILES)
- $(mkdir_p) $(distdir)/$(srcdir) $(distdir)/../..
- @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; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
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 \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -226,7 +228,7 @@
all-am: Makefile $(DATA)
installdirs:
for dir in "$(DESTDIR)$(xmldir)"; do \
- test -z "$$dir" || $(mkdir_p) "$$dir"; \
+ test -z "$$dir" || $(MKDIR_P) "$$dir"; \
done
install: install-am
install-exec: install-exec-am
@@ -275,12 +277,20 @@
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) install-data-hook
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -299,19 +309,23 @@
ps-am:
-uninstall-am: uninstall-info-am uninstall-xmlDATA
+uninstall-am: uninstall-xmlDATA
@$(NORMAL_INSTALL)
$(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+.MAKE: install-am install-data-am install-strip uninstall-am
+
.PHONY: all all-am check check-am check-local 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-hook install-exec install-exec-am install-info \
- install-info-am install-man install-strip install-xmlDATA \
+ install-data-hook install-dvi install-dvi-am install-exec \
+ install-exec-am install-html install-html-am install-info \
+ install-info-am install-man install-pdf install-pdf-am \
+ install-ps install-ps-am install-strip install-xmlDATA \
installcheck installcheck-am installdirs maintainer-clean \
maintainer-clean-generic mostlyclean mostlyclean-generic pdf \
pdf-am ps ps-am uninstall uninstall-am uninstall-hook \
- uninstall-info-am uninstall-xmlDATA
+ uninstall-xmlDATA
iso_639_3.pot: iso_639_3.xml
@@ -321,7 +335,7 @@
check-local: check-content
%.mo: %.po
- $(MSGFMT) --verbose --check $< -o $@
+ $(MSGFMT) $(MSGFMT_FLAGS) -o $@ $<
.PHONY: check-content
check-content:
Modified: trunk/iso-codes/iso_639/zh_CN.po
===================================================================
--- trunk/iso-codes/iso_639/zh_CN.po 2007-03-07 09:47:18 UTC (rev 837)
+++ trunk/iso-codes/iso_639/zh_CN.po 2007-03-07 14:09:52 UTC (rev 838)
@@ -12,8 +12,8 @@
"Project-Id-Version: iso_639 CVS\n"
"Report-Msgid-Bugs-To: Debian iso-codes team <pkg-isocodes-devel at lists.alioth."
"debian.org>\n"
-"POT-Creation-Date: 2006-12-09 14:13+0100\n"
-"PO-Revision-Date: 2007-02-23 17:11+0800\n"
+"POT-Creation-Date: 2007-03-07 21:58+0800\n"
+"PO-Revision-Date: 2007-03-07 21:45+0800\n"
"Last-Translator: Mai Hao Hui <mhh at 126.com>\n"
"Language-Team: zh_CN <i18n-translation at lists.linux.net.cn>\n"
"MIME-Version: 1.0\n"
@@ -22,11 +22,11 @@
"X-Generator: KBabel 0.8\n"
"Translator: Hominid He(viperii) <hominid at 39.net>\n"
-#. name for aar
+#. name for aar, aa
msgid "Afar"
msgstr "阿法尔语"
-#. name for abk
+#. name for abk, ab
msgid "Abkhazian"
msgstr "阿布哈兹语"
@@ -55,7 +55,7 @@
msgid "Afrihili"
msgstr ""
-#. name for afr
+#. name for afr, af
msgid "Afrikaans"
msgstr "南非荷兰语"
@@ -63,7 +63,7 @@
msgid "Ainu"
msgstr ""
-#. name for aka
+#. name for aka, ak
#, fuzzy
msgid "Akan"
msgstr "南非荷兰语"
@@ -73,7 +73,7 @@
msgid "Akkadian"
msgstr "阿尔巴尼亚语"
-#. name for sqi
+#. name for sqi, sq
msgid "Albanian"
msgstr "阿尔巴尼亚语"
@@ -89,7 +89,7 @@
msgid "Southern Altai"
msgstr ""
-#. name for amh
+#. name for amh, am
msgid "Amharic"
msgstr "阿拉伯语"
@@ -106,7 +106,7 @@
msgid "Apache languages"
msgstr ""
-#. name for ara
+#. name for ara, ar
msgid "Arabic"
msgstr "阿拉伯语"
@@ -115,12 +115,12 @@
msgid "Aramaic"
msgstr "阿拉伯语"
-#. name for arg
+#. name for arg, an
#, fuzzy
msgid "Aragonese"
msgstr "法罗语"
-#. name for hye
+#. name for hye, hy
msgid "Armenian"
msgstr ""
@@ -140,7 +140,7 @@
msgid "Arawak"
msgstr ""
-#. name for asm
+#. name for asm, as
msgid "Assamese"
msgstr ""
@@ -156,12 +156,12 @@
msgid "Australian languages"
msgstr ""
-#. name for ava
+#. name for ava, av
#, fuzzy
msgid "Avaric"
msgstr "阿拉伯语"
-#. name for ave
+#. name for ave, ae
msgid "Avestan"
msgstr ""
@@ -169,11 +169,11 @@
msgid "Awadhi"
msgstr ""
-#. name for aym
+#. name for aym, ay
msgid "Aymara"
msgstr ""
-#. name for aze
+#. name for aze, az
msgid "Azerbaijani"
msgstr "阿塞拜疆语"
@@ -185,7 +185,7 @@
msgid "Bamileke languages"
msgstr ""
-#. name for bak
+#. name for bak, ba
msgid "Bashkir"
msgstr ""
@@ -193,7 +193,7 @@
msgid "Baluchi"
msgstr ""
-#. name for bam
+#. name for bam, bm
msgid "Bambara"
msgstr ""
@@ -202,7 +202,7 @@
msgid "Balinese"
msgstr "中文"
-#. name for eus
+#. name for eus, eu
msgid "Basque"
msgstr "巴斯克语"
@@ -219,7 +219,7 @@
msgid "Beja"
msgstr ""
-#. name for bel
+#. name for bel, be
msgid "Belarusian"
msgstr "白俄罗斯语"
@@ -227,7 +227,7 @@
msgid "Bemba"
msgstr ""
-#. name for ben
+#. name for ben, bn
#, fuzzy
msgid "Bengali"
msgstr "波罗的海语"
@@ -240,7 +240,7 @@
msgid "Bhojpuri"
msgstr ""
-#. name for bih
+#. name for bih, bh
#, fuzzy
msgid "Bihari"
msgstr "泰语"
@@ -254,7 +254,7 @@
msgid "Bini; Edo"
msgstr "查找："
-#. name for bis
+#. name for bis, bi
msgid "Bislama"
msgstr ""
@@ -266,7 +266,7 @@
msgid "Bantu (Other)"
msgstr ""
-#. name for bos
+#. name for bos, bs
#, fuzzy
msgid "Bosnian"
msgstr "罗马尼亚语"
@@ -275,7 +275,7 @@
msgid "Braj"
msgstr ""
-#. name for bre
+#. name for bre, br
msgid "Breton"
msgstr "布里多尼语"
@@ -293,11 +293,11 @@
msgid "Buginese"
msgstr "中文"
-#. name for bul
+#. name for bul, bg
msgid "Bulgarian"
msgstr "保加利亚语"
-#. name for mya
+#. name for mya, my
msgid "Burmese"
msgstr ""
@@ -318,7 +318,7 @@
msgid "Galibi Carib"
msgstr "Galeon"
-#. name for cat
+#. name for cat, ca
msgid "Catalan; Valencian"
msgstr ""
@@ -334,7 +334,7 @@
msgid "Celtic (Other)"
msgstr ""
-#. name for cha
+#. name for cha, ch
msgid "Chamorro"
msgstr ""
@@ -342,7 +342,7 @@
msgid "Chibcha"
msgstr ""
-#. name for che
+#. name for che, ce
#, fuzzy
msgid "Chechen"
msgstr "捷克语"
@@ -351,9 +351,9 @@
msgid "Chagatai"
msgstr ""
-#. name for zho
+#. name for zho, zh
msgid "Chinese"
-msgstr "中文"
+msgstr "汉语"
#. name for chk
#, fuzzy
@@ -381,13 +381,13 @@
msgid "Cherokee"
msgstr ""
-#. name for chu
+#. name for chu, cu
msgid ""
"Church Slavic; Old Slavonic; Church Slavonic; Old Bulgarian; Old Church "
"Slavonic"
msgstr ""
-#. name for chv
+#. name for chv, cv
msgid "Chuvash"
msgstr ""
@@ -403,12 +403,12 @@
msgid "Coptic"
msgstr ""
-#. name for cor
+#. name for cor, kw
#, fuzzy
msgid "Cornish"
msgstr "颜色"
-#. name for cos
+#. name for cos, co
msgid "Corsican"
msgstr ""
@@ -424,7 +424,7 @@
msgid "Creoles and pidgins, Portuguese-based (Other)"
msgstr ""
-#. name for cre
+#. name for cre, cr
#, fuzzy
msgid "Cree"
msgstr "希腊语"
@@ -445,7 +445,7 @@
msgid "Cushitic (Other)"
msgstr ""
-#. name for ces
+#. name for ces, cs
msgid "Czech"
msgstr "捷克语"
@@ -453,7 +453,7 @@
msgid "Dakota"
msgstr ""
-#. name for dan
+#. name for dan, da
msgid "Danish"
msgstr "丹麦语"
@@ -482,7 +482,7 @@
msgid "Dinka"
msgstr ""
-#. name for div
+#. name for div, dv
msgid "Divehi; Dhivehi; Maldivian"
msgstr ""
@@ -508,15 +508,15 @@
msgid "Dutch, Middle (ca. 1050-1350)"
msgstr ""
-#. name for nld
+#. name for nld, nl
msgid "Dutch; Flemish"
-msgstr ""
+msgstr "荷兰语"
#. name for dyu
msgid "Dyula"
msgstr ""
-#. name for dzo
+#. name for dzo, dz
msgid "Dzongkha"
msgstr ""
@@ -536,7 +536,7 @@
msgid "Elamite"
msgstr ""
-#. name for eng
+#. name for eng, en
msgid "English"
msgstr "英语"
@@ -544,15 +544,15 @@
msgid "English, Middle (1100-1500)"
msgstr ""
-#. name for epo
+#. name for epo, eo
msgid "Esperanto"
msgstr "世界语"
-#. name for est
+#. name for est, et
msgid "Estonian"
msgstr "爱沙尼亚语"
-#. name for ewe
+#. name for ewe, ee
msgid "Ewe"
msgstr ""
@@ -564,7 +564,7 @@
msgid "Fang"
msgstr ""
-#. name for fao
+#. name for fao, fo
msgid "Faroese"
msgstr "法罗语"
@@ -573,7 +573,7 @@
msgid "Fanti"
msgstr "位置"
-#. name for fij
+#. name for fij, fj
msgid "Fijian"
msgstr ""
@@ -581,7 +581,7 @@
msgid "Filipino; Pilipino"
msgstr ""
-#. name for fin
+#. name for fin, fi
msgid "Finnish"
msgstr "芬兰语"
@@ -593,7 +593,7 @@
msgid "Fon"
msgstr ""
-#. name for fra
+#. name for fra, fr
msgid "French"
msgstr "法语"
@@ -615,12 +615,12 @@
msgid "Eastern Frisian"
msgstr "乌克兰语"
-#. name for fry
+#. name for fry, fy
#, fuzzy
msgid "Western Frisian"
msgstr "乌克兰语"
-#. name for ful
+#. name for ful, ff
msgid "Fulah"
msgstr ""
@@ -645,11 +645,11 @@
msgid "Germanic (Other)"
msgstr ""
-#. name for kat
+#. name for kat, ka
msgid "Georgian"
msgstr ""
-#. name for deu
+#. name for deu, de
msgid "German"
msgstr "德语"
@@ -663,20 +663,20 @@
msgid "Gilbertese"
msgstr "越南语"
-#. name for gla
+#. name for gla, gd
msgid "Gaelic; Scottish Gaelic"
msgstr ""
-#. name for gle
+#. name for gle, ga
msgid "Irish"
msgstr "爱尔兰语"
-#. name for glg
+#. name for glg, gl
#, fuzzy
msgid "Galician"
msgstr "Galeon"
-#. name for glv
+#. name for glv, gv
#, fuzzy
msgid "Manx"
msgstr "手册"
@@ -711,11 +711,11 @@
msgid "Greek, Ancient (to 1453)"
msgstr ""
-#. name for ell
+#. name for ell, el
msgid "Greek, Modern (1453-)"
msgstr ""
-#. name for grn
+#. name for grn, gn
msgid "Guarani"
msgstr ""
@@ -723,7 +723,7 @@
msgid "Swiss German; Alemannic"
msgstr ""
-#. name for guj
+#. name for guj, gu
msgid "Gujarati"
msgstr ""
@@ -736,11 +736,11 @@
msgid "Haida"
msgstr "查找："
-#. name for hat
+#. name for hat, ht
msgid "Haitian; Haitian Creole"
msgstr ""
-#. name for hau
+#. name for hau, ha
#, fuzzy
msgid "Hausa"
msgstr "暂停"
@@ -749,11 +749,11 @@
msgid "Hawaiian"
msgstr ""
-#. name for heb
+#. name for heb, he
msgid "Hebrew"
msgstr "希伯来语"
-#. name for her
+#. name for her, hz
#, fuzzy
msgid "Herero"
msgstr "希伯来语"
@@ -766,7 +766,7 @@
msgid "Himachali"
msgstr ""
-#. name for hin
+#. name for hin, hi
#, fuzzy
msgid "Hindi"
msgstr "查找："
@@ -779,7 +779,7 @@
msgid "Hmong"
msgstr ""
-#. name for hmo
+#. name for hmo, ho
#, fuzzy
msgid "Hiri Motu"
msgstr "查找："
@@ -789,7 +789,7 @@
msgid "Upper Sorbian"
msgstr "塞尔维亚语"
-#. name for hun
+#. name for hun, hu
msgid "Hungarian"
msgstr "匈牙利语"
@@ -802,19 +802,19 @@
msgid "Iban"
msgstr ""
-#. name for ibo
+#. name for ibo, ig
msgid "Igbo"
msgstr ""
-#. name for isl
+#. name for isl, is
msgid "Icelandic"
msgstr "冰岛语"
-#. name for ido
+#. name for ido, io
msgid "Ido"
msgstr ""
-#. name for iii
+#. name for iii, ii
#, fuzzy
msgid "Sichuan Yi"
msgstr "立陶宛语"
@@ -823,11 +823,11 @@
msgid "Ijo languages"
msgstr ""
-#. name for iku
+#. name for iku, iu
msgid "Inuktitut"
msgstr ""
-#. name for ile
+#. name for ile, ie
#, fuzzy
msgid "Interlingue"
msgstr "页面处理"
@@ -836,7 +836,7 @@
msgid "Iloko"
msgstr ""
-#. name for ina
+#. name for ina, ia
msgid "Interlingua (International Auxiliary Language Association)"
msgstr ""
@@ -844,7 +844,7 @@
msgid "Indic (Other)"
msgstr ""
-#. name for ind
+#. name for ind, id
msgid "Indonesian"
msgstr "印尼语"
@@ -857,7 +857,7 @@
msgid "Ingush"
msgstr "英语"
-#. name for ipk
+#. name for ipk, ik
#, fuzzy
msgid "Inupiaq"
msgstr "印度语"
@@ -870,11 +870,11 @@
msgid "Iroquoian languages"
msgstr ""
-#. name for ita
+#. name for ita, it
msgid "Italian"
msgstr "意大利语"
-#. name for jav
+#. name for jav, jv
#, fuzzy
msgid "Javanese"
msgstr "日语"
@@ -883,7 +883,7 @@
msgid "Lojban"
msgstr ""
-#. name for jpn
+#. name for jpn, ja
msgid "Japanese"
msgstr "日语"
@@ -909,7 +909,7 @@
msgid "Kachin; Jingpho"
msgstr ""
-#. name for kal
+#. name for kal, kl
msgid "Kalaallisut; Greenlandic"
msgstr ""
@@ -917,7 +917,7 @@
msgid "Kamba"
msgstr ""
-#. name for kan
+#. name for kan, kn
msgid "Kannada"
msgstr ""
@@ -926,11 +926,11 @@
msgid "Karen languages"
msgstr "朝鲜语"
-#. name for kas
+#. name for kas, ks
msgid "Kashmiri"
msgstr ""
-#. name for kau
+#. name for kau, kr
#, fuzzy
msgid "Kanuri"
msgstr "土耳其语"
@@ -939,7 +939,7 @@
msgid "Kawi"
msgstr ""
-#. name for kaz
+#. name for kaz, kk
msgid "Kazakh"
msgstr ""
@@ -956,7 +956,7 @@
msgid "Khoisan (Other)"
msgstr ""
-#. name for khm
+#. name for khm, km
msgid "Central Khmer"
msgstr ""
@@ -965,15 +965,15 @@
msgid "Khotanese"
msgstr "中文"
-#. name for kik
+#. name for kik, ki
msgid "Kikuyu; Gikuyu"
msgstr ""
-#. name for kin
+#. name for kin, rw
msgid "Kinyarwanda"
msgstr ""
-#. name for kir
+#. name for kir, ky
msgid "Kirghiz; Kyrgyz"
msgstr ""
@@ -986,15 +986,15 @@
msgid "Konkani"
msgstr "朝鲜语"
-#. name for kom
+#. name for kom, kv
msgid "Komi"
msgstr ""
-#. name for kon
+#. name for kon, kg
msgid "Kongo"
msgstr ""
-#. name for kor
+#. name for kor, ko
msgid "Korean"
msgstr "朝鲜语"
@@ -1025,7 +1025,7 @@
msgid "Kurukh"
msgstr "土耳其语"
-#. name for kua
+#. name for kua, kj
msgid "Kuanyama; Kwanyama"
msgstr ""
@@ -1033,7 +1033,7 @@
msgid "Kumyk"
msgstr ""
-#. name for kur
+#. name for kur, ku
#, fuzzy
msgid "Kurdish"
msgstr "土耳其语"
@@ -1055,16 +1055,16 @@
msgid "Lamba"
msgstr ""
-#. name for lao
+#. name for lao, lo
msgid "Lao"
msgstr ""
-#. name for lat
+#. name for lat, la
#, fuzzy
msgid "Latin"
msgstr "位置"
-#. name for lav
+#. name for lav, lv
msgid "Latvian"
msgstr "拉脱维亚语"
@@ -1072,16 +1072,16 @@
msgid "Lezghian"
msgstr ""
-#. name for lim
+#. name for lim, li
msgid "Limburgan; Limburger; Limburgish"
msgstr ""
-#. name for lin
+#. name for lin, ln
#, fuzzy
msgid "Lingala"
msgstr "法律信息(_G)"
-#. name for lit
+#. name for lit, lt
msgid "Lithuanian"
msgstr "立陶宛语"
@@ -1093,7 +1093,7 @@
msgid "Lozi"
msgstr ""
-#. name for ltz
+#. name for ltz, lb
msgid "Luxembourgish; Letzeburgesch"
msgstr ""
@@ -1101,11 +1101,11 @@
msgid "Luba-Lulua"
msgstr ""
-#. name for lub
+#. name for lub, lu
msgid "Luba-Katanga"
msgstr ""
-#. name for lug
+#. name for lug, lg
msgid "Ganda"
msgstr ""
@@ -1126,7 +1126,7 @@
msgid "Lushai"
msgstr "泰语"
-#. name for mkd
+#. name for mkd, mk
msgid "Macedonian"
msgstr "马其顿语"
@@ -1139,7 +1139,7 @@
msgid "Magahi"
msgstr ""
-#. name for mah
+#. name for mah, mh
#, fuzzy
msgid "Marshallese"
msgstr "否"
@@ -1152,7 +1152,7 @@
msgid "Makasar"
msgstr ""
-#. name for mal
+#. name for mal, ml
msgid "Malayalam"
msgstr ""
@@ -1160,7 +1160,7 @@
msgid "Mandingo"
msgstr ""
-#. name for mri
+#. name for mri, mi
#, fuzzy
msgid "Maori"
msgstr "安全系数"
@@ -1169,7 +1169,7 @@
msgid "Austronesian (Other)"
msgstr ""
-#. name for mar
+#. name for mar, mr
msgid "Marathi"
msgstr ""
@@ -1178,7 +1178,7 @@
msgid "Masai"
msgstr "安全系数"
-#. name for msa
+#. name for msa, ms
msgid "Malay"
msgstr ""
@@ -1215,11 +1215,11 @@
msgid "Mon-Khmer (Other)"
msgstr ""
-#. name for mlg
+#. name for mlg, mg
msgid "Malagasy"
msgstr ""
-#. name for mlt
+#. name for mlt, mt
#, fuzzy
msgid "Maltese"
msgstr "否"
@@ -1242,11 +1242,11 @@
msgid "Mohawk"
msgstr ""
-#. name for mol
+#. name for mol, mo
msgid "Moldavian"
msgstr ""
-#. name for mon
+#. name for mon, mn
msgid "Mongolian"
msgstr ""
@@ -1300,23 +1300,23 @@
msgid "Neapolitan"
msgstr "新建别名(_A)"
-#. name for nau
+#. name for nau, na
msgid "Nauru"
msgstr ""
-#. name for nav
+#. name for nav, nv
msgid "Navajo; Navaho"
msgstr ""
-#. name for nbl
+#. name for nbl, nr
msgid "Ndebele, South; South Ndebele"
msgstr ""
-#. name for nde
+#. name for nde, nd
msgid "Ndebele, North; North Ndebele"
msgstr ""
-#. name for ndo
+#. name for ndo, ng
msgid "Ndonga"
msgstr ""
@@ -1324,7 +1324,7 @@
msgid "Low German; Low Saxon; German, Low; Saxon, Low"
msgstr ""
-#. name for nep
+#. name for nep, ne
#, fuzzy
msgid "Nepali"
msgstr "新建别名(_A)"
@@ -1345,12 +1345,12 @@
msgid "Niuean"
msgstr ""
-#. name for nno
+#. name for nno, nn
#, fuzzy
msgid "Norwegian Nynorsk; Nynorsk, Norwegian"
msgstr "挪威语"
-#. name for nob
+#. name for nob, nb
#, fuzzy
msgid "Norwegian Bokmål; Bokmål, Norwegian"
msgstr "挪威语"
@@ -1364,7 +1364,7 @@
msgid "Norse, Old"
msgstr ""
-#. name for nor
+#. name for nor, no
msgid "Norwegian"
msgstr "挪威语"
@@ -1384,7 +1384,7 @@
msgid "Classical Newari; Old Newari; Classical Nepal Bhasa"
msgstr ""
-#. name for nya
+#. name for nya, ny
msgid "Chichewa; Chewa; Nyanja"
msgstr ""
@@ -1404,19 +1404,19 @@
msgid "Nzima"
msgstr ""
-#. name for oci
+#. name for oci, oc
msgid "Occitan (post 1500); Provençal"
msgstr ""
-#. name for oji
+#. name for oji, oj
msgid "Ojibwa"
msgstr ""
-#. name for ori
+#. name for ori, or
msgid "Oriya"
msgstr ""
-#. name for orm
+#. name for orm, om
#, fuzzy
msgid "Oromo"
msgstr "从："
@@ -1425,7 +1425,7 @@
msgid "Osage"
msgstr ""
-#. name for oss
+#. name for oss, os
#, fuzzy
msgid "Ossetian; Ossetic"
msgstr "俄语"
@@ -1455,7 +1455,7 @@
msgid "Pampanga"
msgstr ""
-#. name for pan
+#. name for pan, pa
msgid "Panjabi; Punjabi"
msgstr ""
@@ -1471,7 +1471,7 @@
msgid "Persian, Old (ca. 600-400 B.C.)"
msgstr ""
-#. name for fas
+#. name for fas, fa
#, fuzzy
msgid "Persian"
msgstr "打印"
@@ -1485,12 +1485,12 @@
msgid "Phoenician"
msgstr "斯洛文尼亚语"
-#. name for pli
+#. name for pli, pi
#, fuzzy
msgid "Pali"
msgstr "波兰语"
-#. name for pol
+#. name for pol, pl
msgid "Polish"
msgstr "波兰语"
@@ -1499,7 +1499,7 @@
msgid "Pohnpeian"
msgstr "印尼语"
-#. name for por
+#. name for por, pt
msgid "Portuguese"
msgstr "葡萄牙语"
@@ -1511,7 +1511,7 @@
msgid "Provençal, Old (to 1500)"
msgstr ""
-#. name for pus
+#. name for pus, ps
msgid "Pushto"
msgstr ""
@@ -1519,7 +1519,7 @@
msgid "Reserved for local use"
msgstr ""
-#. name for que
+#. name for que, qu
msgid "Quechua"
msgstr ""
@@ -1539,7 +1539,7 @@
msgid "Romance (Other)"
msgstr ""
-#. name for roh
+#. name for roh, rm
#, fuzzy
msgid "Romansh"
msgstr "罗马尼亚语"
@@ -1549,11 +1549,11 @@
msgid "Romany"
msgstr "罗马尼亚语"
-#. name for ron
+#. name for ron, ro
msgid "Romanian"
msgstr "罗马尼亚语"
-#. name for run
+#. name for run, rn
msgid "Rundi"
msgstr ""
@@ -1561,7 +1561,7 @@
msgid "Aromanian; Arumanian; Macedo-Romanian"
msgstr ""
-#. name for rus
+#. name for rus, ru
msgid "Russian"
msgstr "俄语"
@@ -1569,7 +1569,7 @@
msgid "Sandawe"
msgstr ""
-#. name for sag
+#. name for sag, sg
msgid "Sango"
msgstr ""
@@ -1589,7 +1589,7 @@
msgid "Samaritan Aramaic"
msgstr ""
-#. name for san
+#. name for san, sa
#, fuzzy
msgid "Sanskrit"
msgstr "无衬线"
@@ -1603,7 +1603,7 @@
msgid "Santali"
msgstr ""
-#. name for srp
+#. name for srp, sr
msgid "Serbian"
msgstr "塞尔维亚语"
@@ -1617,7 +1617,7 @@
msgid "Scots"
msgstr "停止"
-#. name for hrv
+#. name for hrv, hr
msgid "Croatian"
msgstr "克罗地亚语"
@@ -1645,7 +1645,7 @@
msgid "Sidamo"
msgstr ""
-#. name for sin
+#. name for sin, si
#, fuzzy
msgid "Sinhala; Sinhalese"
msgstr "越南语"
@@ -1662,11 +1662,11 @@
msgid "Slavic (Other)"
msgstr ""
-#. name for slk
+#. name for slk, sk
msgid "Slovak"
msgstr "斯洛伐克语"
-#. name for slv
+#. name for slv, sl
msgid "Slovenian"
msgstr "斯洛文尼亚语"
@@ -1674,7 +1674,7 @@
msgid "Southern Sami"
msgstr ""
-#. name for sme
+#. name for sme, se
msgid "Northern Sami"
msgstr ""
@@ -1690,7 +1690,7 @@
msgid "Inari Sami"
msgstr ""
-#. name for smo
+#. name for smo, sm
msgid "Samoan"
msgstr ""
@@ -1698,11 +1698,11 @@
msgid "Skolt Sami"
msgstr ""
-#. name for sna
+#. name for sna, sn
msgid "Shona"
msgstr ""
-#. name for snd
+#. name for snd, sd
msgid "Sindhi"
msgstr ""
@@ -1716,7 +1716,7 @@
msgid "Sogdian"
msgstr "挪威语"
-#. name for som
+#. name for som, so
msgid "Somali"
msgstr ""
@@ -1724,15 +1724,15 @@
msgid "Songhai languages"
msgstr ""
-#. name for sot
+#. name for sot, st
msgid "Sotho, Southern"
msgstr ""
-#. name for spa
+#. name for spa, es
msgid "Spanish; Castilian"
-msgstr ""
+msgstr "西班牙语"
-#. name for srd
+#. name for srd, sc
#, fuzzy
msgid "Sardinian"
msgstr "马其顿语"
@@ -1750,7 +1750,7 @@
msgid "Nilo-Saharan (Other)"
msgstr ""
-#. name for ssw
+#. name for ssw, ss
msgid "Swati"
msgstr ""
@@ -1758,7 +1758,7 @@
msgid "Sukuma"
msgstr ""
-#. name for sun
+#. name for sun, su
msgid "Sundanese"
msgstr ""
@@ -1771,11 +1771,11 @@
msgid "Sumerian"
msgstr "塞尔维亚语"
-#. name for swa
+#. name for swa, sw
msgid "Swahili"
msgstr ""
-#. name for swe
+#. name for swe, sv
msgid "Swedish"
msgstr "瑞典语"
@@ -1784,7 +1784,7 @@
msgid "Syriac"
msgstr "塞尔维亚语"
-#. name for tah
+#. name for tah, ty
#, fuzzy
msgid "Tahitian"
msgstr "拉脱维亚语"
@@ -1793,16 +1793,16 @@
msgid "Tai (Other)"
msgstr ""
-#. name for tam
+#. name for tam, ta
#, fuzzy
msgid "Tamil"
msgstr "泰语"
-#. name for tat
+#. name for tat, tt
msgid "Tatar"
msgstr ""
-#. name for tel
+#. name for tel, te
msgid "Telugu"
msgstr ""
@@ -1818,20 +1818,20 @@
msgid "Tetum"
msgstr ""
-#. name for tgk
+#. name for tgk, tg
#, fuzzy
msgid "Tajik"
msgstr "泰语"
-#. name for tgl
+#. name for tgl, tl
msgid "Tagalog"
msgstr ""
-#. name for tha
+#. name for tha, th
msgid "Thai"
msgstr "泰语"
-#. name for bod
+#. name for bod, bo
msgid "Tibetan"
msgstr ""
@@ -1840,7 +1840,7 @@
msgid "Tigre"
msgstr "土耳其语"
-#. name for tir
+#. name for tir, ti
#, fuzzy
msgid "Tigrinya"
msgstr "土耳其语"
@@ -1869,7 +1869,7 @@
msgid "Tonga (Nyasa)"
msgstr ""
-#. name for ton
+#. name for ton, to
msgid "Tonga (Tonga Islands)"
msgstr ""
@@ -1882,15 +1882,15 @@
msgid "Tsimshian"
msgstr "乌克兰语"
-#. name for tsn
+#. name for tsn, tn
msgid "Tswana"
msgstr ""
-#. name for tso
+#. name for tso, ts
msgid "Tsonga"
msgstr ""
-#. name for tuk
+#. name for tuk, tk
msgid "Turkmen"
msgstr ""
@@ -1902,7 +1902,7 @@
msgid "Tupi languages"
msgstr ""
-#. name for tur
+#. name for tur, tr
msgid "Turkish"
msgstr "土耳其语"
@@ -1914,7 +1914,7 @@
msgid "Tuvalu"
msgstr ""
-#. name for twi
+#. name for twi, tw
msgid "Twi"
msgstr ""
@@ -1930,11 +1930,11 @@
msgid "Ugaritic"
msgstr ""
-#. name for uig
+#. name for uig, ug
msgid "Uighur; Uyghur"
msgstr ""
-#. name for ukr
+#. name for ukr, uk
#, fuzzy
msgid "Ukrainian"
msgstr "乌克兰语"
@@ -1948,11 +1948,11 @@
msgid "Undetermined"
msgstr "页面处理"
-#. name for urd
+#. name for urd, ur
msgid "Urdu"
msgstr ""
-#. name for uzb
+#. name for uzb, uz
msgid "Uzbek"
msgstr ""
@@ -1960,15 +1960,15 @@
msgid "Vai"
msgstr ""
-#. name for ven
+#. name for ven, ve
msgid "Venda"
msgstr ""
-#. name for vie
+#. name for vie, vi
msgid "Vietnamese"
msgstr "越南语"
-#. name for vol
+#. name for vol, vo
msgid "Volapük"
msgstr ""
@@ -1992,7 +1992,7 @@
msgid "Washo"
msgstr ""
-#. name for cym
+#. name for cym, cy
msgid "Welsh"
msgstr ""
@@ -2000,11 +2000,11 @@
msgid "Sorbian languages"
msgstr ""
-#. name for wln
+#. name for wln, wa
msgid "Walloon"
msgstr ""
-#. name for wol
+#. name for wol, wo
msgid "Wolof"
msgstr ""
@@ -2012,7 +2012,7 @@
msgid "Kalmyk; Oirat"
msgstr ""
-#. name for xho
+#. name for xho, xh
msgid "Xhosa"
msgstr ""
@@ -2025,11 +2025,11 @@
msgid "Yapese"
msgstr "日语"
-#. name for yid
+#. name for yid, yi
msgid "Yiddish"
msgstr ""
-#. name for yor
+#. name for yor, yo
msgid "Yoruba"
msgstr ""
@@ -2046,7 +2046,7 @@
msgid "Zenaga"
msgstr "波罗的海语"
-#. name for zha
+#. name for zha, za
msgid "Zhuang; Chuang"
msgstr ""
@@ -2054,7 +2054,7 @@
msgid "Zande languages"
msgstr ""
-#. name for zul
+#. name for zul, zu
msgid "Zulu"
msgstr ""
Modified: trunk/iso-codes/notes/Makefile.in
===================================================================
--- trunk/iso-codes/notes/Makefile.in 2007-03-07 09:47:18 UTC (rev 837)
+++ trunk/iso-codes/notes/Makefile.in 2007-03-07 14:09:52 UTC (rev 838)
@@ -1,8 +1,8 @@
-# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# Makefile.in generated by automake 1.10 from Makefile.am.
# @configure_input@
# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2003, 2004, 2005, 2006 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.
@@ -13,15 +13,11 @@
# 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
@@ -57,6 +53,7 @@
ECHO_C = @ECHO_C@
ECHO_N = @ECHO_N@
ECHO_T = @ECHO_T@
+INSTALL = @INSTALL@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
INSTALL_SCRIPT = @INSTALL_SCRIPT@
@@ -65,10 +62,10 @@
LIBS = @LIBS@
LTLIBOBJS = @LTLIBOBJS@
MAINT = @MAINT@
-MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
MAKEINFO = @MAKEINFO@
+MKDIR_P = @MKDIR_P@
MSGFMT = @MSGFMT@
+MSGFMT_FLAGS = @MSGFMT_FLAGS@
PACKAGE = @PACKAGE@
PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
PACKAGE_NAME = @PACKAGE_NAME@
@@ -80,11 +77,16 @@
SHELL = @SHELL@
STRIP = @STRIP@
VERSION = @VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
am__leading_dot = @am__leading_dot@
am__tar = @am__tar@
am__untar = @am__untar@
bindir = @bindir@
build_alias = @build_alias@
+builddir = @builddir@
datadir = @datadir@
datarootdir = @datarootdir@
docdir = @docdir@
@@ -108,8 +110,11 @@
psdir = @psdir@
sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
EXTRA_DIST = \
Country.pm \
iso-3166.tab \
@@ -149,7 +154,6 @@
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:
@@ -158,22 +162,21 @@
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; \
+ @srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+ list='$(DISTFILES)'; \
+ dist_files=`for file in $$list; do echo $$file; done | \
+ sed -e "s|^$$srcdirstrip/||;t" \
+ -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+ case $$dist_files in \
+ */*) $(MKDIR_P) `echo "$$dist_files" | \
+ sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+ sort -u` ;; \
+ esac; \
+ for file in $$dist_files; do \
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 \
+ dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
cp -pR $(srcdir)/$$file $(distdir)$$dir || exit 1; \
fi; \
@@ -232,12 +235,20 @@
install-data-am:
+install-dvi: install-dvi-am
+
install-exec-am:
+install-html: install-html-am
+
install-info: install-info-am
install-man:
+install-pdf: install-pdf-am
+
+install-ps: install-ps-am
+
installcheck-am:
maintainer-clean: maintainer-clean-am
@@ -256,16 +267,19 @@
ps-am:
-uninstall-am: uninstall-info-am
+uninstall-am:
+.MAKE: install-am install-strip
+
.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 install-am install-data install-data-am install-dvi \
+ install-dvi-am install-exec install-exec-am install-html \
+ install-html-am install-info install-info-am install-man \
+ install-pdf install-pdf-am install-ps install-ps-am \
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
+ mostlyclean-generic pdf pdf-am ps ps-am uninstall uninstall-am
# 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.
More information about the Pkg-isocodes-devel
mailing list