[gnome-network] Ubuntu (new upstream) gnome-nettool 2.19.90-0ubuntu1
- From: Ubuntu Merge-o-Matic <mom ubuntu com>
- To: gnome-nettool packages qa debian org
- Subject: [gnome-network] Ubuntu (new upstream) gnome-nettool 2.19.90-0ubuntu1
- Date: Thu, 16 Aug 2007 23:14:39 -0000
This e-mail has been sent due to an upload to Ubuntu of a new upstream
version which still contains Ubuntu changes. It contains the difference
between the Ubuntu version and the equivalent base version in Debian, note
that this difference may include the upstream changes.
Format: 1.7
Date: Thu, 16 Aug 2007 23:34:10 +0200
Source: gnome-nettool
Binary: gnome-nettool
Architecture: source
Version: 2.19.90-0ubuntu1
Distribution: gutsy
Urgency: low
Maintainer: Ubuntu Desktop Team <ubuntu-desktop lists ubuntu com>
Changed-By: Sebastien Bacher <seb128 canonical com>
Description:
gnome-nettool - network information tool for GNOME
Changes:
gnome-nettool (2.19.90-0ubuntu1) gutsy; urgency=low
.
* New upstream version:
- #408452: Fixed the output for traceroute/ping.
- #414068: Added missing strings for translation
- #435650: Fixed Run gtk-update-icon-cache in uninstall-hook
- #401076: Added Tango icons for different sizes
- #311350: Fixed locale problem in whois
* debian/patches/03_autoconf.patch:
- updated
* debian/patches/04_menu_change.patch:
- updated
Files:
8f7b3a7361a2a95133a0458716b52173 1160 gnome optional gnome-nettool_2.19.90-0ubuntu1.dsc
4e541067894f7231620990e5e467e41b 8504 gnome optional gnome-nettool_2.19.90-0ubuntu1.diff.gz
Original-Maintainer: Andrew Lau <netsnipe users sourceforge net>
diff -pruN 2.18.0-2/aclocal.m4 2.19.90-0ubuntu1/aclocal.m4
--- 2.18.0-2/aclocal.m4 2007-03-13 01:48:41.000000000 +0000
+++ 2.19.90-0ubuntu1/aclocal.m4 2007-08-14 03:44:46.000000000 +0100
@@ -114,7 +114,8 @@ AC_SUBST($1)dnl
#-----------------
glib_DEFUN([GLIB_WITH_NLS],
dnl NLS is obligatory
- [USE_NLS=yes
+ [AC_REQUIRE([AC_CANONICAL_HOST])dnl
+ USE_NLS=yes
AC_SUBST(USE_NLS)
gt_cv_have_gettext=no
@@ -218,6 +219,20 @@ glib_DEFUN([GLIB_WITH_NLS],
glib_save_LIBS="$LIBS"
LIBS="$LIBS $INTLLIBS"
AC_CHECK_FUNCS(dcgettext)
+ MSGFMT_OPTS=
+ AC_MSG_CHECKING([if msgfmt accepts -c])
+ GLIB_RUN_PROG([msgfmt -c -o /dev/null],[
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: test 1.0\n"
+"PO-Revision-Date: 2007-02-15 12:01+0100\n"
+"Last-Translator: test <foo bar xx>\n"
+"Language-Team: C <LL li org>\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+], [MSGFMT_OPTS=-c; AC_MSG_RESULT([yes])], [AC_MSG_RESULT([no])])
+ AC_SUBST(MSGFMT_OPTS)
AC_PATH_PROG(GMSGFMT, gmsgfmt, $MSGFMT)
GLIB_PATH_PROG_WITH_TEST(XGETTEXT, xgettext,
[test -z "`$ac_dir/$ac_word -h 2>&1 | grep '(HELP)'`"], :)
@@ -389,8 +404,10 @@ glib_DEFUN([GLIB_DEFINE_LOCALEDIR],
[glib_REQUIRE([GLIB_GNU_GETTEXT])dnl
glib_save_prefix="$prefix"
glib_save_exec_prefix="$exec_prefix"
+glib_save_datarootdir="$datarootdir"
test "x$prefix" = xNONE && prefix=$ac_default_prefix
test "x$exec_prefix" = xNONE && exec_prefix=$prefix
+datarootdir=`eval echo "${datarootdir}"`
if test "x$CATOBJEXT" = "x.mo" ; then
localedir=`eval echo "${libdir}/locale"`
else
@@ -398,6 +415,7 @@ else
fi
prefix="$glib_save_prefix"
exec_prefix="$glib_save_exec_prefix"
+datarootdir="$glib_save_datarootdir"
AC_DEFINE_UNQUOTED($1, "$localedir",
[Define the location where the catalogs will be installed])
])
@@ -410,6 +428,23 @@ AC_DEFUN([AM_GLIB_GNU_GETTEXT],[GLIB_GNU
AC_DEFUN([AM_GLIB_DEFINE_LOCALEDIR],[GLIB_DEFINE_LOCALEDIR($@)])
])dnl
+# GLIB_RUN_PROG(PROGRAM, TEST-FILE, [ACTION-IF-PASS], [ACTION-IF-FAIL])
+#
+# Create a temporary file with TEST-FILE as its contents and pass the
+# file name to PROGRAM. Perform ACTION-IF-PASS if PROGRAM exits with
+# 0 and perform ACTION-IF-FAIL for any other exit status.
+AC_DEFUN([GLIB_RUN_PROG],
+[cat >conftest.foo <<_ACEOF
+$2
+_ACEOF
+if AC_RUN_LOG([$1 conftest.foo]); then
+ m4_ifval([$3], [$3], [:])
+m4_ifvaln([$4], [else $4])dnl
+echo "$as_me: failed input was:" >&AS_MESSAGE_LOG_FD
+sed 's/^/| /' conftest.foo >&AS_MESSAGE_LOG_FD
+fi])
+
+
dnl GNOME_COMPILE_WARNINGS
dnl Turn on many useful compiler warnings
dnl For now, only works on GCC
@@ -507,11 +542,11 @@ AC_DEFUN([GNOME_CXX_WARNINGS],[
AC_MSG_CHECKING(what warning flags to pass to the C++ compiler)
warnCXXFLAGS=
- if test "x$GCC" != xyes; then
- enable_compile_warnings=no
+ if test "x$GXX" != xyes; then
+ enable_cxx_warnings=no
fi
if test "x$enable_cxx_warnings" != "xno"; then
- if test "x$GCC" = "xyes"; then
+ if test "x$GXX" = "xyes"; then
case " $CXXFLAGS " in
*[\ \ ]-Wall[\ \ ]*) ;;
*) warnCXXFLAGS="-Wall -Wno-unused" ;;
@@ -534,7 +569,7 @@ AC_DEFUN([GNOME_CXX_WARNINGS],[
AC_MSG_CHECKING(what language compliance flags to pass to the C++ compiler)
complCXXFLAGS=
if test "x$enable_iso_cxx" != "xno"; then
- if test "x$GCC" = "xyes"; then
+ if test "x$GXX" = "xyes"; then
case " $CXXFLAGS " in
*[\ \ ]-ansi[\ \ ]*) ;;
*) complCXXFLAGS="$complCXXFLAGS -ansi" ;;
@@ -7059,7 +7094,8 @@ installed software in a non-standard pre
_PKG_TEXT
])],
- [$4])
+ [AC_MSG_RESULT([no])
+ $4])
elif test $pkg_failed = untried; then
ifelse([$4], , [AC_MSG_FAILURE(dnl
[The pkg-config script could not be found or is too old. Make sure it
diff -pruN 2.18.0-2/ChangeLog 2.19.90-0ubuntu1/ChangeLog
--- 2.18.0-2/ChangeLog 2007-03-13 01:50:52.000000000 +0000
+++ 2.19.90-0ubuntu1/ChangeLog 2007-08-14 03:43:56.000000000 +0100
@@ -1,3 +1,74 @@
+2007-08-13 German Poo-Caamano <gpoo ubiobio cl>
+
+ Released 2.19.90.
+
+2007-08-13 German Poo-Caamano <gpoo ubiobio cl>
+
+ * MAINTAINERS: Updated to new format requested by
+ Olav Vitters.
+
+2007-08-05 German Poo-Caamano <gpoo ubiobio cl>
+
+ * src/traceroute.c:
+ * src/ping.c: Fixed the output for each command processed.
+ Append each line at the endd of the the table output, instead
+ of after the cursor position. Fixed #408452.
+
+2007-08-04 German Poo-Caamano <gpoo ubiobio cl>
+
+ * configure.in: Added gnome-doc-utils dependency.
+
+2007-08-04 German Poo-Caamano <gpoo ubiobio cl>
+
+ * src/gnome-nettool.desktop.in.in: Better application's description.
+ (From Debian patches throught Ubuntu).
+
+2007-08-04 German Poo-Caamano <gpoo ubiobio cl>
+
+ * src/callbacks.c: Added message for translators.
+
+2007-08-04 German Poo-Caamano <gpoo ubiobio cl>
+
+ * src/callbacks.c: Added missing strings for translations.
+ Fixed #414068.
+ * pixmaps/icons/*/apps: Fixed some other icons' locations.
+
+2007-08-04 German Poo-Caamano <gpoo ubiobio cl>
+
+ * pixmaps/icons/*/apps: Fixed locations of icons.
+ * po/POTFILES.skip: Added src/gnome-nettool.desktop.in as
+ not to be translated.
+ * configure.in: Updated target version to 2.19.1.
+
+2007-08-04 German Poo-Caamano <gpoo ubiobio cl>
+
+ Fixed #401076.
+
+ * pixmaps/Makefile.am:
+ * pixmaps/icons/16x16/gnome-nettool.png
+ * pixmaps/icons/16x16/Makefile.am
+ * pixmaps/icons/22x22/gnome-nettool.png
+ * pixmaps/icons/22x22/Makefile.am
+ * pixmaps/icons/32x32/gnome-nettool.png
+ * pixmaps/icons/32x32/Makefile.am
+ * pixmaps/icons/scalable/gnome-nettool.svg
+ * pixmaps/icons/scalable/Makefile.am
+ * pixmaps/icons/Makefile.am: Added (tango) icons and rules for
+ various sizes. Icons made by Hylke Bons.
+ * pixmaps/gnome-nettool.png: Updated to a Tango logo by Hylke Bons.
+ * src/gnome-nettool.png: Deleted duplicated logo.
+ * configure.in: Added Makefiles' from pixmaps/icons directory.
+
+2007-03-12 German Poo-Caamano <gpoo ubiobio cl>
+
+ * NEWS: Updated
+
+2007-03-16 Loïc Minier <lminier svn gnome org>
+
+ * src/nettool.c: (netinfo_text_buffer_insert):
+ Set the I/O channel's encoding to the current locale and add some
+ error handling; fixes bug #311350.
+
2007-03-12 German Poo-Caamano <gpoo ubiobio cl>
Released 2.18.0.
@@ -537,7 +608,7 @@
* src/gn-combo-history.c (gn_on_gconf_history_changed): Don't unset the
active item when gconf changes.
-2004-11-03 German Poo-Caamaño <gpoo ubiobio cl>
+2004-11-03 German Poo-Caamaño <gpoo ubiobio cl>
* pixmaps/network.png: Resized of network icon to 16x16.
@@ -550,7 +621,7 @@
* configure.in: Added "id" (Indonesian) to ALL_LINGUAS
* po/id.po: Added Indonesian translation
-2004-09-20 German Poo-Caamaño <gpoo ubiobio cl>
+2004-09-20 German Poo-Caamaño <gpoo ubiobio cl>
* src/gnome-nettool.glade: Fixed a typo in ping. bug #151913
@@ -652,7 +723,7 @@
* configure.in: Added ta to ALL_LINGUAS.
-2004-08-25 Iñaki Larrañaga <dooteo euskalgnu org>
+2004-08-25 Iñaki Larrañaga <dooteo euskalgnu org>
* configure.in: Added "eu" (Basque) to ALL_LINGUAS.
@@ -662,7 +733,7 @@
2004-08-24 Kjartan Maraas <kmaraas gnome org>
- * configure.in: Add «nb» to ALL_LINGUAS.
+ * configure.in: Add «nb» to ALL_LINGUAS.
2004-08-23 William Jon McCann <mccann jhu edu>
@@ -723,7 +794,7 @@
* src/callbacks.c (gn_quit_app): Use gboolean type for
delete-event handler.
-2004-06-23 Carlos García Campos <carlosgc gnome org>
+2004-06-23 Carlos GarcÃa Campos <carlosgc gnome org>
* src/callbacks.c (on_page_switch), src/finger.c (finger_do),
src/lookup.c (lookup_do), src/netstat.c (get_active_option),
@@ -741,7 +812,7 @@
* src/info.c: (info_get_nic_information), (info_get_interfaces):
check if ifa_addr is NULL before trying to access it. Bug #144300
-2004-06-13 Jürg Billeter <j bitron ch>
+2004-06-13 J�¼rg Billeter <j bitron ch>
Fixes #144278
@@ -784,7 +855,7 @@
(netinfo_error_message): New HIGish error dialog.
(netinfo_validate_host): use netinfo_error_message function.
-2004-06-09 Carlos García Campos <carlosgc gnome org>
+2004-06-09 Carlos GarcÃa Campos <carlosgc gnome org>
* src/callbacks.c (on_finger_activate): s/strcmp/g_strcasecmp/
@@ -820,7 +891,7 @@
* src/gnome-nettool.glade: Revert change that adds underscores to
notebook tab labels.
-2004-06-08 Carlos García Campos <carlosgc gnome org>
+2004-06-08 Carlos GarcÃa Campos <carlosgc gnome org>
* src/info.c (load_iface): checks if there is no network devices
enabled
@@ -967,7 +1038,7 @@
* src/callbacks.c (on_about_activate): added Carlos and myself to list
of authors.
-2004-03-21 Carlos García Campos <carlosgc gnome org>
+2004-03-21 Carlos GarcÃa Campos <carlosgc gnome org>
* src/callbacks.c (on_about_activate): updated the name of the tool using
GNOME Netinfo. Removed the "untranslated version" message.
@@ -1055,7 +1126,7 @@
* callbacks.h: Add typedef for activate callback functions.
-2003-12-15 Carlos García Campos <carlosgc gnome org>
+2003-12-15 Carlos GarcÃa Campos <carlosgc gnome org>
* info.c (info_get_nic_information): removed invalid g_free()
@@ -1133,7 +1204,7 @@
(load_lookup_widgets_from_xml, load_finger_widgets_from_xml):
Added pointer to main window to the netinfo structure.
- Based on changes sent by Carlos García Campos <carlosgc gnome org>
+ Based on changes sent by Carlos GarcÃa Campos <carlosgc gnome org>
* callbacks.[ch] (gn_quit_app), gnome-netinfo.glade:
kill of all the children before exit
* netinfo.[ch] (validate_host): function to validate a host
@@ -1147,7 +1218,7 @@
returns zero for IPv6. Also reduces the number of system calls
performed.
-2003-10-02 Carlos García Campos <carlosgc gnome org>
+2003-10-02 Carlos GarcÃa Campos <carlosgc gnome org>
* netinfo.c (get_ip_version): added a function to get the
ip version (IPv4 or IPv6) of a host or ip address
diff -pruN 2.18.0-2/config.guess 2.19.90-0ubuntu1/config.guess
--- 2.18.0-2/config.guess 2007-03-13 01:48:45.000000000 +0000
+++ 2.19.90-0ubuntu1/config.guess 2007-08-14 03:44:51.000000000 +0100
@@ -1,9 +1,10 @@
#! /bin/sh
# Attempt to guess a canonical system name.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+# Inc.
-timestamp='2006-02-23'
+timestamp='2006-07-02'
# This file is free software; you can redistribute it and/or modify it
# under the terms of the GNU General Public License as published by
@@ -210,7 +211,7 @@ case "${UNAME_MACHINE}:${UNAME_SYSTEM}:$
echo ${UNAME_MACHINE}-unknown-solidbsd${UNAME_RELEASE}
exit ;;
macppc:MirBSD:*:*)
- echo powerppc-unknown-mirbsd${UNAME_RELEASE}
+ echo powerpc-unknown-mirbsd${UNAME_RELEASE}
exit ;;
*:MirBSD:*:*)
echo ${UNAME_MACHINE}-unknown-mirbsd${UNAME_RELEASE}
@@ -770,6 +771,8 @@ EOF
case ${UNAME_MACHINE} in
pc98)
echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+ amd64)
+ echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
*)
echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
esac
@@ -780,9 +783,6 @@ EOF
i*:MINGW*:*)
echo ${UNAME_MACHINE}-pc-mingw32
exit ;;
- i*:MSYS_NT-*:*:*)
- echo ${UNAME_MACHINE}-pc-mingw32
- exit ;;
i*:windows32*:*)
# uname -m includes "-pc" on this system.
echo ${UNAME_MACHINE}-mingw32
@@ -790,10 +790,10 @@ EOF
i*:PW*:*)
echo ${UNAME_MACHINE}-pc-pw32
exit ;;
- x86:Interix*:[345]*)
+ x86:Interix*:[3456]*)
echo i586-pc-interix${UNAME_RELEASE}
exit ;;
- EM64T:Interix*:[345]*)
+ EM64T:Interix*:[3456]*)
echo x86_64-unknown-interix${UNAME_RELEASE}
exit ;;
[345]86:Windows_95:* | [345]86:Windows_98:* | [345]86:Windows_NT:*)
@@ -831,6 +831,9 @@ EOF
arm*:Linux:*:*)
echo ${UNAME_MACHINE}-unknown-linux-gnu
exit ;;
+ avr32*:Linux:*:*)
+ echo ${UNAME_MACHINE}-unknown-linux-gnu
+ exit ;;
cris:Linux:*:*)
echo cris-axis-linux-gnu
exit ;;
@@ -989,7 +992,7 @@ EOF
LIBC=gnulibc1
# endif
#else
- #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__sun)
+ #if defined(__INTEL_COMPILER) || defined(__PGI) || defined(__SUNPRO_C) || defined(__SUNPRO_CC)
LIBC=gnu
#else
LIBC=gnuaout
diff -pruN 2.18.0-2/config.sub 2.19.90-0ubuntu1/config.sub
--- 2.18.0-2/config.sub 2007-03-13 01:48:45.000000000 +0000
+++ 2.19.90-0ubuntu1/config.sub 2007-08-14 03:44:51.000000000 +0100
@@ -1,9 +1,10 @@
#! /bin/sh
# Configuration validation subroutine script.
# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-# 2000, 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+# 2000, 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation,
+# Inc.
-timestamp='2006-02-23'
+timestamp='2006-09-20'
# This file is (in principle) common to ALL GNU software.
# The presence of a machine in this file suggests that SOME GNU software
@@ -240,7 +241,7 @@ case $basic_machine in
| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
| am33_2.0 \
- | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr \
+ | arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
| bfin \
| c4x | clipper \
| d10v | d30v | dlx | dsp16xx \
@@ -248,7 +249,8 @@ case $basic_machine in
| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
| i370 | i860 | i960 | ia64 \
| ip2k | iq2000 \
- | m32r | m32rle | m68000 | m68k | m88k | maxq | mb | microblaze | mcore \
+ | m32c | m32r | m32rle | m68000 | m68k | m88k \
+ | maxq | mb | microblaze | mcore \
| mips | mipsbe | mipseb | mipsel | mipsle \
| mips16 \
| mips64 | mips64el \
@@ -274,21 +276,19 @@ case $basic_machine in
| pdp10 | pdp11 | pj | pjl \
| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
| pyramid \
- | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | shbe | shle | sh[1234]le | sh3ele \
+ | score \
+ | sh | sh[1234] | sh[24]a | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
| sh64 | sh64le \
- | sparc | sparc64 | sparc64b | sparc86x | sparclet | sparclite \
- | sparcv8 | sparcv9 | sparcv9b \
- | strongarm \
+ | sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
+ | sparcv8 | sparcv9 | sparcv9b | sparcv9v \
+ | spu | strongarm \
| tahoe | thumb | tic4x | tic80 | tron \
| v850 | v850e \
| we32k \
- | x86 | xscale | xscalee[bl] | xstormy16 | xtensa \
+ | x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
| z8k)
basic_machine=$basic_machine-unknown
;;
- m32c)
- basic_machine=$basic_machine-unknown
- ;;
m6811 | m68hc11 | m6812 | m68hc12)
# Motorola 68HC11/12.
basic_machine=$basic_machine-unknown
@@ -318,7 +318,7 @@ case $basic_machine in
| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
| arm-* | armbe-* | armle-* | armeb-* | armv*-* \
- | avr-* \
+ | avr-* | avr32-* \
| bfin-* | bs2000-* \
| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
| clipper-* | craynv-* | cydra-* \
@@ -329,7 +329,7 @@ case $basic_machine in
| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
| i*86-* | i860-* | i960-* | ia64-* \
| ip2k-* | iq2000-* \
- | m32r-* | m32rle-* \
+ | m32c-* | m32r-* | m32rle-* \
| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
| m88110-* | m88k-* | maxq-* | mcore-* \
| mips-* | mipsbe-* | mipseb-* | mipsel-* | mipsle-* \
@@ -358,23 +358,21 @@ case $basic_machine in
| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
| pyramid-* \
| romp-* | rs6000-* \
- | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | shbe-* \
+ | sh-* | sh[1234]-* | sh[24]a-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
- | sparc-* | sparc64-* | sparc64b-* | sparc86x-* | sparclet-* \
+ | sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
| sparclite-* \
- | sparcv8-* | sparcv9-* | sparcv9b-* | strongarm-* | sv1-* | sx?-* \
+ | sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
| tahoe-* | thumb-* \
| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
| tron-* \
| v850-* | v850e-* | vax-* \
| we32k-* \
- | x86-* | x86_64-* | xps100-* | xscale-* | xscalee[bl]-* \
+ | x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
| xstormy16-* | xtensa-* \
| ymp-* \
| z8k-*)
;;
- m32c-*)
- ;;
# Recognize the various machine names and aliases which stand
# for a CPU type and a company and sometimes even an OS.
386bsd)
@@ -912,6 +910,10 @@ case $basic_machine in
sb1el)
basic_machine=mipsisa64sb1el-unknown
;;
+ sde)
+ basic_machine=mipsisa32-sde
+ os=-elf
+ ;;
sei)
basic_machine=mips-sei
os=-seiux
@@ -1128,7 +1130,7 @@ case $basic_machine in
sh[1234] | sh[24]a | sh[34]eb | sh[1234]le | sh[23]ele)
basic_machine=sh-unknown
;;
- sparc | sparcv8 | sparcv9 | sparcv9b)
+ sparc | sparcv8 | sparcv9 | sparcv9b | sparcv9v)
basic_machine=sparc-sun
;;
cydra)
@@ -1217,7 +1219,7 @@ case $os in
| -os2* | -vos* | -palmos* | -uclinux* | -nucleus* \
| -morphos* | -superux* | -rtmk* | -rtmk-nova* | -windiss* \
| -powermax* | -dnix* | -nx6 | -nx7 | -sei* | -dragonfly* \
- | -skyos* | -haiku* | -rdos*)
+ | -skyos* | -haiku* | -rdos* | -toppers*)
# Remember, each alternative MUST END IN *, to match a version number.
;;
-qnx*)
@@ -1369,6 +1371,12 @@ else
# system, and we'll never get to this point.
case $basic_machine in
+ score-*)
+ os=-elf
+ ;;
+ spu-*)
+ os=-elf
+ ;;
*-acorn)
os=-riscix1.2
;;
@@ -1378,9 +1386,9 @@ case $basic_machine in
arm*-semi)
os=-aout
;;
- c4x-* | tic4x-*)
- os=-coff
- ;;
+ c4x-* | tic4x-*)
+ os=-coff
+ ;;
# This must come before the *-dec entry.
pdp10-*)
os=-tops20
diff -pruN 2.18.0-2/configure 2.19.90-0ubuntu1/configure
--- 2.18.0-2/configure 2007-03-13 01:48:44.000000000 +0000
+++ 2.19.90-0ubuntu1/configure 2007-08-14 03:44:49.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.60 for GNOME Nettool 2.18.0.
+# Generated by GNU Autoconf 2.61 for GNOME Nettool 2.19.90.
#
# Report bugs to <http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-nettool>.
#
@@ -12,7 +12,8 @@
## M4sh Initialization. ##
## --------------------- ##
-# Be Bourne compatible
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
@@ -21,10 +22,13 @@ if test -n "${ZSH_VERSION+set}" && (emul
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+ case `(set -o) 2>/dev/null` in
+ *posix*) set -o posix ;;
+esac
+
fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+
+
# PATH needs CR
@@ -217,7 +221,7 @@ test \$exitcode = 0) || { (exit 1); exit
else
as_candidate_shells=
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in /usr/bin/posix$PATH_SEPARATOR/bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
+for as_dir in /bin$PATH_SEPARATOR/usr/bin$PATH_SEPARATOR$PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
@@ -235,7 +239,6 @@ IFS=$as_save_IFS
# Try only shells that exist, to save several forks.
if { test -f "$as_shell" || test -f "$as_shell.exe"; } &&
{ ("$as_shell") 2> /dev/null <<\_ASEOF
-# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
@@ -244,10 +247,12 @@ if test -n "${ZSH_VERSION+set}" && (emul
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+ case `(set -o) 2>/dev/null` in
+ *posix*) set -o posix ;;
+esac
+
fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+
:
_ASEOF
@@ -255,7 +260,6 @@ _ASEOF
CONFIG_SHELL=$as_shell
as_have_required=yes
if { "$as_shell" 2> /dev/null <<\_ASEOF
-# Be Bourne compatible
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
@@ -264,10 +268,12 @@ if test -n "${ZSH_VERSION+set}" && (emul
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+ case `(set -o) 2>/dev/null` in
+ *posix*) set -o posix ;;
+esac
+
fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+
:
(as_func_return () {
@@ -514,19 +520,28 @@ else
as_mkdir_p=false
fi
-# Find out whether ``test -x'' works. Don't use a zero-byte file, as
-# systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
- as_executable_p="test -x"
+if test -x / >/dev/null 2>&1; then
+ as_test_x='test -x'
else
- as_executable_p=:
+ if ls -dL / >/dev/null 2>&1; then
+ as_ls_L_option=L
+ else
+ as_ls_L_option=
+ fi
+ as_test_x='
+ eval sh -c '\''
+ if test -d "$1"; then
+ test -d "$1/.";
+ else
+ case $1 in
+ -*)set "./$1";;
+ esac;
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+ ???[sx]*):;;*)false;;esac;fi
+ '\'' sh
+ '
fi
-rm -f conf$$.file
+as_executable_p=$as_test_x
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -713,44 +728,44 @@ SHELL=${CONFIG_SHELL-/bin/sh}
# Identity of this package.
PACKAGE_NAME='GNOME Nettool'
PACKAGE_TARNAME='gnome-nettool'
-PACKAGE_VERSION='2.18.0'
-PACKAGE_STRING='GNOME Nettool 2.18.0'
+PACKAGE_VERSION='2.19.90'
+PACKAGE_STRING='GNOME Nettool 2.19.90'
PACKAGE_BUGREPORT='http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-nettool'
ac_unique_file="src/ping.c"
# Factoring default headers for most tests.
ac_includes_default="\
#include <stdio.h>
-#if HAVE_SYS_TYPES_H
+#ifdef HAVE_SYS_TYPES_H
# include <sys/types.h>
#endif
-#if HAVE_SYS_STAT_H
+#ifdef HAVE_SYS_STAT_H
# include <sys/stat.h>
#endif
-#if STDC_HEADERS
+#ifdef STDC_HEADERS
# include <stdlib.h>
# include <stddef.h>
#else
-# if HAVE_STDLIB_H
+# ifdef HAVE_STDLIB_H
# include <stdlib.h>
# endif
#endif
-#if HAVE_STRING_H
-# if !STDC_HEADERS && HAVE_MEMORY_H
+#ifdef HAVE_STRING_H
+# if !defined STDC_HEADERS && defined HAVE_MEMORY_H
# include <memory.h>
# endif
# include <string.h>
#endif
-#if HAVE_STRINGS_H
+#ifdef HAVE_STRINGS_H
# include <strings.h>
#endif
-#if HAVE_INTTYPES_H
+#ifdef HAVE_INTTYPES_H
# include <inttypes.h>
#endif
-#if HAVE_STDINT_H
+#ifdef HAVE_STDINT_H
# include <stdint.h>
#endif
-#if HAVE_UNISTD_H
+#ifdef HAVE_UNISTD_H
# include <unistd.h>
#endif"
@@ -859,6 +874,7 @@ AMDEPBACKSLASH
CCDEPMODE
am__fastdepCC_TRUE
am__fastdepCC_FALSE
+DATADIRNAME
CPP
GREP
EGREP
@@ -892,11 +908,11 @@ NETTOOL_LIBS
GETTEXT_PACKAGE
USE_NLS
MSGFMT
+MSGFMT_OPTS
GMSGFMT
XGETTEXT
CATALOGS
CATOBJEXT
-DATADIRNAME
GMOFILES
INSTOBJEXT
INTLLIBS
@@ -905,13 +921,13 @@ PO_IN_DATADIR_FALSE
POFILES
POSUB
MKINSTALLDIRS
-GDU_MODULE_VERSION_CHECK_CFLAGS
-GDU_MODULE_VERSION_CHECK_LIBS
HELP_DIR
OMF_DIR
DOC_USER_FORMATS
ENABLE_SK_TRUE
ENABLE_SK_FALSE
+HAVE_GNOME_DOC_UTILS_TRUE
+HAVE_GNOME_DOC_UTILS_FALSE
LIBOBJS
LTLIBOBJS'
ac_subst_files=''
@@ -921,6 +937,7 @@ target_alias
CC
CFLAGS
LDFLAGS
+LIBS
CPPFLAGS
CPP
CXX
@@ -931,9 +948,7 @@ F77
FFLAGS
PKG_CONFIG
NETTOOL_CFLAGS
-NETTOOL_LIBS
-GDU_MODULE_VERSION_CHECK_CFLAGS
-GDU_MODULE_VERSION_CHECK_LIBS'
+NETTOOL_LIBS'
# Initialize some variables set by options.
@@ -1039,10 +1054,10 @@ do
-disable-* | --disable-*)
ac_feature=`expr "x$ac_option" : 'x-*disable-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid feature name: $ac_feature" >&2
{ (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
eval enable_$ac_feature=no ;;
-docdir | --docdir | --docdi | --doc | --do)
@@ -1058,10 +1073,10 @@ do
-enable-* | --enable-*)
ac_feature=`expr "x$ac_option" : 'x-*enable-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_feature" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+ expr "x$ac_feature" : ".*[^-._$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid feature name: $ac_feature" >&2
{ (exit 1); exit 1; }; }
- ac_feature=`echo $ac_feature | sed 's/-/_/g'`
+ ac_feature=`echo $ac_feature | sed 's/[-.]/_/g'`
eval enable_$ac_feature=\$ac_optarg ;;
-exec-prefix | --exec_prefix | --exec-prefix | --exec-prefi \
@@ -1255,19 +1270,19 @@ do
-with-* | --with-*)
ac_package=`expr "x$ac_option" : 'x-*with-\([^=]*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid package name: $ac_package" >&2
{ (exit 1); exit 1; }; }
- ac_package=`echo $ac_package| sed 's/-/_/g'`
+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
eval with_$ac_package=\$ac_optarg ;;
-without-* | --without-*)
ac_package=`expr "x$ac_option" : 'x-*without-\(.*\)'`
# Reject names that are not valid shell variable names.
- expr "x$ac_package" : ".*[^-_$as_cr_alnum]" >/dev/null &&
+ expr "x$ac_package" : ".*[^-._$as_cr_alnum]" >/dev/null &&
{ echo "$as_me: error: invalid package name: $ac_package" >&2
{ (exit 1); exit 1; }; }
- ac_package=`echo $ac_package | sed 's/-/_/g'`
+ ac_package=`echo $ac_package | sed 's/[-.]/_/g'`
eval with_$ac_package=no ;;
--x)
@@ -1436,7 +1451,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures GNOME Nettool 2.18.0 to adapt to many kinds of systems.
+\`configure' configures GNOME Nettool 2.19.90 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1506,7 +1521,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of GNOME Nettool 2.18.0:";;
+ short | recursive ) echo "Configuration of GNOME Nettool 2.19.90:";;
esac
cat <<\_ACEOF
@@ -1545,6 +1560,7 @@ Some influential environment variables:
CFLAGS C compiler flags
LDFLAGS linker flags, e.g. -L<lib dir> if you have libraries in a
nonstandard directory <lib dir>
+ LIBS libraries to pass to the linker, e.g. -l<library>
CPPFLAGS C/C++/Objective C preprocessor flags, e.g. -I<include dir> if
you have headers in a nonstandard directory <include dir>
CPP C preprocessor
@@ -1558,11 +1574,6 @@ Some influential environment variables:
C compiler flags for NETTOOL, overriding pkg-config
NETTOOL_LIBS
linker flags for NETTOOL, overriding pkg-config
- GDU_MODULE_VERSION_CHECK_CFLAGS
- C compiler flags for GDU_MODULE_VERSION_CHECK, overriding
- pkg-config
- GDU_MODULE_VERSION_CHECK_LIBS
- linker flags for GDU_MODULE_VERSION_CHECK, overriding pkg-config
Use these variables to override the choices made by `configure' or to help
it to find libraries and programs with nonstandard names/locations.
@@ -1628,8 +1639,8 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-GNOME Nettool configure 2.18.0
-generated by GNU Autoconf 2.60
+GNOME Nettool configure 2.19.90
+generated by GNU Autoconf 2.61
Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
@@ -1642,8 +1653,8 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by GNOME Nettool $as_me 2.18.0, which was
-generated by GNU Autoconf 2.60. Invocation command line was
+It was created by GNOME Nettool $as_me 2.19.90, which was
+generated by GNU Autoconf 2.61. Invocation command line was
$ $0 $@
@@ -2070,7 +2081,7 @@ case $as_dir/ in
# by default.
for ac_prog in ginstall scoinst install; do
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_executable_p "$as_dir/$ac_prog$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
if test $ac_prog = install &&
grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
# AIX install. It has an incompatible calling convention.
@@ -2236,7 +2247,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AWK="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2319,7 +2330,7 @@ fi
# Define the identity of the package.
PACKAGE='gnome-nettool'
- VERSION='2.18.0'
+ VERSION='2.19.90'
cat >>confdefs.h <<_ACEOF
@@ -2371,7 +2382,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2411,7 +2422,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_STRIP="strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -2465,14 +2476,6 @@ am__tar='${AMTAR} chof - "$$tardir"'; am
-case m4 in
- [\\/]* | ?:[\\/]* ) ac_macro_dir=m4 ;;
- *) ac_macro_dir=$srcdir/m4 ;;
-esac
-test -d "$ac_macro_dir" ||
- { { echo "$as_me:$LINENO: error: cannot find macro directory \`m4'" >&5
-echo "$as_me: error: cannot find macro directory \`m4'" >&2;}
- { (exit 1); exit 1; }; }
{ echo "$as_me:$LINENO: checking whether to enable maintainer-specific portions of Makefiles" >&5
echo $ECHO_N "checking whether to enable maintainer-specific portions of Makefiles... $ECHO_C" >&6; }
@@ -2499,99 +2502,95 @@ fi
+DEPDIR="${am__leading_dot}deps"
-case "$am__api_version" in
- 1.01234)
- { { echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
-echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
- { (exit 1); exit 1; }; }
- ;;
- *)
- ;;
-esac
-
-if test -n "0.35.0"; then
- { echo "$as_me:$LINENO: checking for intltool >= 0.35.0" >&5
-echo $ECHO_N "checking for intltool >= 0.35.0... $ECHO_C" >&6; }
+ac_config_commands="$ac_config_commands depfiles"
- INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
- INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
- INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
- { echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
-echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; }
- test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
- { { echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.35.0 or later." >&5
-echo "$as_me: error: Your intltool is too old. You need intltool 0.35.0 or later." >&2;}
- { (exit 1); exit 1; }; }
+am_make=${MAKE-make}
+cat > confinc << 'END'
+am__doit:
+ @echo done
+.PHONY: am__doit
+END
+# If we don't find an include directive, just comment out the code.
+{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
+echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
+am__include="#"
+am__quote=
+_am_result=none
+# First try GNU make style include.
+echo "include confinc" > confmf
+# We grep out `Entering directory' and `Leaving directory'
+# messages which can occur if `w' ends up in MAKEFLAGS.
+# In particular we don't look at `^make:' because GNU make might
+# be invoked under some other name (usually "gmake"), in which
+# case it prints its new name instead of `make'.
+if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
+ am__include=include
+ am__quote=
+ _am_result=GNU
+fi
+# Now try BSD make style include.
+if test "$am__include" = "#"; then
+ echo '.include "confinc"' > confmf
+ if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
+ am__include=.include
+ am__quote="\""
+ _am_result=BSD
+ 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_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@'
- 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 $< $@'
- INTLTOOL_SERVICE_RULE='%.service: %.service.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 $< $@'
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+{ echo "$as_me:$LINENO: result: $_am_result" >&5
+echo "${ECHO_T}$_am_result" >&6; }
+rm -f confinc confmf
+# Check whether --enable-dependency-tracking was given.
+if test "${enable_dependency_tracking+set}" = set; then
+ enableval=$enable_dependency_tracking;
+fi
+if test "x$enable_dependency_tracking" != xno; then
+ am_depcomp="$ac_aux_dir/depcomp"
+ AMDEPBACKSLASH='\'
+fi
-# 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'
+if test "x$enable_dependency_tracking" != xno; then
+ AMDEP_TRUE=
+ AMDEP_FALSE='#'
+else
+ AMDEP_TRUE='#'
+ AMDEP_FALSE=
+fi
-INTLTOOL_UPDATE='$(top_builddir)/intltool-update'
-# Extract the first word of "perl", so it can be a program name with args.
-set dummy perl; ac_word=$2
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}gcc; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- case $INTLTOOL_PERL in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="${ac_tool_prefix}gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -2599,62 +2598,39 @@ done
done
IFS=$as_save_IFS
- ;;
-esac
fi
-INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
-if test -n "$INTLTOOL_PERL"; then
- { echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
-echo "${ECHO_T}$INTLTOOL_PERL" >&6; }
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
fi
-if test -z "$INTLTOOL_PERL"; then
- { { echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5
-echo "$as_me: error: perl not found; required for intltool" >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
- { { echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
-echo "$as_me: error: perl 5.x required for intltool" >&2;}
- { (exit 1); exit 1; }; }
-fi
-if test "x" != "xno-xml"; then
- { echo "$as_me:$LINENO: checking for XML::Parser" >&5
-echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6; }
- if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
- { echo "$as_me:$LINENO: result: ok" >&5
-echo "${ECHO_T}ok" >&6; }
- else
- { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
-echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
- { (exit 1); exit 1; }; }
- fi
fi
-
-# Extract the first word of "iconv", so it can be a program name with args.
-set dummy iconv; ac_word=$2
+if test -z "$ac_cv_prog_CC"; then
+ ac_ct_CC=$CC
+ # Extract the first word of "gcc", so it can be a program name with args.
+set dummy gcc; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_INTLTOOL_ICONV+set}" = set; then
+if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- case $INTLTOOL_ICONV in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_INTLTOOL_ICONV="$INTLTOOL_ICONV" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ if test -n "$ac_ct_CC"; then
+ ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_INTLTOOL_ICONV="$as_dir/$ac_word$ac_exec_ext"
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CC="gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -2662,40 +2638,56 @@ done
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_INTLTOOL_ICONV" && ac_cv_path_INTLTOOL_ICONV="iconv"
- ;;
-esac
fi
-INTLTOOL_ICONV=$ac_cv_path_INTLTOOL_ICONV
-if test -n "$INTLTOOL_ICONV"; then
- { echo "$as_me:$LINENO: result: $INTLTOOL_ICONV" >&5
-echo "${ECHO_T}$INTLTOOL_ICONV" >&6; }
+fi
+ac_ct_CC=$ac_cv_prog_ac_ct_CC
+if test -n "$ac_ct_CC"; then
+ { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
+echo "${ECHO_T}$ac_ct_CC" >&6; }
else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
fi
+ if test "x$ac_ct_CC" = x; then
+ CC=""
+ else
+ case $cross_compiling:$ac_tool_warned in
+yes:)
+{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf gnu org " >&5
+echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
+whose name does not start with the host triplet. If you think this
+configuration is useful to you, please write to autoconf gnu org " >&2;}
+ac_tool_warned=yes ;;
+esac
+ CC=$ac_ct_CC
+ fi
+else
+ CC="$ac_cv_prog_CC"
+fi
-# Extract the first word of "msgfmt", so it can be a program name with args.
-set dummy msgfmt; ac_word=$2
+if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
+set dummy ${ac_tool_prefix}cc; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_INTLTOOL_MSGFMT+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- case $INTLTOOL_MSGFMT in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_INTLTOOL_MSGFMT="$INTLTOOL_MSGFMT" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_INTLTOOL_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="${ac_tool_prefix}cc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -2703,81 +2695,44 @@ done
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_INTLTOOL_MSGFMT" && ac_cv_path_INTLTOOL_MSGFMT="msgfmt"
- ;;
-esac
fi
-INTLTOOL_MSGFMT=$ac_cv_path_INTLTOOL_MSGFMT
-if test -n "$INTLTOOL_MSGFMT"; then
- { echo "$as_me:$LINENO: result: $INTLTOOL_MSGFMT" >&5
-echo "${ECHO_T}$INTLTOOL_MSGFMT" >&6; }
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
fi
-# Extract the first word of "msgmerge", so it can be a program name with args.
-set dummy msgmerge; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_INTLTOOL_MSGMERGE+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- case $INTLTOOL_MSGMERGE in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_INTLTOOL_MSGMERGE="$INTLTOOL_MSGMERGE" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_INTLTOOL_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
fi
-done
-done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_INTLTOOL_MSGMERGE" && ac_cv_path_INTLTOOL_MSGMERGE="msgmerge"
- ;;
-esac
-fi
-INTLTOOL_MSGMERGE=$ac_cv_path_INTLTOOL_MSGMERGE
-if test -n "$INTLTOOL_MSGMERGE"; then
- { echo "$as_me:$LINENO: result: $INTLTOOL_MSGMERGE" >&5
-echo "${ECHO_T}$INTLTOOL_MSGMERGE" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
fi
-
-
-# Extract the first word of "xgettext", so it can be a program name with args.
-set dummy xgettext; ac_word=$2
+if test -z "$CC"; then
+ # Extract the first word of "cc", so it can be a program name with args.
+set dummy cc; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_path_INTLTOOL_XGETTEXT+set}" = set; then
+if test "${ac_cv_prog_CC+set}" = set; then
echo $ECHO_N "(cached) $ECHO_C" >&6
else
- case $INTLTOOL_XGETTEXT in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_INTLTOOL_XGETTEXT="$INTLTOOL_XGETTEXT" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+ if test -n "$CC"; then
+ ac_cv_prog_CC="$CC" # Let the user override the test.
+else
+ ac_prog_rejected=no
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
for as_dir in $PATH
do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_path_INTLTOOL_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
+ ac_prog_rejected=yes
+ continue
+ fi
+ ac_cv_prog_CC="cc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -2785,105 +2740,37 @@ done
done
IFS=$as_save_IFS
- test -z "$ac_cv_path_INTLTOOL_XGETTEXT" && ac_cv_path_INTLTOOL_XGETTEXT="xgettext"
- ;;
-esac
+if test $ac_prog_rejected = yes; then
+ # We found a bogon in the path, so make sure we never use it.
+ set dummy $ac_cv_prog_CC
+ shift
+ if test $# != 0; then
+ # We chose a different compiler from the bogus one.
+ # However, it has the same basename, so the bogon will be chosen
+ # first if we set CC to just the basename; use the full file name.
+ shift
+ ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
+ fi
fi
-INTLTOOL_XGETTEXT=$ac_cv_path_INTLTOOL_XGETTEXT
-if test -n "$INTLTOOL_XGETTEXT"; then
- { echo "$as_me:$LINENO: result: $INTLTOOL_XGETTEXT" >&5
-echo "${ECHO_T}$INTLTOOL_XGETTEXT" >&6; }
+fi
+fi
+CC=$ac_cv_prog_CC
+if test -n "$CC"; then
+ { echo "$as_me:$LINENO: result: $CC" >&5
+echo "${ECHO_T}$CC" >&6; }
else
{ echo "$as_me:$LINENO: result: no" >&5
echo "${ECHO_T}no" >&6; }
fi
-
-# Substitute ALL_LINGUAS so we can use it in po/Makefile
-
-
-
-
-
-ac_config_commands="$ac_config_commands intltool"
-
-
-
-
-DEPDIR="${am__leading_dot}deps"
-
-ac_config_commands="$ac_config_commands depfiles"
-
-
-am_make=${MAKE-make}
-cat > confinc << 'END'
-am__doit:
- @echo done
-.PHONY: am__doit
-END
-# If we don't find an include directive, just comment out the code.
-{ echo "$as_me:$LINENO: checking for style of include used by $am_make" >&5
-echo $ECHO_N "checking for style of include used by $am_make... $ECHO_C" >&6; }
-am__include="#"
-am__quote=
-_am_result=none
-# First try GNU make style include.
-echo "include confinc" > confmf
-# We grep out `Entering directory' and `Leaving directory'
-# messages which can occur if `w' ends up in MAKEFLAGS.
-# In particular we don't look at `^make:' because GNU make might
-# be invoked under some other name (usually "gmake"), in which
-# case it prints its new name instead of `make'.
-if test "`$am_make -s -f confmf 2> /dev/null | grep -v 'ing directory'`" = "done"; then
- am__include=include
- am__quote=
- _am_result=GNU
-fi
-# Now try BSD make style include.
-if test "$am__include" = "#"; then
- echo '.include "confinc"' > confmf
- if test "`$am_make -s -f confmf 2> /dev/null`" = "done"; then
- am__include=.include
- am__quote="\""
- _am_result=BSD
- fi
-fi
-
-
-{ echo "$as_me:$LINENO: result: $_am_result" >&5
-echo "${ECHO_T}$_am_result" >&6; }
-rm -f confinc confmf
-
-# Check whether --enable-dependency-tracking was given.
-if test "${enable_dependency_tracking+set}" = set; then
- enableval=$enable_dependency_tracking;
-fi
-
-if test "x$enable_dependency_tracking" != xno; then
- am_depcomp="$ac_aux_dir/depcomp"
- AMDEPBACKSLASH='\'
-fi
-
-
-if test "x$enable_dependency_tracking" != xno; then
- AMDEP_TRUE=
- AMDEP_FALSE='#'
-else
- AMDEP_TRUE='#'
- AMDEP_FALSE=
fi
-
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}gcc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}gcc; ac_word=$2
+if test -z "$CC"; then
+ if test -n "$ac_tool_prefix"; then
+ for ac_prog in cl.exe
+ do
+ # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_CC+set}" = set; then
@@ -2898,8 +2785,8 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}gcc"
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -2919,11 +2806,15 @@ echo "${ECHO_T}no" >&6; }
fi
+ test -n "$CC" && break
+ done
fi
-if test -z "$ac_cv_prog_CC"; then
+if test -z "$CC"; then
ac_ct_CC=$CC
- # Extract the first word of "gcc", so it can be a program name with args.
-set dummy gcc; ac_word=$2
+ for ac_prog in cl.exe
+do
+ # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
@@ -2938,8 +2829,8 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="gcc"
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_prog_ac_ct_CC="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
fi
@@ -2958,210 +2849,10 @@ else
echo "${ECHO_T}no" >&6; }
fi
- if test "x$ac_ct_CC" = x; then
- CC=""
- else
- case $cross_compiling:$ac_tool_warned in
-yes:)
-{ echo "$as_me:$LINENO: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf gnu org " >&5
-echo "$as_me: WARNING: In the future, Autoconf will not detect cross-tools
-whose name does not start with the host triplet. If you think this
-configuration is useful to you, please write to autoconf gnu org " >&2;}
-ac_tool_warned=yes ;;
-esac
- CC=$ac_ct_CC
- fi
-else
- CC="$ac_cv_prog_CC"
-fi
-
-if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- # Extract the first word of "${ac_tool_prefix}cc", so it can be a program name with args.
-set dummy ${ac_tool_prefix}cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="${ac_tool_prefix}cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
- fi
-fi
-if test -z "$CC"; then
- # Extract the first word of "cc", so it can be a program name with args.
-set dummy cc; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
- ac_prog_rejected=no
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
- if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
- ac_prog_rejected=yes
- continue
- fi
- ac_cv_prog_CC="cc"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-if test $ac_prog_rejected = yes; then
- # We found a bogon in the path, so make sure we never use it.
- set dummy $ac_cv_prog_CC
- shift
- if test $# != 0; then
- # We chose a different compiler from the bogus one.
- # However, it has the same basename, so the bogon will be chosen
- # first if we set CC to just the basename; use the full file name.
- shift
- ac_cv_prog_CC="$as_dir/$ac_word${1+' '}$@"
- fi
-fi
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
-fi
-if test -z "$CC"; then
- if test -n "$ac_tool_prefix"; then
- for ac_prog in cl.exe
- do
- # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$CC"; then
- ac_cv_prog_CC="$CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-CC=$ac_cv_prog_CC
-if test -n "$CC"; then
- { echo "$as_me:$LINENO: result: $CC" >&5
-echo "${ECHO_T}$CC" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
- test -n "$CC" && break
- done
-fi
-if test -z "$CC"; then
- ac_ct_CC=$CC
- for ac_prog in cl.exe
-do
- # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ echo "$as_me:$LINENO: checking for $ac_word" >&5
-echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
-else
- if test -n "$ac_ct_CC"; then
- ac_cv_prog_ac_ct_CC="$ac_ct_CC" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
- ac_cv_prog_ac_ct_CC="$ac_prog"
- echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
-done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CC=$ac_cv_prog_ac_ct_CC
-if test -n "$ac_ct_CC"; then
- { echo "$as_me:$LINENO: result: $ac_ct_CC" >&5
-echo "${ECHO_T}$ac_ct_CC" >&6; }
-else
- { echo "$as_me:$LINENO: result: no" >&5
-echo "${ECHO_T}no" >&6; }
-fi
-
-
- test -n "$ac_ct_CC" && break
-done
-
+
+ test -n "$ac_ct_CC" && break
+done
+
if test "x$ac_ct_CC" = x; then
CC=""
else
@@ -3279,7 +2970,7 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
# in a Makefile. We should not override ac_cv_exeext if it was cached,
# so that the user can short-circuit this test for compilers unknown to
# Autoconf.
-for ac_file in $ac_files
+for ac_file in $ac_files ''
do
test -f "$ac_file" || continue
case $ac_file in
@@ -3307,6 +2998,12 @@ done
test "$ac_cv_exeext" = no && ac_cv_exeext=
else
+ ac_file=''
+fi
+
+{ echo "$as_me:$LINENO: result: $ac_file" >&5
+echo "${ECHO_T}$ac_file" >&6; }
+if test -z "$ac_file"; then
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
@@ -3318,8 +3015,6 @@ See \`config.log' for more details." >&2
fi
ac_exeext=$ac_cv_exeext
-{ echo "$as_me:$LINENO: result: $ac_file" >&5
-echo "${ECHO_T}$ac_file" >&6; }
# Check that the compiler produces executables we can run. If not, either
# the compiler is broken, or we cross compile.
@@ -3497,27 +3192,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
@@ -3572,27 +3250,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
@@ -3627,27 +3288,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
:
else
echo "$as_me: failed program was:" >&5
@@ -3683,27 +3327,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
@@ -3774,215 +3401,653 @@ static char *f (char * (*g) (char **, in
return s;
}
-/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
- function prototypes and stuff, but not '\xHH' hex character constants.
- These don't provoke an error unfortunately, instead are silently treated
- as 'x'. The following induces an error, until -std is added to get
- proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
- array size at least. It's necessary to write '\x00'==0 to get something
- that's true only with -std. */
-int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+/* OSF 4.0 Compaq cc is some sort of almost-ANSI by default. It has
+ function prototypes and stuff, but not '\xHH' hex character constants.
+ These don't provoke an error unfortunately, instead are silently treated
+ as 'x'. The following induces an error, until -std is added to get
+ proper ANSI mode. Curiously '\x00'!='x' always comes out true, for an
+ array size at least. It's necessary to write '\x00'==0 to get something
+ that's true only with -std. */
+int osf4_cc_array ['\x00' == 0 ? 1 : -1];
+
+/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
+ inside strings and character constants. */
+#define FOO(x) 'x'
+int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+
+int test (int i, double x);
+struct s1 {int (*f) (int a);};
+struct s2 {int (*f) (double a);};
+int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
+int argc;
+char **argv;
+int
+main ()
+{
+return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
+ ;
+ return 0;
+}
+_ACEOF
+for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
+ -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
+do
+ CC="$ac_save_CC $ac_arg"
+ rm -f conftest.$ac_objext
+if { (ac_try="$ac_compile"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_compile") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
+ ac_cv_prog_cc_c89=$ac_arg
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+
+fi
+
+rm -f core conftest.err conftest.$ac_objext
+ test "x$ac_cv_prog_cc_c89" != "xno" && break
+done
+rm -f conftest.$ac_ext
+CC=$ac_save_CC
+
+fi
+# AC_CACHE_VAL
+case "x$ac_cv_prog_cc_c89" in
+ x)
+ { echo "$as_me:$LINENO: result: none needed" >&5
+echo "${ECHO_T}none needed" >&6; } ;;
+ xno)
+ { echo "$as_me:$LINENO: result: unsupported" >&5
+echo "${ECHO_T}unsupported" >&6; } ;;
+ *)
+ CC="$CC $ac_cv_prog_cc_c89"
+ { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
+echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
+esac
+
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+depcc="$CC" am_compiler_list=
+
+{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
+echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
+if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
+ # We make a subdir and do the tests there. Otherwise we can end up
+ # making bogus files that we don't know about and never remove. For
+ # instance it was reported that on HP-UX the gcc test will end up
+ # making a dummy file named `D' -- because `-MD' means `put the output
+ # in D'.
+ mkdir conftest.dir
+ # Copy depcomp to subdir because otherwise we won't find it if we're
+ # using a relative directory.
+ cp "$am_depcomp" conftest.dir
+ cd conftest.dir
+ # We will build objects and dependencies in a subdirectory because
+ # it helps to detect inapplicable dependency modes. For instance
+ # both Tru64's cc and ICC support -MD to output dependencies as a
+ # side effect of compilation, but ICC will put the dependencies in
+ # the current directory while Tru64 will put them in the object
+ # directory.
+ mkdir sub
+
+ am_cv_CC_dependencies_compiler_type=none
+ if test "$am_compiler_list" = ""; then
+ am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
+ fi
+ for depmode in $am_compiler_list; do
+ # Setup a source with many dependencies, because some compilers
+ # like to wrap large dependency lists on column 80 (with \), and
+ # we should not choose a depcomp mode which is confused by this.
+ #
+ # We need to recreate these files for each test, as the compiler may
+ # overwrite some of them when testing with obscure command lines.
+ # This happens at least with the AIX C compiler.
+ : > sub/conftest.c
+ for i in 1 2 3 4 5 6; do
+ echo '#include "conftst'$i'.h"' >> sub/conftest.c
+ # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
+ # Solaris 8's {/usr,}/bin/sh.
+ touch sub/conftst$i.h
+ done
+ echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+
+ case $depmode in
+ nosideeffect)
+ # after this tag, mechanisms are not by side-effect, so they'll
+ # only be used when explicitly requested
+ if test "x$enable_dependency_tracking" = xyes; then
+ continue
+ else
+ break
+ fi
+ ;;
+ none) break ;;
+ esac
+ # We check with `-c' and `-o' for the sake of the "dashmstdout"
+ # mode. It turns out that the SunPro C++ compiler does not properly
+ # handle `-M -o', and we need to detect this.
+ if depmode=$depmode \
+ source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
+ depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
+ $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
+ >/dev/null 2>conftest.err &&
+ grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
+ grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
+ ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
+ # icc doesn't choke on unknown options, it will just issue warnings
+ # or remarks (even with -Werror). So we grep stderr for any message
+ # that says an option was ignored or not supported.
+ # When given -MP, icc 7.0 and 7.1 complain thusly:
+ # icc: Command line warning: ignoring option '-M'; no argument required
+ # The diagnosis changed in icc 8.0:
+ # icc: Command line remark: option '-MP' not supported
+ if (grep 'ignoring option' conftest.err ||
+ grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
+ am_cv_CC_dependencies_compiler_type=$depmode
+ break
+ fi
+ fi
+ done
+
+ cd ..
+ rm -rf conftest.dir
+else
+ am_cv_CC_dependencies_compiler_type=none
+fi
+
+fi
+{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
+echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
+CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
+
+
+
+if
+ test "x$enable_dependency_tracking" != xno \
+ && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
+ am__fastdepCC_TRUE=
+ am__fastdepCC_FALSE='#'
+else
+ am__fastdepCC_TRUE='#'
+ am__fastdepCC_FALSE=
+fi
+
+
+
+
+case "$am__api_version" in
+ 1.01234)
+ { { echo "$as_me:$LINENO: error: Automake 1.5 or newer is required to use intltool" >&5
+echo "$as_me: error: Automake 1.5 or newer is required to use intltool" >&2;}
+ { (exit 1); exit 1; }; }
+ ;;
+ *)
+ ;;
+esac
+
+if test -n "0.35.0"; then
+ { echo "$as_me:$LINENO: checking for intltool >= 0.35.0" >&5
+echo $ECHO_N "checking for intltool >= 0.35.0... $ECHO_C" >&6; }
+
+ INTLTOOL_REQUIRED_VERSION_AS_INT=`echo 0.35.0 | awk -F. '{ print $ 1 * 1000 + $ 2 * 100 + $ 3; }'`
+ INTLTOOL_APPLIED_VERSION=`awk -F\" '/\\$VERSION / { print $ 2; }' ${ac_aux_dir}/intltool-update.in`
+ INTLTOOL_APPLIED_VERSION_AS_INT=`awk -F\" '/\\$VERSION / { split($ 2, VERSION, "."); print VERSION[1] * 1000 + VERSION[2] * 100 + VERSION[3];}' ${ac_aux_dir}/intltool-update.in`
+
+ { echo "$as_me:$LINENO: result: $INTLTOOL_APPLIED_VERSION found" >&5
+echo "${ECHO_T}$INTLTOOL_APPLIED_VERSION found" >&6; }
+ test "$INTLTOOL_APPLIED_VERSION_AS_INT" -ge "$INTLTOOL_REQUIRED_VERSION_AS_INT" ||
+ { { echo "$as_me:$LINENO: error: Your intltool is too old. You need intltool 0.35.0 or later." >&5
+echo "$as_me: error: Your intltool is too old. You need intltool 0.35.0 or later." >&2;}
+ { (exit 1); exit 1; }; }
+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_XML_NOMERGE_RULE='%.xml: %.xml.in $(INTLTOOL_MERGE) ; LC_ALL=C $(INTLTOOL_MERGE) -x -u /tmp $< $@'
+ 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 $< $@'
+ INTLTOOL_SERVICE_RULE='%.service: %.service.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 $< $@'
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+# 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'
+
+
+# Extract the first word of "perl", so it can be a program name with args.
+set dummy perl; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_INTLTOOL_PERL+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $INTLTOOL_PERL in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_INTLTOOL_PERL="$INTLTOOL_PERL" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_INTLTOOL_PERL="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ ;;
+esac
+fi
+INTLTOOL_PERL=$ac_cv_path_INTLTOOL_PERL
+if test -n "$INTLTOOL_PERL"; then
+ { echo "$as_me:$LINENO: result: $INTLTOOL_PERL" >&5
+echo "${ECHO_T}$INTLTOOL_PERL" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+if test -z "$INTLTOOL_PERL"; then
+ { { echo "$as_me:$LINENO: error: perl not found; required for intltool" >&5
+echo "$as_me: error: perl not found; required for intltool" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test -z "`$INTLTOOL_PERL -v | fgrep '5.' 2> /dev/null`"; then
+ { { echo "$as_me:$LINENO: error: perl 5.x required for intltool" >&5
+echo "$as_me: error: perl 5.x required for intltool" >&2;}
+ { (exit 1); exit 1; }; }
+fi
+if test "x" != "xno-xml"; then
+ { echo "$as_me:$LINENO: checking for XML::Parser" >&5
+echo $ECHO_N "checking for XML::Parser... $ECHO_C" >&6; }
+ if `$INTLTOOL_PERL -e "require XML::Parser" 2>/dev/null`; then
+ { echo "$as_me:$LINENO: result: ok" >&5
+echo "${ECHO_T}ok" >&6; }
+ else
+ { { echo "$as_me:$LINENO: error: XML::Parser perl module is required for intltool" >&5
+echo "$as_me: error: XML::Parser perl module is required for intltool" >&2;}
+ { (exit 1); exit 1; }; }
+ fi
+fi
+
+# Extract the first word of "iconv", so it can be a program name with args.
+set dummy iconv; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_INTLTOOL_ICONV+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $INTLTOOL_ICONV in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_INTLTOOL_ICONV="$INTLTOOL_ICONV" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_INTLTOOL_ICONV="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_INTLTOOL_ICONV" && ac_cv_path_INTLTOOL_ICONV="iconv"
+ ;;
+esac
+fi
+INTLTOOL_ICONV=$ac_cv_path_INTLTOOL_ICONV
+if test -n "$INTLTOOL_ICONV"; then
+ { echo "$as_me:$LINENO: result: $INTLTOOL_ICONV" >&5
+echo "${ECHO_T}$INTLTOOL_ICONV" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+# Extract the first word of "msgfmt", so it can be a program name with args.
+set dummy msgfmt; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_INTLTOOL_MSGFMT+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $INTLTOOL_MSGFMT in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_INTLTOOL_MSGFMT="$INTLTOOL_MSGFMT" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_INTLTOOL_MSGFMT="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_INTLTOOL_MSGFMT" && ac_cv_path_INTLTOOL_MSGFMT="msgfmt"
+ ;;
+esac
+fi
+INTLTOOL_MSGFMT=$ac_cv_path_INTLTOOL_MSGFMT
+if test -n "$INTLTOOL_MSGFMT"; then
+ { echo "$as_me:$LINENO: result: $INTLTOOL_MSGFMT" >&5
+echo "${ECHO_T}$INTLTOOL_MSGFMT" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+# Extract the first word of "msgmerge", so it can be a program name with args.
+set dummy msgmerge; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_INTLTOOL_MSGMERGE+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $INTLTOOL_MSGMERGE in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_INTLTOOL_MSGMERGE="$INTLTOOL_MSGMERGE" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_INTLTOOL_MSGMERGE="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_INTLTOOL_MSGMERGE" && ac_cv_path_INTLTOOL_MSGMERGE="msgmerge"
+ ;;
+esac
+fi
+INTLTOOL_MSGMERGE=$ac_cv_path_INTLTOOL_MSGMERGE
+if test -n "$INTLTOOL_MSGMERGE"; then
+ { echo "$as_me:$LINENO: result: $INTLTOOL_MSGMERGE" >&5
+echo "${ECHO_T}$INTLTOOL_MSGMERGE" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+# Extract the first word of "xgettext", so it can be a program name with args.
+set dummy xgettext; ac_word=$2
+{ echo "$as_me:$LINENO: checking for $ac_word" >&5
+echo $ECHO_N "checking for $ac_word... $ECHO_C" >&6; }
+if test "${ac_cv_path_INTLTOOL_XGETTEXT+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ case $INTLTOOL_XGETTEXT in
+ [\\/]* | ?:[\\/]*)
+ ac_cv_path_INTLTOOL_XGETTEXT="$INTLTOOL_XGETTEXT" # Let the user override the test with a path.
+ ;;
+ *)
+ as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+ IFS=$as_save_IFS
+ test -z "$as_dir" && as_dir=.
+ for ac_exec_ext in '' $ac_executable_extensions; do
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+ ac_cv_path_INTLTOOL_XGETTEXT="$as_dir/$ac_word$ac_exec_ext"
+ echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
+ break 2
+ fi
+done
+done
+IFS=$as_save_IFS
+
+ test -z "$ac_cv_path_INTLTOOL_XGETTEXT" && ac_cv_path_INTLTOOL_XGETTEXT="xgettext"
+ ;;
+esac
+fi
+INTLTOOL_XGETTEXT=$ac_cv_path_INTLTOOL_XGETTEXT
+if test -n "$INTLTOOL_XGETTEXT"; then
+ { echo "$as_me:$LINENO: result: $INTLTOOL_XGETTEXT" >&5
+echo "${ECHO_T}$INTLTOOL_XGETTEXT" >&6; }
+else
+ { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+fi
+
+
+
+# Substitute ALL_LINGUAS so we can use it in po/Makefile
+
+
+# Set DATADIRNAME correctly if it is not set yet
+# (copied from glib-gettext.m4)
+if test -z "$DATADIRNAME"; then
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+
+int
+main ()
+{
+extern int _nl_msg_cat_cntr;
+ return _nl_msg_cat_cntr
+ ;
+ return 0;
+}
+_ACEOF
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
+ *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
+ *) ac_try_echo=$ac_try;;
+esac
+eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
+ (eval "$ac_link") 2>conftest.er1
+ ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ DATADIRNAME=share
+else
+ echo "$as_me: failed program was:" >&5
+sed 's/^/| /' conftest.$ac_ext >&5
+
+ case $host in
+ *-*-solaris*)
+ { echo "$as_me:$LINENO: checking for bind_textdomain_codeset" >&5
+echo $ECHO_N "checking for bind_textdomain_codeset... $ECHO_C" >&6; }
+if test "${ac_cv_func_bind_textdomain_codeset+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+else
+ cat >conftest.$ac_ext <<_ACEOF
+/* confdefs.h. */
+_ACEOF
+cat confdefs.h >>conftest.$ac_ext
+cat >>conftest.$ac_ext <<_ACEOF
+/* end confdefs.h. */
+/* Define bind_textdomain_codeset to an innocuous variant, in case <limits.h> declares bind_textdomain_codeset.
+ For example, HP-UX 11i <limits.h> declares gettimeofday. */
+#define bind_textdomain_codeset innocuous_bind_textdomain_codeset
+
+/* System header to define __stub macros and hopefully few prototypes,
+ which can conflict with char bind_textdomain_codeset (); below.
+ Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+ <limits.h> exists even on freestanding compilers. */
+
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+
+#undef bind_textdomain_codeset
-/* IBM C 6 for AIX is almost-ANSI by default, but it replaces macro parameters
- inside strings and character constants. */
-#define FOO(x) 'x'
-int xlc6_cc_array[FOO(a) == 'x' ? 1 : -1];
+/* Override any GCC internal prototype to avoid an error.
+ Use char because int might match the return type of a GCC
+ builtin and then its argument prototype would still apply. */
+#ifdef __cplusplus
+extern "C"
+#endif
+char bind_textdomain_codeset ();
+/* The GNU C library defines this for functions which it implements
+ to always fail with ENOSYS. Some functions are actually named
+ something starting with __ and the normal name is an alias. */
+#if defined __stub_bind_textdomain_codeset || defined __stub___bind_textdomain_codeset
+choke me
+#endif
-int test (int i, double x);
-struct s1 {int (*f) (int a);};
-struct s2 {int (*f) (double a);};
-int pairnames (int, char **, FILE *(*)(struct buf *, struct stat *, int), int, int);
-int argc;
-char **argv;
int
main ()
{
-return f (e, argv, 0) != argv[0] || f (e, argv, 1) != argv[1];
+return bind_textdomain_codeset ();
;
return 0;
}
_ACEOF
-for ac_arg in '' -qlanglvl=extc89 -qlanglvl=ansi -std \
- -Ae "-Aa -D_HPUX_SOURCE" "-Xc -D__EXTENSIONS__"
-do
- CC="$ac_save_CC $ac_arg"
- rm -f conftest.$ac_objext
-if { (ac_try="$ac_compile"
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_compile") 2>conftest.er1
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
- ac_cv_prog_cc_c89=$ac_arg
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
+ ac_cv_func_bind_textdomain_codeset=yes
else
echo "$as_me: failed program was:" >&5
sed 's/^/| /' conftest.$ac_ext >&5
-
+ ac_cv_func_bind_textdomain_codeset=no
fi
-rm -f core conftest.err conftest.$ac_objext
- test "x$ac_cv_prog_cc_c89" != "xno" && break
-done
-rm -f conftest.$ac_ext
-CC=$ac_save_CC
-
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
fi
-# AC_CACHE_VAL
-case "x$ac_cv_prog_cc_c89" in
- x)
- { echo "$as_me:$LINENO: result: none needed" >&5
-echo "${ECHO_T}none needed" >&6; } ;;
- xno)
- { echo "$as_me:$LINENO: result: unsupported" >&5
-echo "${ECHO_T}unsupported" >&6; } ;;
- *)
- CC="$CC $ac_cv_prog_cc_c89"
- { echo "$as_me:$LINENO: result: $ac_cv_prog_cc_c89" >&5
-echo "${ECHO_T}$ac_cv_prog_cc_c89" >&6; } ;;
-esac
-
-
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-depcc="$CC" am_compiler_list=
-
-{ echo "$as_me:$LINENO: checking dependency style of $depcc" >&5
-echo $ECHO_N "checking dependency style of $depcc... $ECHO_C" >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
+{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
+echo "${ECHO_T}$ac_cv_func_bind_textdomain_codeset" >&6; }
+if test $ac_cv_func_bind_textdomain_codeset = yes; then
+ DATADIRNAME=share
else
- if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
- # We make a subdir and do the tests there. Otherwise we can end up
- # making bogus files that we don't know about and never remove. For
- # instance it was reported that on HP-UX the gcc test will end up
- # making a dummy file named `D' -- because `-MD' means `put the output
- # in D'.
- mkdir conftest.dir
- # Copy depcomp to subdir because otherwise we won't find it if we're
- # using a relative directory.
- cp "$am_depcomp" conftest.dir
- cd conftest.dir
- # We will build objects and dependencies in a subdirectory because
- # it helps to detect inapplicable dependency modes. For instance
- # both Tru64's cc and ICC support -MD to output dependencies as a
- # side effect of compilation, but ICC will put the dependencies in
- # the current directory while Tru64 will put them in the object
- # directory.
- mkdir sub
-
- am_cv_CC_dependencies_compiler_type=none
- if test "$am_compiler_list" = ""; then
- am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
- fi
- for depmode in $am_compiler_list; do
- # Setup a source with many dependencies, because some compilers
- # like to wrap large dependency lists on column 80 (with \), and
- # we should not choose a depcomp mode which is confused by this.
- #
- # We need to recreate these files for each test, as the compiler may
- # overwrite some of them when testing with obscure command lines.
- # This happens at least with the AIX C compiler.
- : > sub/conftest.c
- for i in 1 2 3 4 5 6; do
- echo '#include "conftst'$i'.h"' >> sub/conftest.c
- # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
- # Solaris 8's {/usr,}/bin/sh.
- touch sub/conftst$i.h
- done
- echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
+ DATADIRNAME=lib
+fi
- case $depmode in
- nosideeffect)
- # after this tag, mechanisms are not by side-effect, so they'll
- # only be used when explicitly requested
- if test "x$enable_dependency_tracking" = xyes; then
- continue
- else
- break
- fi
- ;;
- none) break ;;
+ ;;
+ *)
+ DATADIRNAME=lib
+ ;;
esac
- # We check with `-c' and `-o' for the sake of the "dashmstdout"
- # mode. It turns out that the SunPro C++ compiler does not properly
- # handle `-M -o', and we need to detect this.
- if depmode=$depmode \
- source=sub/conftest.c object=sub/conftest.${OBJEXT-o} \
- depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
- $SHELL ./depcomp $depcc -c -o sub/conftest.${OBJEXT-o} sub/conftest.c \
- >/dev/null 2>conftest.err &&
- grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
- grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
- ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
- # icc doesn't choke on unknown options, it will just issue warnings
- # or remarks (even with -Werror). So we grep stderr for any message
- # that says an option was ignored or not supported.
- # When given -MP, icc 7.0 and 7.1 complain thusly:
- # icc: Command line warning: ignoring option '-M'; no argument required
- # The diagnosis changed in icc 8.0:
- # icc: Command line remark: option '-MP' not supported
- if (grep 'ignoring option' conftest.err ||
- grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
- am_cv_CC_dependencies_compiler_type=$depmode
- break
- fi
- fi
- done
-
- cd ..
- rm -rf conftest.dir
-else
- am_cv_CC_dependencies_compiler_type=none
fi
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
+ conftest$ac_exeext conftest.$ac_ext
fi
-{ echo "$as_me:$LINENO: result: $am_cv_CC_dependencies_compiler_type" >&5
-echo "${ECHO_T}$am_cv_CC_dependencies_compiler_type" >&6; }
-CCDEPMODE=depmode=$am_cv_CC_dependencies_compiler_type
-if
- test "x$enable_dependency_tracking" != xno \
- && test "$am_cv_CC_dependencies_compiler_type" = gcc3; then
- am__fastdepCC_TRUE=
- am__fastdepCC_FALSE='#'
-else
- am__fastdepCC_TRUE='#'
- am__fastdepCC_FALSE=
-fi
+
+
+ac_config_commands="$ac_config_commands intltool"
+
@@ -4034,27 +4099,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_search_strerror=$ac_res
else
echo "$as_me: failed program was:" >&5
@@ -4063,7 +4112,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext
if test "${ac_cv_search_strerror+set}" = set; then
break
@@ -4107,7 +4156,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4147,7 +4196,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="gcc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4204,7 +4253,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="${ac_tool_prefix}cc"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4245,7 +4294,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
ac_prog_rejected=yes
continue
@@ -4303,7 +4352,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4347,7 +4396,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CC="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -4467,27 +4516,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
@@ -4542,27 +4574,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
@@ -4597,27 +4612,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
:
else
echo "$as_me: failed program was:" >&5
@@ -4653,27 +4651,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_prog_cc_g=yes
else
echo "$as_me: failed program was:" >&5
@@ -4789,27 +4770,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_prog_cc_c89=$ac_arg
else
echo "$as_me: failed program was:" >&5
@@ -5007,17 +4971,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
:
else
echo "$as_me: failed program was:" >&5
@@ -5051,17 +5008,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
# Broken: success on invalid input.
continue
else
@@ -5126,17 +5076,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
:
else
echo "$as_me: failed program was:" >&5
@@ -5170,17 +5113,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
# Broken: success on invalid input.
continue
else
@@ -5235,7 +5171,7 @@ do
for ac_prog in grep ggrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_GREP" && $as_executable_p "$ac_path_GREP"; } || continue
+ { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
# Check for GNU ac_path_GREP and select it if it is found.
# Check for GNU $ac_path_GREP
case `"$ac_path_GREP" --version 2>&1` in
@@ -5317,7 +5253,7 @@ do
for ac_prog in egrep; do
for ac_exec_ext in '' $ac_executable_extensions; do
ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
- { test -f "$ac_path_EGREP" && $as_executable_p "$ac_path_EGREP"; } || continue
+ { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
# Check for GNU ac_path_EGREP and select it if it is found.
# Check for GNU $ac_path_EGREP
case `"$ac_path_EGREP" --version 2>&1` in
@@ -5413,27 +5349,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_header_stdc=yes
else
echo "$as_me: failed program was:" >&5
@@ -5609,27 +5528,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
eval "$as_ac_Header=yes"
else
echo "$as_me: failed program was:" >&5
@@ -5692,27 +5594,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
@@ -5748,17 +5633,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
@@ -5862,27 +5740,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
@@ -5918,17 +5779,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
@@ -6629,7 +6483,7 @@ ia64-*-hpux*)
;;
*-*-irix6*)
# Find out which ABI we are using.
- echo '#line 6632 "configure"' > conftest.$ac_ext
+ echo '#line 6486 "configure"' > conftest.$ac_ext
if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
(eval $ac_compile) 2>&5
ac_status=$?
@@ -6753,27 +6607,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
lt_cv_cc_needs_belf=yes
else
echo "$as_me: failed program was:" >&5
@@ -6782,7 +6620,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
lt_cv_cc_needs_belf=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
ac_ext=c
ac_cpp='$CPP $CPPFLAGS'
@@ -6863,27 +6701,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
@@ -6919,17 +6740,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
@@ -7021,7 +6835,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7065,7 +6879,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_CXX="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7178,27 +6992,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
@@ -7253,27 +7050,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_prog_cxx_g=yes
else
echo "$as_me: failed program was:" >&5
@@ -7308,27 +7088,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
:
else
echo "$as_me: failed program was:" >&5
@@ -7364,27 +7127,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_prog_cxx_g=yes
else
echo "$as_me: failed program was:" >&5
@@ -7584,20 +7330,13 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
(eval "$ac_cpp conftest.$ac_ext") 2>conftest.er1
ac_status=$?
grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_cxx_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ rm -f conftest.er1
+ cat conftest.err >&5
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ }; then
:
else
echo "$as_me: failed program was:" >&5
@@ -7631,17 +7370,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_cxx_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ }; then
# Broken: success on invalid input.
continue
else
@@ -7706,17 +7438,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_cxx_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ }; then
:
else
echo "$as_me: failed program was:" >&5
@@ -7750,17 +7475,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_cxx_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_cxx_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_cxx_preproc_warn_flag$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ }; then
# Broken: success on invalid input.
continue
else
@@ -7801,7 +7519,7 @@ ac_compile='$F77 -c $FFLAGS conftest.$ac
ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
ac_compiler_gnu=$ac_cv_f77_compiler_gnu
if test -n "$ac_tool_prefix"; then
- for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
+ for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
do
# Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
set dummy $ac_tool_prefix$ac_prog; ac_word=$2
@@ -7819,7 +7537,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_F77="$ac_tool_prefix$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7845,7 +7563,7 @@ fi
fi
if test -z "$F77"; then
ac_ct_F77=$F77
- for ac_prog in g77 f77 xlf frt pgf77 cf77 fort77 fl32 af77 f90 xlf90 pgf90 pghpf epcf90 gfortran g95 f95 fort xlf95 ifort ifc efc pgf95 lf95 ftn
+ for ac_prog in g77 xlf f77 frt pgf77 cf77 fort77 fl32 af77 xlf90 f90 pgf90 pghpf epcf90 gfortran g95 xlf95 f95 fort ifort ifc efc pgf95 lf95 ftn
do
# Extract the first word of "$ac_prog", so it can be a program name with args.
set dummy $ac_prog; ac_word=$2
@@ -7863,7 +7581,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_F77="$ac_prog"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -7970,27 +7688,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_f77_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_compiler_gnu=yes
else
echo "$as_me: failed program was:" >&5
@@ -8033,27 +7734,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_f77_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_cv_prog_f77_g=yes
else
echo "$as_me: failed program was:" >&5
@@ -8508,7 +8192,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_AR="${ac_tool_prefix}ar"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8548,7 +8232,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_AR="ar"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8604,7 +8288,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8644,7 +8328,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_RANLIB="ranlib"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8700,7 +8384,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_STRIP="${ac_tool_prefix}strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -8740,7 +8424,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_prog_ac_ct_STRIP="strip"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -9057,11 +8741,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9060: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:8744: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9064: \$? = $ac_status" >&5
+ echo "$as_me:8748: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -9325,11 +9009,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9328: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9012: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:9332: \$? = $ac_status" >&5
+ echo "$as_me:9016: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -9429,11 +9113,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:9432: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:9116: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:9436: \$? = $ac_status" >&5
+ echo "$as_me:9120: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -9910,27 +9594,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
@@ -9944,7 +9612,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -9985,27 +9653,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
@@ -10019,7 +9671,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -11255,27 +10907,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_dl_dlopen=yes
else
echo "$as_me: failed program was:" >&5
@@ -11284,7 +10920,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_dl_dlopen=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -11366,27 +11002,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_func_shl_load=yes
else
echo "$as_me: failed program was:" >&5
@@ -11395,7 +11015,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_shl_load=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_shl_load" >&5
@@ -11445,27 +11065,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_dld_shl_load=yes
else
echo "$as_me: failed program was:" >&5
@@ -11474,7 +11078,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_dld_shl_load=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -11546,27 +11150,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_func_dlopen=yes
else
echo "$as_me: failed program was:" >&5
@@ -11575,7 +11163,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_dlopen=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_dlopen" >&5
@@ -11625,27 +11213,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_dl_dlopen=yes
else
echo "$as_me: failed program was:" >&5
@@ -11654,7 +11226,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_dl_dlopen=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -11705,27 +11277,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_svld_dlopen=yes
else
echo "$as_me: failed program was:" >&5
@@ -11734,7 +11290,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_svld_dlopen=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -11785,27 +11341,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_dld_dld_link=yes
else
echo "$as_me: failed program was:" >&5
@@ -11814,7 +11354,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_dld_dld_link=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -11870,7 +11410,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11873 "configure"
+#line 11413 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -11970,7 +11510,7 @@ else
lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
lt_status=$lt_dlunknown
cat > conftest.$ac_ext <<EOF
-#line 11973 "configure"
+#line 11513 "configure"
#include "confdefs.h"
#if HAVE_DLFCN_H
@@ -13057,27 +12597,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
@@ -13091,7 +12615,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -13133,27 +12657,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_cxx_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_cxx_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
@@ -13167,7 +12675,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -14338,11 +13846,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14341: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13849: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:14345: \$? = $ac_status" >&5
+ echo "$as_me:13853: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -14442,11 +13950,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:14445: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:13953: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:14449: \$? = $ac_status" >&5
+ echo "$as_me:13957: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16003,11 +15511,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16006: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15514: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:16010: \$? = $ac_status" >&5
+ echo "$as_me:15518: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -16107,11 +15615,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:16110: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:15618: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:16114: \$? = $ac_status" >&5
+ echo "$as_me:15622: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -16572,33 +16080,17 @@ case "(($ac_try" in
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_f77_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
@@ -16612,7 +16104,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -16643,27 +16135,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_f77_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_f77_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
@@ -16677,7 +16153,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -18326,11 +17802,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18329: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:17805: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18333: \$? = $ac_status" >&5
+ echo "$as_me:17809: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -18594,11 +18070,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18597: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18073: $lt_compile\"" >&5)
(eval "$lt_compile" 2>conftest.err)
ac_status=$?
cat conftest.err >&5
- echo "$as_me:18601: \$? = $ac_status" >&5
+ echo "$as_me:18077: \$? = $ac_status" >&5
if (exit $ac_status) && test -s "$ac_outfile"; then
# The compiler can only warn and ignore the option if not recognized
# So say no if there are warnings other than the usual output.
@@ -18698,11 +18174,11 @@ else
-e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
-e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
-e 's:$: $lt_compiler_flag:'`
- (eval echo "\"\$as_me:18701: $lt_compile\"" >&5)
+ (eval echo "\"\$as_me:18177: $lt_compile\"" >&5)
(eval "$lt_compile" 2>out/conftest.err)
ac_status=$?
cat out/conftest.err >&5
- echo "$as_me:18705: \$? = $ac_status" >&5
+ echo "$as_me:18181: \$? = $ac_status" >&5
if (exit $ac_status) && test -s out/conftest2.$ac_objext
then
# The compiler can only warn and ignore the option if not recognized
@@ -19179,27 +18655,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
@@ -19213,7 +18673,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -19254,27 +18714,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
}'`
@@ -19288,7 +18732,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
@@ -21446,27 +20890,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
has_option=yes
else
echo "$as_me: failed program was:" >&5
@@ -21561,7 +20988,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -21604,7 +21031,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -21671,16 +21098,19 @@ if test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED
libglade-2.0 >= \$LIBGLADE_REQUIRED
- gconf-2.0 >= \$GCONF_REQUIRED\"") >&5
+ gconf-2.0 >= \$GCONF_REQUIRED
+ gnome-doc-utils\"") >&5
($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED
libglade-2.0 >= $LIBGLADE_REQUIRED
- gconf-2.0 >= $GCONF_REQUIRED") 2>&5
+ gconf-2.0 >= $GCONF_REQUIRED
+ gnome-doc-utils") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_NETTOOL_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED
libglade-2.0 >= $LIBGLADE_REQUIRED
- gconf-2.0 >= $GCONF_REQUIRED" 2>/dev/null`
+ gconf-2.0 >= $GCONF_REQUIRED
+ gnome-doc-utils" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -21695,16 +21125,19 @@ if test -n "$PKG_CONFIG"; then
if test -n "$PKG_CONFIG" && \
{ (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED
libglade-2.0 >= \$LIBGLADE_REQUIRED
- gconf-2.0 >= \$GCONF_REQUIRED\"") >&5
+ gconf-2.0 >= \$GCONF_REQUIRED
+ gnome-doc-utils\"") >&5
($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED
libglade-2.0 >= $LIBGLADE_REQUIRED
- gconf-2.0 >= $GCONF_REQUIRED") 2>&5
+ gconf-2.0 >= $GCONF_REQUIRED
+ gnome-doc-utils") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
pkg_cv_NETTOOL_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED
libglade-2.0 >= $LIBGLADE_REQUIRED
- gconf-2.0 >= $GCONF_REQUIRED" 2>/dev/null`
+ gconf-2.0 >= $GCONF_REQUIRED
+ gnome-doc-utils" 2>/dev/null`
else
pkg_failed=yes
fi
@@ -21725,18 +21158,21 @@ fi
if test $_pkg_short_errors_supported = yes; then
NETTOOL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED
libglade-2.0 >= $LIBGLADE_REQUIRED
- gconf-2.0 >= $GCONF_REQUIRED"`
+ gconf-2.0 >= $GCONF_REQUIRED
+ gnome-doc-utils"`
else
NETTOOL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED
libglade-2.0 >= $LIBGLADE_REQUIRED
- gconf-2.0 >= $GCONF_REQUIRED"`
+ gconf-2.0 >= $GCONF_REQUIRED
+ gnome-doc-utils"`
fi
# Put the nasty error message in config.log where it belongs
echo "$NETTOOL_PKG_ERRORS" >&5
{ { echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED
libglade-2.0 >= $LIBGLADE_REQUIRED
- gconf-2.0 >= $GCONF_REQUIRED) were not met:
+ gconf-2.0 >= $GCONF_REQUIRED
+ gnome-doc-utils) were not met:
$NETTOOL_PKG_ERRORS
@@ -21749,7 +21185,8 @@ See the pkg-config man page for more det
" >&5
echo "$as_me: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED
libglade-2.0 >= $LIBGLADE_REQUIRED
- gconf-2.0 >= $GCONF_REQUIRED) were not met:
+ gconf-2.0 >= $GCONF_REQUIRED
+ gnome-doc-utils) were not met:
$NETTOOL_PKG_ERRORS
@@ -21840,27 +21277,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
@@ -21896,17 +21316,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
@@ -22004,27 +21417,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
am_cv_val_LC_MESSAGES=yes
else
echo "$as_me: failed program was:" >&5
@@ -22033,7 +21430,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
am_cv_val_LC_MESSAGES=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $am_cv_val_LC_MESSAGES" >&5
@@ -22046,7 +21443,7 @@ _ACEOF
fi
fi
- USE_NLS=yes
+ USE_NLS=yes
gt_cv_have_gettext=no
@@ -22089,27 +21486,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest.$ac_objext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest.$ac_objext; then
ac_header_compiler=yes
else
echo "$as_me: failed program was:" >&5
@@ -22145,17 +21525,10 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } >/dev/null; then
- if test -s conftest.err; then
- ac_cpp_err=$ac_c_preproc_warn_flag
- ac_cpp_err=$ac_cpp_err$ac_c_werror_flag
- else
- ac_cpp_err=
- fi
-else
- ac_cpp_err=yes
-fi
-if test -z "$ac_cpp_err"; then
+ (exit $ac_status); } >/dev/null && {
+ test -z "$ac_c_preproc_warn_flag$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ }; then
ac_header_preproc=yes
else
echo "$as_me: failed program was:" >&5
@@ -22251,27 +21624,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
gt_cv_func_ngettext_libc=yes
else
echo "$as_me: failed program was:" >&5
@@ -22280,7 +21637,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
gt_cv_func_ngettext_libc=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
@@ -22323,27 +21680,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
gt_cv_func_dgettext_libc=yes
else
echo "$as_me: failed program was:" >&5
@@ -22352,7 +21693,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
gt_cv_func_dgettext_libc=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
@@ -22428,27 +21769,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
@@ -22457,7 +21782,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
@@ -22522,27 +21847,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_intl_bindtextdomain=yes
else
echo "$as_me: failed program was:" >&5
@@ -22551,7 +21860,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_intl_bindtextdomain=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -22600,27 +21909,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_intl_ngettext=yes
else
echo "$as_me: failed program was:" >&5
@@ -22629,7 +21922,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_intl_ngettext=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -22678,27 +21971,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_intl_dgettext=yes
else
echo "$as_me: failed program was:" >&5
@@ -22707,7 +21984,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_intl_dgettext=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -22756,40 +22033,24 @@ return ngettext ();
return 0;
}
_ACEOF
-rm -f conftest.$ac_objext conftest$ac_exeext
-if { (ac_try="$ac_link"
-case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_link") 2>conftest.er1
- ac_status=$?
- grep -v '^ *+' conftest.er1 >conftest.err
- rm -f conftest.er1
- cat conftest.err >&5
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (case "(($ac_try" in
+rm -f conftest.$ac_objext conftest$ac_exeext
+if { (ac_try="$ac_link"
+case "(($ac_try" in
*\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
*) ac_try_echo=$ac_try;;
esac
eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
+ (eval "$ac_link") 2>conftest.er1
ac_status=$?
+ grep -v '^ *+' conftest.er1 >conftest.err
+ rm -f conftest.er1
+ cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_intl_ngettext=yes
else
echo "$as_me: failed program was:" >&5
@@ -22798,7 +22059,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_intl_ngettext=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -22847,27 +22108,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_lib_intl_dcgettext=yes
else
echo "$as_me: failed program was:" >&5
@@ -22876,7 +22121,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_lib_intl_dcgettext=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS=$ac_check_lib_save_LIBS
fi
@@ -22971,27 +22216,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
@@ -23000,7 +22229,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
@@ -23147,27 +22376,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
eval "$as_ac_var=yes"
else
echo "$as_me: failed program was:" >&5
@@ -23176,7 +22389,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
eval "$as_ac_var=no"
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
ac_res=`eval echo '${'$as_ac_var'}'`
@@ -23190,6 +22403,35 @@ _ACEOF
fi
done
+ MSGFMT_OPTS=
+ { echo "$as_me:$LINENO: checking if msgfmt accepts -c" >&5
+echo $ECHO_N "checking if msgfmt accepts -c... $ECHO_C" >&6; }
+ cat >conftest.foo <<_ACEOF
+
+msgid ""
+msgstr ""
+"Content-Type: text/plain; charset=UTF-8\n"
+"Project-Id-Version: test 1.0\n"
+"PO-Revision-Date: 2007-02-15 12:01+0100\n"
+"Last-Translator: test <foo bar xx>\n"
+"Language-Team: C <LL li org>\n"
+"MIME-Version: 1.0\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+_ACEOF
+if { (echo "$as_me:$LINENO: msgfmt -c -o /dev/null conftest.foo") >&5
+ (msgfmt -c -o /dev/null conftest.foo) 2>&5
+ ac_status=$?
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ MSGFMT_OPTS=-c; { echo "$as_me:$LINENO: result: yes" >&5
+echo "${ECHO_T}yes" >&6; }
+else { echo "$as_me:$LINENO: result: no" >&5
+echo "${ECHO_T}no" >&6; }
+echo "$as_me: failed input was:" >&5
+sed 's/^/| /' conftest.foo >&5
+fi
+
# Extract the first word of "gmsgfmt", so it can be a program name with args.
set dummy gmsgfmt; ac_word=$2
{ echo "$as_me:$LINENO: checking for $ac_word" >&5
@@ -23208,7 +22450,7 @@ do
IFS=$as_save_IFS
test -z "$as_dir" && as_dir=.
for ac_exec_ext in '' $ac_executable_extensions; do
- if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_executable_p "$as_dir/$ac_word$ac_exec_ext"; }; then
+ if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
ac_cv_path_GMSGFMT="$as_dir/$ac_word$ac_exec_ext"
echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5
break 2
@@ -23296,27 +22538,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
CATOBJEXT=.gmo
DATADIRNAME=share
else
@@ -23388,27 +22614,11 @@ eval "echo \"\$as_me:$LINENO: $ac_try_ec
rm -f conftest.er1
cat conftest.err >&5
echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); } &&
- { ac_try='test -z "$ac_c_werror_flag" || test ! -s conftest.err'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; } &&
- { ac_try='test -s conftest$ac_exeext'
- { (case "(($ac_try" in
- *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
- *) ac_try_echo=$ac_try;;
-esac
-eval "echo \"\$as_me:$LINENO: $ac_try_echo\"") >&5
- (eval "$ac_try") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; }; then
+ (exit $ac_status); } && {
+ test -z "$ac_c_werror_flag" ||
+ test ! -s conftest.err
+ } && test -s conftest$ac_exeext &&
+ $as_test_x conftest$ac_exeext; then
ac_cv_func_bind_textdomain_codeset=yes
else
echo "$as_me: failed program was:" >&5
@@ -23417,7 +22627,7 @@ sed 's/^/| /' conftest.$ac_ext >&5
ac_cv_func_bind_textdomain_codeset=no
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
fi
{ echo "$as_me:$LINENO: result: $ac_cv_func_bind_textdomain_codeset" >&5
@@ -23438,7 +22648,7 @@ fi
esac
fi
-rm -f core conftest.err conftest.$ac_objext \
+rm -f core conftest.err conftest.$ac_objext conftest_ipa8_conftest.oo \
conftest$ac_exeext conftest.$ac_ext
LIBS="$glib_save_LIBS"
INSTOBJEXT=.mo
@@ -23559,126 +22769,29 @@ echo "${ECHO_T}$LINGUAS" >&6; }
-if test "x$PACKAGE" != "xgnome-doc-utils"; then
- GDU_REQUIRED_VERSION=0.3.2
- if test -n ""; then
- GDU_REQUIRED_VERSION=
- fi
-
-
-pkg_failed=no
-{ echo "$as_me:$LINENO: checking for GDU_MODULE_VERSION_CHECK" >&5
-echo $ECHO_N "checking for GDU_MODULE_VERSION_CHECK... $ECHO_C" >&6; }
+gdu_cv_version_required=0.3.2
-if test -n "$PKG_CONFIG"; then
- if test -n "$GDU_MODULE_VERSION_CHECK_CFLAGS"; then
- pkg_cv_GDU_MODULE_VERSION_CHECK_CFLAGS="$GDU_MODULE_VERSION_CHECK_CFLAGS"
- else
- if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$GDU_REQUIRED_VERSION\"") >&5
- ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $GDU_REQUIRED_VERSION") 2>&5
- ac_status=$?
- echo "$as_me:$LINENO: \$? = $ac_status" >&5
- (exit $ac_status); }; then
- pkg_cv_GDU_MODULE_VERSION_CHECK_CFLAGS=`$PKG_CONFIG --cflags "gnome-doc-utils >= $GDU_REQUIRED_VERSION" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
-else
- pkg_failed=untried
-fi
-if test -n "$PKG_CONFIG"; then
- if test -n "$GDU_MODULE_VERSION_CHECK_LIBS"; then
- pkg_cv_GDU_MODULE_VERSION_CHECK_LIBS="$GDU_MODULE_VERSION_CHECK_LIBS"
- else
- if test -n "$PKG_CONFIG" && \
- { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$GDU_REQUIRED_VERSION\"") >&5
- ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $GDU_REQUIRED_VERSION") 2>&5
+if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gnome-doc-utils >= \$gdu_cv_version_required\"") >&5
+ ($PKG_CONFIG --exists --print-errors "gnome-doc-utils >= $gdu_cv_version_required") 2>&5
ac_status=$?
echo "$as_me:$LINENO: \$? = $ac_status" >&5
(exit $ac_status); }; then
- pkg_cv_GDU_MODULE_VERSION_CHECK_LIBS=`$PKG_CONFIG --libs "gnome-doc-utils >= $GDU_REQUIRED_VERSION" 2>/dev/null`
-else
- pkg_failed=yes
-fi
- fi
+ gdu_cv_have_gdu=yes
else
- pkg_failed=untried
+ gdu_cv_have_gdu=no
fi
-
-
-if test $pkg_failed = yes; then
-
-if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then
- _pkg_short_errors_supported=yes
+if test "$gdu_cv_have_gdu" = "yes"; then
+ :
else
- _pkg_short_errors_supported=no
-fi
- if test $_pkg_short_errors_supported = yes; then
- GDU_MODULE_VERSION_CHECK_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gnome-doc-utils >= $GDU_REQUIRED_VERSION"`
- else
- GDU_MODULE_VERSION_CHECK_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gnome-doc-utils >= $GDU_REQUIRED_VERSION"`
- fi
- # Put the nasty error message in config.log where it belongs
- echo "$GDU_MODULE_VERSION_CHECK_PKG_ERRORS" >&5
-
- { { echo "$as_me:$LINENO: error: Package requirements (gnome-doc-utils >= $GDU_REQUIRED_VERSION) were not met:
-
-$GDU_MODULE_VERSION_CHECK_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables GDU_MODULE_VERSION_CHECK_CFLAGS
-and GDU_MODULE_VERSION_CHECK_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&5
-echo "$as_me: error: Package requirements (gnome-doc-utils >= $GDU_REQUIRED_VERSION) were not met:
-
-$GDU_MODULE_VERSION_CHECK_PKG_ERRORS
-
-Consider adjusting the PKG_CONFIG_PATH environment variable if you
-installed software in a non-standard prefix.
-
-Alternatively, you may set the environment variables GDU_MODULE_VERSION_CHECK_CFLAGS
-and GDU_MODULE_VERSION_CHECK_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-" >&2;}
- { (exit 1); exit 1; }; }
-elif test $pkg_failed = untried; then
- { { echo "$as_me:$LINENO: error: The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables GDU_MODULE_VERSION_CHECK_CFLAGS
-and GDU_MODULE_VERSION_CHECK_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-See \`config.log' for more details." >&5
-echo "$as_me: error: The pkg-config script could not be found or is too old. Make sure it
-is in your PATH or set the PKG_CONFIG environment variable to the full
-path to pkg-config.
-
-Alternatively, you may set the environment variables GDU_MODULE_VERSION_CHECK_CFLAGS
-and GDU_MODULE_VERSION_CHECK_LIBS to avoid the need to call pkg-config.
-See the pkg-config man page for more details.
-
-To get pkg-config, see <http://www.freedesktop.org/software/pkgconfig>.
-See \`config.log' for more details." >&2;}
+ { { echo "$as_me:$LINENO: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&5
+echo "$as_me: error: gnome-doc-utils >= $gdu_cv_version_required not found" >&2;}
{ (exit 1); exit 1; }; }
-else
- GDU_MODULE_VERSION_CHECK_CFLAGS=$pkg_cv_GDU_MODULE_VERSION_CHECK_CFLAGS
- GDU_MODULE_VERSION_CHECK_LIBS=$pkg_cv_GDU_MODULE_VERSION_CHECK_LIBS
- { echo "$as_me:$LINENO: result: yes" >&5
-echo "${ECHO_T}yes" >&6; }
- :
-fi
fi
+
# Check whether --with-help-dir was given.
if test "${with_help_dir+set}" = set; then
withval=$with_help_dir;
@@ -23720,7 +22833,7 @@ fi
-if test "x$enable_scrollkeeper" = "xyes"; then
+if test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"; then
ENABLE_SK_TRUE=
ENABLE_SK_FALSE='#'
else
@@ -23731,6 +22844,17 @@ fi
+if test "$gdu_cv_have_gdu" = "yes"; then
+ HAVE_GNOME_DOC_UTILS_TRUE=
+ HAVE_GNOME_DOC_UTILS_FALSE='#'
+else
+ HAVE_GNOME_DOC_UTILS_TRUE='#'
+ HAVE_GNOME_DOC_UTILS_FALSE=
+fi
+
+
+
+
set_debug=no
# Check whether --enable-debug was given.
if test "${enable_debug+set}" = set; then
@@ -23749,7 +22873,7 @@ else
echo "${ECHO_T}no" >&6; }
fi
-ac_config_files="$ac_config_files Makefile po/Makefile.in pixmaps/Makefile help/Makefile src/Makefile src/gnome-nettool.desktop.in"
+ac_config_files="$ac_config_files Makefile po/Makefile.in pixmaps/Makefile pixmaps/icons/Makefile pixmaps/icons/16x16/Makefile pixmaps/icons/16x16/apps/Makefile pixmaps/icons/22x22/Makefile pixmaps/icons/22x22/apps/Makefile pixmaps/icons/32x32/Makefile pixmaps/icons/32x32/apps/Makefile pixmaps/icons/scalable/Makefile pixmaps/icons/scalable/apps/Makefile help/Makefile src/Makefile src/gnome-nettool.desktop.in"
cat >confcache <<\_ACEOF
# This file is a shell script that caches the results of configure
@@ -23854,10 +22978,6 @@ echo "$as_me: error: conditional \"MAINT
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
-
- ac_config_commands="$ac_config_commands po/stamp-it"
-
-
if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -23872,6 +22992,10 @@ echo "$as_me: error: conditional \"am__f
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+
+ ac_config_commands="$ac_config_commands po/stamp-it"
+
+
if test -z "${am__fastdepCC_TRUE}" && test -z "${am__fastdepCC_FALSE}"; then
{ { echo "$as_me:$LINENO: error: conditional \"am__fastdepCC\" was never defined.
Usually this means the macro was only invoked conditionally." >&5
@@ -23893,6 +23017,13 @@ echo "$as_me: error: conditional \"ENABL
Usually this means the macro was only invoked conditionally." >&2;}
{ (exit 1); exit 1; }; }
fi
+if test -z "${HAVE_GNOME_DOC_UTILS_TRUE}" && test -z "${HAVE_GNOME_DOC_UTILS_FALSE}"; then
+ { { echo "$as_me:$LINENO: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&5
+echo "$as_me: error: conditional \"HAVE_GNOME_DOC_UTILS\" was never defined.
+Usually this means the macro was only invoked conditionally." >&2;}
+ { (exit 1); exit 1; }; }
+fi
: ${CONFIG_STATUS=./config.status}
ac_clean_files_save=$ac_clean_files
@@ -23917,7 +23048,8 @@ cat >>$CONFIG_STATUS <<\_ACEOF
## M4sh Initialization. ##
## --------------------- ##
-# Be Bourne compatible
+# Be more Bourne compatible
+DUALCASE=1; export DUALCASE # for MKS sh
if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
emulate sh
NULLCMD=:
@@ -23926,10 +23058,13 @@ if test -n "${ZSH_VERSION+set}" && (emul
alias -g '${1+"$@"}'='"$@"'
setopt NO_GLOB_SUBST
else
- case `(set -o) 2>/dev/null` in *posix*) set -o posix;; esac
+ case `(set -o) 2>/dev/null` in
+ *posix*) set -o posix ;;
+esac
+
fi
-BIN_SH=xpg4; export BIN_SH # for Tru64
-DUALCASE=1; export DUALCASE # for MKS sh
+
+
# PATH needs CR
@@ -24153,19 +23288,28 @@ else
as_mkdir_p=false
fi
-# Find out whether ``test -x'' works. Don't use a zero-byte file, as
-# systems may use methods other than mode bits to determine executability.
-cat >conf$$.file <<_ASEOF
-#! /bin/sh
-exit 0
-_ASEOF
-chmod +x conf$$.file
-if test -x conf$$.file >/dev/null 2>&1; then
- as_executable_p="test -x"
+if test -x / >/dev/null 2>&1; then
+ as_test_x='test -x'
else
- as_executable_p=:
+ if ls -dL / >/dev/null 2>&1; then
+ as_ls_L_option=L
+ else
+ as_ls_L_option=
+ fi
+ as_test_x='
+ eval sh -c '\''
+ if test -d "$1"; then
+ test -d "$1/.";
+ else
+ case $1 in
+ -*)set "./$1";;
+ esac;
+ case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in
+ ???[sx]*):;;*)false;;esac;fi
+ '\'' sh
+ '
fi
-rm -f conf$$.file
+as_executable_p=$as_test_x
# Sed expression to map a string onto a valid CPP name.
as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -24180,8 +23324,8 @@ exec 6>&1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by GNOME Nettool $as_me 2.18.0, which was
-generated by GNU Autoconf 2.60. Invocation command line was
+This file was extended by GNOME Nettool $as_me 2.19.90, which was
+generated by GNU Autoconf 2.61. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
CONFIG_HEADERS = $CONFIG_HEADERS
@@ -24210,7 +23354,7 @@ current configuration.
Usage: $0 [OPTIONS] [FILE]...
-h, --help print this help, then exit
- -V, --version print version number, then exit
+ -V, --version print version number and configuration settings, then exit
-q, --quiet do not print progress messages
-d, --debug don't remove temporary files
--recheck update $as_me by reconfiguring in the same conditions
@@ -24233,8 +23377,8 @@ Report bugs to <bug-autoconf gnu org>."
_ACEOF
cat >>$CONFIG_STATUS <<_ACEOF
ac_cs_version="\\
-GNOME Nettool config.status 2.18.0
-configured by $0, generated by GNU Autoconf 2.60,
+GNOME Nettool config.status 2.19.90
+configured by $0, generated by GNU Autoconf 2.61,
with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
Copyright (C) 2006 Free Software Foundation, Inc.
@@ -24336,12 +23480,12 @@ cat >>$CONFIG_STATUS <<_ACEOF
#
# INIT-COMMANDS
#
+AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
INTLTOOL_PERL='${INTLTOOL_PERL}' ac_aux_dir='${ac_aux_dir}'
prefix="$prefix" exec_prefix="$exec_prefix" INTLTOOL_LIBDIR="$libdir"
INTLTOOL_EXTRACT='${INTLTOOL_EXTRACT}' INTLTOOL_ICONV='${INTLTOOL_ICONV}'
INTLTOOL_MSGFMT='${INTLTOOL_MSGFMT}' INTLTOOL_MSGMERGE='${INTLTOOL_MSGMERGE}'
INTLTOOL_XGETTEXT='${INTLTOOL_XGETTEXT}'
-AMDEP_TRUE="$AMDEP_TRUE" ac_aux_dir="$ac_aux_dir"
_ACEOF
@@ -24353,12 +23497,21 @@ for ac_config_target in $ac_config_targe
do
case $ac_config_target in
"config.h") CONFIG_HEADERS="$CONFIG_HEADERS config.h" ;;
- "intltool") CONFIG_COMMANDS="$CONFIG_COMMANDS intltool" ;;
"depfiles") CONFIG_COMMANDS="$CONFIG_COMMANDS depfiles" ;;
+ "intltool") CONFIG_COMMANDS="$CONFIG_COMMANDS intltool" ;;
"default-1") CONFIG_COMMANDS="$CONFIG_COMMANDS default-1" ;;
"Makefile") CONFIG_FILES="$CONFIG_FILES Makefile" ;;
"po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
"pixmaps/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/Makefile" ;;
+ "pixmaps/icons/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/icons/Makefile" ;;
+ "pixmaps/icons/16x16/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/icons/16x16/Makefile" ;;
+ "pixmaps/icons/16x16/apps/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/icons/16x16/apps/Makefile" ;;
+ "pixmaps/icons/22x22/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/icons/22x22/Makefile" ;;
+ "pixmaps/icons/22x22/apps/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/icons/22x22/apps/Makefile" ;;
+ "pixmaps/icons/32x32/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/icons/32x32/Makefile" ;;
+ "pixmaps/icons/32x32/apps/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/icons/32x32/apps/Makefile" ;;
+ "pixmaps/icons/scalable/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/icons/scalable/Makefile" ;;
+ "pixmaps/icons/scalable/apps/Makefile") CONFIG_FILES="$CONFIG_FILES pixmaps/icons/scalable/apps/Makefile" ;;
"help/Makefile") CONFIG_FILES="$CONFIG_FILES help/Makefile" ;;
"src/Makefile") CONFIG_FILES="$CONFIG_FILES src/Makefile" ;;
"src/gnome-nettool.desktop.in") CONFIG_FILES="$CONFIG_FILES src/gnome-nettool.desktop.in" ;;
@@ -24571,6 +23724,7 @@ AMDEPBACKSLASH!$AMDEPBACKSLASH$ac_delim
CCDEPMODE!$CCDEPMODE$ac_delim
am__fastdepCC_TRUE!$am__fastdepCC_TRUE$ac_delim
am__fastdepCC_FALSE!$am__fastdepCC_FALSE$ac_delim
+DATADIRNAME!$DATADIRNAME$ac_delim
CPP!$CPP$ac_delim
GREP!$GREP$ac_delim
EGREP!$EGREP$ac_delim
@@ -24604,11 +23758,11 @@ NETTOOL_LIBS!$NETTOOL_LIBS$ac_delim
GETTEXT_PACKAGE!$GETTEXT_PACKAGE$ac_delim
USE_NLS!$USE_NLS$ac_delim
MSGFMT!$MSGFMT$ac_delim
+MSGFMT_OPTS!$MSGFMT_OPTS$ac_delim
GMSGFMT!$GMSGFMT$ac_delim
XGETTEXT!$XGETTEXT$ac_delim
CATALOGS!$CATALOGS$ac_delim
CATOBJEXT!$CATOBJEXT$ac_delim
-DATADIRNAME!$DATADIRNAME$ac_delim
GMOFILES!$GMOFILES$ac_delim
INSTOBJEXT!$INSTOBJEXT$ac_delim
INTLLIBS!$INTLLIBS$ac_delim
@@ -24617,18 +23771,18 @@ PO_IN_DATADIR_FALSE!$PO_IN_DATADIR_FALSE
POFILES!$POFILES$ac_delim
POSUB!$POSUB$ac_delim
MKINSTALLDIRS!$MKINSTALLDIRS$ac_delim
-GDU_MODULE_VERSION_CHECK_CFLAGS!$GDU_MODULE_VERSION_CHECK_CFLAGS$ac_delim
-GDU_MODULE_VERSION_CHECK_LIBS!$GDU_MODULE_VERSION_CHECK_LIBS$ac_delim
HELP_DIR!$HELP_DIR$ac_delim
OMF_DIR!$OMF_DIR$ac_delim
DOC_USER_FORMATS!$DOC_USER_FORMATS$ac_delim
ENABLE_SK_TRUE!$ENABLE_SK_TRUE$ac_delim
ENABLE_SK_FALSE!$ENABLE_SK_FALSE$ac_delim
+HAVE_GNOME_DOC_UTILS_TRUE!$HAVE_GNOME_DOC_UTILS_TRUE$ac_delim
+HAVE_GNOME_DOC_UTILS_FALSE!$HAVE_GNOME_DOC_UTILS_FALSE$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` = 63; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 64; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
@@ -25064,27 +24218,6 @@ echo "$as_me: executing $ac_file command
case $ac_file$ac_mode in
- "intltool":C)
-
-for file in intltool-extract intltool-merge intltool-update; do
- sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
- -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
- -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \
- -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \
- -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \
- -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \
- -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
- < ${ac_aux_dir}/${file}.in > ${file}.out
- if cmp -s ${file} ${file}.out 2>/dev/null; then
- rm -f ${file}.out
- else
- mv -f ${file}.out ${file}
- fi
- chmod ugo+x ${file}
- chmod u+w ${file}
-done
-
- ;;
"depfiles":C) test x"$AMDEP_TRUE" != x"" || for mf in $CONFIG_FILES; do
# Strip MF so we end up with the name of the file.
mf=`echo "$mf" | sed -e 's/:.*$//'`
@@ -25208,6 +24341,27 @@ echo "$as_me: error: cannot create direc
done
done
;;
+ "intltool":C)
+
+for file in intltool-extract intltool-merge intltool-update; do
+ sed -e "s|@INTLTOOL_EXTRACT@|`pwd`/intltool-extract|g" \
+ -e "s|@INTLTOOL_LIBDIR@|${INTLTOOL_LIBDIR}|g" \
+ -e "s|@INTLTOOL_ICONV@|${INTLTOOL_ICONV}|g" \
+ -e "s|@INTLTOOL_MSGFMT@|${INTLTOOL_MSGFMT}|g" \
+ -e "s|@INTLTOOL_MSGMERGE@|${INTLTOOL_MSGMERGE}|g" \
+ -e "s|@INTLTOOL_XGETTEXT@|${INTLTOOL_XGETTEXT}|g" \
+ -e "s|@INTLTOOL_PERL@|${INTLTOOL_PERL}|g" \
+ < ${ac_aux_dir}/${file}.in > ${file}.out
+ if cmp -s ${file} ${file}.out 2>/dev/null; then
+ rm -f ${file}.out
+ else
+ mv -f ${file}.out ${file}
+ fi
+ chmod ugo+x ${file}
+ chmod u+w ${file}
+done
+
+ ;;
"default-1":C) case "$CONFIG_FILES" in *po/Makefile.in*)
sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile
esac ;;
diff -pruN 2.18.0-2/configure.in 2.19.90-0ubuntu1/configure.in
--- 2.18.0-2/configure.in 2007-03-13 01:29:42.000000000 +0000
+++ 2.19.90-0ubuntu1/configure.in 2007-08-14 03:43:56.000000000 +0100
@@ -1,5 +1,5 @@
AC_PREREQ(2.59)
-AC_INIT([GNOME Nettool], [2.18.0], [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-nettool], [gnome-nettool])
+AC_INIT([GNOME Nettool], [2.19.90], [http://bugzilla.gnome.org/enter_bug.cgi?product=gnome-nettool], [gnome-nettool])
AC_CONFIG_SRCDIR([src/ping.c])
dnl Useful to call aclocal after 'make'
@@ -35,7 +35,8 @@ GCONF_REQUIRED=1.1.11
PKG_CHECK_MODULES(NETTOOL,
gtk+-2.0 >= $GTK_REQUIRED
libglade-2.0 >= $LIBGLADE_REQUIRED
- gconf-2.0 >= $GCONF_REQUIRED)
+ gconf-2.0 >= $GCONF_REQUIRED
+ gnome-doc-utils)
AC_SUBST(NETTOOL_CFLAGS)
AC_SUBST(NETTOOL_LIBS)
@@ -73,6 +74,15 @@ AC_CONFIG_FILES([
Makefile
po/Makefile.in
pixmaps/Makefile
+pixmaps/icons/Makefile
+pixmaps/icons/16x16/Makefile
+pixmaps/icons/16x16/apps/Makefile
+pixmaps/icons/22x22/Makefile
+pixmaps/icons/22x22/apps/Makefile
+pixmaps/icons/32x32/Makefile
+pixmaps/icons/32x32/apps/Makefile
+pixmaps/icons/scalable/Makefile
+pixmaps/icons/scalable/apps/Makefile
help/Makefile
src/Makefile
src/gnome-nettool.desktop.in])
diff -pruN 2.18.0-2/debian/changelog 2.19.90-0ubuntu1/debian/changelog
--- 2.18.0-2/debian/changelog 2007-08-17 00:11:33.000000000 +0100
+++ 2.19.90-0ubuntu1/debian/changelog 2007-08-17 00:10:55.000000000 +0100
@@ -1,3 +1,34 @@
+gnome-nettool (2.19.90-0ubuntu1) gutsy; urgency=low
+
+ * New upstream version:
+ - #408452: Fixed the output for traceroute/ping.
+ - #414068: Added missing strings for translation
+ - #435650: Fixed Run gtk-update-icon-cache in uninstall-hook
+ - #401076: Added Tango icons for different sizes
+ - #311350: Fixed locale problem in whois
+ * debian/patches/03_autoconf.patch:
+ - updated
+ * debian/patches/04_menu_change.patch:
+ - updated
+
+ -- Sebastien Bacher <seb128 canonical com> Thu, 16 Aug 2007 23:34:10 +0200
+
+gnome-nettool (2.18.0-2ubuntu1) gutsy; urgency=low
+
+ * Merge with Debian:
+ * debian/control.in:
+ - Build-Depends on liblaunchpad-integration-dev
+ - Depends on "iputils-tracepath" rather than "tcptraceroute | traceroute"
+ - make the description mention tracepath rather than traceroute
+ * debian/patches:
+ - 01_use_tracepath.patch: Use tracepath rather than tcptraceroute.
+ - 02_lpi.patch: LaunchpadIntegration.
+ - 03_autoconf.patch: Updated.
+ - 04_menu_change.patch: MenuRevisited.
+ - 05_gksu_for_network_admin.patch: Call network-admin with gksu.
+
+ -- Christian Bjälevik <nafallo ubuntu com> Fri, 27 Apr 2007 18:48:26 +0200
+
gnome-nettool (2.18.0-2) unstable; urgency=low
* Set LDFLAGS directly instead of via DEB_CONFIGURE_SCRIPT_ENV; build-dep on
diff -pruN 2.18.0-2/debian/control 2.19.90-0ubuntu1/debian/control
--- 2.18.0-2/debian/control 2007-08-17 00:11:33.000000000 +0100
+++ 2.19.90-0ubuntu1/debian/control 2007-08-17 00:10:55.000000000 +0100
@@ -1,7 +1,8 @@
Source: gnome-nettool
Section: gnome
Priority: optional
-Maintainer: Andrew Lau <netsnipe users sourceforge net>
+XSBC-Original-Maintainer: Andrew Lau <netsnipe users sourceforge net>
+Maintainer: Ubuntu Desktop Team <ubuntu-desktop lists ubuntu com>
Build-Depends: autotools-dev,
cdbs (>= 0.4.41),
debhelper (>= 5),
@@ -12,8 +13,9 @@ Build-Depends: autotools-dev,
libglade2-dev (>= 2.0.0),
libgconf2-dev (>= 1.1.11),
libxml-parser-perl,
+ liblaunchpad-integration-dev,
gnome-doc-utils
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers lists alioth debian org>, Josselin Mouette <joss debian org>, Loic Minier <lool dooz org>, Marc 'HE' Brockschmidt <he debian org>
+Uploaders: Andrew Lau <netsnipe users sourceforge net>, Debian GNOME Maintainers <pkg-gnome-maintainers lists alioth debian org>, Josselin Mouette <joss debian org>, Loic Minier <lool dooz org>, Marc 'HE' Brockschmidt <he debian org>
Standards-Version: 3.7.2
Package: gnome-nettool
@@ -25,7 +27,7 @@ Depends: ${shlibs:Depends},
finger,
net-tools,
ping,
- tcptraceroute | traceroute,
+ iputils-tracepath,
whois
Suggests: gnome-system-tools
Conflicts: gnome-network (<= 1.99.5)
@@ -35,7 +37,7 @@ Description: network information tool fo
* ifconfig
* ping
* netstat
- * traceroute
+ * tracepath
* port scanning
* DNS lookup
* finger
diff -pruN 2.18.0-2/debian/control.in 2.19.90-0ubuntu1/debian/control.in
--- 2.18.0-2/debian/control.in 2007-08-17 00:11:33.000000000 +0100
+++ 2.19.90-0ubuntu1/debian/control.in 2007-08-17 00:10:55.000000000 +0100
@@ -1,7 +1,8 @@
Source: gnome-nettool
Section: gnome
Priority: optional
-Maintainer: Andrew Lau <netsnipe users sourceforge net>
+XSBC-Original-Maintainer: Andrew Lau <netsnipe users sourceforge net>
+Maintainer: Ubuntu Desktop Team <ubuntu-desktop lists ubuntu com>
Build-Depends: autotools-dev,
cdbs (>= 0.4.41),
debhelper (>= 5),
@@ -12,6 +13,7 @@ Build-Depends: autotools-dev,
libglade2-dev (>= 2.0.0),
libgconf2-dev (>= 1.1.11),
libxml-parser-perl,
+ liblaunchpad-integration-dev,
gnome-doc-utils
Uploaders: @GNOME_TEAM@
Standards-Version: 3.7.2
@@ -25,7 +27,7 @@ Depends: ${shlibs:Depends},
finger,
net-tools,
ping,
- tcptraceroute | traceroute,
+ iputils-tracepath,
whois
Suggests: gnome-system-tools
Conflicts: gnome-network (<= 1.99.5)
@@ -35,7 +37,7 @@ Description: network information tool fo
* ifconfig
* ping
* netstat
- * traceroute
+ * tracepath
* port scanning
* DNS lookup
* finger
diff -pruN 2.18.0-2/debian/patches/01_use_tracepath.patch 2.19.90-0ubuntu1/debian/patches/01_use_tracepath.patch
--- 2.18.0-2/debian/patches/01_use_tracepath.patch 1970-01-01 01:00:00.000000000 +0100
+++ 2.19.90-0ubuntu1/debian/patches/01_use_tracepath.patch 2007-08-17 00:10:55.000000000 +0100
@@ -0,0 +1,101 @@
+diff -Nur gnome-nettool-1.0.0.orig/src/traceroute.c gnome-nettool-1.0.0/src/traceroute.c
+--- gnome-nettool-1.0.0.orig/src/traceroute.c 2004-09-10 23:56:42.000000000 +0200
++++ gnome-nettool-1.0.0/src/traceroute.c 2004-12-22 20:02:11.037129360 +0100
+@@ -70,20 +70,15 @@
+ switch (netinfo_get_ip_version (netinfo))
+ {
+ case IPV4:
+- program = util_find_program_in_path ("tcptraceroute", NULL);
+ #ifdef DEBUG
+- g_print ("tcptraceroute: %s\n", program);
++ g_print ("tracepath: %s\n", program);
+ #endif /* DEBUG */
+- if (program != NULL) {
+- program_name = g_strdup ("tcptraceroute");
+- } else {
+- program = util_find_program_dialog ("traceroute", parent);
+- program_name = g_strdup ("traceroute");
+- }
++ program = util_find_program_dialog ("tracepath", parent);
++ program_name = g_strdup ("tracepath");
+ break;
+ case IPV6:
+- program = util_find_program_in_path ("traceroute6", NULL);
+- program_name = g_strdup ("traceroute6");
++ program = util_find_program_in_path ("tracepath6", NULL);
++ program_name = g_strdup ("tracepath6");
+ break;
+ default:
+ program = NULL;
+@@ -92,8 +87,7 @@
+
+ if (program != NULL) {
+ command =
+- g_strdup_printf ("%s %s %s %s", program, program_name,
+- TCPTRACEROUTE_OPTIONS, host);
++ g_strdup_printf ("%s %s %s", program, program_name, host);
+
+ netinfo->command_line = g_strsplit (command, " ", -1);
+
+@@ -222,7 +216,7 @@
+
+ count = sscanf (line, TRACE_FORMAT,
+ &(data)->hop_count, data->hostname, data->ip,
+- data->rtt1, data->rtt2/*, data->rtt3*/);
++ data->rtt1/*, data->rtt2, data->rtt3*/);
+
+ if (count == TRACE_NUM_ARGS) {
+ return count;
+@@ -230,7 +224,7 @@
+
+ if (count == TRACE_NUM_ERR) {
+ g_sprintf (data->rtt1, "*");
+- g_sprintf (data->rtt2, "*");
++ //g_sprintf (data->rtt2, "*");
+ return TRACE_NUM_ARGS;
+ }
+ /* The last line is different, because it has a
+@@ -240,14 +234,14 @@
+
+ count = sscanf (line, TRACE_FORMAT_OPEN,
+ &(data)->hop_count, data->hostname, data->ip,
+- data->rtt1, data->rtt2/*, data->rtt3*/);
++ data->rtt1/*, data->rtt2, data->rtt3*/);
+
+ if (count == TRACE_NUM_ARGS) {
+ return count;
+ } else {
+ count = sscanf (line, TRACE_FORMAT_CLOSE,
+ &(data)->hop_count, data->hostname,
+- data->ip, data->rtt1, data->rtt2 /*,
++ data->ip, data->rtt1/*, data->rtt2,
+ data->rtt3*/);
+ }
+
+@@ -306,7 +300,7 @@
+ gtk_tree_view_column_new_with_attributes
+ (_("Time 2"), renderer, "text", TRACE_RTT2, NULL);
+ g_object_set (G_OBJECT (renderer), "xalign", 1.0, NULL);
+- gtk_tree_view_append_column (widget, column);
++ // gtk_tree_view_append_column (widget, column);
+
+ model = GTK_TREE_MODEL (gtk_list_store_new
+ (TRACE_NUM_COLUMNS,
+diff -Nur gnome-nettool-1.0.0.orig/src/traceroute.h gnome-nettool-1.0.0/src/traceroute.h
+--- gnome-nettool-1.0.0.orig/src/traceroute.h 2004-05-10 14:19:21.000000000 +0200
++++ gnome-nettool-1.0.0/src/traceroute.h 2004-12-22 20:00:37.062415688 +0100
+@@ -23,12 +23,12 @@
+
+ #include "nettool.h"
+
+-#define TRACE_FORMAT "%d %s %s %s ms %s ms"
++#define TRACE_FORMAT "%d: %s %s %sms"
+ #define TRACE_FORMAT_CLOSE "%d %s %s [closed] %s ms %s ms"
+ #define TRACE_FORMAT_OPEN "%d %s %s [open] %s ms %s ms"
+ #define TRACE_SELECT_DEVICE "Selected device %s address %s port %d for outgoing packets"
+ #define TRACE_TRACE_PATH "Tracing the path to %s (146.83.195.14) on TCP port 80 %d hops max"
+-#define TRACE_NUM_ARGS 5
++#define TRACE_NUM_ARGS 4
+ #define TRACE_NUM_ERR 3
+
+ /* Try 40 hops maximum and send only 1 packet */
diff -pruN 2.18.0-2/debian/patches/02_lpi.patch 2.19.90-0ubuntu1/debian/patches/02_lpi.patch
--- 2.18.0-2/debian/patches/02_lpi.patch 1970-01-01 01:00:00.000000000 +0100
+++ 2.19.90-0ubuntu1/debian/patches/02_lpi.patch 2007-08-17 00:10:55.000000000 +0100
@@ -0,0 +1,32 @@
+diff -Nur gnome-nettool-1.3.91.orig/configure.in gnome-nettool-1.3.91/configure.in
+--- gnome-nettool-1.3.91.orig/configure.in 2005-08-08 14:12:20.000000000 +0200
++++ gnome-nettool-1.3.91/configure.in 2005-08-08 18:43:37.000000000 +0200
+@@ -31,6 +31,7 @@
+
+ PKG_CHECK_MODULES(NETTOOL,
+ gtk+-2.0 >= $GTK_REQUIRED
++ launchpad-integration
+ libglade-2.0 >= $LIBGLADE_REQUIRED
+ gconf-2.0 >= $GCONF_REQUIRED)
+ AC_SUBST(NETTOOL_CFLAGS)
+diff -Nur gnome-nettool-1.3.91.orig/src/main.c gnome-nettool-1.3.91/src/main.c
+--- gnome-nettool-1.3.91.orig/src/main.c 2005-05-06 22:10:28.000000000 +0200
++++ gnome-nettool-1.3.91/src/main.c 2005-08-08 18:45:14.000000000 +0200
+@@ -25,6 +25,7 @@
+ #include <string.h>
+ #include <glib/gi18n.h>
+ #include <glade/glade.h>
++#include <launchpad-integration.h>
+
+ #include "callbacks.h"
+ #include "ping.h"
+@@ -217,6 +218,9 @@
+ G_CALLBACK (on_about_activate),
+ (gpointer) window);
+
++ menu_about = glade_xml_get_widget (xml, "help1_menu");
++ launchpad_integration_add_items (menu_about, -1, FALSE, TRUE);
++
+ menu_copy = glade_xml_get_widget (xml, "m_copy");
+
+ g_signal_connect (G_OBJECT (menu_copy), "activate",
diff -pruN 2.18.0-2/debian/patches/03_autoconf.patch 2.19.90-0ubuntu1/debian/patches/03_autoconf.patch
--- 2.18.0-2/debian/patches/03_autoconf.patch 1970-01-01 01:00:00.000000000 +0100
+++ 2.19.90-0ubuntu1/debian/patches/03_autoconf.patch 2007-08-17 00:10:55.000000000 +0100
@@ -0,0 +1,75 @@
+diff -Nur gnome-nettool-2.19.90/configure gnome-nettool-2.19.90.new/configure
+--- gnome-nettool-2.19.90/configure 2007-08-14 04:44:49.000000000 +0200
++++ gnome-nettool-2.19.90.new/configure 2007-08-16 23:36:50.000000000 +0200
+@@ -21097,10 +21097,12 @@
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED
++ launchpad-integration
+ libglade-2.0 >= \$LIBGLADE_REQUIRED
+ gconf-2.0 >= \$GCONF_REQUIRED
+ gnome-doc-utils\"") >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED
++ launchpad-integration
+ libglade-2.0 >= $LIBGLADE_REQUIRED
+ gconf-2.0 >= $GCONF_REQUIRED
+ gnome-doc-utils") 2>&5
+@@ -21108,6 +21110,7 @@
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_NETTOOL_CFLAGS=`$PKG_CONFIG --cflags "gtk+-2.0 >= $GTK_REQUIRED
++ launchpad-integration
+ libglade-2.0 >= $LIBGLADE_REQUIRED
+ gconf-2.0 >= $GCONF_REQUIRED
+ gnome-doc-utils" 2>/dev/null`
+@@ -21124,10 +21127,12 @@
+ else
+ if test -n "$PKG_CONFIG" && \
+ { (echo "$as_me:$LINENO: \$PKG_CONFIG --exists --print-errors \"gtk+-2.0 >= \$GTK_REQUIRED
++ launchpad-integration
+ libglade-2.0 >= \$LIBGLADE_REQUIRED
+ gconf-2.0 >= \$GCONF_REQUIRED
+ gnome-doc-utils\"") >&5
+ ($PKG_CONFIG --exists --print-errors "gtk+-2.0 >= $GTK_REQUIRED
++ launchpad-integration
+ libglade-2.0 >= $LIBGLADE_REQUIRED
+ gconf-2.0 >= $GCONF_REQUIRED
+ gnome-doc-utils") 2>&5
+@@ -21135,6 +21140,7 @@
+ echo "$as_me:$LINENO: \$? = $ac_status" >&5
+ (exit $ac_status); }; then
+ pkg_cv_NETTOOL_LIBS=`$PKG_CONFIG --libs "gtk+-2.0 >= $GTK_REQUIRED
++ launchpad-integration
+ libglade-2.0 >= $LIBGLADE_REQUIRED
+ gconf-2.0 >= $GCONF_REQUIRED
+ gnome-doc-utils" 2>/dev/null`
+@@ -21157,11 +21163,13 @@
+ fi
+ if test $_pkg_short_errors_supported = yes; then
+ NETTOOL_PKG_ERRORS=`$PKG_CONFIG --short-errors --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED
++ launchpad-integration
+ libglade-2.0 >= $LIBGLADE_REQUIRED
+ gconf-2.0 >= $GCONF_REQUIRED
+ gnome-doc-utils"`
+ else
+ NETTOOL_PKG_ERRORS=`$PKG_CONFIG --errors-to-stdout --print-errors "gtk+-2.0 >= $GTK_REQUIRED
++ launchpad-integration
+ libglade-2.0 >= $LIBGLADE_REQUIRED
+ gconf-2.0 >= $GCONF_REQUIRED
+ gnome-doc-utils"`
+@@ -21170,6 +21178,7 @@
+ echo "$NETTOOL_PKG_ERRORS" >&5
+
+ { { echo "$as_me:$LINENO: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED
++ launchpad-integration
+ libglade-2.0 >= $LIBGLADE_REQUIRED
+ gconf-2.0 >= $GCONF_REQUIRED
+ gnome-doc-utils) were not met:
+@@ -21184,6 +21193,7 @@
+ See the pkg-config man page for more details.
+ " >&5
+ echo "$as_me: error: Package requirements (gtk+-2.0 >= $GTK_REQUIRED
++ launchpad-integration
+ libglade-2.0 >= $LIBGLADE_REQUIRED
+ gconf-2.0 >= $GCONF_REQUIRED
+ gnome-doc-utils) were not met:
diff -pruN 2.18.0-2/debian/patches/04_menu_change.patch 2.19.90-0ubuntu1/debian/patches/04_menu_change.patch
--- 2.18.0-2/debian/patches/04_menu_change.patch 1970-01-01 01:00:00.000000000 +0100
+++ 2.19.90-0ubuntu1/debian/patches/04_menu_change.patch 2007-08-17 00:10:55.000000000 +0100
@@ -0,0 +1,12 @@
+diff -Nur gnome-nettool-2.19.90/src/gnome-nettool.desktop.in.in gnome-nettool-2.19.90.new/src/gnome-nettool.desktop.in.in
+--- gnome-nettool-2.19.90/src/gnome-nettool.desktop.in.in 2007-08-14 04:43:09.000000000 +0200
++++ gnome-nettool-2.19.90.new/src/gnome-nettool.desktop.in.in 2007-08-16 23:38:19.000000000 +0200
+@@ -6,7 +6,7 @@
+ Icon=gnome-nettool
+ Terminal=false
+ Type=Application
+-Categories=System;Utility;GNOME;GTK;
++Categories=System;Settings;GNOME;GTK;
+ StartupNotify=true
+ X-GNOME-Bugzilla-Bugzilla=GNOME
+ X-GNOME-Bugzilla-Product=gnome-nettool
diff -pruN 2.18.0-2/debian/patches/05_gksu_for_network_admin.patch 2.19.90-0ubuntu1/debian/patches/05_gksu_for_network_admin.patch
--- 2.18.0-2/debian/patches/05_gksu_for_network_admin.patch 1970-01-01 01:00:00.000000000 +0100
+++ 2.19.90-0ubuntu1/debian/patches/05_gksu_for_network_admin.patch 2007-08-17 00:10:55.000000000 +0100
@@ -0,0 +1,12 @@
+diff -Nur gnome-nettool-2.17.4/src/callbacks.c gnome-nettool-2.17.4.new/src/callbacks.c
+--- gnome-nettool-2.17.4/src/callbacks.c 2006-05-09 00:27:09.000000000 +0200
++++ gnome-nettool-2.17.4.new/src/callbacks.c 2006-12-20 13:18:50.000000000 +0100
+@@ -143,7 +143,7 @@
+ if (gtk_combo_box_get_active_iter (combo, &iter)) {
+ gtk_tree_model_get (model, &iter, 2, &nic, -1);
+
+- command_line = g_string_new (info->network_tool_path);
++ command_line = g_string_new ("gksu -- network-admin");
+ g_string_append (command_line, " --configure ");
+ g_string_append (command_line, nic);
+
diff -pruN 2.18.0-2/gnome-doc-utils.make 2.19.90-0ubuntu1/gnome-doc-utils.make
--- 2.18.0-2/gnome-doc-utils.make 2007-03-13 01:48:36.000000000 +0000
+++ 2.19.90-0ubuntu1/gnome-doc-utils.make 2007-08-14 03:44:43.000000000 +0100
@@ -59,13 +59,19 @@ $(DOC_H_FILE): $(DOC_H_DOCS);
done;
cp $ tmp $@ && rm -f $ tmp
+dist-check-gdu:
+if !HAVE_GNOME_DOC_UTILS
+ @echo "*** GNOME Doc Utils must be installed in order to make dist"
+ @false
+endif
+
.PHONY: dist-doc-header
dist-doc-header: $(DOC_H_FILE)
@if test -f "$(DOC_H_FILE)"; then d=; else d="$(srcdir)/"; fi; \
echo "$(INSTALL_DATA) $${d}$(DOC_H_FILE) $(distdir)/$(DOC_H_FILE)"; \
$(INSTALL_DATA) "$${d}$(DOC_H_FILE)" "$(distdir)/$(DOC_H_FILE)";
-doc-dist-hook: $(if $(DOC_H_FILE),dist-doc-header)
+doc-dist-hook: dist-check-gdu $(if $(DOC_H_FILE),dist-doc-header)
.PHONY: clean-doc-header
_clean_doc_header = $(if $(DOC_H_FILE),clean-doc-header)
@@ -110,13 +116,7 @@ _DOC_REAL_LINGUAS = $(if $(filter enviro
$(filter $(LINGUAS),$(DOC_LINGUAS)), \
$(DOC_LINGUAS))
-## @ RNGDOC_DIRS
-## The directories containing RNG files to be documented with rngdoc
-RNGDOC_DIRS ?=
-
-## @ XSLDOC_DIRS
-## The directories containing XSLT files to be documented with xsldoc
-XSLDOC_DIRS ?=
+_DOC_ABS_SRCDIR = @abs_srcdir@
################################################################################
@@ -126,71 +126,16 @@ _xml2po ?= `which xml2po`
_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
-_rngdoc ?= `$(PKG_CONFIG) --variable rngdoc gnome-doc-utils`
-_xsldoc ?= `$(PKG_CONFIG) --variable xsldoc gnome-doc-utils`
_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
+if ENABLE_SK
+_ENABLE_SK = true
+_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir`
_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir`
-
-
-################################################################################
-## @@ Rules for rngdoc
-
-rngdoc_args = \
- --stringparam rngdoc.id \
- $(shell echo $(basename $(notdir $(1))) | sed -e 's/[^A-Za-z0-9_-]/_/g')\
- $(_rngdoc) $(filter %/$(basename $(notdir $(1))).rng,$(_RNGDOC_RNGS))
-
-## @ _RNGDOC_RNGS
-## The actual RNG files for which to generate documentation with rngdoc
-_RNGDOC_RNGS = $(sort $(patsubst ./%, %, $(foreach dir,$(RNGDOC_DIRS), \
- $(wildcard $(dir)/*.rng) $(wildcard $(srcdir)/$(dir)/*.rng))))
-
-## @ _RNGDOC_C_DOCS
-## The generated rngdoc documentation in the C locale
-_RNGDOC_C_DOCS = $(foreach rng,$(_RNGDOC_RNGS), C/$(basename $(notdir $(rng))).xml)
-
-# FIXME: Fix the dependancies
-$(_RNGDOC_C_DOCS) : $(_RNGDOC_RNGS)
- if ! test -d $(dir $@); then mkdir $(dir $@); fi;
- xsltproc $(call rngdoc_args,$@,$<) | xmllint --c14n - > $ tmp && \
- cp $ tmp $@ && rm -f $ tmp
-
-.PHONY: rngdoc
-rngdoc: $(_RNGDOC_C_DOCS)
-
-
-################################################################################
-## @@ Rules for xsldoc
-
-# FIXME: _XSLDOC_XSLS is getting dupes with relative/absolute in some
-# cases. Right now, I'm just taking the first, but that's just a bad
-# work-around. Fix the real problem.
-xsldoc_args = \
- --stringparam xsldoc.id \
- $(shell echo $(basename $(notdir $(1))) | sed -e 's/[^A-Za-z0-9_-]/_/g')\
- $(_xsldoc) \
- $(word 1,$(filter %/$(basename $(notdir $(1))).xsl,$(_XSLDOC_XSLS)))
-
-## @ _XSLDOC_XSLS
-## The actual XSLT files for which to generate documentation with xsldoc
-_XSLDOC_XSLS = $(sort $(patsubst ./%, %, $(foreach dir,$(XSLDOC_DIRS), \
- $(wildcard $(dir)/*.xsl) $(wildcard $(srcdir)/$(dir)/*.xsl))))
-
-## @ _XSLDOC_C_DOCS
-## The generated xsldoc documentation in the C locale
-_XSLDOC_C_DOCS = $(foreach xsl,$(_XSLDOC_XSLS), C/$(basename $(notdir $(xsl))).xml)
-
-# FIXME: Fix the dependancies
-$(_XSLDOC_C_DOCS) : $(_XSLDOC_XSLS)
- if ! test -d $(dir $@); then mkdir $(dir $@); fi;
- xsltproc $(call xsldoc_args,$@,$<) | xmllint --c14n - > $ tmp && \
- cp $ tmp $@ && rm -f $ tmp
-
-.PHONY: xsldoc
-xsldoc: $(_XSLDOC_C_DOCS)
+_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml
+endif
################################################################################
@@ -205,12 +150,14 @@ db2omf_args = \
--stringparam db2omf.lang $(notdir $(patsubst %/$(notdir $(2)),%,$(2))) \
--stringparam db2omf.omf_dir "$(OMF_DIR)" \
--stringparam db2omf.help_dir "$(HELP_DIR)" \
- --stringparam db2omf.omf_in "`pwd`/$(_DOC_OMF_IN)" \
+ --stringparam db2omf.omf_in "$(_DOC_OMF_IN)" \
+ $(if $(_ENABLE_SK), \
+ --stringparam db2omf.scrollkeeper_cl "$(_skcontentslist)") \
$(_db2omf) $(2)
## @ _DOC_OMF_IN
## The OMF input file
-_DOC_OMF_IN = $(if $(DOC_MODULE),$(wildcard $(srcdir)/$(DOC_MODULE).omf.in))
+_DOC_OMF_IN = $(if $(DOC_MODULE),$(wildcard $(_DOC_ABS_SRCDIR)/$(DOC_MODULE).omf.in))
## @ _DOC_OMF_DB
## The OMF files for DocBook output
@@ -219,7 +166,11 @@ _DOC_OMF_DB = $(if $(_DOC_OMF_IN),
$(_DOC_OMF_DB) : $(_DOC_OMF_IN)
$(_DOC_OMF_DB) : $(DOC_MODULE)-%.omf : %/$(DOC_MODULE).xml
- xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook')
+ @test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || { \
+ echo "The file '$(_skcontentslist)' does not exist." >&2; \
+ echo "Please check your ScrollKeeper installation." >&2; \
+ exit 1; }
+ xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; }
## @ _DOC_OMF_HTML
## The OMF files for HTML output
@@ -228,7 +179,13 @@ _DOC_OMF_HTML = $(if $(_DOC_OMF_IN),
$(_DOC_OMF_HTML) : $(_DOC_OMF_IN)
$(_DOC_OMF_HTML) : $(DOC_MODULE)-html-%.omf : %/$(DOC_MODULE).xml
- xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml')
+if ENABLE_SK
+ @test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || { \
+ echo "The file '$(_skcontentslist)' does not exist" >&2; \
+ echo "Please check your ScrollKeeper installation." >&2; \
+ exit 1; }
+endif
+ xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; }
## @ _DOC_OMF_ALL
## All OMF output files to be built
@@ -242,66 +199,6 @@ omf: $(_DOC_OMF_ALL)
################################################################################
-## @@ Rules for .cvsignore Files
-
-## @ _CVSIGNORE_TOP
-## The .cvsignore file in the top directory
-_CVSIGNORE_TOP = $(if $(DOC_MODULE), .cvsignore)
-
-## @ _CVSIGNORE_C
-## The .cvsignore file in the C directory
-_CVSIGNORE_C = $(if $(DOC_MODULE), C/.cvsignore)
-
-## @ _CVSIGNORE_LC
-## The .cvsignore files in other locale directories
-_CVSIGNORE_LC = $(if $(DOC_MODULE),$(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/.cvsignore))
-
-## @ _CVSIGNORE_TOP_FILES
-## The list of files to be listed in the top-level .cvsignore file
-_CVSIGNORE_TOP_FILES = $(_DOC_OMF_ALL) $(_DOC_DSK_ALL)
-
-## @ _CVSIGNORE_C_FILES
-## The list of files to be listed in the .cvsignore file in the C directory
-_CVSIGNORE_C_FILES = $(_RNGDOC_C_DOCS) $(_XSLDOC_C_DOCS)
-
-## @ _CVSIGNORE_C_FILES
-## The list of files to be listed in the .cvsignore files in other
-## locale directories
-_CVSIGNORE_LC_FILES = $(_DOC_LC_DOCS)
-
-$(_CVSIGNORE_TOP) : $(_CVSIGNORE_TOP_FILES)
- if ! test -f $@; then touch $@; fi
- cat $@ > $ tmp
- list='$^'; for file in $$list; do \
- echo $$file >> $ tmp; \
- done
- cat $ tmp | sort | uniq > $@
- rm $ tmp
-
-$(_CVSIGNORE_C) : $(_CVSIGNORE_C_FILES)
- if ! test -f $@; then touch $@; fi
- cat $@ > $ tmp
- list='$^'; for file in $$list; do \
- echo $$file | sed -e 's/.*\///' >> $ tmp; \
- done
- cat $ tmp | sort | uniq > $@
- rm $ tmp
-
-$(_CVSIGNORE_LC) : $(_CVSIGNORE_LC_FILES)
- if ! test -f $@; then touch $@; fi
- cat $@ > $ tmp
- list='$(wildcard $(_CVSIGNORE_LC_FILES),$(dir $@)/*)'; \
- for file in $$list; do \
- echo $$file | sed -e 's/.*\///' >> $ tmp; \
- done
- cat $ tmp | sort | uniq > $@
- rm $ tmp
-
-.PHONY: cvsignore
-cvsignore: $(_CVSIGNORE_TOP) $(_CVSIGNROE_C) $(_CVSIGNORE_LC)
-
-
-################################################################################
## @@ C Locale Documents
## @ _DOC_C_MODULE
@@ -320,15 +217,13 @@ _DOC_C_INCLUDES = $(foreach inc,$(DOC_IN
## All documentation files in the C locale
_DOC_C_DOCS = \
$(_DOC_C_ENTITIES) $(_DOC_C_INCLUDES) \
- $(_RNGDOC_C_DOCS) $(_XSLDOC_C_DOCS) \
$(_DOC_C_MODULE)
## @ _DOC_C_DOCS_NOENT
## All documentation files in the C locale,
## except files included with a SYSTEM entity
_DOC_C_DOCS_NOENT = \
- $(_DOC_C_MODULE) $(_DOC_C_INCLUDES) \
- $(_RNGDOC_C_DOCS) $(_XSLDOC_C_DOCS)
+ $(_DOC_C_MODULE) $(_DOC_C_INCLUDES)
## @ _DOC_C_FIGURES
## All figures and other external data in the C locale
@@ -367,18 +262,6 @@ _DOC_LC_INCLUDES = \
$(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach inc,$(_DOC_C_INCLUDES), \
$(lc)/$(notdir $(inc)) ))
-## @ _RNGDOC_LC_DOCS
-## The generated rngdoc documentation in all other locales
-_RNGDOC_LC_DOCS = \
- $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach doc,$(_RNGDOC_C_DOCS), \
- $(lc)/$(notdir $(doc)) ))
-
-## @ _XSLDOC_LC_DOCS
-## The generated xsldoc documentation in all other locales
-_XSLDOC_LC_DOCS = \
- $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach doc,$(_XSLDOC_C_DOCS), \
- $(lc)/$(notdir $(doc)) ))
-
## @ _DOC_LC_HTML
## All HTML documentation in all other locales
# FIXME: probably have to shell escape to determine the file names
@@ -390,7 +273,6 @@ _DOC_LC_HTML = \
## All documentation files in all other locales
_DOC_LC_DOCS = \
$(_DOC_LC_MODULES) $(_DOC_LC_INCLUDES) \
- $(_RNGDOC_LC_DOCS) $(_XSLDOC_LC_DOCS) \
$(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML))
## @ _DOC_LC_FIGURES
@@ -413,11 +295,7 @@ $(_DOC_POFILES):
fi;
@docs=; \
list='$(_DOC_C_DOCS_NOENT)'; for doc in $$list; do \
- if test -f $$doc; then \
- docs="$$docs ../$$doc"; \
- else \
- docs="$$docs ../$(srcdir)/$$doc"; \
- fi; \
+ docs="$$docs $(_DOC_ABS_SRCDIR)/$$doc"; \
done; \
if ! test -f $@; then \
echo "(cd $(dir $@) && \
@@ -438,8 +316,7 @@ $(_DOC_POFILES):
$(_DOC_LC_DOCS) : $(_DOC_POFILES)
$(_DOC_LC_DOCS) : $(_DOC_C_DOCS)
if ! test -d $(dir $@); then mkdir $(dir $@); fi
- case "$(srcdir)" in /*) sd="$(srcdir)";; *) sd="../$(srcdir)";; esac; \
- if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$$sd/"; fi; \
+ if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \
(cd $(dir $@) && \
$(_xml2po) -e -p \
"$${d}$(dir $@)$(patsubst %/$(notdir $@),%,$@).po" \
@@ -471,22 +348,14 @@ $(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC
################################################################################
-if ENABLE_SK
-_ENABLE_SK = true
-else
-_ENABLE_SK = false
-endif
-
all: \
$(_DOC_C_DOCS) $(_DOC_LC_DOCS) \
$(_DOC_OMF_ALL) $(_DOC_DSK_ALL) \
$(_DOC_HTML_ALL) $(_DOC_POFILES)
-.PHONY: clean-doc-rngdoc clean-doc-xsldoc clean-doc-omf clean-doc-dsk clean-doc-lc clean-doc-dir
+.PHONY: clean-doc-omf clean-doc-dsk clean-doc-lc clean-doc-dir
-clean-doc-rngdoc: ; rm -f $(_RNGDOC_C_DOCS) $(_RNGDOC_LC_DOCS)
-clean-doc-xsldoc: ; rm -f $(_XSLDOC_C_DOCS) $(_XSLDOC_LC_DOCS)
clean-doc-omf: ; rm -f $(_DOC_OMF_DB) $(_DOC_OMF_HTML)
clean-doc-dsk: ; rm -f $(_DOC_DSK_DB) $(_DOC_DSK_HTML)
clean-doc-lc:
@@ -513,27 +382,21 @@ clean-doc-dir:
done; \
done
-_clean_rngdoc = $(if $(RNGDOC_DIRS),clean-doc-rngdoc)
-_clean_xsldoc = $(if $(XSLDOC_DIRS),clean-doc-xsldoc)
_clean_omf = $(if $(_DOC_OMF_IN),clean-doc-omf)
_clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk)
_clean_lc = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc)
_clean_dir = $(if $(DOC_MODULE),clean-doc-dir)
clean-local: \
- $(_clean_rngdoc) $(_clean_xsldoc) \
$(_clean_omf) $(_clean_dsk) \
$(_clean_lc) $(_clean_dir)
distclean-local: \
- $(_clean_rngdoc) $(_clean_xsldoc) \
$(_clean_omf) $(_clean_dsk) \
$(_clean_lc) $(_clean_dir)
mostlyclean-local: \
- $(_clean_rngdoc) $(_clean_xsldoc) \
$(_clean_omf) $(_clean_dsk) \
$(_clean_lc) $(_clean_dir)
maintainer-clean-local: \
- $(_clean_rngdoc) $(_clean_xsldoc) \
$(_clean_omf) $(_clean_dsk) \
$(_clean_lc) $(_clean_dir)
diff -pruN 2.18.0-2/help/ca/ca.po 2.19.90-0ubuntu1/help/ca/ca.po
--- 2.18.0-2/help/ca/ca.po 1970-01-01 01:00:00.000000000 +0100
+++ 2.19.90-0ubuntu1/help/ca/ca.po 2007-08-14 03:45:17.000000000 +0100
@@ -0,0 +1,101 @@
+msgid ""
+msgstr ""
+"Project-Id-Version: gnome-nettool\n"
+"POT-Creation-Date: 2007-07-01 03:30+0100\n"
+"PO-Revision-Date: 2007-07-11 20:27+0100\n"
+"Last-Translator: Joan Duran <jodufi gmail com>\n"
+"Language-Team: Catalan <tradgnome softcatala org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: C/gnome-nettool.xml:15(title)
+msgid "GNOME Nettool Manual V2.7"
+msgstr "Manual del GNOME Nettool v2.7"
+
+#: C/gnome-nettool.xml:17(para)
+msgid "User manual for the GNOME Network Tool application"
+msgstr "Manual d'usuari per a l'aplicació GNOME Eines de xarxa"
+
+#: C/gnome-nettool.xml:22(year) C/gnome-nettool.xml:65(date)
+msgid "2006"
+msgstr "2006"
+
+#: C/gnome-nettool.xml:23(holder)
+msgid "GNOME Foundation"
+msgstr "Fundació GNOME"
+
+#: C/gnome-nettool.xml:35(publishername) C/gnome-nettool.xml:67(para)
+msgid "GNOME Documentation Project"
+msgstr "Projecte de documentació del GNOME"
+
+#: C/gnome-nettool.xml:2(para)
+msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
+msgstr "Teniu permÃs per a copiar, distribuir i/o modificar aquest document, sota els termes de la Llicència de documentació lliure GNU (GFDL), versió 1.1 o qualsevol versió publicada posteriorment per la Free Software Foundation, sense seccions invariants, sense texts de portada i sense texts de contraportada. Podeu trobar una còpia de la GFDL en aquest <ulink type=\"help\" url=\"ghelp:fdl\">enllaç</ulink> o en el fitxer COPYING-DOCS distribuït amb aquest manual."
+
+#: C/gnome-nettool.xml:12(para)
+msgid "This manual is part of a collection of GNOME manuals distributed under the GFDL. If you want to distribute this manual separately from the collection, you can do so by adding a copy of the license to the manual, as described in section 6 of the license."
+msgstr "Aquest manual forma part d'una col·lecció de manuals del GNOME distribuïts sota la GFDL. Si voleu distribuir aquest manual independentment de la col·lecció, podeu fer-ho afegint una còpia de la llicència al manual, tal com es descriu a la secció 6 de la llicència."
+
+#: C/gnome-nettool.xml:19(para)
+msgid "Many of the names used by companies to distinguish their products and services are claimed as trademarks. Where those names appear in any GNOME documentation, and the members of the GNOME Documentation Project are made aware of those trademarks, then the names are in capital letters or initial capital letters."
+msgstr "Molts dels noms que les empreses utilitzen per a distingir els seus productes i serveis es consideren marques comercials. Quan aquests noms apareguin en qualsevol documentació del GNOME, si els membres del Projecte de documentació del GNOME han estat avisats pel que fa a les marques, els noms apareixeran en majúscules o amb les inicials en majúscules."
+
+#: C/gnome-nettool.xml:35(para)
+msgid "DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND"
+msgstr "EL DOCUMENT S'OFEREIX «TAL COM �S», SENSE CAP TIPUS DE GARANTIA, NI EXPL�CITA NI IMPL�CITA; AIX� INCLOU, SENSE LIMITAR-S'HI, LES GARANTIES QUE EL DOCUMENT O LA VERSI� MODIFICADA DEL DOCUMENT NO TINGUI DEFECTES, SIGUI COMERCIALITZABLE, SIGUI ADEQUAT PER A UN �S CONCRET O NO INFRINGEIXI CAP LLEI. TOT EL RISC PEL QUE FA A LA QUALITAT, EXACTITUD I RENDIMENT DEL DOCUMENT O LA VERSI� MODIFICADA DEL DOCUMENT �S VOSTRE. EN CAS QUE EL DOCUMENT RESULT�S DEFECTU�S EN QUALSEVOL ASPECTE, V�S (NO PAS L'ESCRIPTOR INICIAL, L'AUTOR O CAP ALTRE COL·LABORADOR) ASSUMIU TOT EL COST DE MANTENIMENT, REPARACI� O CORRECCI�. AQUESTA REN�NCIA DE GARANTIA CONSTITUEIX UNA PART ESSENCIAL D'AQUESTA LLIC�NCIA. NO S'AUTORITZA L'�S DE CAP DOCUMENT O VERSI� MODIFICADA DEL DOCUMENT EXCEPTE SOTA AQUESTA REN�NCIA DE GARANTIA; I "
+
+#: C/gnome-nettool.xml:55(para)
+msgid "UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES."
+msgstr "EN CAP CAS I SOTA CAP INTERPRETACI� LEGAL, JA SIGUI PER AGREUJAMENT (INCLOENT-HI LA NEGLIG�NCIA), CONTRACTE O ALTRE CAS, L'AUTOR, L'ESCRIPTOR ORIGINAL, QUALSEVOL DELS COL·LABORADORS O DISTRIBU�DORS DEL DOCUMENT O UNA VERSI� MODIFICADA DEL DOCUMENT NI CAP PROVE�DOR D'AQUESTES PARTS NO SERAN RESPONSABLES DAVANT DE NING� PER CAP DANY DIRECTE, INDIRECTE, ESPECIAL, ACCIDENTAL O CONSECUTIU DE QUALSEVOL TIPUS; AIX� INCLOU, SENSE LIMITAR-S'HI, ELS DANYS PER P�RDUA DE CLIENTS, INTERRUPCIONS DE LA FEINA, FALLADA O MALFUNCIONAMENT DE L'ORDINADOR, O QUALSEVOL ALTRA P�RDUA O DANY RELACIONAT AMB L'�S DEL DOCUMENT I LES VERSIONS MODIFICADES DEL DOCUMENT, FINS I TOT SI S'HA INFORMAT AQUESTA PART DE LA POSSIBILITAT D'AQUESTS DANYS."
+
+#: C/gnome-nettool.xml:28(para)
+msgid "DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: <placeholder-1/>"
+msgstr "EL DOCUMENT I LES VERSIONS MODIFICADES DEL DOCUMENT S'OFEREIXEN SOTA ELS TERMES DE LA LLICÃ?NCIA DE DOCUMENTACIÃ? LLIURE DE GNU, TENINT EN COMPTE QUE: <placeholder-1/>"
+
+#: C/gnome-nettool.xml:40(firstname)
+msgid "Rodrigo"
+msgstr "Rodrigo"
+
+#: C/gnome-nettool.xml:41(surname)
+msgid "Moya"
+msgstr "Moya"
+
+#: C/gnome-nettool.xml:64(revnumber)
+msgid "gnome-nettool V2.17.1"
+msgstr "gnome-nettool V2.17.1"
+
+#: C/gnome-nettool.xml:71(releaseinfo)
+msgid "This manual describes version 2.17.1 of GNOME Nettool."
+msgstr "Aquest manual descriu la versió 2.17.1 del GNOME Nettool."
+
+#: C/gnome-nettool.xml:74(title)
+msgid "Feedback"
+msgstr "Comentaris"
+
+#: C/gnome-nettool.xml:75(para)
+msgid "To report a bug or make a suggestion regarding the <application>GNOME Nettool</application> application or this manual, follow the directions in the <ulink url=\"ghelp:gnome-feedback\" type=\"help\">GNOME Feedback Page</ulink>."
+msgstr "Per a informar d'un error o fer algun suggeriment sobre l'aplicació <application>GNOME Nettool</application> o d'aquest manual, seguiu les indicacions a la <ulink url=\"ghelp:gnome-feedback\" type=\"help\">Pà gina de comentaris del GNOME</ulink>."
+
+#: C/gnome-nettool.xml:81(primary)
+msgid "gnome-nettool"
+msgstr "gnome-nettool"
+
+#: C/gnome-nettool.xml:82(primary)
+msgid "network tool application"
+msgstr "aplicació d'eines de xarxa"
+
+#: C/gnome-nettool.xml:87(title)
+msgid "Introduction"
+msgstr "Introducció"
+
+#: C/gnome-nettool.xml:88(para)
+msgid "This is only a template to get the documentation done. It should not be translated."
+msgstr "Això només és una plantilla per a tenir feta la documentació. No s'hauria de traduir."
+
+#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
+#: C/gnome-nettool.xml:0(None)
+msgid "translator-credits"
+msgstr "Joan Duran <jodufi gmail com>, 2007"
+
diff -pruN 2.18.0-2/help/ca/gnome-nettool.xml 2.19.90-0ubuntu1/help/ca/gnome-nettool.xml
--- 2.18.0-2/help/ca/gnome-nettool.xml 1970-01-01 01:00:00.000000000 +0100
+++ 2.19.90-0ubuntu1/help/ca/gnome-nettool.xml 2007-08-14 03:45:17.000000000 +0100
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"; [
+<!ENTITY legal SYSTEM "legal.xml">
+<!ENTITY appversion "2.17.1">
+<!ENTITY manrevision "2.7">
+<!ENTITY date "November 2006">
+<!ENTITY app "GNOME Nettool">
+]>
+<!-- =============Document Header ============================= -->
+<article id="index" lang="ca">
+<!-- please do not change the id; for translations, change lang to -->
+<!-- appropriate code -->
+ <articleinfo>
+ <title>Manual del GNOME Nettool v2.7</title>
+ <abstract role="description">
+ <para>Manual d'usuari per a l'aplicació GNOME Eines de xarxa</para>
+ </abstract>
+ <copyright>
+ <year>2006</year>
+ <holder>Fundació GNOME</holder>
+ </copyright><copyright><year>2007</year><holder>Joan Duran (jodufi gmail com)</holder></copyright>
+
+<!-- translators: uncomment this:
+
+ <copyright>
+ <year>2003</year>
+ <holder>ME-THE-TRANSLATOR (Latin translation)</holder>
+ </copyright>
+
+ -->
+ <publisher>
+ <publishername>Projecte de documentació del GNOME</publishername>
+ </publisher>
+ <legalnotice id="legalnotice">
+ <para>Teniu permÃs per a copiar, distribuir i/o modificar aquest document, sota els termes de la Llicència de documentació lliure GNU (GFDL), versió 1.1 o qualsevol versió publicada posteriorment per la Free Software Foundation, sense seccions invariants, sense texts de portada i sense texts de contraportada. Podeu trobar una còpia de la GFDL en aquest <ulink type="help" url="ghelp:fdl">enllaç</ulink> o en el fitxer COPYING-DOCS distribuït amb aquest manual.</para>
+ <para>Aquest manual forma part d'una col·lecció de manuals del GNOME distribuïts sota la GFDL. Si voleu distribuir aquest manual independentment de la col·lecció, podeu fer-ho afegint una còpia de la llicència al manual, tal com es descriu a la secció 6 de la llicència.</para>
+
+ <para>Molts dels noms que les empreses utilitzen per a distingir els seus productes i serveis es consideren marques comercials. Quan aquests noms apareguin en qualsevol documentació del GNOME, si els membres del Projecte de documentació del GNOME han estat avisats pel que fa a les marques, els noms apareixeran en majúscules o amb les inicials en majúscules.</para>
+
+ <para>EL DOCUMENT I LES VERSIONS MODIFICADES DEL DOCUMENT S'OFEREIXEN SOTA ELS TERMES DE LA LLICÃ?NCIA DE DOCUMENTACIÃ? LLIURE DE GNU, TENINT EN COMPTE QUE: <orderedlist>
+ <listitem>
+ <para>EL DOCUMENT S'OFEREIX «TAL COM �S», SENSE CAP TIPUS DE GARANTIA, NI EXPL�CITA NI IMPL�CITA; AIX� INCLOU, SENSE LIMITAR-S'HI, LES GARANTIES QUE EL DOCUMENT O LA VERSI� MODIFICADA DEL DOCUMENT NO TINGUI DEFECTES, SIGUI COMERCIALITZABLE, SIGUI ADEQUAT PER A UN �S CONCRET O NO INFRINGEIXI CAP LLEI. TOT EL RISC PEL QUE FA A LA QUALITAT, EXACTITUD I RENDIMENT DEL DOCUMENT O LA VERSI� MODIFICADA DEL DOCUMENT �S VOSTRE. EN CAS QUE EL DOCUMENT RESULT�S DEFECTU�S EN QUALSEVOL ASPECTE, V�S (NO PAS L'ESCRIPTOR INICIAL, L'AUTOR O CAP ALTRE COL·LABORADOR) ASSUMIU TOT EL COST DE MANTENIMENT, REPARACI� O CORRECCI�. AQUESTA REN�NCIA DE GARANTIA CONSTITUEIX UNA PART ESSENCIAL D'AQUESTA LLIC�NCIA. NO S'AUTORITZA L'�S DE CAP DOCUMENT O VERSI� MODIFICADA DEL DOCUMENT EXCEPTE SOTA AQUESTA REN�NCIA DE GARANTIA; I </para>
+ </listitem>
+ <listitem>
+ <para>EN CAP CAS I SOTA CAP INTERPRETACI� LEGAL, JA SIGUI PER AGREUJAMENT (INCLOENT-HI LA NEGLIG�NCIA), CONTRACTE O ALTRE CAS, L'AUTOR, L'ESCRIPTOR ORIGINAL, QUALSEVOL DELS COL·LABORADORS O DISTRIBU�DORS DEL DOCUMENT O UNA VERSI� MODIFICADA DEL DOCUMENT NI CAP PROVE�DOR D'AQUESTES PARTS NO SERAN RESPONSABLES DAVANT DE NING� PER CAP DANY DIRECTE, INDIRECTE, ESPECIAL, ACCIDENTAL O CONSECUTIU DE QUALSEVOL TIPUS; AIX� INCLOU, SENSE LIMITAR-S'HI, ELS DANYS PER P�RDUA DE CLIENTS, INTERRUPCIONS DE LA FEINA, FALLADA O MALFUNCIONAMENT DE L'ORDINADOR, O QUALSEVOL ALTRA P�RDUA O DANY RELACIONAT AMB L'�S DEL DOCUMENT I LES VERSIONS MODIFICADES DEL DOCUMENT, FINS I TOT SI S'HA INFORMAT AQUESTA PART DE LA POSSIBILITAT D'AQUESTS DANYS.</para>
+ </listitem>
+ </orderedlist></para>
+ </legalnotice>
+
+ <authorgroup>
+ <author role="maintainer">
+ <firstname>Rodrigo</firstname>
+ <surname>Moya</surname>
+ </author>
+
+<!-- This is appropriate place for other contributors: translators,
+ maintainers, etc. Commented out by default.
+ <othercredit role="translator">
+ <firstname>Latin</firstname>
+ <surname>Translator 1</surname>
+ <affiliation>
+ <orgname>Latin Translation Team</orgname>
+ <address> <email>translator gnome org</email> </address>
+ </affiliation>
+ <contrib>Latin translation</contrib>
+ </othercredit>
+-->
+ </authorgroup>
+
+<!-- According to GNU FDL, revision history is mandatory if you are -->
+<!-- modifying/reusing someone else's document. If not, you can omit it. -->
+ <revhistory>
+<!-- Remember to remove the &manrevision; entity from the revision entries other
+ than the current revision. -->
+ <revision>
+ <revnumber>gnome-nettool V2.17.1</revnumber>
+ <date>2006</date>
+ <revdescription>
+ <para role="publisher">Projecte de documentació del GNOME</para>
+ </revdescription>
+ </revision>
+ </revhistory>
+ <releaseinfo>Aquest manual descriu la versió 2.17.1 del GNOME Nettool.</releaseinfo>
+ <legalnotice>
+ <title>Comentaris</title>
+ <para>Per a informar d'un error o fer algun suggeriment sobre l'aplicació <application>GNOME Nettool</application> o d'aquest manual, seguiu les indicacions a la <ulink url="ghelp:gnome-feedback" type="help">Pà gina de comentaris del GNOME</ulink>.</para>
+<!-- Translators may also add here feedback address for translations -->
+ </legalnotice>
+ </articleinfo>
+
+ <indexterm><primary>gnome-nettool</primary></indexterm>
+ <indexterm><primary>aplicació d'eines de xarxa</primary></indexterm>
+
+<!-- ============= Document Body ============================= -->
+<!-- ============= Introduction ============================== -->
+ <sect1 id="gnome-nettool-intro">
+ <title>Introducció</title>
+ <para>Això només és una plantilla per a tenir feta la documentació. No s'hauria de traduir.</para>
+ </sect1>
+
+</article>
+<!-- vi:set ts=2 sw=2 expandtab: -->
diff -pruN 2.18.0-2/help/ChangeLog 2.19.90-0ubuntu1/help/ChangeLog
--- 2.18.0-2/help/ChangeLog 2007-03-13 01:18:37.000000000 +0000
+++ 2.19.90-0ubuntu1/help/ChangeLog 2007-08-14 03:43:13.000000000 +0100
@@ -1,3 +1,17 @@
+2007-07-13 Jordi Mas <jmas softcatala org>
+
+ * Makefile.am: Added ca to DOC_LINGUAS.
+ * ca/ca.po: Initial Catalan translation by Joan Duran.
+
+2007-04-21 Jorge Gonzalez <jorgegonz svn gnome org>
+ * Makefile.am: Added es to DOC_LINGUAS.
+ * es/es.po Added Spanish translation.
+
+2007-03-13 Maxim Dziumanenko <dziumanenko gmail com>
+
+ * Makefile.am: Added uk to DOC_LINGUAS.
+ * uk/uk.po: Added Ukrainian translation.
+
2007-03-03 Claude Paroz <claude 2xlibre net>
* Makefile.am: Added fr to DOC_LINGUAS.
diff -pruN 2.18.0-2/help/es/es.po 2.19.90-0ubuntu1/help/es/es.po
--- 2.18.0-2/help/es/es.po 1970-01-01 01:00:00.000000000 +0100
+++ 2.19.90-0ubuntu1/help/es/es.po 2007-08-14 03:45:17.000000000 +0100
@@ -0,0 +1,145 @@
+# Jorge González <jorge gonzalez gonzalez hispalinux es>, 2007.
+msgid ""
+msgstr ""
+"Project-Id-Version: gnome-nettool.manual.gnome-2-18.es\n"
+"POT-Creation-Date: 2007-04-12 03:26+0100\n"
+"PO-Revision-Date: 2007-04-12 14:09+0200\n"
+"Last-Translator: Jorge González <jorge gonzalez gonzalez hispalinux es>\n"
+"Language-Team: Spanish <traductores es gnome org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+#: C/gnome-nettool.xml:15(title)
+msgid "GNOME Nettool Manual V2.7"
+msgstr "Manual de las Herramientas de red de GNOME V2.7"
+
+#: C/gnome-nettool.xml:17(para)
+msgid "User manual for the GNOME Network Tool application"
+msgstr "Manual del usuario para las Herramientas de red de GNOME"
+
+#: C/gnome-nettool.xml:22(year) C/gnome-nettool.xml:65(date)
+msgid "2006"
+msgstr "2006"
+
+#: C/gnome-nettool.xml:23(holder)
+msgid "GNOME Foundation"
+msgstr "Fundación GNOME"
+
+#: C/gnome-nettool.xml:35(publishername) C/gnome-nettool.xml:67(para)
+msgid "GNOME Documentation Project"
+msgstr "Proyecto de documentación de GNOME"
+
+#: C/gnome-nettool.xml:2(para)
+msgid "Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any later version published by the Free Software Foundation with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or in the file COPYING-DOCS distributed with this manual."
+msgstr ""
+"Se otorga permiso para copiar, distribuir y/o modificar este documento bajo "
+"los términos de la Licencia de Documentación Libre de GNU, Versión 1.1 o "
+"cualquier otra versión posterior publicada por la Free Software Foundation; "
+"sin Secciones Invariantes ni Textos de Cubierta Delantera ni Textos de "
+"Cubierta Trasera. Puede encontrar una copia de la licencia GFDL en este "
+"<ulink type=\"help\" url=\"ghelp:fdl\">enlace</ulink> o en el archivo "
+"COPYING-DOCS distribuido con este manual."
+
+#: C/gnome-nettool.xml:12(para)
+msgid "This manual is part of a collection of GNOME manuals distributed under the GFDL. If you want to distribute this manual separately from the collection, you can do so by adding a copy of the license to the manual, as described in section 6 of the license."
+msgstr ""
+"Este manual es parte de una colección de manuales de GNOME distribuido bajo "
+"la GFDL. Si quiere distribuir este manual por separado de la colección, "
+"puede hacerlo añadiendo una copia de la licencia al manual, tal como se "
+"describe en la sección 6 de la licencia."
+
+#: C/gnome-nettool.xml:19(para)
+msgid "Many of the names used by companies to distinguish their products and services are claimed as trademarks. Where those names appear in any GNOME documentation, and the members of the GNOME Documentation Project are made aware of those trademarks, then the names are in capital letters or initial capital letters."
+msgstr ""
+"Muchos de los nombres usados por compañÃas para distinguir sus productos y "
+"servicios son mencionados como marcas comerciales. Donde esos nombres "
+"aparezcan en cualquier documentación de GNOME, y los miembros del Proyecto "
+"de Documentación de GNOME están al corriente de esas marcas comerciales, "
+"entonces los nombres se pondrán en mayúsculas o con la inicial en mayúsculas."
+
+#: C/gnome-nettool.xml:35(para)
+msgid "DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND"
+msgstr ""
+"EL DOCUMENTO SE PROPORCIONA \"TAL CUAL\", SIN GARANTÃ?A DE NINGÃ?N TIPO, NI "
+"EXPLÃ?CITA NI IMPLÃ?CITA INCLUYENDO, SIN LIMITACIÃ?N, GARANTÃ?A DE QUE EL "
+"DOCUMENTO O VERSIÃ?N MODIFICADA DE Ã?STE CAREZCA DE DEFECTOS COMERCIALES, SEA "
+"ADECUADO A UN FIN CONCRETO O INCUMPLA ALGUNA NORMATIVA. TODO EL RIESGO "
+"RELATIVO A LA CALIDAD, PRECISIÃ?N Y UTILIDAD DEL DOCUMENTO O SU VERSIÃ?N "
+"MODIFICADA RECAE EN USTED. SI CUALQUIER DOCUMENTO O VERSIÃ?N MODIFICADA DE "
+"AQUÃ?L RESULTARA DEFECTUOSO EN CUALQUIER ASPECTO, USTED (Y NO EL REDACTOR "
+"INICIAL, AUTOR O CONTRIBUYENTE) ASUMIRÃ? LOS COSTES DE TODA REPARACIÃ?N, "
+"MANTENIMIENTO O CORRECCIÃ?N NECESARIOS. ESTA RENUNCIA DE GARANTÃ?A ES UNA "
+"PARTE ESENCIAL DE ESTA LICENCIA. NO SE AUTORIZA EL USO DE NINGÃ?N DOCUMENTO "
+"NI VERSIÃ?N MODIFICADA DE Ã?STE POR EL PRESENTE, SALVO DENTRO DEL CUMPLIMIENTO "
+"DE LA RENUNCIA;Y"
+
+#: C/gnome-nettool.xml:55(para)
+msgid "UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES."
+msgstr ""
+"BAJO NINGUNA CIRCUNSTANCIA NI BAJO NINGUNA TEORÃ?A LEGAL, SEA POR ERROR "
+"(INCLUYENDO NEGLIGENCIA), CONTRATO O DE ALGÃ?N OTRO MODO, EL AUTOR, EL "
+"ESCRITOR INICIAL, CUALQUIER CONTRIBUIDOR, O CUALQUIER DISTRIBUIDOR DEL "
+"DOCUMENTO O VERSIÃ?N MODIFICADA DEL DOCUMENTO, O CUALQUIER PROVEEDOR DE "
+"CUALQUIERA DE ESAS PARTES, SERÃ? RESPONSABLE ANTE NINGUNA PERSONA POR NINGÃ?N "
+"DAÃ?O DIRECTO, INDIRECTO, ESPECIAL, INCIDENTAL O DERIVADO DE NINGÃ?N TIPO, "
+"INCLUYENDO, SIN LIMITACIÃ?N DAÃ?OS POR PÃ?RDIDA DE MERCANCÃ?AS, PARO TÃ?CNICO, "
+"FALLO INFORMÃ?TICO O MAL FUNCIONAMIENTO O CUALQUIER OTRO POSIBLE DAÃ?O O "
+"PÃ?RDIDAS DERIVADAS O RELACIONADAS CON EL USO DEL DOCUMENTO O SUS VERSIONES "
+"MODIFICADAS, AUNQUE DICHA PARTE HAYA SIDO INFORMADA DE LA POSIBILIDAD DE QUE "
+"SE PRODUJESEN DICHOS DAÃ?OS."
+
+#: C/gnome-nettool.xml:28(para)
+msgid "DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: <placeholder-1/>"
+msgstr ""
+"ESTE DOCUMENTO Y LAS VERSIONES MODIFICADAS DEL MISMO SE PROPORCIONAN SEGÃ?N "
+"LAS CONDICIONES ESTABLECIDAS EN LA LICENCIA DE DOCUMENTACIÃ?N LIBRE DE GNU "
+"(GFDL) Y TENIENDO EN CUENTA QUE: <placeholder-1/>"
+
+#: C/gnome-nettool.xml:40(firstname)
+msgid "Rodrigo"
+msgstr "Rodrigo"
+
+#: C/gnome-nettool.xml:41(surname)
+msgid "Moya"
+msgstr "Moya"
+
+#: C/gnome-nettool.xml:64(revnumber)
+msgid "gnome-nettool V2.17.1"
+msgstr "Heramientas de red V2.17.1"
+
+#: C/gnome-nettool.xml:71(releaseinfo)
+msgid "This manual describes version 2.17.1 of GNOME Nettool."
+msgstr "Este manual describe la versión 2.17.1 de Herramientas de red de GNOME"
+
+#: C/gnome-nettool.xml:74(title)
+msgid "Feedback"
+msgstr "Comentarios"
+
+#: C/gnome-nettool.xml:75(para)
+msgid "To report a bug or make a suggestion regarding the <application>GNOME Nettool</application> application or this manual, follow the directions in the <ulink url=\"ghelp:gnome-feedback\" type=\"help\">GNOME Feedback Page</ulink>."
+msgstr "Para informar sobre un fallo o hacer sugerencias sobre la aplicación <application>Herramientas de red de GNOME</" "application> o sobre este manual, siga las indicaciones en la <ulink url=\"ghelp:gnome-feedback\" type=\"help\">Página" "de comentarios de Gnome</ulink>."
+
+#: C/gnome-nettool.xml:81(primary)
+msgid "gnome-nettool"
+msgstr "gnome-nettool"
+
+#: C/gnome-nettool.xml:82(primary)
+msgid "network tool application"
+msgstr "aplicación de herramientas de red"
+
+#: C/gnome-nettool.xml:87(title)
+msgid "Introduction"
+msgstr "Introducción"
+
+#: C/gnome-nettool.xml:88(para)
+msgid "This is only a template to get the documentation done. It should not be translated."
+msgstr "Esto eso sólo una plantilla para tener el documento hecho. No deberÃa ser traducido."
+
+#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
+#: C/gnome-nettool.xml:0(None)
+msgid "translator-credits"
+msgstr "Jorge González <jorge gonzalez gonzalez hispalinux es> 2007"
+
diff -pruN 2.18.0-2/help/es/gnome-nettool.xml 2.19.90-0ubuntu1/help/es/gnome-nettool.xml
--- 2.18.0-2/help/es/gnome-nettool.xml 1970-01-01 01:00:00.000000000 +0100
+++ 2.19.90-0ubuntu1/help/es/gnome-nettool.xml 2007-08-14 03:45:17.000000000 +0100
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"; [
+<!ENTITY legal SYSTEM "legal.xml">
+<!ENTITY appversion "2.17.1">
+<!ENTITY manrevision "2.7">
+<!ENTITY date "November 2006">
+<!ENTITY app "GNOME Nettool">
+]>
+<!-- =============Document Header ============================= -->
+<article id="index" lang="es">
+<!-- please do not change the id; for translations, change lang to -->
+<!-- appropriate code -->
+ <articleinfo>
+ <title>Manual de las Herramientas de red de GNOME V2.7</title>
+ <abstract role="description">
+ <para>Manual del usuario para las Herramientas de red de GNOME</para>
+ </abstract>
+ <copyright>
+ <year>2006</year>
+ <holder>Fundación GNOME</holder>
+ </copyright>
+
+<!-- translators: uncomment this:
+
+ <copyright>
+ <year>2003</year>
+ <holder>ME-THE-TRANSLATOR (Latin translation)</holder>
+ </copyright>
+
+ -->
+ <publisher>
+ <publishername>Proyecto de documentación de GNOME</publishername>
+ </publisher>
+ <legalnotice id="legalnotice">
+ <para>Se otorga permiso para copiar, distribuir y/o modificar este documento bajo los términos de la Licencia de Documentación Libre de GNU, Versión 1.1 o cualquier otra versión posterior publicada por la Free Software Foundation; sin Secciones Invariantes ni Textos de Cubierta Delantera ni Textos de Cubierta Trasera. Puede encontrar una copia de la licencia GFDL en este <ulink type="help" url="ghelp:fdl">enlace</ulink> o en el archivo COPYING-DOCS distribuido con este manual.</para>
+ <para>Este manual es parte de una colección de manuales de GNOME distribuido bajo la GFDL. Si quiere distribuir este manual por separado de la colección, puede hacerlo añadiendo una copia de la licencia al manual, tal como se describe en la sección 6 de la licencia.</para>
+
+ <para>Muchos de los nombres usados por compañÃas para distinguir sus productos y servicios son mencionados como marcas comerciales. Donde esos nombres aparezcan en cualquier documentación de GNOME, y los miembros del Proyecto de Documentación de GNOME están al corriente de esas marcas comerciales, entonces los nombres se pondrán en mayúsculas o con la inicial en mayúsculas.</para>
+
+ <para>ESTE DOCUMENTO Y LAS VERSIONES MODIFICADAS DEL MISMO SE PROPORCIONAN SEGÃ?N LAS CONDICIONES ESTABLECIDAS EN LA LICENCIA DE DOCUMENTACIÃ?N LIBRE DE GNU (GFDL) Y TENIENDO EN CUENTA QUE: <orderedlist>
+ <listitem>
+ <para>EL DOCUMENTO SE PROPORCIONA "TAL CUAL", SIN GARANTÃ?A DE NINGÃ?N TIPO, NI EXPLÃ?CITA NI IMPLÃ?CITA INCLUYENDO, SIN LIMITACIÃ?N, GARANTÃ?A DE QUE EL DOCUMENTO O VERSIÃ?N MODIFICADA DE Ã?STE CAREZCA DE DEFECTOS COMERCIALES, SEA ADECUADO A UN FIN CONCRETO O INCUMPLA ALGUNA NORMATIVA. TODO EL RIESGO RELATIVO A LA CALIDAD, PRECISIÃ?N Y UTILIDAD DEL DOCUMENTO O SU VERSIÃ?N MODIFICADA RECAE EN USTED. SI CUALQUIER DOCUMENTO O VERSIÃ?N MODIFICADA DE AQUÃ?L RESULTARA DEFECTUOSO EN CUALQUIER ASPECTO, USTED (Y NO EL REDACTOR INICIAL, AUTOR O CONTRIBUYENTE) ASUMIRÃ? LOS COSTES DE TODA REPARACIÃ?N, MANTENIMIENTO O CORRECCIÃ?N NECESARIOS. ESTA RENUNCIA DE GARANTÃ?A ES UNA PARTE ESENCIAL DE ESTA LICENCIA. NO SE AUTORIZA EL USO DE NINGÃ?N DOCUMENTO NI VERSIÃ?N MODIFICADA DE Ã?STE POR EL PRESENTE, SALVO DENTRO DEL CUMPLIMIENTO DE LA RENUNCIA;Y</para>
+ </listitem>
+ <listitem>
+ <para>BAJO NINGUNA CIRCUNSTANCIA NI BAJO NINGUNA TEORÃ?A LEGAL, SEA POR ERROR (INCLUYENDO NEGLIGENCIA), CONTRATO O DE ALGÃ?N OTRO MODO, EL AUTOR, EL ESCRITOR INICIAL, CUALQUIER CONTRIBUIDOR, O CUALQUIER DISTRIBUIDOR DEL DOCUMENTO O VERSIÃ?N MODIFICADA DEL DOCUMENTO, O CUALQUIER PROVEEDOR DE CUALQUIERA DE ESAS PARTES, SERÃ? RESPONSABLE ANTE NINGUNA PERSONA POR NINGÃ?N DAÃ?O DIRECTO, INDIRECTO, ESPECIAL, INCIDENTAL O DERIVADO DE NINGÃ?N TIPO, INCLUYENDO, SIN LIMITACIÃ?N DAÃ?OS POR PÃ?RDIDA DE MERCANCÃ?AS, PARO TÃ?CNICO, FALLO INFORMÃ?TICO O MAL FUNCIONAMIENTO O CUALQUIER OTRO POSIBLE DAÃ?O O PÃ?RDIDAS DERIVADAS O RELACIONADAS CON EL USO DEL DOCUMENTO O SUS VERSIONES MODIFICADAS, AUNQUE DICHA PARTE HAYA SIDO INFORMADA DE LA POSIBILIDAD DE QUE SE PRODUJESEN DICHOS DAÃ?OS.</para>
+ </listitem>
+ </orderedlist></para>
+ </legalnotice>
+
+ <authorgroup>
+ <author role="maintainer">
+ <firstname>Rodrigo</firstname>
+ <surname>Moya</surname>
+ </author>
+
+<!-- This is appropriate place for other contributors: translators,
+ maintainers, etc. Commented out by default.
+ <othercredit role="translator">
+ <firstname>Latin</firstname>
+ <surname>Translator 1</surname>
+ <affiliation>
+ <orgname>Latin Translation Team</orgname>
+ <address> <email>translator gnome org</email> </address>
+ </affiliation>
+ <contrib>Latin translation</contrib>
+ </othercredit>
+-->
+ </authorgroup>
+
+<!-- According to GNU FDL, revision history is mandatory if you are -->
+<!-- modifying/reusing someone else's document. If not, you can omit it. -->
+ <revhistory>
+<!-- Remember to remove the &manrevision; entity from the revision entries other
+ than the current revision. -->
+ <revision>
+ <revnumber>Heramientas de red V2.17.1</revnumber>
+ <date>2006</date>
+ <revdescription>
+ <para role="publisher">Proyecto de documentación de GNOME</para>
+ </revdescription>
+ </revision>
+ </revhistory>
+ <releaseinfo>Este manual describe la versión 2.17.1 de Herramientas de red de GNOME</releaseinfo>
+ <legalnotice>
+ <title>Comentarios</title>
+ <para>Para informar sobre un fallo o hacer sugerencias sobre la aplicación <application>Herramientas de red de GNOME</application> o sobre este manual, siga las indicaciones en la <ulink url="ghelp:gnome-feedback" type="help">Páginade comentarios de Gnome</ulink>.</para>
+<!-- Translators may also add here feedback address for translations -->
+ </legalnotice>
+ </articleinfo>
+
+ <indexterm><primary>gnome-nettool</primary></indexterm>
+ <indexterm><primary>aplicación de herramientas de red</primary></indexterm>
+
+<!-- ============= Document Body ============================= -->
+<!-- ============= Introduction ============================== -->
+ <sect1 id="gnome-nettool-intro">
+ <title>Introducción</title>
+ <para>Esto eso sólo una plantilla para tener el documento hecho. No deberÃa ser traducido.</para>
+ </sect1>
+
+</article>
+<!-- vi:set ts=2 sw=2 expandtab: -->
diff -pruN 2.18.0-2/help/Makefile.am 2.19.90-0ubuntu1/help/Makefile.am
--- 2.18.0-2/help/Makefile.am 2007-03-13 01:18:37.000000000 +0000
+++ 2.19.90-0ubuntu1/help/Makefile.am 2007-08-14 03:43:13.000000000 +0100
@@ -6,4 +6,4 @@ DOC_ENTITIES = legal.xml
DOC_INCLUDES =
DOC_FIGURES =
-DOC_LINGUAS = fr pa sv
+DOC_LINGUAS = ca es fr pa sv uk
diff -pruN 2.18.0-2/help/Makefile.in 2.19.90-0ubuntu1/help/Makefile.in
--- 2.18.0-2/help/Makefile.in 2007-03-13 01:48:45.000000000 +0000
+++ 2.19.90-0ubuntu1/help/Makefile.in 2007-08-14 03:44:50.000000000 +0100
@@ -110,12 +110,12 @@ ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-GDU_MODULE_VERSION_CHECK_CFLAGS = @GDU_MODULE_VERSION_CHECK_CFLAGS@
-GDU_MODULE_VERSION_CHECK_LIBS = @GDU_MODULE_VERSION_CHECK_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
HELP_DIR = @HELP_DIR@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -161,6 +161,7 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_
MAKEINFO = @MAKEINFO@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
NETTOOL_CFLAGS = @NETTOOL_CFLAGS@
NETTOOL_LIBS = @NETTOOL_LIBS@
OBJEXT = @OBJEXT@
@@ -238,33 +239,8 @@ _DOC_REAL_LINGUAS = $(if $(filter enviro
$(filter $(LINGUAS),$(DOC_LINGUAS)), \
$(DOC_LINGUAS))
-
-################################################################################
-rngdoc_args = \
- --stringparam rngdoc.id \
- $(shell echo $(basename $(notdir $(1))) | sed -e 's/[^A-Za-z0-9_-]/_/g')\
- $(_rngdoc) $(filter %/$(basename $(notdir $(1))).rng,$(_RNGDOC_RNGS))
-
-_RNGDOC_RNGS = $(sort $(patsubst ./%, %, $(foreach dir,$(RNGDOC_DIRS), \
- $(wildcard $(dir)/*.rng) $(wildcard $(srcdir)/$(dir)/*.rng))))
-
-_RNGDOC_C_DOCS = $(foreach rng,$(_RNGDOC_RNGS), C/$(basename $(notdir $(rng))).xml)
-
-################################################################################
-
-# FIXME: _XSLDOC_XSLS is getting dupes with relative/absolute in some
-# cases. Right now, I'm just taking the first, but that's just a bad
-# work-around. Fix the real problem.
-xsldoc_args = \
- --stringparam xsldoc.id \
- $(shell echo $(basename $(notdir $(1))) | sed -e 's/[^A-Za-z0-9_-]/_/g')\
- $(_xsldoc) \
- $(word 1,$(filter %/$(basename $(notdir $(1))).xsl,$(_XSLDOC_XSLS)))
-
-_XSLDOC_XSLS = $(sort $(patsubst ./%, %, $(foreach dir,$(XSLDOC_DIRS), \
- $(wildcard $(dir)/*.xsl) $(wildcard $(srcdir)/$(dir)/*.xsl))))
-
-_XSLDOC_C_DOCS = $(foreach xsl,$(_XSLDOC_XSLS), C/$(basename $(notdir $(xsl))).xml)
+_DOC_ABS_SRCDIR = @abs_srcdir@
+ ENABLE_SK_TRUE@_ENABLE_SK = true
################################################################################
db2omf_args = \
@@ -276,10 +252,12 @@ db2omf_args = \
--stringparam db2omf.lang $(notdir $(patsubst %/$(notdir $(2)),%,$(2))) \
--stringparam db2omf.omf_dir "$(OMF_DIR)" \
--stringparam db2omf.help_dir "$(HELP_DIR)" \
- --stringparam db2omf.omf_in "`pwd`/$(_DOC_OMF_IN)" \
+ --stringparam db2omf.omf_in "$(_DOC_OMF_IN)" \
+ $(if $(_ENABLE_SK), \
+ --stringparam db2omf.scrollkeeper_cl "$(_skcontentslist)") \
$(_db2omf) $(2)
-_DOC_OMF_IN = $(if $(DOC_MODULE),$(wildcard $(srcdir)/$(DOC_MODULE).omf.in))
+_DOC_OMF_IN = $(if $(DOC_MODULE),$(wildcard $(_DOC_ABS_SRCDIR)/$(DOC_MODULE).omf.in))
_DOC_OMF_DB = $(if $(_DOC_OMF_IN), \
$(foreach lc,C $(_DOC_REAL_LINGUAS),$(DOC_MODULE)-$(lc).omf))
@@ -294,25 +272,15 @@ _DOC_OMF_ALL = \
################################################################################
-_CVSIGNORE_TOP = $(if $(DOC_MODULE), .cvsignore)
-_CVSIGNORE_C = $(if $(DOC_MODULE), C/.cvsignore)
-_CVSIGNORE_LC = $(if $(DOC_MODULE),$(foreach lc,$(_DOC_REAL_LINGUAS),$(lc)/.cvsignore))
-_CVSIGNORE_TOP_FILES = $(_DOC_OMF_ALL) $(_DOC_DSK_ALL)
-_CVSIGNORE_C_FILES = $(_RNGDOC_C_DOCS) $(_XSLDOC_C_DOCS)
-_CVSIGNORE_LC_FILES = $(_DOC_LC_DOCS)
-
-################################################################################
_DOC_C_MODULE = $(if $(DOC_MODULE),C/$(DOC_MODULE).xml)
_DOC_C_ENTITIES = $(foreach ent,$(DOC_ENTITIES),C/$(ent))
_DOC_C_INCLUDES = $(foreach inc,$(DOC_INCLUDES),C/$(inc))
_DOC_C_DOCS = \
$(_DOC_C_ENTITIES) $(_DOC_C_INCLUDES) \
- $(_RNGDOC_C_DOCS) $(_XSLDOC_C_DOCS) \
$(_DOC_C_MODULE)
_DOC_C_DOCS_NOENT = \
- $(_DOC_C_MODULE) $(_DOC_C_INCLUDES) \
- $(_RNGDOC_C_DOCS) $(_XSLDOC_C_DOCS)
+ $(_DOC_C_MODULE) $(_DOC_C_INCLUDES)
_DOC_C_FIGURES = $(if $(DOC_FIGURES), \
$(foreach fig,$(DOC_FIGURES),C/$(fig)), \
@@ -338,14 +306,6 @@ _DOC_LC_INCLUDES = \
$(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach inc,$(_DOC_C_INCLUDES), \
$(lc)/$(notdir $(inc)) ))
-_RNGDOC_LC_DOCS = \
- $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach doc,$(_RNGDOC_C_DOCS), \
- $(lc)/$(notdir $(doc)) ))
-
-_XSLDOC_LC_DOCS = \
- $(foreach lc,$(_DOC_REAL_LINGUAS),$(foreach doc,$(_XSLDOC_C_DOCS), \
- $(lc)/$(notdir $(doc)) ))
-
# FIXME: probably have to shell escape to determine the file names
_DOC_LC_HTML = \
@@ -354,7 +314,6 @@ _DOC_LC_HTML = \
_DOC_LC_DOCS = \
$(_DOC_LC_MODULES) $(_DOC_LC_INCLUDES) \
- $(_RNGDOC_LC_DOCS) $(_XSLDOC_LC_DOCS) \
$(if $(filter html HTML,$(_DOC_REAL_FORMATS)),$(_DOC_LC_HTML))
_DOC_LC_FIGURES = $(foreach lc,$(_DOC_REAL_LINGUAS), \
@@ -371,12 +330,6 @@ _DOC_HTML_ALL = $(if $(filter html HTML,
$(_DOC_C_HTML) $(_DOC_LC_HTML))
_DOC_HTML_TOPS = $(foreach lc,C $(_DOC_REAL_LINGUAS),$(lc)/$(DOC_MODULE).xhtml)
- ENABLE_SK_FALSE@_ENABLE_SK = false
-
-################################################################################
- ENABLE_SK_TRUE@_ENABLE_SK = true
-_clean_rngdoc = $(if $(RNGDOC_DIRS),clean-doc-rngdoc)
-_clean_xsldoc = $(if $(XSLDOC_DIRS),clean-doc-xsldoc)
_clean_omf = $(if $(_DOC_OMF_IN),clean-doc-omf)
_clean_dsk = $(if $(_DOC_DSK_IN),clean-doc-dsk)
_clean_lc = $(if $(_DOC_REAL_LINGUAS),clean-doc-lc)
@@ -385,7 +338,7 @@ DOC_MODULE = gnome-nettool
DOC_ENTITIES = legal.xml
DOC_INCLUDES =
DOC_FIGURES =
-DOC_LINGUAS = fr pa sv
+DOC_LINGUAS = ca es fr pa sv uk
all: all-am
.SUFFIXES:
@@ -588,13 +541,17 @@ $(DOC_H_FILE): $(DOC_H_DOCS);
done;
cp $ tmp $@ && rm -f $ tmp
+dist-check-gdu:
+ HAVE_GNOME_DOC_UTILS_FALSE@ @echo "*** GNOME Doc Utils must be installed in order to make dist"
+ HAVE_GNOME_DOC_UTILS_FALSE@ @false
+
.PHONY: dist-doc-header
dist-doc-header: $(DOC_H_FILE)
@if test -f "$(DOC_H_FILE)"; then d=; else d="$(srcdir)/"; fi; \
echo "$(INSTALL_DATA) $${d}$(DOC_H_FILE) $(distdir)/$(DOC_H_FILE)"; \
$(INSTALL_DATA) "$${d}$(DOC_H_FILE)" "$(distdir)/$(DOC_H_FILE)";
-doc-dist-hook: $(if $(DOC_H_FILE),dist-doc-header)
+doc-dist-hook: dist-check-gdu $(if $(DOC_H_FILE),dist-doc-header)
.PHONY: clean-doc-header
clean-local: $(_clean_doc_header)
@@ -620,84 +577,38 @@ DOC_FORMATS ?= docbook
DOC_LINGUAS ?=
-RNGDOC_DIRS ?=
-
-XSLDOC_DIRS ?=
-
################################################################################
_xml2po ?= `which xml2po`
_db2html ?= `$(PKG_CONFIG) --variable db2html gnome-doc-utils`
_db2omf ?= `$(PKG_CONFIG) --variable db2omf gnome-doc-utils`
-_rngdoc ?= `$(PKG_CONFIG) --variable rngdoc gnome-doc-utils`
-_xsldoc ?= `$(PKG_CONFIG) --variable xsldoc gnome-doc-utils`
_chunks ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/chunks.xsl
_credits ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/credits.xsl
_ids ?= `$(PKG_CONFIG) --variable xmldir gnome-doc-utils`/gnome/xslt/docbook/utils/ids.xsl
-
-_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir`
-
-# FIXME: Fix the dependancies
-$(_RNGDOC_C_DOCS) : $(_RNGDOC_RNGS)
- if ! test -d $(dir $@); then mkdir $(dir $@); fi;
- xsltproc $(call rngdoc_args,$@,$<) | xmllint --c14n - > $ tmp && \
- cp $ tmp $@ && rm -f $ tmp
-
-.PHONY: rngdoc
-rngdoc: $(_RNGDOC_C_DOCS)
-
-# FIXME: Fix the dependancies
-$(_XSLDOC_C_DOCS) : $(_XSLDOC_XSLS)
- if ! test -d $(dir $@); then mkdir $(dir $@); fi;
- xsltproc $(call xsldoc_args,$@,$<) | xmllint --c14n - > $ tmp && \
- cp $ tmp $@ && rm -f $ tmp
-
-.PHONY: xsldoc
-xsldoc: $(_XSLDOC_C_DOCS)
+ ENABLE_SK_TRUE@_skpkgdatadir ?= `scrollkeeper-config --pkgdatadir`
+ ENABLE_SK_TRUE@_sklocalstatedir ?= `scrollkeeper-config --pkglocalstatedir`
+ ENABLE_SK_TRUE@_skcontentslist ?= $(_skpkgdatadir)/Templates/C/scrollkeeper_cl.xml
$(_DOC_OMF_DB) : $(_DOC_OMF_IN)
$(_DOC_OMF_DB) : $(DOC_MODULE)-%.omf : %/$(DOC_MODULE).xml
- xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook')
+ @test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || { \
+ echo "The file '$(_skcontentslist)' does not exist." >&2; \
+ echo "Please check your ScrollKeeper installation." >&2; \
+ exit 1; }
+ xsltproc -o $@ $(call db2omf_args,$@,$<,'docbook') || { rm -f "$@"; exit 1; }
$(_DOC_OMF_HTML) : $(_DOC_OMF_IN)
$(_DOC_OMF_HTML) : $(DOC_MODULE)-html-%.omf : %/$(DOC_MODULE).xml
- xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml')
+ ENABLE_SK_TRUE@ @test "x$(_ENABLE_SK)" != "xtrue" -o -f "$(_skcontentslist)" || { \
+ ENABLE_SK_TRUE@ echo "The file '$(_skcontentslist)' does not exist" >&2; \
+ ENABLE_SK_TRUE@ echo "Please check your ScrollKeeper installation." >&2; \
+ ENABLE_SK_TRUE@ exit 1; }
+ xsltproc -o $@ $(call db2omf_args,$@,$<,'xhtml') || { rm -f "$@"; exit 1; }
.PHONY: omf
omf: $(_DOC_OMF_ALL)
-$(_CVSIGNORE_TOP) : $(_CVSIGNORE_TOP_FILES)
- if ! test -f $@; then touch $@; fi
- cat $@ > $ tmp
- list='$^'; for file in $$list; do \
- echo $$file >> $ tmp; \
- done
- cat $ tmp | sort | uniq > $@
- rm $ tmp
-
-$(_CVSIGNORE_C) : $(_CVSIGNORE_C_FILES)
- if ! test -f $@; then touch $@; fi
- cat $@ > $ tmp
- list='$^'; for file in $$list; do \
- echo $$file | sed -e 's/.*\///' >> $ tmp; \
- done
- cat $ tmp | sort | uniq > $@
- rm $ tmp
-
-$(_CVSIGNORE_LC) : $(_CVSIGNORE_LC_FILES)
- if ! test -f $@; then touch $@; fi
- cat $@ > $ tmp
- list='$(wildcard $(_CVSIGNORE_LC_FILES),$(dir $@)/*)'; \
- for file in $$list; do \
- echo $$file | sed -e 's/.*\///' >> $ tmp; \
- done
- cat $ tmp | sort | uniq > $@
- rm $ tmp
-
-.PHONY: cvsignore
-cvsignore: $(_CVSIGNORE_TOP) $(_CVSIGNROE_C) $(_CVSIGNORE_LC)
-
.PHONY: po
po: $(_DOC_POFILES)
@@ -712,11 +623,7 @@ $(_DOC_POFILES):
fi;
@docs=; \
list='$(_DOC_C_DOCS_NOENT)'; for doc in $$list; do \
- if test -f $$doc; then \
- docs="$$docs ../$$doc"; \
- else \
- docs="$$docs ../$(srcdir)/$$doc"; \
- fi; \
+ docs="$$docs $(_DOC_ABS_SRCDIR)/$$doc"; \
done; \
if ! test -f $@; then \
echo "(cd $(dir $@) && \
@@ -737,8 +644,7 @@ $(_DOC_POFILES):
$(_DOC_LC_DOCS) : $(_DOC_POFILES)
$(_DOC_LC_DOCS) : $(_DOC_C_DOCS)
if ! test -d $(dir $@); then mkdir $(dir $@); fi
- case "$(srcdir)" in /*) sd="$(srcdir)";; *) sd="../$(srcdir)";; esac; \
- if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$$sd/"; fi; \
+ if [ -f "C/$(notdir $@)" ]; then d="../"; else d="$(_DOC_ABS_SRCDIR)/"; fi; \
(cd $(dir $@) && \
$(_xml2po) -e -p \
"$${d}$(dir $@)$(patsubst %/$(notdir $@),%,$@).po" \
@@ -752,15 +658,15 @@ $(_DOC_POT): $(_DOC_C_DOCS_NOENT)
$(_DOC_HTML_TOPS): $(_DOC_C_DOCS) $(_DOC_LC_DOCS)
xsltproc -o $@ --xinclude --param db.chunk.chunk_top "false()" --stringparam db.chunk.basename "$(DOC_MODULE)" --stringparam db.chunk.extension ".xhtml" $(_db2html) $(patsubst %.xhtml,%.xml,$@)
+################################################################################
+
all: \
$(_DOC_C_DOCS) $(_DOC_LC_DOCS) \
$(_DOC_OMF_ALL) $(_DOC_DSK_ALL) \
$(_DOC_HTML_ALL) $(_DOC_POFILES)
-.PHONY: clean-doc-rngdoc clean-doc-xsldoc clean-doc-omf clean-doc-dsk clean-doc-lc clean-doc-dir
+.PHONY: clean-doc-omf clean-doc-dsk clean-doc-lc clean-doc-dir
-clean-doc-rngdoc: ; rm -f $(_RNGDOC_C_DOCS) $(_RNGDOC_LC_DOCS)
-clean-doc-xsldoc: ; rm -f $(_XSLDOC_C_DOCS) $(_XSLDOC_LC_DOCS)
clean-doc-omf: ; rm -f $(_DOC_OMF_DB) $(_DOC_OMF_HTML)
clean-doc-dsk: ; rm -f $(_DOC_DSK_DB) $(_DOC_DSK_HTML)
clean-doc-lc:
@@ -788,19 +694,15 @@ clean-doc-dir:
done
clean-local: \
- $(_clean_rngdoc) $(_clean_xsldoc) \
$(_clean_omf) $(_clean_dsk) \
$(_clean_lc) $(_clean_dir)
distclean-local: \
- $(_clean_rngdoc) $(_clean_xsldoc) \
$(_clean_omf) $(_clean_dsk) \
$(_clean_lc) $(_clean_dir)
mostlyclean-local: \
- $(_clean_rngdoc) $(_clean_xsldoc) \
$(_clean_omf) $(_clean_dsk) \
$(_clean_lc) $(_clean_dir)
maintainer-clean-local: \
- $(_clean_rngdoc) $(_clean_xsldoc) \
$(_clean_omf) $(_clean_dsk) \
$(_clean_lc) $(_clean_dir)
diff -pruN 2.18.0-2/help/uk/gnome-nettool.xml 2.19.90-0ubuntu1/help/uk/gnome-nettool.xml
--- 2.18.0-2/help/uk/gnome-nettool.xml 1970-01-01 01:00:00.000000000 +0100
+++ 2.19.90-0ubuntu1/help/uk/gnome-nettool.xml 2007-08-14 03:45:17.000000000 +0100
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!DOCTYPE article PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" "http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd"; [
+<!ENTITY legal SYSTEM "legal.xml">
+<!ENTITY appversion "2.17.1">
+<!ENTITY manrevision "2.7">
+<!ENTITY date "November 2006">
+<!ENTITY app "GNOME Nettool">
+]>
+<!-- =============Document Header ============================= -->
+<article id="index" lang="uk">
+<!-- please do not change the id; for translations, change lang to -->
+<!-- appropriate code -->
+ <articleinfo>
+ <title>Ð?овÑ?дка з пÑ?огÑ?ами меÑ?ежнÑ? Ñ?Ñ?илÑ?Ñ?и длÑ? GNOME веÑ?Ñ?Ñ?Ñ? 2.7</title>
+ <abstract role="description">
+ <para>Ð?оÑ?Ñ?бник коÑ?иÑ?Ñ?Ñ?ваÑ?а з пÑ?огÑ?ами Ð?еÑ?ежнÑ? Ñ?Ñ?илÑ?Ñ?и длÑ? GNOME</para>
+ </abstract>
+ <copyright>
+ <year>2006</year>
+ <holder>ФÑ?ндаÑ?Ñ?Ñ? GNOME</holder>
+ </copyright>
+
+<!-- translators: uncomment this:
+
+ <copyright>
+ <year>2003</year>
+ <holder>ME-THE-TRANSLATOR (Latin translation)</holder>
+ </copyright>
+
+ -->
+ <publisher>
+ <publishername>Ð?Ñ?оекÑ? докÑ?менÑ?Ñ?ваннÑ? GNOME</publishername>
+ </publisher>
+ <legalnotice id="legalnotice">
+ <para>Ð?озволÑ?Ñ?Ñ?Ñ?Ñ?Ñ? копÑ?Ñ?ваÑ?и, Ñ?озповÑ?Ñ?джÑ?ваÑ?и Ñ?а/або змÑ?нÑ?ваÑ?и Ñ?ей докÑ?менÑ? на Ñ?моваÑ? лÑ?Ñ?ензÑ?Ñ? GNU Free Documentation License (GFDL), веÑ?Ñ?Ñ?Ñ? 1.1 або бÑ?дÑ?-Ñ?коÑ? Ñ?Ñ?аÑ?Ñ?оÑ? веÑ?Ñ?Ñ?Ñ?, Ñ?о опÑ?блÑ?кована Free Software Foundation без Ñ?нваÑ?Ñ?анÑ?ниÑ? Ñ?оздÑ?лÑ?в, Ñ?екÑ?Ñ?Ñ? Ñ?иÑ?Ñ?лÑ?ноÑ? Ñ?Ñ?оÑ?Ñ?нки, Ñ?а Ñ?екÑ?Ñ?Ñ? Ñ?Ñ?налÑ?ноÑ? Ñ?Ñ?оÑ?Ñ?нки. Ð?опÑ?Ñ? GFDL можна знайÑ?и <ulink type="help" url="ghelp:fdl">за адÑ?еÑ?оÑ?</ulink> або Ñ? Ñ?айлÑ? COPYING-DOCS, Ñ?о поÑ?Ñ?аÑ?аÑ?Ñ?Ñ?Ñ?Ñ? з Ñ?Ñ?Ñ?Ñ? довÑ?дкоÑ?.</para>
+ <para>ЦÑ? довÑ?дка Ñ? Ñ?аÑ?Ñ?иноÑ? збÑ?Ñ?ки докÑ?менÑ?аÑ?Ñ?Ñ? з GNOME, Ñ?о поÑ?Ñ?аÑ?аÑ?Ñ?Ñ?Ñ?Ñ? на Ñ?моваÑ? лÑ?Ñ?ензÑ?Ñ? GFDL. ЯкÑ?о ви бажаÑ?Ñ?е Ñ?озповÑ?Ñ?джÑ?ваÑ?и Ñ?Ñ? довÑ?дкÑ? окÑ?емо вÑ?д збÑ?Ñ?ки, можеÑ?е Ñ?е зÑ?обиÑ?и додавÑ?и до довÑ?дки копÑ?Ñ? лÑ?Ñ?ензÑ?Ñ?, Ñ?к опиÑ?ано Ñ? пÑ?нкÑ?Ñ? 6 лÑ?Ñ?ензÑ?Ñ?.</para>
+
+ <para>Ð?Ñ?лÑ?Ñ?Ñ?Ñ?Ñ?Ñ? назв, Ñ?о викоÑ?иÑ?Ñ?овÑ?Ñ?Ñ?Ñ?Ñ?Ñ? компанÑ?Ñ?ми длÑ? Ñ?озповÑ?Ñ?дженнÑ? Ñ?Ñ? пÑ?одÑ?кÑ?Ñ?в Ñ?а поÑ?лÑ?г Ñ? Ñ?оÑ?говими маÑ?ками. ЯкÑ?о Ñ?акÑ? назви зÑ?Ñ?Ñ?Ñ?Ñ?Ñ?аÑ?Ñ?Ñ?Ñ?Ñ? Ñ? докÑ?менÑ?аÑ?Ñ?Ñ? з GNOME Ñ?а Ñ?Ñ?аÑ?никам пÑ?оекÑ?Ñ? докÑ?менÑ?Ñ?ваннÑ? GNOME вÑ?домо, Ñ?о вони Ñ? Ñ?оÑ?говими маÑ?ками, Ñ?одÑ? Ñ?Ñ? назви пиÑ?Ñ?Ñ?Ñ?Ñ?Ñ? великими лÑ?Ñ?еÑ?ами або поÑ?инаÑ?Ñ?Ñ?Ñ?Ñ? з великоÑ? лÑ?Ñ?еÑ?и.</para>
+
+ <para>Ð?Ð?Ð?УÐ?Ð?Ð?Т ТÐ? Ð?Ð?Ð?Ð?Ð?Ð?Ð? Ð?Ð?РСÐ?Ð? ЦЬÐ?Ð?Ð? Ð?Ð?Ð?УÐ?Ð?Ð?ТУ Ð?Ð?СТÐ?ЧÐ?ЮТЬСЯ Ð?Ð? УÐ?Ð?Ð?Ð?Ð¥ Ð?Ð?Ð?ЬÐ?Ð?Ð? Ð?Ð?ЦÐ?Ð?Ð?Ð?Ð? Ð?Ð?Я Ð?Ð?Ð?УÐ?Ð?Ð?ТÐ?ЦÐ?Ð? GNU Ð? Ð?Ð?Ð?Ð?Ð?ЬШÐ?Ð? Ð Ð?Ð?УÐ?Ð?Ð?Ð?ЯÐ? ЩÐ?: <orderedlist>
+ <listitem>
+ <para>Ð?Ð?Ð?УÐ?Ð?Ð?Т Ð?Ð?Ð?Ð?Ð?ТЬСЯ "ЯÐ? Ð?", Ð?Ð?Ð? Ð?УÐ?Ь-ЯÐ?Ð?Ð¥ Ð?Ð?Ð Ð?Ð?ТÐ?Ð?, ЯÐ?Ð?Ð?Ð¥ ЧÐ? Ð?Ð?ЯÐ?Ð?Ð?Ð¥, Ð?Ð?Ð?ЮЧÐ?ЮЧÐ?, Ð?Ð?Ð? Ð?Ð? Ð?Ð?Ð?Ð?Ð?УЮЧÐ?СЬ, Ð?Ð?Ð Ð?Ð?ТÐ?Ð? ЩÐ? ЦÐ?Ð? Ð?Ð?Ð?УÐ?Ð?Ð?Т ЧÐ? Ð?Ð?Ð?Ð?Ð?Ð?Ð? Ð?Ð?РСÐ?Я Ð?Ð?Ð?УÐ?Ð?Ð?ТÐ? Ð?Ð?Ð?ЬÐ?Ð? Ð?Ð?Ð? Ð?Ð?ФÐ?Ð?ТÐ?Ð?, Ð?Ð Ð?Ð?Ð?ТÐ?Ð? Ð?Ð? Ð?Ð Ð?Ð?Ð?Ð?У, Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?ЮТЬ Ð?Ð?Ð?Ð?Ð?Ð? Ð?Ð?ТÐ? Ð?Ð?Ð? Ð?Ð? Ð?Ð?РУШУЮТЬ ЧÐ?Ð?СЬ Ð?Ð Ð?Ð?Ð?. Ð?Ð?СЬ Ð Ð?Ð?Ð?Ð? Ð?Ð? ЯÐ?Ð?СТЬ, ТÐ?ЧÐ?Ð?СТЬ, ТÐ? ЧÐ?Ð?Ð?Ð?СТЬ ЦЬÐ?Ð?Ð? Ð?Ð?Ð?УÐ?Ð?Ð?ТУ Ð?Ð?Ð? Ð?Ð?Ð?Ð? Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð¥ Ð?Ð?РСÐ?Ð? Ð?Ð?Ð?Ð?ТЬ Ð?Ð? Ð?Ð?С. ЯÐ?ЩÐ? Ð?УÐ?Ь-ЯÐ?Ð?Ð? Ð?Ð?Ð?УÐ?Ð?Ð?Т ЧÐ? Ð?Ð?Ð?Ð?Ð?Ð?Ð? Ð?Ð?РСÐ?Я Ð?УÐ?УТЬ Ð?Ð?Ð?Ð?Ð?Ð?Ð? Ð?Ð?ФÐ?Ð?ТÐ?Ð?Ð?Ð? У Ð?УÐ?Ь-ЯÐ?Ð?Ð?У Ð?Ð?Ð?Ð?Ð?ШÐ?Ð?Ð?Ð?, Ð?Ð? (Ð?Ð? Ð?Ð?ЧÐ?ТÐ?Ð?Ð?Ð?Ð? УÐ?Ð?Ð?Ð?Ð?Ч, Ð?Ð?ТÐ?Ð Ð?Ð?Ð? Ð?УÐ?Ь-ЯÐ?Ð?Ð? СÐ?Ð?Ð?Ð?Ð?ТÐ?Ð ) Ð?Ð?Ð Ð?ТÐ? Ð?Ð? СÐ?Ð?Ð? Ð?Ð?ТРÐ?ТÐ? Ð?Ð? Ð?УÐ?Ь-ЯÐ?Ð? Ð?Ð?Ð?Ð?Ð¥Ð?Ð?Ð?Ð? Ð?Ð?СÐ?УÐ?Ð?Ð?УÐ?Ð?Ð?Ð?Я, Ð Ð?Ð?Ð?Ð?Т ЧÐ? Ð?Ð?Ð?Ð Ð?Ð?Ð?Ð?Ð?Ð?Я. ЦЯ Ð?Ð?Ð?Ð?Ð?Ð?Ð? Ð?Ð?Ð? Ð?Ð?Ð Ð?Ð?ТÐ?Ð? СÐ?Ð?Ð?Ð?Ð?Ð? Ð?Ð?Ð?Ð?Ð?Ð?У ЧÐ?СТÐ?Ð?У ЦÐ?Ð?Ð? Ð?Ð?ЦÐ?Ð?Ð?Ð?Ð?. Ð?Ð? Ð?Ð?Ð?УСÐ?Ð?Ð?ТЬСЯ Ð?Ð?Ð?Ð?Ð Ð?СТÐ?Ð?Ð?Я ЦЬÐ?Ð?Ð? Ð?Ð?Ð?УÐ?Ð?Ð?ТУ Ð?Ð?Ð? Ð?Ð?Ð?Ð? Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð? Ð?Ð?РСÐ?Ð? Ð?Ð?Ð? Ð?Ð Ð?Ð?Ð?ЯТТЯ ЦÐ?Ð?Ð? Ð?Ð?Ð?Ð?Ð?Ð?Ð?; ТÐ?</para>
+ </listitem>
+ <listitem>
+ <para>Ð?Ð? Ð?Ð? ЯÐ?Ð?Ð¥ Ð?Ð?СТÐ?Ð?Ð?Ð? ТÐ? Ð?Ð? Ð?УÐ?Ь-ЯÐ?Ð?Ð?Ð? Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?СТÐ?Ð?, ЧÐ? ТÐ? Ð?Ð Ð?Ð?Ð?Ð?ЯÐ?СЬÐ?Ð?Ð? Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?ЬÐ?Ð?СТÐ? (Ð?Ð?Ð?ЮЧÐ?ЮЧÐ? Ð¥Ð?Ð?Ð?ТÐ?Ð?СТЬ), Ð?Ð?Ð?Ð?Ð?Ð?РУ, ЧÐ? ЧÐ?Ð?Ð?СЬ Ð?Ð?ШÐ?Ð?Ð?, Ð?Ð?ТÐ?Ð , Ð?Ð?ЧÐ?ТÐ?Ð?Ð?Ð?Ð? УÐ?Ð?Ð?Ð?Ð?Ч, Ð?УÐ?Ь-ЯÐ?Ð?Ð? СÐ?Ð?Ð?Ð?Ð?ТÐ?Ð , Ð?Ð?Ð? Ð?Ð?СТРÐ?Ð?'ЮТÐ?Ð Ð?Ð?Ð?УÐ?Ð?Ð?ТУ ЧÐ? Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð? Ð?Ð?РСÐ?Ð? Ð?Ð?Ð?УÐ?Ð?Ð?ТУ, Ð?Ð?Ð? Ð?УÐ?Ь-ЯÐ?Ð?Ð? Ð?Ð?СТÐ?ЧÐ?Ð?ЬÐ?Ð?Ð? Ð?УÐ?Ь-ЯÐ?Ð?Ð? Ð? ЦÐ?Ð¥ СТÐ?Ð Ð?Ð?, Ð?Ð? Ð?Ð?СÐ? Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?ЬÐ?Ð?СТЬ Ð?Ð?Ð Ð?Ð? Ð?УÐ?Ь-ЯÐ?Ð?Ю Ð?СÐ?Ð?Ð?Ю Ð?Ð? Ð?УÐ?Ь-ЯÐ?Ð? Ð?РЯÐ?Ð?, Ð?Ð?Ð?РЯÐ?Ð?, Ð?СÐ?Ð?Ð?Ð?Ð?Ð?, Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?, Ð?Ð?Ð? Ð?СТÐ?ТÐ?Ð? Ð?Ð?Ð?ТÐ?Ð? Ð?УÐ?Ь-ЯÐ?Ð?Ð?Ð? Ð¥Ð?Ð Ð?Ð?ТÐ?РУ Ð?Ð?Ð?ЮЧÐ?ЮЧÐ?, Ð?Ð?Ð? Ð?Ð? Ð?Ð?Ð?Ð?Ð?УЮЧÐ?СЬ, Ð?Ð?Ð?ТÐ?Ð?Ð?Ð? Ð?Ð?Ð? Ð?ТРÐ?ТÐ? Ð?Ð Ð?СТÐ?Ð?У, Ð?УÐ?Ð?Ð?Ð?Ð? Ð Ð?Ð?Ð?ТÐ?, Ð?Ð?Ð?Ð?Ð? Ð?Ð?Ð? Ð?Ð?СÐ?Ð Ð?Ð?Ð?Ð?СТÐ?Ð? Ð?Ð?Ð?Ð?'ЮТÐ?Ð Ð?, Ð?Ð?Ð? Ð?УÐ?Ь-ЯÐ?Ð? Ð?Ð?ШÐ? Ð?Ð?Ð?ТÐ?Ð? Ð?Ð?Ð? Ð?ТРÐ?ТÐ? ЩÐ? Ð?Ð?Ð?Ð?Ð?Ð?Ð? Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?СÐ?Ð? Ð?Ð?Ð? Ð?Ð?Ð?СÐ?Ð?Ð?Ð?Ð? Ð?Ð?Ð?Ð?Ð Ð?СТÐ?Ð?Ð?Я ЦЬÐ?Ð?Ð? Ð?Ð?Ð?УÐ?Ð?Ð?ТУ ТÐ? Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð¥ Ð?Ð?РСÐ?Ð? ЦЬÐ?Ð?Ð? Ð?Ð?Ð?УÐ?Ð?Ð?ТУ, Ð?Ð?Ð?Ð?ТЬ ЯÐ?ЩÐ? ЦÐ? СТÐ?Ð Ð?Ð?Ð?, Ð?Ð?Ð?Ð?Ð?Ð?Ð?, Ð?УÐ?Ð? Ð?Ð Ð?Ð?Ð?ФÐ?Ð Ð?Ð?Ð?Ð?Ð?Ð? Ð?Ð Ð? Ð?Ð?Ð?Ð?Ð?Ð?Ð?СТЬ ТÐ?Ð?Ð?Ð¥ Ð?Ð?Ð?ТÐ?Ð?Ð?.</para>
+ </listitem>
+ </orderedlist></para>
+ </legalnotice>
+
+ <authorgroup>
+ <author role="maintainer">
+ <firstname>Rodrigo</firstname>
+ <surname>Moya</surname>
+ </author>
+
+<!-- This is appropriate place for other contributors: translators,
+ maintainers, etc. Commented out by default.
+ <othercredit role="translator">
+ <firstname>Latin</firstname>
+ <surname>Translator 1</surname>
+ <affiliation>
+ <orgname>Latin Translation Team</orgname>
+ <address> <email>translator gnome org</email> </address>
+ </affiliation>
+ <contrib>Latin translation</contrib>
+ </othercredit>
+-->
+ </authorgroup>
+
+<!-- According to GNU FDL, revision history is mandatory if you are -->
+<!-- modifying/reusing someone else's document. If not, you can omit it. -->
+ <revhistory>
+<!-- Remember to remove the &manrevision; entity from the revision entries other
+ than the current revision. -->
+ <revision>
+ <revnumber>gnome-nettool веÑ?Ñ?Ñ?Ñ? 2.17.1</revnumber>
+ <date>2006</date>
+ <revdescription>
+ <para role="publisher">Ð?Ñ?оекÑ? докÑ?менÑ?Ñ?ваннÑ? GNOME</para>
+ </revdescription>
+ </revision>
+ </revhistory>
+ <releaseinfo>У довÑ?дÑ?Ñ? опиÑ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ? пÑ?огÑ?ама Ð?еÑ?ежнÑ? Ñ?Ñ?илÑ?Ñ?и длÑ? GNOME веÑ?Ñ?Ñ?Ñ? 2.17.1.</releaseinfo>
+ <legalnotice>
+ <title>Ð?воÑ?оÑ?нÑ?й зв'Ñ?зок</title>
+ <para>Щоб Ñ?повÑ?Ñ?Ñ?иÑ?и пÑ?о помилкÑ? або внеÑ?Ñ?и пÑ?опозиÑ?Ñ?Ñ? вÑ?дноÑ?но пÑ?огÑ?ами <application>Ð?еÑ?ежнÑ? Ñ?Ñ?илÑ?Ñ?и длÑ? GNOME</application> або Ñ?Ñ?Ñ?Ñ? довÑ?дки, доÑ?Ñ?имÑ?йÑ?еÑ?Ñ? Ñ?нÑ?Ñ?Ñ?Ñ?кÑ?Ñ?й на Ñ?Ñ?оÑ?Ñ?нÑ?Ñ? <ulink url="ghelp:gnome-feedback" type="help">Ð?воÑ?оÑ?ний зв'Ñ?зок з GNOME</ulink>.</para>
+<!-- Translators may also add here feedback address for translations -->
+ </legalnotice>
+ </articleinfo>
+
+ <indexterm><primary>gnome-nettool</primary></indexterm>
+ <indexterm><primary>меÑ?ежнÑ? Ñ?Ñ?илÑ?Ñ?и</primary></indexterm>
+
+<!-- ============= Document Body ============================= -->
+<!-- ============= Introduction ============================== -->
+ <sect1 id="gnome-nettool-intro">
+ <title>Ð?Ñ?Ñ?Ñ?п</title>
+ <para>Це лиÑ?е Ñ?аблон докÑ?менÑ?аÑ?Ñ?Ñ?.</para>
+ </sect1>
+
+</article>
+<!-- vi:set ts=2 sw=2 expandtab: -->
diff -pruN 2.18.0-2/help/uk/uk.po 2.19.90-0ubuntu1/help/uk/uk.po
--- 2.18.0-2/help/uk/uk.po 1970-01-01 01:00:00.000000000 +0100
+++ 2.19.90-0ubuntu1/help/uk/uk.po 2007-08-14 03:45:17.000000000 +0100
@@ -0,0 +1,194 @@
+# Ukrainian translation to gnome-nettool manual.
+# Copyright © Free Software Foundation, 2007
+# This file is distributed under the same license as the epiphany package.
+# Maxim Dziumanenko <dziumanenko gmail com>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gnome-nettool manual\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-03-14 10:14+0200\n"
+"PO-Revision-Date: 2007-03-14 10:14+0300\n"
+"Last-Translator: Maxim V. Dziumanenko <dziumanenko softprom kiev ua>\n"
+"Language-Team: Ukrainian <uk li org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../C/legal.xml:2(para)
+msgid ""
+"Permission is granted to copy, distribute and/or modify this document under "
+"the terms of the GNU Free Documentation License (GFDL), Version 1.1 or any "
+"later version published by the Free Software Foundation with no Invariant "
+"Sections, no Front-Cover Texts, and no Back-Cover Texts. You can find a copy "
+"of the GFDL at this <ulink type=\"help\" url=\"ghelp:fdl\">link</ulink> or "
+"in the file COPYING-DOCS distributed with this manual."
+msgstr ""
+"Ð?озволÑ?Ñ?Ñ?Ñ?Ñ?Ñ? копÑ?Ñ?ваÑ?и, Ñ?озповÑ?Ñ?джÑ?ваÑ?и Ñ?а/або змÑ?нÑ?ваÑ?и Ñ?ей докÑ?менÑ? на "
+"Ñ?моваÑ? лÑ?Ñ?ензÑ?Ñ? GNU Free Documentation License (GFDL), веÑ?Ñ?Ñ?Ñ? 1.1 або бÑ?дÑ?-"
+"Ñ?коÑ? Ñ?Ñ?аÑ?Ñ?оÑ? веÑ?Ñ?Ñ?Ñ?, Ñ?о опÑ?блÑ?кована Free Software Foundation без "
+"Ñ?нваÑ?Ñ?анÑ?ниÑ? Ñ?оздÑ?лÑ?в, Ñ?екÑ?Ñ?Ñ? Ñ?иÑ?Ñ?лÑ?ноÑ? Ñ?Ñ?оÑ?Ñ?нки, Ñ?а Ñ?екÑ?Ñ?Ñ? Ñ?Ñ?налÑ?ноÑ? "
+"Ñ?Ñ?оÑ?Ñ?нки. Ð?опÑ?Ñ? GFDL можна знайÑ?и <ulink type=\"help\" url=\"ghelp:fdl\">за "
+"адÑ?еÑ?оÑ?</ulink> або Ñ? Ñ?айлÑ? COPYING-DOCS, Ñ?о поÑ?Ñ?аÑ?аÑ?Ñ?Ñ?Ñ?Ñ? з Ñ?Ñ?Ñ?Ñ? довÑ?дкоÑ?."
+
+#: ../C/legal.xml:12(para)
+msgid ""
+"This manual is part of a collection of GNOME manuals distributed under the "
+"GFDL. If you want to distribute this manual separately from the collection, "
+"you can do so by adding a copy of the license to the manual, as described in "
+"section 6 of the license."
+msgstr ""
+"ЦÑ? довÑ?дка Ñ? Ñ?аÑ?Ñ?иноÑ? збÑ?Ñ?ки докÑ?менÑ?аÑ?Ñ?Ñ? з GNOME, Ñ?о поÑ?Ñ?аÑ?аÑ?Ñ?Ñ?Ñ?Ñ? на Ñ?моваÑ? "
+"лÑ?Ñ?ензÑ?Ñ? GFDL. ЯкÑ?о ви бажаÑ?Ñ?е Ñ?озповÑ?Ñ?джÑ?ваÑ?и Ñ?Ñ? довÑ?дкÑ? окÑ?емо вÑ?д збÑ?Ñ?ки, "
+"можеÑ?е Ñ?е зÑ?обиÑ?и додавÑ?и до довÑ?дки копÑ?Ñ? лÑ?Ñ?ензÑ?Ñ?, Ñ?к опиÑ?ано Ñ? пÑ?нкÑ?Ñ? 6 "
+"лÑ?Ñ?ензÑ?Ñ?."
+
+#: ../C/legal.xml:19(para)
+msgid ""
+"Many of the names used by companies to distinguish their products and "
+"services are claimed as trademarks. Where those names appear in any GNOME "
+"documentation, and the members of the GNOME Documentation Project are made "
+"aware of those trademarks, then the names are in capital letters or initial "
+"capital letters."
+msgstr ""
+"Ð?Ñ?лÑ?Ñ?Ñ?Ñ?Ñ?Ñ? назв, Ñ?о викоÑ?иÑ?Ñ?овÑ?Ñ?Ñ?Ñ?Ñ?Ñ? компанÑ?Ñ?ми длÑ? Ñ?озповÑ?Ñ?дженнÑ? Ñ?Ñ? "
+"пÑ?одÑ?кÑ?Ñ?в Ñ?а поÑ?лÑ?г Ñ? Ñ?оÑ?говими маÑ?ками. ЯкÑ?о Ñ?акÑ? назви зÑ?Ñ?Ñ?Ñ?Ñ?Ñ?аÑ?Ñ?Ñ?Ñ?Ñ? Ñ? "
+"докÑ?менÑ?аÑ?Ñ?Ñ? з GNOME Ñ?а Ñ?Ñ?аÑ?никам пÑ?оекÑ?Ñ? докÑ?менÑ?Ñ?ваннÑ? GNOME вÑ?домо, Ñ?о "
+"вони Ñ? Ñ?оÑ?говими маÑ?ками, Ñ?одÑ? Ñ?Ñ? назви пиÑ?Ñ?Ñ?Ñ?Ñ?Ñ? великими лÑ?Ñ?еÑ?ами або "
+"поÑ?инаÑ?Ñ?Ñ?Ñ?Ñ? з великоÑ? лÑ?Ñ?еÑ?и."
+
+#: ../C/legal.xml:35(para)
+msgid ""
+"DOCUMENT IS PROVIDED ON AN \"AS IS\" BASIS, WITHOUT WARRANTY OF ANY KIND, "
+"EITHER EXPRESSED OR IMPLIED, INCLUDING, WITHOUT LIMITATION, WARRANTIES THAT "
+"THE DOCUMENT OR MODIFIED VERSION OF THE DOCUMENT IS FREE OF DEFECTS "
+"MERCHANTABLE, FIT FOR A PARTICULAR PURPOSE OR NON-INFRINGING. THE ENTIRE "
+"RISK AS TO THE QUALITY, ACCURACY, AND PERFORMANCE OF THE DOCUMENT OR "
+"MODIFIED VERSION OF THE DOCUMENT IS WITH YOU. SHOULD ANY DOCUMENT OR "
+"MODIFIED VERSION PROVE DEFECTIVE IN ANY RESPECT, YOU (NOT THE INITIAL "
+"WRITER, AUTHOR OR ANY CONTRIBUTOR) ASSUME THE COST OF ANY NECESSARY "
+"SERVICING, REPAIR OR CORRECTION. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN "
+"ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY DOCUMENT OR MODIFIED VERSION "
+"OF THE DOCUMENT IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER; AND"
+msgstr ""
+"Ð?Ð?Ð?УÐ?Ð?Ð?Т Ð?Ð?Ð?Ð?Ð?ТЬСЯ \"ЯÐ? Ð?\", Ð?Ð?Ð? Ð?УÐ?Ь-ЯÐ?Ð?Ð¥ Ð?Ð?Ð Ð?Ð?ТÐ?Ð?, ЯÐ?Ð?Ð?Ð¥ ЧÐ? Ð?Ð?ЯÐ?Ð?Ð?Ð¥, "
+"Ð?Ð?Ð?ЮЧÐ?ЮЧÐ?, Ð?Ð?Ð? Ð?Ð? Ð?Ð?Ð?Ð?Ð?УЮЧÐ?СЬ, Ð?Ð?Ð Ð?Ð?ТÐ?Ð? ЩÐ? ЦÐ?Ð? Ð?Ð?Ð?УÐ?Ð?Ð?Т ЧÐ? Ð?Ð?Ð?Ð?Ð?Ð?Ð? Ð?Ð?РСÐ?Я "
+"Ð?Ð?Ð?УÐ?Ð?Ð?ТÐ? Ð?Ð?Ð?ЬÐ?Ð? Ð?Ð?Ð? Ð?Ð?ФÐ?Ð?ТÐ?Ð?, Ð?Ð Ð?Ð?Ð?ТÐ?Ð? Ð?Ð? Ð?Ð Ð?Ð?Ð?Ð?У, Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?ЮТЬ Ð?Ð?Ð?Ð?Ð?Ð? Ð?Ð?ТÐ? "
+"Ð?Ð?Ð? Ð?Ð? Ð?Ð?РУШУЮТЬ ЧÐ?Ð?СЬ Ð?Ð Ð?Ð?Ð?. Ð?Ð?СЬ Ð Ð?Ð?Ð?Ð? Ð?Ð? ЯÐ?Ð?СТЬ, ТÐ?ЧÐ?Ð?СТЬ, ТÐ? ЧÐ?Ð?Ð?Ð?СТЬ "
+"ЦЬÐ?Ð?Ð? Ð?Ð?Ð?УÐ?Ð?Ð?ТУ Ð?Ð?Ð? Ð?Ð?Ð?Ð? Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð¥ Ð?Ð?РСÐ?Ð? Ð?Ð?Ð?Ð?ТЬ Ð?Ð? Ð?Ð?С. ЯÐ?ЩÐ? Ð?УÐ?Ь-ЯÐ?Ð?Ð? "
+"Ð?Ð?Ð?УÐ?Ð?Ð?Т ЧÐ? Ð?Ð?Ð?Ð?Ð?Ð?Ð? Ð?Ð?РСÐ?Я Ð?УÐ?УТЬ Ð?Ð?Ð?Ð?Ð?Ð?Ð? Ð?Ð?ФÐ?Ð?ТÐ?Ð?Ð?Ð? У Ð?УÐ?Ь-ЯÐ?Ð?Ð?У "
+"Ð?Ð?Ð?Ð?Ð?ШÐ?Ð?Ð?Ð?, Ð?Ð? (Ð?Ð? Ð?Ð?ЧÐ?ТÐ?Ð?Ð?Ð?Ð? УÐ?Ð?Ð?Ð?Ð?Ч, Ð?Ð?ТÐ?Ð Ð?Ð?Ð? Ð?УÐ?Ь-ЯÐ?Ð?Ð? СÐ?Ð?Ð?Ð?Ð?ТÐ?Ð ) Ð?Ð?Ð Ð?ТÐ? "
+"Ð?Ð? СÐ?Ð?Ð? Ð?Ð?ТРÐ?ТÐ? Ð?Ð? Ð?УÐ?Ь-ЯÐ?Ð? Ð?Ð?Ð?Ð?Ð¥Ð?Ð?Ð?Ð? Ð?Ð?СÐ?УÐ?Ð?Ð?УÐ?Ð?Ð?Ð?Я, Ð Ð?Ð?Ð?Ð?Т ЧÐ? Ð?Ð?Ð?Ð Ð?Ð?Ð?Ð?Ð?Ð?Я. "
+"ЦЯ Ð?Ð?Ð?Ð?Ð?Ð?Ð? Ð?Ð?Ð? Ð?Ð?Ð Ð?Ð?ТÐ?Ð? СÐ?Ð?Ð?Ð?Ð?Ð? Ð?Ð?Ð?Ð?Ð?Ð?У ЧÐ?СТÐ?Ð?У ЦÐ?Ð?Ð? Ð?Ð?ЦÐ?Ð?Ð?Ð?Ð?. Ð?Ð? "
+"Ð?Ð?Ð?УСÐ?Ð?Ð?ТЬСЯ Ð?Ð?Ð?Ð?Ð Ð?СТÐ?Ð?Ð?Я ЦЬÐ?Ð?Ð? Ð?Ð?Ð?УÐ?Ð?Ð?ТУ Ð?Ð?Ð? Ð?Ð?Ð?Ð? Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð? Ð?Ð?РСÐ?Ð? Ð?Ð?Ð? "
+"Ð?Ð Ð?Ð?Ð?ЯТТЯ ЦÐ?Ð?Ð? Ð?Ð?Ð?Ð?Ð?Ð?Ð?; ТÐ?"
+
+#: ../C/legal.xml:55(para)
+msgid ""
+"UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER IN TORT (INCLUDING "
+"NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL THE AUTHOR, INITIAL WRITER, ANY "
+"CONTRIBUTOR, OR ANY DISTRIBUTOR OF THE DOCUMENT OR MODIFIED VERSION OF THE "
+"DOCUMENT, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON "
+"FOR ANY DIRECT, INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF "
+"ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, "
+"WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER DAMAGES "
+"OR LOSSES ARISING OUT OF OR RELATING TO USE OF THE DOCUMENT AND MODIFIED "
+"VERSIONS OF THE DOCUMENT, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE "
+"POSSIBILITY OF SUCH DAMAGES."
+msgstr ""
+"Ð?Ð? Ð?Ð? ЯÐ?Ð?Ð¥ Ð?Ð?СТÐ?Ð?Ð?Ð? ТÐ? Ð?Ð? Ð?УÐ?Ь-ЯÐ?Ð?Ð?Ð? Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?СТÐ?Ð?, ЧÐ? ТÐ? Ð?Ð Ð?Ð?Ð?Ð?ЯÐ?СЬÐ?Ð?Ð? "
+"Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?ЬÐ?Ð?СТÐ? (Ð?Ð?Ð?ЮЧÐ?ЮЧÐ? Ð¥Ð?Ð?Ð?ТÐ?Ð?СТЬ), Ð?Ð?Ð?Ð?Ð?Ð?РУ, ЧÐ? ЧÐ?Ð?Ð?СЬ Ð?Ð?ШÐ?Ð?Ð?, Ð?Ð?ТÐ?Ð , "
+"Ð?Ð?ЧÐ?ТÐ?Ð?Ð?Ð?Ð? УÐ?Ð?Ð?Ð?Ð?Ч, Ð?УÐ?Ь-ЯÐ?Ð?Ð? СÐ?Ð?Ð?Ð?Ð?ТÐ?Ð , Ð?Ð?Ð? Ð?Ð?СТРÐ?Ð?'ЮТÐ?Ð Ð?Ð?Ð?УÐ?Ð?Ð?ТУ ЧÐ? "
+"Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð? Ð?Ð?РСÐ?Ð? Ð?Ð?Ð?УÐ?Ð?Ð?ТУ, Ð?Ð?Ð? Ð?УÐ?Ь-ЯÐ?Ð?Ð? Ð?Ð?СТÐ?ЧÐ?Ð?ЬÐ?Ð?Ð? Ð?УÐ?Ь-ЯÐ?Ð?Ð? Ð? ЦÐ?Ð¥ "
+"СТÐ?Ð Ð?Ð?, Ð?Ð? Ð?Ð?СÐ? Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?ЬÐ?Ð?СТЬ Ð?Ð?Ð Ð?Ð? Ð?УÐ?Ь-ЯÐ?Ð?Ю Ð?СÐ?Ð?Ð?Ю Ð?Ð? Ð?УÐ?Ь-ЯÐ?Ð? Ð?РЯÐ?Ð?, "
+"Ð?Ð?Ð?РЯÐ?Ð?, Ð?СÐ?Ð?Ð?Ð?Ð?Ð?, Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?, Ð?Ð?Ð? Ð?СТÐ?ТÐ?Ð? Ð?Ð?Ð?ТÐ?Ð? Ð?УÐ?Ь-ЯÐ?Ð?Ð?Ð? Ð¥Ð?Ð Ð?Ð?ТÐ?РУ "
+"Ð?Ð?Ð?ЮЧÐ?ЮЧÐ?, Ð?Ð?Ð? Ð?Ð? Ð?Ð?Ð?Ð?Ð?УЮЧÐ?СЬ, Ð?Ð?Ð?ТÐ?Ð?Ð?Ð? Ð?Ð?Ð? Ð?ТРÐ?ТÐ? Ð?Ð Ð?СТÐ?Ð?У, Ð?УÐ?Ð?Ð?Ð?Ð? Ð Ð?Ð?Ð?ТÐ?, "
+"Ð?Ð?Ð?Ð?Ð? Ð?Ð?Ð? Ð?Ð?СÐ?Ð Ð?Ð?Ð?Ð?СТÐ?Ð? Ð?Ð?Ð?Ð?'ЮТÐ?Ð Ð?, Ð?Ð?Ð? Ð?УÐ?Ь-ЯÐ?Ð? Ð?Ð?ШÐ? Ð?Ð?Ð?ТÐ?Ð? Ð?Ð?Ð? Ð?ТРÐ?ТÐ? ЩÐ? "
+"Ð?Ð?Ð?Ð?Ð?Ð?Ð? Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð?СÐ?Ð? Ð?Ð?Ð? Ð?Ð?Ð?СÐ?Ð?Ð?Ð?Ð? Ð?Ð?Ð?Ð?Ð Ð?СТÐ?Ð?Ð?Я ЦЬÐ?Ð?Ð? Ð?Ð?Ð?УÐ?Ð?Ð?ТУ ТÐ? Ð?Ð?Ð?Ð?Ð?Ð?Ð?Ð¥ "
+"Ð?Ð?РСÐ?Ð? ЦЬÐ?Ð?Ð? Ð?Ð?Ð?УÐ?Ð?Ð?ТУ, Ð?Ð?Ð?Ð?ТЬ ЯÐ?ЩÐ? ЦÐ? СТÐ?Ð Ð?Ð?Ð?, Ð?Ð?Ð?Ð?Ð?Ð?Ð?, Ð?УÐ?Ð? Ð?Ð Ð?Ð?Ð?ФÐ?Ð Ð?Ð?Ð?Ð?Ð?Ð? "
+"Ð?Ð Ð? Ð?Ð?Ð?Ð?Ð?Ð?Ð?СТЬ ТÐ?Ð?Ð?Ð¥ Ð?Ð?Ð?ТÐ?Ð?Ð?."
+
+#: ../C/legal.xml:28(para)
+msgid ""
+"DOCUMENT AND MODIFIED VERSIONS OF THE DOCUMENT ARE PROVIDED UNDER THE TERMS "
+"OF THE GNU FREE DOCUMENTATION LICENSE WITH THE FURTHER UNDERSTANDING THAT: "
+"<placeholder-1/>"
+msgstr ""
+"Ð?Ð?Ð?УÐ?Ð?Ð?Т ТÐ? Ð?Ð?Ð?Ð?Ð?Ð?Ð? Ð?Ð?РСÐ?Ð? ЦЬÐ?Ð?Ð? Ð?Ð?Ð?УÐ?Ð?Ð?ТУ Ð?Ð?СТÐ?ЧÐ?ЮТЬСЯ Ð?Ð? УÐ?Ð?Ð?Ð?Ð¥ Ð?Ð?Ð?ЬÐ?Ð?Ð? "
+"Ð?Ð?ЦÐ?Ð?Ð?Ð?Ð? Ð?Ð?Я Ð?Ð?Ð?УÐ?Ð?Ð?ТÐ?ЦÐ?Ð? GNU Ð? Ð?Ð?Ð?Ð?Ð?ЬШÐ?Ð? Ð Ð?Ð?УÐ?Ð?Ð?Ð?ЯÐ? ЩÐ?: <placeholder-1/>"
+
+#: ../C/gnome-nettool.xml:15(title)
+msgid "GNOME Nettool Manual V2.7"
+msgstr "Ð?овÑ?дка з пÑ?огÑ?ами меÑ?ежнÑ? Ñ?Ñ?илÑ?Ñ?и длÑ? GNOME веÑ?Ñ?Ñ?Ñ? 2.7"
+
+#: ../C/gnome-nettool.xml:17(para)
+msgid "User manual for the GNOME Network Tool application"
+msgstr "Ð?оÑ?Ñ?бник коÑ?иÑ?Ñ?Ñ?ваÑ?а з пÑ?огÑ?ами Ð?еÑ?ежнÑ? Ñ?Ñ?илÑ?Ñ?и длÑ? GNOME"
+
+#: ../C/gnome-nettool.xml:22(year) ../C/gnome-nettool.xml:65(date)
+msgid "2006"
+msgstr "2006"
+
+#: ../C/gnome-nettool.xml:23(holder)
+msgid "GNOME Foundation"
+msgstr "ФÑ?ндаÑ?Ñ?Ñ? GNOME"
+
+#: ../C/gnome-nettool.xml:35(publishername) ../C/gnome-nettool.xml:67(para)
+msgid "GNOME Documentation Project"
+msgstr "Ð?Ñ?оекÑ? докÑ?менÑ?Ñ?ваннÑ? GNOME"
+
+#: ../C/gnome-nettool.xml:40(firstname)
+msgid "Rodrigo"
+msgstr "Rodrigo"
+
+#: ../C/gnome-nettool.xml:41(surname)
+msgid "Moya"
+msgstr "Moya"
+
+#: ../C/gnome-nettool.xml:64(revnumber)
+msgid "gnome-nettool V2.17.1"
+msgstr "gnome-nettool веÑ?Ñ?Ñ?Ñ? 2.17.1"
+
+#: ../C/gnome-nettool.xml:71(releaseinfo)
+msgid "This manual describes version 2.17.1 of GNOME Nettool."
+msgstr "У довÑ?дÑ?Ñ? опиÑ?Ñ?Ñ?Ñ?Ñ?Ñ?Ñ? пÑ?огÑ?ама Ð?еÑ?ежнÑ? Ñ?Ñ?илÑ?Ñ?и длÑ? GNOME веÑ?Ñ?Ñ?Ñ? 2.17.1."
+
+#: ../C/gnome-nettool.xml:74(title)
+msgid "Feedback"
+msgstr "Ð?воÑ?оÑ?нÑ?й зв'Ñ?зок"
+
+#: ../C/gnome-nettool.xml:75(para)
+msgid ""
+"To report a bug or make a suggestion regarding the <application>GNOME "
+"Nettool</application> application or this manual, follow the directions in "
+"the <ulink url=\"ghelp:gnome-feedback\" type=\"help\">GNOME Feedback Page</"
+"ulink>."
+msgstr ""
+"Щоб Ñ?повÑ?Ñ?Ñ?иÑ?и пÑ?о помилкÑ? або внеÑ?Ñ?и пÑ?опозиÑ?Ñ?Ñ? вÑ?дноÑ?но пÑ?огÑ?ами <application>Ð?еÑ?ежнÑ? Ñ?Ñ?илÑ?Ñ?и длÑ? GNOME"
+"</application> або Ñ?Ñ?Ñ?Ñ? довÑ?дки, доÑ?Ñ?имÑ?йÑ?еÑ?Ñ? Ñ?нÑ?Ñ?Ñ?Ñ?кÑ?Ñ?й на Ñ?Ñ?оÑ?Ñ?нÑ?Ñ? <ulink url=\"ghelp:"
+"gnome-feedback\" type=\"help\">Ð?воÑ?оÑ?ний зв'Ñ?зок з GNOME</ulink>."
+
+#: ../C/gnome-nettool.xml:81(primary)
+msgid "gnome-nettool"
+msgstr "gnome-nettool"
+
+#: ../C/gnome-nettool.xml:82(primary)
+msgid "network tool application"
+msgstr "меÑ?ежнÑ? Ñ?Ñ?илÑ?Ñ?и"
+
+#: ../C/gnome-nettool.xml:87(title)
+msgid "Introduction"
+msgstr "Ð?Ñ?Ñ?Ñ?п"
+
+#: ../C/gnome-nettool.xml:88(para)
+msgid ""
+"This is only a template to get the documentation done. It should not be "
+"translated."
+msgstr ""
+"Це лиÑ?е Ñ?аблон докÑ?менÑ?аÑ?Ñ?Ñ?."
+
+#. Put one translator per line, in the form of NAME <EMAIL>, YEAR1, YEAR2.
+#: ../C/gnome-nettool.xml:0(None)
+msgid "translator-credits"
+msgstr ""
+"Ð?акÑ?им Ð?зÑ?маненко <dziumanenko gmail com>"
diff -pruN 2.18.0-2/intltool-extract.in 2.19.90-0ubuntu1/intltool-extract.in
--- 2.18.0-2/intltool-extract.in 2007-03-13 01:48:36.000000000 +0000
+++ 2.19.90-0ubuntu1/intltool-extract.in 2007-08-14 03:44:43.000000000 +0100
@@ -32,7 +32,7 @@
## Release information
my $PROGRAM = "intltool-extract";
my $PACKAGE = "intltool";
-my $VERSION = "0.35.0";
+my $VERSION = "0.35.5";
## Loaded modules
use strict;
@@ -114,6 +114,11 @@ sub split_on_argument {
sub place_normal {
$FILE = $ARGV[0];
$OUTFILE = "$FILE.h";
+
+ my $dirname = dirname ($OUTFILE);
+ if (! -d "$dirname" && $dirname ne "") {
+ system ("mkdir -p $dirname");
+ }
}
sub place_local {
@@ -156,7 +161,7 @@ XML files. Read manpage (man ${PROGRAM})
--type=TYPE Specify the file type of FILENAME. Currently supports:
"gettext/glade", "gettext/ini", "gettext/keys"
"gettext/rfc822deb", "gettext/schemas",
- "gettext/scheme", "gettext/xml"
+ "gettext/scheme", "gettext/xml", "gettext/quoted"
-l, --local Writes output into current working directory
(conflicts with --update)
--update Writes output into the same directory the source file
@@ -212,6 +217,7 @@ sub convert {
&type_scheme if $gettext_type eq "scheme";
&type_schemas if $gettext_type eq "schemas";
&type_rfc822deb if $gettext_type eq "rfc822deb";
+ &type_quoted if $gettext_type eq "quoted";
}
sub entity_decode_minimal
@@ -242,7 +248,7 @@ sub escape_char
{
return '\"' if $_ eq '"';
return '\n' if $_ eq "\n";
- return '\\' if $_ eq '\\';
+ return '\\\\' if $_ eq '\\';
return $_;
}
@@ -255,8 +261,11 @@ sub escape
sub type_ini {
### For generic translatable desktop files ###
- while ($input =~ /^_.*=(.*)$/mg) {
- $messages{$1} = [];
+ while ($input =~ /^(#(.+)\n)?^_.*=(.*)$/mg) {
+ if (defined($2)) {
+ $comments{$3} = $2;
+ }
+ $messages{$3} = [];
}
}
@@ -711,6 +720,17 @@ sub rfc822deb_split {
return @list;
}
+sub type_quoted {
+ while ($input =~ /\"(([^\"]|\\\")*[^\\\"])\"/g) {
+ my $message = $1;
+ my $before = $`;
+ $message =~ s/\\\"/\"/g;
+ $before =~ s/[^\n]//g;
+ $messages{$message} = [];
+ $loc{$message} = length ($before) + 2;
+ }
+}
+
sub type_glade {
### For translatable Glade XML files ###
diff -pruN 2.18.0-2/intltool-merge.in 2.19.90-0ubuntu1/intltool-merge.in
--- 2.18.0-2/intltool-merge.in 2007-03-13 01:48:36.000000000 +0000
+++ 2.19.90-0ubuntu1/intltool-merge.in 2007-08-14 03:44:43.000000000 +0100
@@ -35,7 +35,7 @@
## Release information
my $PROGRAM = "intltool-merge";
my $PACKAGE = "intltool";
-my $VERSION = "0.35.0";
+my $VERSION = "0.35.5";
## Loaded modules
use strict;
@@ -60,6 +60,7 @@ my $KEYS_STYLE_ARG = 0;
my $DESKTOP_STYLE_ARG = 0;
my $SCHEMAS_STYLE_ARG = 0;
my $RFC822DEB_STYLE_ARG = 0;
+my $QUOTED_STYLE_ARG = 0;
my $QUIET_ARG = 0;
my $PASS_THROUGH_ARG = 0;
my $UTF8_ARG = 0;
@@ -79,6 +80,7 @@ GetOptions
"desktop-style|d" => \$DESKTOP_STYLE_ARG,
"schemas-style|s" => \$SCHEMAS_STYLE_ARG,
"rfc822deb-style|r" => \$RFC822DEB_STYLE_ARG,
+ "quoted-style" => \$QUOTED_STYLE_ARG,
"pass-through|p" => \$PASS_THROUGH_ARG,
"utf8|u" => \$UTF8_ARG,
"multiple-output|m" => \$MULTIPLE_OUTPUT,
@@ -157,6 +159,14 @@ elsif ($RFC822DEB_STYLE_ARG && @ARGV > 2
&rfc822deb_merge_translations;
&finalize;
}
+elsif ($QUOTED_STYLE_ARG && @ARGV > 2)
+{
+ &utf8_sanity_check;
+ &preparation;
+ &print_message;
+ "ed_merge_translations;
+ &finalize;
+}
else
{
&print_help;
@@ -193,6 +203,7 @@ Mandatory options: (exactly one must be
-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
+ --quoted-style includes translations in the quoted string style
-x, --xml-style includes translations in the standard xml style
Other options:
@@ -415,7 +426,7 @@ sub create_translation_database
{
$nextfuzzy = 1 if /^#, fuzzy/;
- if (/^msgid "((\\.|[^\\])*)"/ )
+ if (/^msgid "((\\.|[^\\]+)*)"/ )
{
$translations{$lang, $msgid} = $msgstr if $inmsgstr && $msgid && $msgstr;
$msgid = "";
@@ -431,14 +442,14 @@ sub create_translation_database
$nextfuzzy = 0;
}
- if (/^msgstr "((\\.|[^\\])*)"/)
+ if (/^msgstr "((\\.|[^\\]+)*)"/)
{
$msgstr = unescape_po_string($1);
$inmsgstr = 1;
$inmsgid = 0;
}
- if (/^"((\\.|[^\\])*)"/)
+ if (/^"((\\.|[^\\]+)*)"/)
{
$msgid .= unescape_po_string($1) if $inmsgid;
$msgstr .= unescape_po_string($1) if $inmsgstr;
@@ -1006,8 +1017,8 @@ sub xml_merge_output
if ($MULTIPLE_OUTPUT) {
for my $lang (sort keys %po_files_by_lang) {
- if ( ! -e $lang ) {
- mkdir $lang or die "Cannot create subdirectory $lang: $!\n";
+ if ( ! -d $lang ) {
+ mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
}
open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
binmode (OUTPUT) if $^O eq 'MSWin32';
@@ -1354,3 +1365,39 @@ sub rfc822deb_split
return @list;
}
+sub quoted_translation
+{
+ my ($lang, $string) = @_;
+
+ $string =~ s/\\\"/\"/g;
+
+ my $translation = $translations{$lang, $string};
+ $translation = $string if !$translation;
+
+ $translation =~ s/\"/\\\"/g;
+ return $translation
+}
+
+sub quoted_merge_translations
+{
+ if (!$MULTIPLE_OUTPUT) {
+ print "Quoted only supports Multiple Output.\n";
+ exit(1);
+ }
+
+ for my $lang (sort keys %po_files_by_lang) {
+ if ( ! -d $lang ) {
+ mkdir $lang or -d $lang or die "Cannot create subdirectory $lang: $!\n";
+ }
+ open INPUT, "<${FILE}" or die;
+ open OUTPUT, ">$lang/$OUTFILE" or die "Cannot open $lang/$OUTFILE: $!\n";
+ binmode (OUTPUT) if $^O eq 'MSWin32';
+ while (<INPUT>)
+ {
+ s/\"(([^\"]|\\\")*[^\\\"])\"/"\"" . "ed_translation($lang, $1) . "\""/ge;
+ print OUTPUT;
+ }
+ close OUTPUT;
+ close INPUT;
+ }
+}
diff -pruN 2.18.0-2/intltool-update.in 2.19.90-0ubuntu1/intltool-update.in
--- 2.18.0-2/intltool-update.in 2007-03-13 01:48:36.000000000 +0000
+++ 2.19.90-0ubuntu1/intltool-update.in 2007-08-14 03:44:43.000000000 +0100
@@ -30,7 +30,7 @@
## Release information
my $PROGRAM = "intltool-update";
-my $VERSION = "0.35.0";
+my $VERSION = "0.35.5";
my $PACKAGE = "intltool";
## Loaded modules
@@ -90,10 +90,9 @@ my $buildin_gettext_support =
$| = 1;
## Sometimes the source tree will be rooted somewhere else.
-my $SRCDIR = ".";
+my $SRCDIR = $ENV{"srcdir"} || ".";
my $POTFILES_in;
-$SRCDIR = $ENV{"srcdir"} if $ENV{"srcdir"};
$POTFILES_in = "<$SRCDIR/POTFILES.in";
my $devnull = ($^O eq 'MSWin32' ? 'NUL:' : '/dev/null');
@@ -124,8 +123,10 @@ my $arg_count = ($DIST_ARG > 0)
&Console_Write_IntltoolHelp if $arg_count > 1;
+my $PKGNAME = FindPackageName ();
+
# --version and --help don't require a module name
-my $MODULE = $GETTEXT_PACKAGE || &FindPackageName || "unknown";
+my $MODULE = $GETTEXT_PACKAGE || $PKGNAME || "unknown";
if ($POT_ARG)
{
@@ -316,7 +317,8 @@ sub FindLeftoutFiles
@buf_potfiles_ignore,
@buf_allfiles,
@buf_allfiles_sorted,
- @buf_potfiles_sorted
+ @buf_potfiles_sorted,
+ @buf_potfiles_ignore_sorted
);
## Search and find all translatable files
@@ -342,7 +344,7 @@ sub FindLeftoutFiles
## comparing with POTFILES.in
foreach my $ignore ("POTFILES.skip", "POTFILES.ignore")
{
- (-s $ignore) or next;
+ (-s "$SRCDIR/$ignore") or next;
if ("$ignore" eq "POTFILES.ignore")
{
@@ -351,7 +353,7 @@ sub FindLeftoutFiles
}
print "Found $ignore: Ignoring files...\n" if $VERBOSE;
- open FILE, "<$ignore" or die "ERROR: Failed to open $ignore!\n";
+ open FILE, "<$SRCDIR/$ignore" or die "ERROR: Failed to open $SRCDIR/$ignore!\n";
while (<FILE>)
{
@@ -359,7 +361,7 @@ sub FindLeftoutFiles
}
close FILE;
- @buf_potfiles = (@buf_potfiles_ignore, @buf_potfiles);
+ @buf_potfiles_ignore_sorted = sort (@buf_potfiles_ignore);
}
foreach my $file (@buf_i18n_plain)
@@ -417,7 +419,7 @@ sub FindLeftoutFiles
}
}
- if (/\.GetString ?\(QUOTEDTEXT/)
+ if (/\w\.GetString *\(QUOTEDTEXT/)
{
if (defined isNotValidMissing (unpack("x3 A*", $file))) {
## Remove the first 3 chars and add newline
@@ -426,7 +428,8 @@ sub FindLeftoutFiles
last;
}
- if (/_\(QUOTEDTEXT/)
+ ## N_ Q_ and _ are the three macros defined in gi8n.h
+ if (/[NQ]?_ *\(QUOTEDTEXT/)
{
if (defined isNotValidMissing (unpack("x3 A*", $file))) {
## Remove the first 3 chars and add newline
@@ -489,6 +492,11 @@ sub FindLeftoutFiles
$in2{$_} = 1;
}
+ foreach (@buf_potfiles_ignore_sorted)
+ {
+ $in2{$_} = 1;
+ }
+
my @result;
foreach (@buf_allfiles_sorted)
@@ -504,7 +512,7 @@ sub FindLeftoutFiles
foreach (@buf_potfiles_sorted)
{
chomp (my $dummy = $_);
- if ("$dummy" ne "" and ! -f "../$dummy")
+ if ("$dummy" ne "" and !(-f "$SRCDIR/../$dummy" or -f "../$dummy"))
{
push @buf_potfiles_notexist, $_;
}
@@ -537,7 +545,7 @@ sub FindLeftoutFiles
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".
+ warn "Please remove them from POTFILES.in. A file \e[1m'notexist'\e[0m\n".
"containing this list of absent files has been written in the current directory.\n";
}
}
@@ -555,16 +563,21 @@ sub Console_WriteError_InvalidOption
exit 1;
}
-sub GenerateHeaders
+sub isIntltoolExtractInPath
{
- my $EXTRACT = "@INTLTOOL_EXTRACT@";
- chomp $EXTRACT;
+ my ($file) = @_;
+ # If either a file exists, or when run it returns 0 exit status
+ return 1 if ((-x $file) or (system("$file >/dev/null") == 0));
+ return 0;
+}
- $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} if $ENV{"INTLTOOL_EXTRACT"};
+sub GenerateHeaders
+{
+ my $EXTRACT = $ENV{"INTLTOOL_EXTRACT"} || "intltool-extract";
## Generate the .h header files, so we can allow glade and
## xml translation support
- if (! -x "$EXTRACT")
+ if (! isIntltoolExtractInPath("$EXTRACT"))
{
print STDERR "\n *** The intltool-extract script wasn't found!"
."\n *** Without it, intltool-update can not generate files.\n";
@@ -671,12 +684,8 @@ sub GeneratePOTemplate
}
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);
+ print OUTFILE "$SRCDIR/../$_\n";
+ $gettext_code = &TextFile_DetermineEncoding ("$SRCDIR/../$_") if ($gettext_support_nonascii and not defined $forced_gettext_code);
}
next if (! $gettext_support_nonascii);
diff -pruN 2.18.0-2/m4/gnome-doc-utils.m4 2.19.90-0ubuntu1/m4/gnome-doc-utils.m4
--- 2.18.0-2/m4/gnome-doc-utils.m4 2007-03-13 01:48:36.000000000 +0000
+++ 2.19.90-0ubuntu1/m4/gnome-doc-utils.m4 2007-08-14 03:44:43.000000000 +0100
@@ -1,17 +1,7 @@
-dnl GNOME_DOC_INIT([MINIMUM-VERSION])
-
-AC_DEFUN([GNOME_DOC_INIT],
+dnl Do not call GNOME_DOC_DEFINES directly. It is split out from
+dnl GNOME_DOC_INIT to allow gnome-doc-utils to bootstrap off itself.
+AC_DEFUN([GNOME_DOC_DEFINES],
[
-dnl Only apply the version check if we're not configuring ourselves!
-if test "x$PACKAGE" != "xgnome-doc-utils"; then
- GDU_REQUIRED_VERSION=0.3.2
- if test -n "$1"; then
- GDU_REQUIRED_VERSION=$1
- fi
-
- PKG_CHECK_MODULES([GDU_MODULE_VERSION_CHECK],[gnome-doc-utils >= $GDU_REQUIRED_VERSION])
-fi
-
AC_ARG_WITH([help-dir],
AC_HELP_STRING([--with-help-dir=DIR], [path to help docs]),,
[with_help_dir='${datadir}/gnome/help'])
@@ -34,6 +24,25 @@ AC_ARG_ENABLE([scrollkeeper],
[AC_HELP_STRING([--disable-scrollkeeper],
[do not make updates to the scrollkeeper database])],,
enable_scrollkeeper=yes)
-AM_CONDITIONAL(ENABLE_SK, test "x$enable_scrollkeeper" = "xyes")
+AM_CONDITIONAL([ENABLE_SK],[test "$gdu_cv_have_gdu" = "yes" -a "$enable_scrollkeeper" = "yes"])
+
+AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS],[test "$gdu_cv_have_gdu" = "yes"])
+])
+
+# GNOME_DOC_INIT ([MINIMUM-VERSION],[ACTION-IF-FOUND],[ACTION-IF-NOT-FOUND])
+#
+AC_DEFUN([GNOME_DOC_INIT],
+[
+ifelse([$1],,[gdu_cv_version_required=0.3.2],[gdu_cv_version_required=$1])
+
+PKG_CHECK_EXISTS([gnome-doc-utils >= $gdu_cv_version_required],
+ [gdu_cv_have_gdu=yes],[gdu_cv_have_gdu=no])
+
+if test "$gdu_cv_have_gdu" = "yes"; then
+ ifelse([$2],,[:],[$2])
+else
+ ifelse([$3],,[AC_MSG_ERROR([gnome-doc-utils >= $gdu_cv_version_required not found])],[$3])
+fi
+GNOME_DOC_DEFINES
])
diff -pruN 2.18.0-2/m4/intltool.m4 2.19.90-0ubuntu1/m4/intltool.m4
--- 2.18.0-2/m4/intltool.m4 2007-03-13 01:48:36.000000000 +0000
+++ 2.19.90-0ubuntu1/m4/intltool.m4 2007-08-14 03:44:43.000000000 +0100
@@ -113,7 +113,30 @@ AC_PATH_PROG(INTLTOOL_XGETTEXT, xgettext
# Substitute ALL_LINGUAS so we can use it in po/Makefile
AC_SUBST(ALL_LINGUAS)
-
+
+# Set DATADIRNAME correctly if it is not set yet
+# (copied from glib-gettext.m4)
+if test -z "$DATADIRNAME"; then
+ AC_TRY_LINK(, [extern int _nl_msg_cat_cntr;
+ return _nl_msg_cat_cntr],
+ [DATADIRNAME=share],
+ [case $host in
+ *-*-solaris*)
+ dnl On Solaris, if bind_textdomain_codeset is in libc,
+ dnl GNU format message catalog is always supported,
+ dnl since both are added to the libc all together.
+ dnl Hence, we'd like to go with DATADIRNAME=share
+ dnl in this case.
+ AC_CHECK_FUNC(bind_textdomain_codeset,
+ [DATADIRNAME=share], [DATADIRNAME=lib])
+ ;;
+ *)
+ [DATADIRNAME=lib]
+ ;;
+ esac])
+fi
+AC_SUBST(DATADIRNAME)
+
IT_PO_SUBDIR([po])
dnl The following is very similar to
diff -pruN 2.18.0-2/Makefile.in 2.19.90-0ubuntu1/Makefile.in
--- 2.18.0-2/Makefile.in 2007-03-13 01:48:45.000000000 +0000
+++ 2.19.90-0ubuntu1/Makefile.in 2007-08-14 03:44:51.000000000 +0100
@@ -110,12 +110,12 @@ ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-GDU_MODULE_VERSION_CHECK_CFLAGS = @GDU_MODULE_VERSION_CHECK_CFLAGS@
-GDU_MODULE_VERSION_CHECK_LIBS = @GDU_MODULE_VERSION_CHECK_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
HELP_DIR = @HELP_DIR@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -161,6 +161,7 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_
MAKEINFO = @MAKEINFO@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
NETTOOL_CFLAGS = @NETTOOL_CFLAGS@
NETTOOL_LIBS = @NETTOOL_LIBS@
OBJEXT = @OBJEXT@
diff -pruN 2.18.0-2/NEWS 2.19.90-0ubuntu1/NEWS
--- 2.18.0-2/NEWS 2007-03-13 01:44:23.000000000 +0000
+++ 2.19.90-0ubuntu1/NEWS 2007-08-14 03:43:56.000000000 +0100
@@ -1,3 +1,28 @@
+gnome-nettool 2.19.90, 2007-08-13
+---------------------------------
+
+ - #408452: Fixed the output for traceroute/ping. (Germán Poó-Caamaño)
+ - #414068: Added missing strings for translation (Germán Poó-Caamaño)
+ - #435650: Fixed Run gtk-update-icon-cache in uninstall-hook (David Farning)
+ - #401076: Added Tango icons for different sizes (Hylke Bons)
+ - #311350: Fixed locale problem in whois (Loïs Minier)
+
+ - New translations:
+ - te (Pramod)
+ - si (Danishka Navin)
+
+ - Updated translations:
+ - fi (Ilkka Tuohela)
+ - nb (Kjartan Maraas)
+ - se (Daniel Nylander)
+ - gu (Ankit Patel)
+ - th (Theppitak Karoonboonyanan)
+ - es (Jorge Gonzalez)
+ - ta (I Felix)
+ - dz (Pema Geyleg)
+ - it (Francesco Marletta)
+ - zh_CN (Yang Zhang)
+
gnome-nettool 2.18.0, 2007-03-12
--------------------------------
Binary files 2.18.0-2/pixmaps/gnome-nettool.png and 2.19.90-0ubuntu1/pixmaps/gnome-nettool.png differ
Binary files 2.18.0-2/pixmaps/icons/16x16/apps/gnome-nettool.png and 2.19.90-0ubuntu1/pixmaps/icons/16x16/apps/gnome-nettool.png differ
diff -pruN 2.18.0-2/pixmaps/icons/16x16/apps/Makefile.am 2.19.90-0ubuntu1/pixmaps/icons/16x16/apps/Makefile.am
--- 2.18.0-2/pixmaps/icons/16x16/apps/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ 2.19.90-0ubuntu1/pixmaps/icons/16x16/apps/Makefile.am 2007-08-14 03:43:01.000000000 +0100
@@ -0,0 +1,11 @@
+themedir = $(datadir)/icons/hicolor
+size = 16x16
+context = apps
+
+iconsdir = $(themedir)/$(size)/$(context)
+
+icons_DATA = \
+ gnome-nettool.png
+
+EXTRA_DIST = \
+ $(icons_DATA)
diff -pruN 2.18.0-2/pixmaps/icons/16x16/apps/Makefile.in 2.19.90-0ubuntu1/pixmaps/icons/16x16/apps/Makefile.in
--- 2.18.0-2/pixmaps/icons/16x16/apps/Makefile.in 1970-01-01 01:00:00.000000000 +0100
+++ 2.19.90-0ubuntu1/pixmaps/icons/16x16/apps/Makefile.in 2007-08-14 03:44:50.000000000 +0100
@@ -0,0 +1,413 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005 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 = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = pixmaps/icons/16x16/apps
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(iconsdir)"
+iconsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(icons_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
+HELP_DIR = @HELP_DIR@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_ICONV = @INTLTOOL_ICONV@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+NETTOOL_CFLAGS = @NETTOOL_CFLAGS@
+NETTOOL_LIBS = @NETTOOL_LIBS@
+OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
+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@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+XGETTEXT = @XGETTEXT@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+themedir = $(datadir)/icons/hicolor
+size = 16x16
+context = apps
+iconsdir = $(themedir)/$(size)/$(context)
+icons_DATA = \
+ gnome-nettool.png
+
+EXTRA_DIST = \
+ $(icons_DATA)
+
+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) --foreign pixmaps/icons/16x16/apps/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --foreign pixmaps/icons/16x16/apps/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
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+distclean-libtool:
+ -rm -f libtool
+uninstall-info-am:
+install-iconsDATA: $(icons_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(iconsdir)" || $(mkdir_p) "$(DESTDIR)$(iconsdir)"
+ @list='$(icons_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
+ $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
+ done
+
+uninstall-iconsDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(icons_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(iconsdir)/$$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
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+ for dir in "$(DESTDIR)$(iconsdir)"; 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:
+ -test -z "$(CONFIG_CLEAN_FILES)" || 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 clean-libtool mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-iconsDATA
+
+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 mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-iconsDATA uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-exec install-exec-am \
+ install-iconsDATA install-info install-info-am install-man \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ uninstall uninstall-am uninstall-iconsDATA uninstall-info-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.
+.NOEXPORT:
diff -pruN 2.18.0-2/pixmaps/icons/16x16/Makefile.am 2.19.90-0ubuntu1/pixmaps/icons/16x16/Makefile.am
--- 2.18.0-2/pixmaps/icons/16x16/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ 2.19.90-0ubuntu1/pixmaps/icons/16x16/Makefile.am 2007-08-14 03:43:01.000000000 +0100
@@ -0,0 +1 @@
+SUBDIRS = apps
diff -pruN 2.18.0-2/pixmaps/icons/16x16/Makefile.in 2.19.90-0ubuntu1/pixmaps/icons/16x16/Makefile.in
--- 2.18.0-2/pixmaps/icons/16x16/Makefile.in 1970-01-01 01:00:00.000000000 +0100
+++ 2.19.90-0ubuntu1/pixmaps/icons/16x16/Makefile.in 2007-08-14 03:44:50.000000000 +0100
@@ -0,0 +1,531 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005 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 = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = pixmaps/icons/16x16
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+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
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
+HELP_DIR = @HELP_DIR@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_ICONV = @INTLTOOL_ICONV@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+NETTOOL_CFLAGS = @NETTOOL_CFLAGS@
+NETTOOL_LIBS = @NETTOOL_LIBS@
+OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
+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@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+XGETTEXT = @XGETTEXT@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+SUBDIRS = apps
+all: all-recursive
+
+.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) --foreign pixmaps/icons/16x16/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --foreign pixmaps/icons/16x16/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
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+distclean-libtool:
+ -rm -f libtool
+uninstall-info-am:
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+# (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ rev=''; for subdir in $$list; do \
+ if test "$$subdir" = "."; then :; else \
+ rev="$$subdir $$rev"; \
+ fi; \
+ done; \
+ rev="$$rev ."; \
+ target=`echo $@ | sed s/-recursive//`; \
+ for subdir in $$rev; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done && test -z "$$fail"
+tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test ! -f $$subdir/TAGS || \
+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+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
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+ || $(mkdir_p) "$(distdir)/$$subdir" \
+ || exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+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:
+ -test -z "$(CONFIG_CLEAN_FILES)" || 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-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool \
+ distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-recursive
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+ distclean-recursive distclean-tags 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-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic maintainer-clean-recursive \
+ mostlyclean mostlyclean-generic mostlyclean-libtool \
+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+ uninstall uninstall-am uninstall-info-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.
+.NOEXPORT:
Binary files 2.18.0-2/pixmaps/icons/22x22/apps/gnome-nettool.png and 2.19.90-0ubuntu1/pixmaps/icons/22x22/apps/gnome-nettool.png differ
diff -pruN 2.18.0-2/pixmaps/icons/22x22/apps/Makefile.am 2.19.90-0ubuntu1/pixmaps/icons/22x22/apps/Makefile.am
--- 2.18.0-2/pixmaps/icons/22x22/apps/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ 2.19.90-0ubuntu1/pixmaps/icons/22x22/apps/Makefile.am 2007-08-14 03:43:00.000000000 +0100
@@ -0,0 +1,11 @@
+themedir = $(datadir)/icons/hicolor
+size = 22x22
+context = apps
+
+iconsdir = $(themedir)/$(size)/$(context)
+
+icons_DATA = \
+ gnome-nettool.png
+
+EXTRA_DIST = \
+ $(icons_DATA)
diff -pruN 2.18.0-2/pixmaps/icons/22x22/apps/Makefile.in 2.19.90-0ubuntu1/pixmaps/icons/22x22/apps/Makefile.in
--- 2.18.0-2/pixmaps/icons/22x22/apps/Makefile.in 1970-01-01 01:00:00.000000000 +0100
+++ 2.19.90-0ubuntu1/pixmaps/icons/22x22/apps/Makefile.in 2007-08-14 03:44:50.000000000 +0100
@@ -0,0 +1,413 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005 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 = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = pixmaps/icons/22x22/apps
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(iconsdir)"
+iconsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(icons_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
+HELP_DIR = @HELP_DIR@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_ICONV = @INTLTOOL_ICONV@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+NETTOOL_CFLAGS = @NETTOOL_CFLAGS@
+NETTOOL_LIBS = @NETTOOL_LIBS@
+OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
+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@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+XGETTEXT = @XGETTEXT@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+themedir = $(datadir)/icons/hicolor
+size = 22x22
+context = apps
+iconsdir = $(themedir)/$(size)/$(context)
+icons_DATA = \
+ gnome-nettool.png
+
+EXTRA_DIST = \
+ $(icons_DATA)
+
+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) --foreign pixmaps/icons/22x22/apps/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --foreign pixmaps/icons/22x22/apps/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
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+distclean-libtool:
+ -rm -f libtool
+uninstall-info-am:
+install-iconsDATA: $(icons_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(iconsdir)" || $(mkdir_p) "$(DESTDIR)$(iconsdir)"
+ @list='$(icons_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
+ $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
+ done
+
+uninstall-iconsDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(icons_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(iconsdir)/$$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
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+ for dir in "$(DESTDIR)$(iconsdir)"; 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:
+ -test -z "$(CONFIG_CLEAN_FILES)" || 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 clean-libtool mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-iconsDATA
+
+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 mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-iconsDATA uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-exec install-exec-am \
+ install-iconsDATA install-info install-info-am install-man \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ uninstall uninstall-am uninstall-iconsDATA uninstall-info-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.
+.NOEXPORT:
diff -pruN 2.18.0-2/pixmaps/icons/22x22/Makefile.am 2.19.90-0ubuntu1/pixmaps/icons/22x22/Makefile.am
--- 2.18.0-2/pixmaps/icons/22x22/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ 2.19.90-0ubuntu1/pixmaps/icons/22x22/Makefile.am 2007-08-14 03:43:00.000000000 +0100
@@ -0,0 +1 @@
+SUBDIRS = apps
diff -pruN 2.18.0-2/pixmaps/icons/22x22/Makefile.in 2.19.90-0ubuntu1/pixmaps/icons/22x22/Makefile.in
--- 2.18.0-2/pixmaps/icons/22x22/Makefile.in 1970-01-01 01:00:00.000000000 +0100
+++ 2.19.90-0ubuntu1/pixmaps/icons/22x22/Makefile.in 2007-08-14 03:44:50.000000000 +0100
@@ -0,0 +1,531 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005 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 = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = pixmaps/icons/22x22
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+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
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
+HELP_DIR = @HELP_DIR@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_ICONV = @INTLTOOL_ICONV@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+NETTOOL_CFLAGS = @NETTOOL_CFLAGS@
+NETTOOL_LIBS = @NETTOOL_LIBS@
+OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
+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@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+XGETTEXT = @XGETTEXT@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+SUBDIRS = apps
+all: all-recursive
+
+.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) --foreign pixmaps/icons/22x22/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --foreign pixmaps/icons/22x22/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
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+distclean-libtool:
+ -rm -f libtool
+uninstall-info-am:
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+# (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ rev=''; for subdir in $$list; do \
+ if test "$$subdir" = "."; then :; else \
+ rev="$$subdir $$rev"; \
+ fi; \
+ done; \
+ rev="$$rev ."; \
+ target=`echo $@ | sed s/-recursive//`; \
+ for subdir in $$rev; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done && test -z "$$fail"
+tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test ! -f $$subdir/TAGS || \
+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+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
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+ || $(mkdir_p) "$(distdir)/$$subdir" \
+ || exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+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:
+ -test -z "$(CONFIG_CLEAN_FILES)" || 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-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool \
+ distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-recursive
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+ distclean-recursive distclean-tags 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-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic maintainer-clean-recursive \
+ mostlyclean mostlyclean-generic mostlyclean-libtool \
+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+ uninstall uninstall-am uninstall-info-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.
+.NOEXPORT:
Binary files 2.18.0-2/pixmaps/icons/32x32/apps/gnome-nettool.png and 2.19.90-0ubuntu1/pixmaps/icons/32x32/apps/gnome-nettool.png differ
diff -pruN 2.18.0-2/pixmaps/icons/32x32/apps/Makefile.am 2.19.90-0ubuntu1/pixmaps/icons/32x32/apps/Makefile.am
--- 2.18.0-2/pixmaps/icons/32x32/apps/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ 2.19.90-0ubuntu1/pixmaps/icons/32x32/apps/Makefile.am 2007-08-14 03:43:00.000000000 +0100
@@ -0,0 +1,11 @@
+themedir = $(datadir)/icons/hicolor
+size = 32x32
+context = apps
+
+iconsdir = $(themedir)/$(size)/$(context)
+
+icons_DATA = \
+ gnome-nettool.png
+
+EXTRA_DIST = \
+ $(icons_DATA)
diff -pruN 2.18.0-2/pixmaps/icons/32x32/apps/Makefile.in 2.19.90-0ubuntu1/pixmaps/icons/32x32/apps/Makefile.in
--- 2.18.0-2/pixmaps/icons/32x32/apps/Makefile.in 1970-01-01 01:00:00.000000000 +0100
+++ 2.19.90-0ubuntu1/pixmaps/icons/32x32/apps/Makefile.in 2007-08-14 03:44:51.000000000 +0100
@@ -0,0 +1,413 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005 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 = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = pixmaps/icons/32x32/apps
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(iconsdir)"
+iconsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(icons_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
+HELP_DIR = @HELP_DIR@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_ICONV = @INTLTOOL_ICONV@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+NETTOOL_CFLAGS = @NETTOOL_CFLAGS@
+NETTOOL_LIBS = @NETTOOL_LIBS@
+OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
+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@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+XGETTEXT = @XGETTEXT@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+themedir = $(datadir)/icons/hicolor
+size = 32x32
+context = apps
+iconsdir = $(themedir)/$(size)/$(context)
+icons_DATA = \
+ gnome-nettool.png
+
+EXTRA_DIST = \
+ $(icons_DATA)
+
+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) --foreign pixmaps/icons/32x32/apps/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --foreign pixmaps/icons/32x32/apps/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
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+distclean-libtool:
+ -rm -f libtool
+uninstall-info-am:
+install-iconsDATA: $(icons_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(iconsdir)" || $(mkdir_p) "$(DESTDIR)$(iconsdir)"
+ @list='$(icons_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
+ $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
+ done
+
+uninstall-iconsDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(icons_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(iconsdir)/$$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
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+ for dir in "$(DESTDIR)$(iconsdir)"; 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:
+ -test -z "$(CONFIG_CLEAN_FILES)" || 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 clean-libtool mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-iconsDATA
+
+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 mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-iconsDATA uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-exec install-exec-am \
+ install-iconsDATA install-info install-info-am install-man \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ uninstall uninstall-am uninstall-iconsDATA uninstall-info-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.
+.NOEXPORT:
diff -pruN 2.18.0-2/pixmaps/icons/32x32/Makefile.am 2.19.90-0ubuntu1/pixmaps/icons/32x32/Makefile.am
--- 2.18.0-2/pixmaps/icons/32x32/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ 2.19.90-0ubuntu1/pixmaps/icons/32x32/Makefile.am 2007-08-14 03:43:01.000000000 +0100
@@ -0,0 +1 @@
+SUBDIRS = apps
diff -pruN 2.18.0-2/pixmaps/icons/32x32/Makefile.in 2.19.90-0ubuntu1/pixmaps/icons/32x32/Makefile.in
--- 2.18.0-2/pixmaps/icons/32x32/Makefile.in 1970-01-01 01:00:00.000000000 +0100
+++ 2.19.90-0ubuntu1/pixmaps/icons/32x32/Makefile.in 2007-08-14 03:44:51.000000000 +0100
@@ -0,0 +1,531 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005 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 = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = pixmaps/icons/32x32
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+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
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
+HELP_DIR = @HELP_DIR@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_ICONV = @INTLTOOL_ICONV@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+NETTOOL_CFLAGS = @NETTOOL_CFLAGS@
+NETTOOL_LIBS = @NETTOOL_LIBS@
+OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
+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@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+XGETTEXT = @XGETTEXT@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+SUBDIRS = apps
+all: all-recursive
+
+.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) --foreign pixmaps/icons/32x32/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --foreign pixmaps/icons/32x32/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
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+distclean-libtool:
+ -rm -f libtool
+uninstall-info-am:
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+# (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ rev=''; for subdir in $$list; do \
+ if test "$$subdir" = "."; then :; else \
+ rev="$$subdir $$rev"; \
+ fi; \
+ done; \
+ rev="$$rev ."; \
+ target=`echo $@ | sed s/-recursive//`; \
+ for subdir in $$rev; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done && test -z "$$fail"
+tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test ! -f $$subdir/TAGS || \
+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+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
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+ || $(mkdir_p) "$(distdir)/$$subdir" \
+ || exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+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:
+ -test -z "$(CONFIG_CLEAN_FILES)" || 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-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool \
+ distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-recursive
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+ distclean-recursive distclean-tags 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-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic maintainer-clean-recursive \
+ mostlyclean mostlyclean-generic mostlyclean-libtool \
+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+ uninstall uninstall-am uninstall-info-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.
+.NOEXPORT:
diff -pruN 2.18.0-2/pixmaps/icons/Makefile.am 2.19.90-0ubuntu1/pixmaps/icons/Makefile.am
--- 2.18.0-2/pixmaps/icons/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ 2.19.90-0ubuntu1/pixmaps/icons/Makefile.am 2007-08-14 03:43:01.000000000 +0100
@@ -0,0 +1,14 @@
+SUBDIRS = 16x16 22x22 32x32 scalable
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+
+install-data-hook: update-icon-cache
+uninstall-hook: update-icon-cache
+update-icon-cache:
+ @-if test -z "$(DESTDIR)"; then \
+ echo "Updating Gtk icon cache."; \
+ $(gtk_update_icon_cache); \
+ else \
+ echo "*** Icon cache not updated. After (un)install, run this:"; \
+ echo "*** $(gtk_update_icon_cache)"; \
+ fi
diff -pruN 2.18.0-2/pixmaps/icons/Makefile.in 2.19.90-0ubuntu1/pixmaps/icons/Makefile.in
--- 2.18.0-2/pixmaps/icons/Makefile.in 1970-01-01 01:00:00.000000000 +0100
+++ 2.19.90-0ubuntu1/pixmaps/icons/Makefile.in 2007-08-14 03:44:51.000000000 +0100
@@ -0,0 +1,548 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005 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 = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = pixmaps/icons
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+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
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
+HELP_DIR = @HELP_DIR@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_ICONV = @INTLTOOL_ICONV@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+NETTOOL_CFLAGS = @NETTOOL_CFLAGS@
+NETTOOL_LIBS = @NETTOOL_LIBS@
+OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
+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@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+XGETTEXT = @XGETTEXT@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+SUBDIRS = 16x16 22x22 32x32 scalable
+gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
+all: all-recursive
+
+.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) --foreign pixmaps/icons/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --foreign pixmaps/icons/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
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+distclean-libtool:
+ -rm -f libtool
+uninstall-info-am:
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+# (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ rev=''; for subdir in $$list; do \
+ if test "$$subdir" = "."; then :; else \
+ rev="$$subdir $$rev"; \
+ fi; \
+ done; \
+ rev="$$rev ."; \
+ target=`echo $@ | sed s/-recursive//`; \
+ for subdir in $$rev; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done && test -z "$$fail"
+tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test ! -f $$subdir/TAGS || \
+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+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
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+ || $(mkdir_p) "$(distdir)/$$subdir" \
+ || exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+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:
+ -test -z "$(CONFIG_CLEAN_FILES)" || 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-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool \
+ distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+
+install-exec-am:
+
+install-info: install-info-recursive
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+ @$(NORMAL_INSTALL)
+ $(MAKE) $(AM_MAKEFLAGS) uninstall-hook
+
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+ 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 \
+ installcheck installcheck-am installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic \
+ maintainer-clean-recursive mostlyclean mostlyclean-generic \
+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+ tags tags-recursive uninstall uninstall-am uninstall-hook \
+ uninstall-info-am
+
+
+install-data-hook: update-icon-cache
+uninstall-hook: update-icon-cache
+update-icon-cache:
+ @-if test -z "$(DESTDIR)"; then \
+ echo "Updating Gtk icon cache."; \
+ $(gtk_update_icon_cache); \
+ else \
+ echo "*** Icon cache not updated. After (un)install, run this:"; \
+ echo "*** $(gtk_update_icon_cache)"; \
+ fi
+# 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 -pruN 2.18.0-2/pixmaps/icons/scalable/apps/gnome-nettool.svg 2.19.90-0ubuntu1/pixmaps/icons/scalable/apps/gnome-nettool.svg
--- 2.18.0-2/pixmaps/icons/scalable/apps/gnome-nettool.svg 1970-01-01 01:00:00.000000000 +0100
+++ 2.19.90-0ubuntu1/pixmaps/icons/scalable/apps/gnome-nettool.svg 2007-08-14 03:43:01.000000000 +0100
@@ -0,0 +1,519 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/";
+ xmlns:cc="http://web.resource.org/cc/";
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#";
+ xmlns:svg="http://www.w3.org/2000/svg";
+ xmlns="http://www.w3.org/2000/svg";
+ xmlns:xlink="http://www.w3.org/1999/xlink";
+ xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/s odipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape";
+ width="48px"
+ height="48px"
+ id="svg1307"
+ sodipodi:version="0.32"
+ inkscape:version="0.43"
+ sodipodi:docbase="/home/hbons/Desktop/Tango"
+ sodipodi:docname="gnome-network-utils.svg"
+ inkscape:export-filename="/home/hbons/Desktop/gnome-network-utils.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs1309">
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient2268">
+ <stop
+ style="stop-color:#5c3566;stop-opacity:1;"
+ offset="0"
+ id="stop2270" />
+ <stop
+ style="stop-color:#5c3566;stop-opacity:0;"
+ offset="1"
+ id="stop2272" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient2260">
+ <stop
+ style="stop-color:#ad7fa8;stop-opacity:1;"
+ offset="0"
+ id="stop2262" />
+ <stop
+ style="stop-color:#ad7fa8;stop-opacity:0;"
+ offset="1"
+ id="stop2264" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient2251">
+ <stop
+ style="stop-color:#729fcf;stop-opacity:1;"
+ offset="0"
+ id="stop2253" />
+ <stop
+ style="stop-color:#729fcf;stop-opacity:0;"
+ offset="1"
+ id="stop2255" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient2235">
+ <stop
+ style="stop-color:#204a87;stop-opacity:1;"
+ offset="0"
+ id="stop2237" />
+ <stop
+ style="stop-color:#204a87;stop-opacity:0;"
+ offset="1"
+ id="stop2239" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient4045">
+ <stop
+ style="stop-color:#888a85;stop-opacity:1;"
+ offset="0"
+ id="stop4047" />
+ <stop
+ style="stop-color:#888a85;stop-opacity:0;"
+ offset="1"
+ id="stop4049" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient4029">
+ <stop
+ style="stop-color:#ffffff;stop-opacity:1;"
+ offset="0"
+ id="stop4031" />
+ <stop
+ style="stop-color:#ffffff;stop-opacity:0;"
+ offset="1"
+ id="stop4033" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient2257">
+ <stop
+ style="stop-color:#eeeeec;stop-opacity:1;"
+ offset="0"
+ id="stop2259" />
+ <stop
+ style="stop-color:#eeeeec;stop-opacity:0;"
+ offset="1"
+ id="stop2261" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient2246">
+ <stop
+ style="stop-color:#eeeeec;stop-opacity:1;"
+ offset="0"
+ id="stop2248" />
+ <stop
+ style="stop-color:#eeeeec;stop-opacity:0;"
+ offset="1"
+ id="stop2250" />
+ </linearGradient>
+ <linearGradient
+ inkscape:collect="always"
+ id="linearGradient2211">
+ <stop
+ style="stop-color:#eeeeec;stop-opacity:1;"
+ offset="0"
+ id="stop2213" />
+ <stop
+ style="stop-color:#eeeeec;stop-opacity:0;"
+ offset="1"
+ id="stop2215" />
+ </linearGradient>
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2211"
+ id="radialGradient2217"
+ cx="24.5"
+ cy="20.062737"
+ fx="24.5"
+ fy="20.062737"
+ r="17.46875"
+ gradientTransform="matrix(1.5194,6.959671e-18,-6.760444e-18,1.47591,-12.7253,-10.27302)"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2246"
+ id="radialGradient2252"
+ cx="24.5"
+ cy="9.5105629"
+ fx="24.5"
+ fy="9.5105629"
+ r="14.439805"
+ gradientTransform="matrix(0.979268,6.031362e-17,-3.106849e-17,0.504433,0.50792,9.0591)"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2257"
+ id="radialGradient2263"
+ cx="15.794439"
+ cy="8.3293562"
+ fx="15.794439"
+ fy="8.3293562"
+ r="14.5"
+ gradientTransform="matrix(2.449439,3.028846e-17,-1.514349e-17,1.2495,-26.68752,1.980857)"
+ gradientUnits="userSpaceOnUse" />
+ <radialGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4029"
+ id="radialGradient4035"
+ cx="24.5"
+ cy="17.500086"
+ fx="24.5"
+ fy="17.500086"
+ r="14.50017"
+ gradientTransform="matrix(2.332907,1.036019e-15,-5.358713e-16,1.206675,-32.65621,-3.616833)"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient4045"
+ id="linearGradient4051"
+ x1="1.2813275"
+ y1="46.89257"
+ x2="23.978548"
+ y2="24.195351"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="translate(0,3.124994e-2)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2235"
+ id="linearGradient2241"
+ x1="21.507809"
+ y1="43.466747"
+ x2="21.507809"
+ y2="47.465462"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2251"
+ id="linearGradient2258"
+ x1="21.5"
+ y1="43.467159"
+ x2="21.5"
+ y2="47.532516"
+ gradientUnits="userSpaceOnUse" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2260"
+ id="linearGradient2266"
+ x1="28.58882"
+ y1="42.96125"
+ x2="28.58882"
+ y2="48.851078"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.779487,0,0,0.69777,6.215382,13.4756)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2268"
+ id="linearGradient2274"
+ x1="28.6952"
+ y1="43.444878"
+ x2="28.6952"
+ y2="47.467724"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.102382,0,0,1,-3.135271,0)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2251"
+ id="linearGradient2288"
+ gradientUnits="userSpaceOnUse"
+ x1="21.5"
+ y1="43.467159"
+ x2="21.5"
+ y2="47.532516"
+ gradientTransform="translate(0,-48)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2235"
+ id="linearGradient2290"
+ gradientUnits="userSpaceOnUse"
+ x1="21.507809"
+ y1="43.466747"
+ x2="21.507809"
+ y2="47.465462"
+ gradientTransform="translate(0,-48)" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2260"
+ id="linearGradient2292"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(0.779487,0,0,0.69777,6.215382,-34.5244)"
+ x1="28.58882"
+ y1="42.96125"
+ x2="28.58882"
+ y2="48.851078" />
+ <linearGradient
+ inkscape:collect="always"
+ xlink:href="#linearGradient2268"
+ id="linearGradient2294"
+ gradientUnits="userSpaceOnUse"
+ gradientTransform="matrix(1.102382,0,0,1,-3.135271,-48)"
+ x1="28.6952"
+ y1="43.444878"
+ x2="28.6952"
+ y2="47.467724" />
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="15.004828"
+ inkscape:cx="40.088701"
+ inkscape:cy="25.470012"
+ inkscape:current-layer="layer1"
+ showgrid="true"
+ inkscape:grid-bbox="true"
+ inkscape:document-units="px"
+ inkscape:window-width="1267"
+ inkscape:window-height="971"
+ inkscape:window-x="6"
+ inkscape:window-y="21"
+ fill="#888a85"
+ showguides="true"
+ inkscape:guide-bbox="true" />
+ <metadata
+ id="metadata1312">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage"; />
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ id="layer1"
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer">
+ <rect
+ style="opacity:1;fill:url(#linearGradient2288);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000012;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect2280"
+ width="3"
+ height="6"
+ x="20"
+ y="-6"
+ transform="scale(1,-1)" />
+ <rect
+ style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2290);stroke-width:1.00000036;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect2282"
+ width="3.9812489"
+ height="7.0079803"
+ x="19.517185"
+ y="-6.5044022"
+ transform="scale(1,-1)" />
+ <rect
+ style="opacity:1;fill:url(#linearGradient2292);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000012;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect2284"
+ width="3"
+ height="5.566967"
+ x="27"
+ y="-5.566967"
+ transform="scale(1,-1)" />
+ <rect
+ style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2294);stroke-width:0.99999982;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect2286"
+ width="3.9856846"
+ height="7.9782333"
+ x="26.504959"
+ y="-6.4782333"
+ transform="scale(1,-1)" />
+ <rect
+ style="opacity:1;fill:url(#linearGradient2258);fill-opacity:1.0;fill-rule:evenodd;stroke:none;stroke-width:1.00000012;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect2340"
+ width="3"
+ height="6"
+ x="20"
+ y="42" />
+ <rect
+ style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2241);stroke-width:1.00000036;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect2346"
+ width="3.9812489"
+ height="7.0079803"
+ x="19.517185"
+ y="41.495598" />
+ <rect
+ style="opacity:1;fill:url(#linearGradient2266);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000012;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect2348"
+ width="3"
+ height="5.566967"
+ x="27"
+ y="42.433033" />
+ <rect
+ style="opacity:1;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:url(#linearGradient2274);stroke-width:0.99999982;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect2354"
+ width="3.9856846"
+ height="7.9782333"
+ x="26.504959"
+ y="41.521767" />
+ <rect
+ style="opacity:1;fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:1.00000048;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect2239"
+ width="6.1280832"
+ height="5"
+ x="25.434546"
+ y="37.53125"
+ rx="2.0714309"
+ ry="2.0714285" />
+ <rect
+ style="opacity:1;fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:1.00000048;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect2241"
+ width="6.1280832"
+ height="5"
+ x="18.371916"
+ y="37.53125"
+ rx="2.0714309"
+ ry="2.0714285" />
+ <rect
+ style="opacity:1;fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:1.00000048;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect2237"
+ width="6.1280832"
+ height="5"
+ x="25.5"
+ y="5.53125"
+ rx="2.0714309"
+ ry="2.0714285" />
+ <rect
+ style="opacity:1;fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:1.00000048;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect2235"
+ width="6.1280832"
+ height="5"
+ x="18.43737"
+ y="5.53125"
+ rx="2.0714309"
+ ry="2.0714285" />
+ <path
+ style="fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:1.00000024;stroke-miterlimit:4;stroke-opacity:1"
+ d="M 9.5000017,7.5012726 L 39.499998,7.5012726 C 41.161999,7.5012726 42.5,8.7638627 42.5,10.332192 L 42.5,37.700341 C 42.5,39.268671 41.161999,40.531262 39.499998,40.531262 L 9.5000017,40.531262 C 7.8380007,40.531262 6.5,39.268671 6.5,37.700341 L 6.5,10.332192 C 6.5,8.7638627 7.8380007,7.5012726 9.5000017,7.5012726 z "
+ id="rect1315" />
+ <path
+ sodipodi:type="inkscape:offset"
+ inkscape:radius="-1.0303071"
+ inkscape:original="M 9.5 7.5 C 7.837999 7.5 6.5 8.7754203 6.5 10.34375 L 6.5 37.6875 C 6.5 39.25583 7.8379988 40.531251 9.5 40.53125 L 39.5 40.53125 C 41.162001 40.53125 42.5 39.255831 42.5 37.6875 L 42.5 10.34375 C 42.5 8.7754207 41.162003 7.4999999 39.5 7.5 L 9.5 7.5 z "
+ xlink:href="#rect1315"
+ style="fill:url(#radialGradient2217);fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000012;stroke-miterlimit:4;stroke-opacity:1"
+ id="path2209"
+ inkscape:href="#rect1315"
+ d="M 9.5,7.5 C 8.3651044,7.5 7.53125,8.3301653 7.53125,9.3125 L 7.53125,36.65625 C 7.53125,37.638585 8.3651048,38.468751 9.5,38.46875 L 39.5,38.46875 C 40.634896,38.46875 41.46875,37.638587 41.46875,36.65625 L 41.46875,9.3125 C 41.46875,8.3301645 40.634898,7.5 39.5,7.5 L 9.5,7.5 z " />
+ <path
+ style="fill:#fcaf3e;fill-opacity:1;fill-rule:evenodd;stroke:#ce5c00;stroke-width:1.00000107;stroke-miterlimit:4;stroke-opacity:1"
+ d="M 10.571775,10.537961 L 38.428248,10.537961 C 39.021823,10.537961 39.499682,11.015821 39.499682,11.609396 L 39.499682,25.459629 C 39.499682,26.053204 39.021823,26.531064 38.428248,26.531064 L 10.571775,26.531064 C 9.9782004,26.531064 9.5003405,26.053204 9.5003405,25.459629 L 9.5003405,11.609396 C 9.5003405,11.015821 9.9782004,10.537961 10.571775,10.537961 z "
+ id="rect2190" />
+ <path
+ sodipodi:type="inkscape:offset"
+ inkscape:radius="-0.99585479"
+ inkscape:original="M 10.5625 10.53125 C 9.9689254 10.53125 9.5 11.031425 9.5 11.625 L 9.5 25.46875 C 9.5 26.062325 9.968925 26.531251 10.5625 26.53125 L 38.4375 26.53125 C 39.031075 26.53125 39.499999 26.062325 39.5 25.46875 L 39.5 11.625 C 39.5 11.031425 39.031074 10.53125 38.4375 10.53125 L 10.5625 10.53125 z "
+ xlink:href="#rect2190"
+ style="opacity:0.5;fill:url(#radialGradient2252);fill-opacity:1;fill-rule:evenodd;stroke:url(#radialGradient4035);stroke-width:1.00000107;stroke-miterlimit:4;stroke-opacity:1"
+ id="path2244"
+ inkscape:href="#rect2190"
+ d="M 10.5625,10.5 C 10.528363,10.5 10.5,10.52466 10.5,10.59375 L 10.5,24.4375 C 10.5,24.506591 10.493411,24.5 10.5625,24.5 L 38.4375,24.5 C 38.506591,24.5 38.5,24.506593 38.5,24.4375 L 38.5,10.59375 C 38.5,10.52466 38.471636,10.5 38.4375,10.5 L 10.5625,10.5 z " />
+ <rect
+ style="opacity:1;fill:#d4d8d0;fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:0.99999869;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect2396"
+ width="1.9660958"
+ height="4.9999948"
+ x="45.847095"
+ y="9.9921741"
+ rx="0.9830479"
+ ry="0.9830479"
+ transform="matrix(0.866025,0.5,-0.5,0.866025,0,0)" />
+ <path
+ style="fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:0.99999994;stroke-miterlimit:4;stroke-opacity:1"
+ d="M 38.56005,32.562599 C 38.56005,34.235817 37.202603,35.593791 35.530037,35.593791 C 33.857469,35.593791 32.500022,34.235817 32.500022,32.562599 C 32.500022,30.889382 33.857469,29.531408 35.530037,29.531408 C 37.202603,29.531408 38.56005,30.889382 38.56005,32.562599 z "
+ id="path2192" />
+ <path
+ sodipodi:type="inkscape:offset"
+ inkscape:radius="-1.0485017"
+ inkscape:original="M 35.53125 29.53125 C 33.858682 29.53125 32.499999 30.889283 32.5 32.5625 C 32.5 34.235718 33.858682 35.593749 35.53125 35.59375 C 37.203816 35.59375 38.562499 34.235718 38.5625 32.5625 C 38.5625 30.889283 37.203816 29.53125 35.53125 29.53125 z "
+ xlink:href="#path2192"
+ style="opacity:0.6;fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000012;stroke-miterlimit:4;stroke-opacity:1"
+ id="path2267"
+ inkscape:href="#path2192"
+ d="M 35.53125,29.5625 C 34.426232,29.5625 33.562499,30.425635 33.5625,31.53125 C 33.5625,32.636867 34.426231,33.499999 35.53125,33.5 C 36.636265,33.5 37.499999,32.636867 37.5,31.53125 C 37.5,30.425635 36.636265,29.5625 35.53125,29.5625 z " />
+ <path
+ style="opacity:0.5;fill:url(#radialGradient2263);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1.00000012;stroke-miterlimit:4;stroke-opacity:1"
+ d="M 10,11.03125 L 39,11.03125 C 30.093039,19.938211 20.117581,15.913669 10,26.03125 C 10,22.647147 10,11.03125 10,11.03125 z "
+ id="rect2254"
+ sodipodi:nodetypes="cccc" />
+ <path
+ style="opacity:0.9;fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 13,14.03125 L 13,15.03125 L 13,17.03125 L 10,17.03125 L 10,18.03125 L 13,18.03125 L 14,18.03125 L 14,15.03125 L 15,15.03125 L 15,20.03125 L 15,21.03125 L 18,21.03125 L 18,20.03125 L 18,18.03125 L 20,18.03125 L 23,18.03125 L 24,18.03125 L 24,15.03125 L 25,15.03125 L 25,20.03125 L 25,21.03125 L 28,21.03125 L 28,20.03125 L 28,18.03125 L 30,18.03125 L 32,18.03125 L 33,18.03125 L 33,15.03125 L 34,15.03125 L 34,20.03125 L 34,21.03125 L 37,21.03125 L 37,20.03125 L 37,18.03125 L 39,18.03125 L 39,17.03125 L 36,17.03125 L 36,18.03125 L 36,20.03125 L 35,20.03125 L 35,15.03125 L 35,14.03125 L 32,14.03125 L 32,15.03125 L 32,17.03125 L 30,17.03125 L 27,17.03125 L 27,18.03125 L 27,20.03125 L 26,20.03125 L 26,15.03125 L 26,14.03125 L 23,14.03125 L 23,15.03125 L 23,17.03125 L 20,17.03125 L 17,17.03125 L 17,18.03125 L 17,20.03125 L 16,20.03125 L 16,15.03125 L 16,14.03125 L 13,14.03125 z "
+ id="rect2221" />
+ <rect
+ style="opacity:1;fill:#d4d8d0;fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:0.99999869;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect2394"
+ width="1.9660958"
+ height="4.9999948"
+ x="38.470245"
+ y="10.31988"
+ rx="0.9830479"
+ ry="0.9830479"
+ transform="matrix(0.866025,0.5,-0.5,0.866025,0,0)" />
+ <path
+ style="fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:0.99999994;stroke-miterlimit:4;stroke-opacity:1"
+ d="M 29.560061,32.562599 C 29.560061,34.235817 28.202614,35.593791 26.530048,35.593791 C 24.85748,35.593791 23.500033,34.235817 23.500033,32.562599 C 23.500033,30.889382 24.85748,29.531408 26.530048,29.531408 C 28.202614,29.531408 29.560061,30.889382 29.560061,32.562599 z "
+ id="path2388" />
+ <path
+ sodipodi:type="inkscape:offset"
+ inkscape:radius="-1.0485017"
+ inkscape:original="M 35.53125 29.53125 C 33.858682 29.53125 32.499999 30.889283 32.5 32.5625 C 32.5 34.235718 33.858682 35.593749 35.53125 35.59375 C 37.203816 35.59375 38.562499 34.235718 38.5625 32.5625 C 38.5625 30.889283 37.203816 29.53125 35.53125 29.53125 z "
+ xlink:href="#path2192"
+ style="opacity:0.6;fill:#d3d7cf;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:1.00000012;stroke-miterlimit:4;stroke-opacity:1"
+ id="path2390"
+ inkscape:href="#path2192"
+ d="M 35.53125,29.5625 C 34.426232,29.5625 33.562499,30.425635 33.5625,31.53125 C 33.5625,32.636867 34.426231,33.499999 35.53125,33.5 C 36.636265,33.5 37.499999,32.636867 37.5,31.53125 C 37.5,30.425635 36.636265,29.5625 35.53125,29.5625 z "
+ transform="translate(-8.999989,-5.960464e-8)" />
+ <rect
+ style="opacity:1;fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3103"
+ width="1"
+ height="0.99999952"
+ x="36"
+ y="24.03125" />
+ <rect
+ style="opacity:1;fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3105"
+ width="1"
+ height="2"
+ x="34"
+ y="23.03125" />
+ <rect
+ style="opacity:1;fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3107"
+ width="1"
+ height="3.0000007"
+ x="32"
+ y="22.03125" />
+ <rect
+ style="opacity:1;fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3109"
+ width="1"
+ height="2.000001"
+ x="30"
+ y="23.03125" />
+ <rect
+ style="opacity:1;fill:#eeeeec;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect3111"
+ width="1"
+ height="1"
+ x="28"
+ y="24.03125" />
+ <path
+ style="opacity:1;fill:url(#linearGradient4051);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ d="M 10,28.03125 L 10,29.03125 L 10,37.03125 L 10,38.03125 L 20,38.03125 L 20,37.03125 L 20,29.03125 L 20,28.03125 L 10,28.03125 z M 11,29.03125 L 13,29.03125 L 13,31.03125 L 11,31.03125 L 11,29.03125 z M 14,29.03125 L 16,29.03125 L 16,31.03125 L 14,31.03125 L 14,29.03125 z M 17,29.03125 L 19,29.03125 L 19,31.03125 L 17,31.03125 L 17,29.03125 z M 11,32.03125 L 13,32.03125 L 13,34.03125 L 11,34.03125 L 11,32.03125 z M 14,32.03125 L 16,32.03125 L 16,34.03125 L 14,34.03125 L 14,32.03125 z M 17,32.03125 L 19,32.03125 L 19,34.03125 L 17,34.03125 L 17,32.03125 z M 11,35.03125 L 13,35.03125 L 13,37.03125 L 11,37.03125 L 11,35.03125 z M 14,35.03125 L 16,35.03125 L 16,37.03125 L 14,37.03125 L 14,35.03125 z M 17,35.03125 L 19,35.03125 L 19,37.03125 L 17,37.03125 L 17,35.03125 z "
+ id="rect3988" />
+ </g>
+</svg>
diff -pruN 2.18.0-2/pixmaps/icons/scalable/apps/Makefile.am 2.19.90-0ubuntu1/pixmaps/icons/scalable/apps/Makefile.am
--- 2.18.0-2/pixmaps/icons/scalable/apps/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ 2.19.90-0ubuntu1/pixmaps/icons/scalable/apps/Makefile.am 2007-08-14 03:43:01.000000000 +0100
@@ -0,0 +1,11 @@
+themedir = $(datadir)/icons/hicolor
+size = scalable
+context = apps
+
+iconsdir = $(themedir)/$(size)/$(context)
+
+icons_DATA = \
+ gnome-nettool.svg
+
+EXTRA_DIST = \
+ $(icons_DATA)
diff -pruN 2.18.0-2/pixmaps/icons/scalable/apps/Makefile.in 2.19.90-0ubuntu1/pixmaps/icons/scalable/apps/Makefile.in
--- 2.18.0-2/pixmaps/icons/scalable/apps/Makefile.in 1970-01-01 01:00:00.000000000 +0100
+++ 2.19.90-0ubuntu1/pixmaps/icons/scalable/apps/Makefile.in 2007-08-14 03:44:51.000000000 +0100
@@ -0,0 +1,413 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005 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 = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = pixmaps/icons/scalable/apps
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+SOURCES =
+DIST_SOURCES =
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+ $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+ *) f=$$p;; \
+ esac;
+am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
+am__installdirs = "$(DESTDIR)$(iconsdir)"
+iconsDATA_INSTALL = $(INSTALL_DATA)
+DATA = $(icons_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
+HELP_DIR = @HELP_DIR@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_ICONV = @INTLTOOL_ICONV@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+NETTOOL_CFLAGS = @NETTOOL_CFLAGS@
+NETTOOL_LIBS = @NETTOOL_LIBS@
+OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
+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@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+XGETTEXT = @XGETTEXT@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+themedir = $(datadir)/icons/hicolor
+size = scalable
+context = apps
+iconsdir = $(themedir)/$(size)/$(context)
+icons_DATA = \
+ gnome-nettool.svg
+
+EXTRA_DIST = \
+ $(icons_DATA)
+
+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) --foreign pixmaps/icons/scalable/apps/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --foreign pixmaps/icons/scalable/apps/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
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+distclean-libtool:
+ -rm -f libtool
+uninstall-info-am:
+install-iconsDATA: $(icons_DATA)
+ @$(NORMAL_INSTALL)
+ test -z "$(iconsdir)" || $(mkdir_p) "$(DESTDIR)$(iconsdir)"
+ @list='$(icons_DATA)'; for p in $$list; do \
+ if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ f=$(am__strip_dir) \
+ echo " $(iconsDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(iconsdir)/$$f'"; \
+ $(iconsDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(iconsdir)/$$f"; \
+ done
+
+uninstall-iconsDATA:
+ @$(NORMAL_UNINSTALL)
+ @list='$(icons_DATA)'; for p in $$list; do \
+ f=$(am__strip_dir) \
+ echo " rm -f '$(DESTDIR)$(iconsdir)/$$f'"; \
+ rm -f "$(DESTDIR)$(iconsdir)/$$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
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+ for dir in "$(DESTDIR)$(iconsdir)"; 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:
+ -test -z "$(CONFIG_CLEAN_FILES)" || 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 clean-libtool mostlyclean-am
+
+distclean: distclean-am
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+info: info-am
+
+info-am:
+
+install-data-am: install-iconsDATA
+
+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 mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-iconsDATA uninstall-info-am
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+ distclean distclean-generic distclean-libtool distdir dvi \
+ dvi-am html html-am info info-am install install-am \
+ install-data install-data-am install-exec install-exec-am \
+ install-iconsDATA install-info install-info-am install-man \
+ install-strip installcheck installcheck-am installdirs \
+ maintainer-clean maintainer-clean-generic mostlyclean \
+ mostlyclean-generic mostlyclean-libtool pdf pdf-am ps ps-am \
+ uninstall uninstall-am uninstall-iconsDATA uninstall-info-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.
+.NOEXPORT:
diff -pruN 2.18.0-2/pixmaps/icons/scalable/Makefile.am 2.19.90-0ubuntu1/pixmaps/icons/scalable/Makefile.am
--- 2.18.0-2/pixmaps/icons/scalable/Makefile.am 1970-01-01 01:00:00.000000000 +0100
+++ 2.19.90-0ubuntu1/pixmaps/icons/scalable/Makefile.am 2007-08-14 03:43:01.000000000 +0100
@@ -0,0 +1 @@
+SUBDIRS = apps
diff -pruN 2.18.0-2/pixmaps/icons/scalable/Makefile.in 2.19.90-0ubuntu1/pixmaps/icons/scalable/Makefile.in
--- 2.18.0-2/pixmaps/icons/scalable/Makefile.in 1970-01-01 01:00:00.000000000 +0100
+++ 2.19.90-0ubuntu1/pixmaps/icons/scalable/Makefile.in 2007-08-14 03:44:51.000000000 +0100
@@ -0,0 +1,531 @@
+# Makefile.in generated by automake 1.9.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005 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 = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = pixmaps/icons/scalable
+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/gnome-doc-utils.m4 \
+ $(top_srcdir)/m4/intltool.m4 $(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+ $(ACLOCAL_M4)
+mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
+CONFIG_HEADER = $(top_builddir)/config.h
+CONFIG_CLEAN_FILES =
+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
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
+ALL_LINGUAS = @ALL_LINGUAS@
+AMDEP_FALSE = @AMDEP_FALSE@
+AMDEP_TRUE = @AMDEP_TRUE@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CATALOGS = @CATALOGS@
+CATOBJEXT = @CATOBJEXT@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DATADIRNAME = @DATADIRNAME@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DOC_USER_FORMATS = @DOC_USER_FORMATS@
+ECHO = @ECHO@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+ENABLE_SK_FALSE = @ENABLE_SK_FALSE@
+ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
+EXEEXT = @EXEEXT@
+F77 = @F77@
+FFLAGS = @FFLAGS@
+GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
+GMOFILES = @GMOFILES@
+GMSGFMT = @GMSGFMT@
+GREP = @GREP@
+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
+HELP_DIR = @HELP_DIR@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+INSTOBJEXT = @INSTOBJEXT@
+INTLLIBS = @INTLLIBS@
+INTLTOOL_CAVES_RULE = @INTLTOOL_CAVES_RULE@
+INTLTOOL_DESKTOP_RULE = @INTLTOOL_DESKTOP_RULE@
+INTLTOOL_DIRECTORY_RULE = @INTLTOOL_DIRECTORY_RULE@
+INTLTOOL_EXTRACT = @INTLTOOL_EXTRACT@
+INTLTOOL_ICONV = @INTLTOOL_ICONV@
+INTLTOOL_KBD_RULE = @INTLTOOL_KBD_RULE@
+INTLTOOL_KEYS_RULE = @INTLTOOL_KEYS_RULE@
+INTLTOOL_MERGE = @INTLTOOL_MERGE@
+INTLTOOL_MSGFMT = @INTLTOOL_MSGFMT@
+INTLTOOL_MSGMERGE = @INTLTOOL_MSGMERGE@
+INTLTOOL_OAF_RULE = @INTLTOOL_OAF_RULE@
+INTLTOOL_PERL = @INTLTOOL_PERL@
+INTLTOOL_PONG_RULE = @INTLTOOL_PONG_RULE@
+INTLTOOL_PROP_RULE = @INTLTOOL_PROP_RULE@
+INTLTOOL_SCHEMAS_RULE = @INTLTOOL_SCHEMAS_RULE@
+INTLTOOL_SERVER_RULE = @INTLTOOL_SERVER_RULE@
+INTLTOOL_SERVICE_RULE = @INTLTOOL_SERVICE_RULE@
+INTLTOOL_SHEET_RULE = @INTLTOOL_SHEET_RULE@
+INTLTOOL_SOUNDLIST_RULE = @INTLTOOL_SOUNDLIST_RULE@
+INTLTOOL_THEME_RULE = @INTLTOOL_THEME_RULE@
+INTLTOOL_UI_RULE = @INTLTOOL_UI_RULE@
+INTLTOOL_UPDATE = @INTLTOOL_UPDATE@
+INTLTOOL_XAM_RULE = @INTLTOOL_XAM_RULE@
+INTLTOOL_XGETTEXT = @INTLTOOL_XGETTEXT@
+INTLTOOL_XML_NOMERGE_RULE = @INTLTOOL_XML_NOMERGE_RULE@
+INTLTOOL_XML_RULE = @INTLTOOL_XML_RULE@
+LDFLAGS = @LDFLAGS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBTOOL = @LIBTOOL@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAINT = @MAINT@
+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
+MAKEINFO = @MAKEINFO@
+MKINSTALLDIRS = @MKINSTALLDIRS@
+MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
+NETTOOL_CFLAGS = @NETTOOL_CFLAGS@
+NETTOOL_LIBS = @NETTOOL_LIBS@
+OBJEXT = @OBJEXT@
+OMF_DIR = @OMF_DIR@
+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@
+POFILES = @POFILES@
+POSUB = @POSUB@
+PO_IN_DATADIR_FALSE = @PO_IN_DATADIR_FALSE@
+PO_IN_DATADIR_TRUE = @PO_IN_DATADIR_TRUE@
+RANLIB = @RANLIB@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+USE_NLS = @USE_NLS@
+VERSION = @VERSION@
+WARN_CFLAGS = @WARN_CFLAGS@
+XGETTEXT = @XGETTEXT@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_F77 = @ac_ct_F77@
+am__fastdepCC_FALSE = @am__fastdepCC_FALSE@
+am__fastdepCC_TRUE = @am__fastdepCC_TRUE@
+am__fastdepCXX_FALSE = @am__fastdepCXX_FALSE@
+am__fastdepCXX_TRUE = @am__fastdepCXX_TRUE@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+SUBDIRS = apps
+all: all-recursive
+
+.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) --foreign pixmaps/icons/scalable/Makefile'; \
+ cd $(top_srcdir) && \
+ $(AUTOMAKE) --foreign pixmaps/icons/scalable/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
+
+mostlyclean-libtool:
+ -rm -f *.lo
+
+clean-libtool:
+ -rm -rf .libs _libs
+
+distclean-libtool:
+ -rm -f libtool
+uninstall-info-am:
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+# (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ rev=''; for subdir in $$list; do \
+ if test "$$subdir" = "."; then :; else \
+ rev="$$subdir $$rev"; \
+ fi; \
+ done; \
+ rev="$$rev ."; \
+ target=`echo $@ | sed s/-recursive//`; \
+ for subdir in $$rev; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done && test -z "$$fail"
+tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
+tags: TAGS
+
+TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test ! -f $$subdir/TAGS || \
+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
+ctags: CTAGS
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
+
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
+
+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
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+ || $(mkdir_p) "$(distdir)/$$subdir" \
+ || exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+ done
+check-am: all-am
+check: check-recursive
+all-am: Makefile
+installdirs: installdirs-recursive
+installdirs-am:
+install: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
+
+install-am: all-am
+ @$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-recursive
+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:
+ -test -z "$(CONFIG_CLEAN_FILES)" || 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-recursive
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-recursive
+ -rm -f Makefile
+distclean-am: clean-am distclean-generic distclean-libtool \
+ distclean-tags
+
+dvi: dvi-recursive
+
+dvi-am:
+
+html: html-recursive
+
+info: info-recursive
+
+info-am:
+
+install-data-am:
+
+install-exec-am:
+
+install-info: install-info-recursive
+
+install-man:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-recursive
+ -rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-recursive
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-recursive
+
+pdf-am:
+
+ps: ps-recursive
+
+ps-am:
+
+uninstall-am: uninstall-info-am
+
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+ distclean-recursive distclean-tags 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-strip installcheck \
+ installcheck-am installdirs installdirs-am maintainer-clean \
+ maintainer-clean-generic maintainer-clean-recursive \
+ mostlyclean mostlyclean-generic mostlyclean-libtool \
+ mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
+ uninstall uninstall-am uninstall-info-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.
+.NOEXPORT:
diff -pruN 2.18.0-2/pixmaps/Makefile.am 2.19.90-0ubuntu1/pixmaps/Makefile.am
--- 2.18.0-2/pixmaps/Makefile.am 2007-02-17 00:53:08.000000000 +0000
+++ 2.19.90-0ubuntu1/pixmaps/Makefile.am 2007-08-14 03:43:01.000000000 +0100
@@ -1,3 +1,5 @@
+SUBDIRS = icons
+
pixmapsdir = $(datadir)/gnome-nettool/pixmaps
pixmaps_DATA = \
16_ethernet.xpm \
@@ -6,21 +8,7 @@ pixmaps_DATA = \
16_ppp.xpm \
irda-16.png \
network.png \
+ gnome-nettool.png \
wavelan-16.png
-icondir = $(datadir)/icons/hicolor/48x48/apps
-icon_DATA = gnome-nettool.png
-
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-
-install-data-hook:
- @-if test -z "$(DESTDIR)"; then \
- echo "Updating Gtk icon cache."; \
- $(gtk_update_icon_cache); \
- else \
- echo "*** Icon cache not updated. After install, run this:"; \
- echo "*** $(gtk_update_icon_cache)"; \
- fi
-
-EXTRA_DIST = $(pixmaps_DATA) \
- $(icon_DATA)
+EXTRA_DIST = $(pixmaps_DATA)
diff -pruN 2.18.0-2/pixmaps/Makefile.in 2.19.90-0ubuntu1/pixmaps/Makefile.in
--- 2.18.0-2/pixmaps/Makefile.in 2007-03-13 01:48:45.000000000 +0000
+++ 2.19.90-0ubuntu1/pixmaps/Makefile.in 2007-08-14 03:44:50.000000000 +0100
@@ -48,16 +48,24 @@ CONFIG_HEADER = $(top_builddir)/config.h
CONFIG_CLEAN_FILES =
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
am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
am__vpath_adj = case $$p in \
$(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
*) f=$$p;; \
esac;
am__strip_dir = `echo $$p | sed -e 's|^.*/||'`;
-am__installdirs = "$(DESTDIR)$(icondir)" "$(DESTDIR)$(pixmapsdir)"
-iconDATA_INSTALL = $(INSTALL_DATA)
+am__installdirs = "$(DESTDIR)$(pixmapsdir)"
pixmapsDATA_INSTALL = $(INSTALL_DATA)
-DATA = $(icon_DATA) $(pixmaps_DATA)
+DATA = $(pixmaps_DATA)
+ETAGS = etags
+CTAGS = ctags
+DIST_SUBDIRS = $(SUBDIRS)
DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
ACLOCAL = @ACLOCAL@
ACLOCAL_AMFLAGS = @ACLOCAL_AMFLAGS@
@@ -96,12 +104,12 @@ ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-GDU_MODULE_VERSION_CHECK_CFLAGS = @GDU_MODULE_VERSION_CHECK_CFLAGS@
-GDU_MODULE_VERSION_CHECK_LIBS = @GDU_MODULE_VERSION_CHECK_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
HELP_DIR = @HELP_DIR@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -147,6 +155,7 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_
MAKEINFO = @MAKEINFO@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
NETTOOL_CFLAGS = @NETTOOL_CFLAGS@
NETTOOL_LIBS = @NETTOOL_LIBS@
OBJEXT = @OBJEXT@
@@ -218,6 +227,7 @@ sbindir = @sbindir@
sharedstatedir = @sharedstatedir@
sysconfdir = @sysconfdir@
target_alias = @target_alias@
+SUBDIRS = icons
pixmapsdir = $(datadir)/gnome-nettool/pixmaps
pixmaps_DATA = \
16_ethernet.xpm \
@@ -226,15 +236,11 @@ pixmaps_DATA = \
16_ppp.xpm \
irda-16.png \
network.png \
+ gnome-nettool.png \
wavelan-16.png
-icondir = $(datadir)/icons/hicolor/48x48/apps
-icon_DATA = gnome-nettool.png
-gtk_update_icon_cache = gtk-update-icon-cache -f -t $(datadir)/icons/hicolor
-EXTRA_DIST = $(pixmaps_DATA) \
- $(icon_DATA)
-
-all: all-am
+EXTRA_DIST = $(pixmaps_DATA)
+all: all-recursive
.SUFFIXES:
$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(am__configure_deps)
@@ -276,23 +282,6 @@ clean-libtool:
distclean-libtool:
-rm -f libtool
uninstall-info-am:
-install-iconDATA: $(icon_DATA)
- @$(NORMAL_INSTALL)
- test -z "$(icondir)" || $(mkdir_p) "$(DESTDIR)$(icondir)"
- @list='$(icon_DATA)'; for p in $$list; do \
- if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- f=$(am__strip_dir) \
- echo " $(iconDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(icondir)/$$f'"; \
- $(iconDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(icondir)/$$f"; \
- done
-
-uninstall-iconDATA:
- @$(NORMAL_UNINSTALL)
- @list='$(icon_DATA)'; for p in $$list; do \
- f=$(am__strip_dir) \
- echo " rm -f '$(DESTDIR)$(icondir)/$$f'"; \
- rm -f "$(DESTDIR)$(icondir)/$$f"; \
- done
install-pixmapsDATA: $(pixmaps_DATA)
@$(NORMAL_INSTALL)
test -z "$(pixmapsdir)" || $(mkdir_p) "$(DESTDIR)$(pixmapsdir)"
@@ -310,12 +299,138 @@ uninstall-pixmapsDATA:
echo " rm -f '$(DESTDIR)$(pixmapsdir)/$$f'"; \
rm -f "$(DESTDIR)$(pixmapsdir)/$$f"; \
done
+
+# This directory's subdirectories are mostly independent; you can cd
+# into them and run `make' without going through this Makefile.
+# To change the values of `make' variables: instead of editing Makefiles,
+# (1) if the variable is set in `config.status', edit `config.status'
+# (which will cause the Makefiles to be regenerated when you run `make');
+# (2) otherwise, pass the desired values on the `make' command line.
+$(RECURSIVE_TARGETS):
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ target=`echo $@ | sed s/-recursive//`; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ dot_seen=yes; \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done; \
+ if test "$$dot_seen" = "no"; then \
+ $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
+ fi; test -z "$$fail"
+
+mostlyclean-recursive clean-recursive distclean-recursive \
+maintainer-clean-recursive:
+ @failcom='exit 1'; \
+ for f in x $$MAKEFLAGS; do \
+ case $$f in \
+ *=* | --[!k]*);; \
+ *k*) failcom='fail=yes';; \
+ esac; \
+ done; \
+ dot_seen=no; \
+ case "$@" in \
+ distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
+ *) list='$(SUBDIRS)' ;; \
+ esac; \
+ rev=''; for subdir in $$list; do \
+ if test "$$subdir" = "."; then :; else \
+ rev="$$subdir $$rev"; \
+ fi; \
+ done; \
+ rev="$$rev ."; \
+ target=`echo $@ | sed s/-recursive//`; \
+ for subdir in $$rev; do \
+ echo "Making $$target in $$subdir"; \
+ if test "$$subdir" = "."; then \
+ local_target="$$target-am"; \
+ else \
+ local_target="$$target"; \
+ fi; \
+ (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
+ || eval $$failcom; \
+ done && test -z "$$fail"
+tags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) tags); \
+ done
+ctags-recursive:
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
+ done
+
+ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ mkid -fID $$unique
tags: TAGS
-TAGS:
+TAGS: tags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
+ include_option=--etags-include; \
+ empty_fix=.; \
+ else \
+ include_option=--include; \
+ empty_fix=; \
+ fi; \
+ list='$(SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test ! -f $$subdir/TAGS || \
+ tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
+ fi; \
+ done; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
+ test -n "$$unique" || unique=$$empty_fix; \
+ $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
+ $$tags $$unique; \
+ fi
ctags: CTAGS
-CTAGS:
+CTAGS: ctags-recursive $(HEADERS) $(SOURCES) $(TAGS_DEPENDENCIES) \
+ $(TAGS_FILES) $(LISP)
+ tags=; \
+ here=`pwd`; \
+ list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
+ unique=`for i in $$list; do \
+ if test -f "$$i"; then echo $$i; else echo $(srcdir)/$$i; fi; \
+ done | \
+ $(AWK) ' { files[$$0] = 1; } \
+ END { for (i in files) print i; }'`; \
+ test -z "$(CTAGS_ARGS)$$tags$$unique" \
+ || $(CTAGS) $(CTAGSFLAGS) $(AM_CTAGSFLAGS) $(CTAGS_ARGS) \
+ $$tags $$unique
+
+GTAGS:
+ here=`$(am__cd) $(top_builddir) && pwd` \
+ && cd $(top_srcdir) \
+ && gtags -i $(GTAGS_ARGS) $$here
+distclean-tags:
+ -rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
distdir: $(DISTFILES)
@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
@@ -344,22 +459,38 @@ distdir: $(DISTFILES)
|| exit 1; \
fi; \
done
+ list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
+ if test "$$subdir" = .; then :; else \
+ test -d "$(distdir)/$$subdir" \
+ || $(mkdir_p) "$(distdir)/$$subdir" \
+ || exit 1; \
+ distdir=`$(am__cd) $(distdir) && pwd`; \
+ top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
+ (cd $$subdir && \
+ $(MAKE) $(AM_MAKEFLAGS) \
+ top_distdir="$$top_distdir" \
+ distdir="$$distdir/$$subdir" \
+ distdir) \
+ || exit 1; \
+ fi; \
+ done
check-am: all-am
-check: check-am
+check: check-recursive
all-am: Makefile $(DATA)
-installdirs:
- for dir in "$(DESTDIR)$(icondir)" "$(DESTDIR)$(pixmapsdir)"; do \
+installdirs: installdirs-recursive
+installdirs-am:
+ for dir in "$(DESTDIR)$(pixmapsdir)"; 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: install-recursive
+install-exec: install-exec-recursive
+install-data: install-data-recursive
+uninstall: uninstall-recursive
install-am: all-am
@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
-installcheck: installcheck-am
+installcheck: installcheck-recursive
install-strip:
$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
@@ -375,75 +506,69 @@ distclean-generic:
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: clean-recursive
clean-am: clean-generic clean-libtool mostlyclean-am
-distclean: distclean-am
+distclean: distclean-recursive
-rm -f Makefile
-distclean-am: clean-am distclean-generic distclean-libtool
+distclean-am: clean-am distclean-generic distclean-libtool \
+ distclean-tags
-dvi: dvi-am
+dvi: dvi-recursive
dvi-am:
-html: html-am
+html: html-recursive
-info: info-am
+info: info-recursive
info-am:
-install-data-am: install-iconDATA install-pixmapsDATA
- @$(NORMAL_INSTALL)
- $(MAKE) $(AM_MAKEFLAGS) install-data-hook
+install-data-am: install-pixmapsDATA
install-exec-am:
-install-info: install-info-am
+install-info: install-info-recursive
install-man:
installcheck-am:
-maintainer-clean: maintainer-clean-am
+maintainer-clean: maintainer-clean-recursive
-rm -f Makefile
maintainer-clean-am: distclean-am maintainer-clean-generic
-mostlyclean: mostlyclean-am
+mostlyclean: mostlyclean-recursive
mostlyclean-am: mostlyclean-generic mostlyclean-libtool
-pdf: pdf-am
+pdf: pdf-recursive
pdf-am:
-ps: ps-am
+ps: ps-recursive
ps-am:
-uninstall-am: uninstall-iconDATA uninstall-info-am \
+uninstall-am: uninstall-info-am uninstall-pixmapsDATA
+
+uninstall-info: uninstall-info-recursive
+
+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
+ clean clean-generic clean-libtool clean-recursive ctags \
+ ctags-recursive distclean distclean-generic distclean-libtool \
+ distclean-recursive distclean-tags 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-pixmapsDATA install-strip \
+ installcheck installcheck-am installdirs installdirs-am \
+ maintainer-clean maintainer-clean-generic \
+ maintainer-clean-recursive mostlyclean mostlyclean-generic \
+ mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
+ tags tags-recursive uninstall uninstall-am uninstall-info-am \
uninstall-pixmapsDATA
-.PHONY: all all-am check check-am clean clean-generic clean-libtool \
- distclean distclean-generic distclean-libtool 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-iconDATA install-info install-info-am \
- install-man install-pixmapsDATA install-strip installcheck \
- installcheck-am installdirs maintainer-clean \
- maintainer-clean-generic mostlyclean mostlyclean-generic \
- mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
- uninstall-iconDATA uninstall-info-am uninstall-pixmapsDATA
-
-
-install-data-hook:
- @-if test -z "$(DESTDIR)"; then \
- echo "Updating Gtk icon cache."; \
- $(gtk_update_icon_cache); \
- else \
- echo "*** Icon cache not updated. After install, run this:"; \
- echo "*** $(gtk_update_icon_cache)"; \
- fi
# 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 -pruN 2.18.0-2/po/ChangeLog 2.19.90-0ubuntu1/po/ChangeLog
--- 2.18.0-2/po/ChangeLog 2007-03-13 01:50:22.000000000 +0000
+++ 2.19.90-0ubuntu1/po/ChangeLog 2007-08-14 03:43:55.000000000 +0100
@@ -1,3 +1,65 @@
+2007-08-13 German Poo-Caamano <gpoo ubiobio cl>
+
+ Released 2.19.90.
+
+2007-08-13 Ilkka Tuohela <hile iki fi>
+
+ * fi.po: Updated Finnish translation.
+
+2007-08-09 Sunil Mohan Adapa <sunil atc tcs com>
+
+ * te.po: Added Telugu translation done by
+ Pramod <pramod swecha net>
+
+2007-08-09 Kjartan Maraas <kmaraas gnome org>
+
+ * nb.po: Updated translation.
+
+2007-08-06 Daniel Nylander <po danielnylander se>
+
+ * sv.po: Updated Swedish translation.
+
+2007-08-06 Ankit Patel <ankit644 yahoo com>
+
+ * gu.po: Updated Gujarati Translation.
+
+2007-08-06 Theppitak Karoonboonyanan <thep linux thai net>
+
+ * th.po: Updated Thai translation.
+
+2007-08-05 Jorge Gonzalez <jorgegonz svn gnome org>
+
+ * es.po: Updated Spanish translation
+
+2007-08-04 Inaki Larranaga Murgoitio <dooteo zundan com>
+
+ * eu.po: Updated Basque translation.
+
+2007-08-03 Danishka Navin <danishka gmail com>
+
+ * si.po: Added Sinhala translation by Danishka Navin
+ * LINGUAS: Added "si".
+
+2007-07-16 Ilkka Tuohela <hile iki fi>
+
+ * fi.po: Updated Finnish translation.
+
+2007-06-18 I Felix <ifelix25 gmail com>
+
+ * ta.po: Updated Tamil Translation.
+
+2007-06-13 Pema Geyleg <pema geyleg gmail com>
+
+ * dz.po: updated dzongkha translation
+
+2007-04-23 Luca Ferretti <elle uca libero it>
+
+ * it.po: Updated Italian translation by Francesco Marletta.
+
+2007-04-22 Funda Wang <fundawang gmail com>
+
+ * zh_CN.po: Updated Simplified Chinese translation from Yang Zhang.
+
2007-03-12 German Poo-Caamano <gpoo ubiobio cl>
Released 2.18.0.
diff -pruN 2.18.0-2/po/dz.po 2.19.90-0ubuntu1/po/dz.po
--- 2.18.0-2/po/dz.po 2007-02-17 00:54:03.000000000 +0000
+++ 2.19.90-0ubuntu1/po/dz.po 2007-08-14 03:43:55.000000000 +0100
@@ -6,9 +6,9 @@ msgid ""
msgstr ""
"Project-Id-Version: gnome-nettool.HEAD.dz\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-05-28 22:55+0200\n"
-"PO-Revision-Date: 2006-05-30 11:30+0530\n"
-"Last-Translator: Mindu Dorji\n"
+"POT-Creation-Date: 2007-01-02 04:19+0000\n"
+"PO-Revision-Date: 2007-05-30 00:02+0530\n"
+"Last-Translator: Tshewang Norbu <bumthap2006 hotmail com>\n"
"Language-Team: DZONGKHA <pgeyleg dit gov bt>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=utf-8\n"
@@ -75,85 +75,85 @@ msgid "Collisions:"
msgstr "��ོ���ུ��:"
#: ../src/gnome-nettool.glade.h:13
+msgid "Details"
+msgstr "ར�ྱས��ཤ���ུ"
+
+#: ../src/gnome-nettool.glade.h:14
msgid "Devices"
msgstr "��ས�འ�ྲུལ�"
#. Dear Translator: This is the Window Title
-#: ../src/gnome-nettool.glade.h:15
+#: ../src/gnome-nettool.glade.h:16
msgid "Devices - Network Tools"
msgstr "��ས�འ�ྲུལ� - ཡོ�ས�འ�ྲེལ�ལ���ས�"
-#: ../src/gnome-nettool.glade.h:16
+#: ../src/gnome-nettool.glade.h:17
msgid "Display:"
msgstr "��ྲ��ས�ོ��:"
-#: ../src/gnome-nettool.glade.h:17
-#: ../src/main.c:864
+#: ../src/gnome-nettool.glade.h:18
+#: ../src/main.c:868
msgid "Finger"
msgstr "��ུ���ོ�"
-#: ../src/gnome-nettool.glade.h:18
+#: ../src/gnome-nettool.glade.h:19
msgid "Hardware address:"
msgstr "སྲ��ས����ྱ��:"
-#: ../src/gnome-nettool.glade.h:19
+#: ../src/gnome-nettool.glade.h:20
msgid "Host"
msgstr "ཧོསི�ི�"
-#: ../src/gnome-nettool.glade.h:20
+#: ../src/gnome-nettool.glade.h:21
msgid "IP Address:"
msgstr "ཨའི��ི����ྱ��:"
-#: ../src/gnome-nettool.glade.h:21
+#: ../src/gnome-nettool.glade.h:22
msgid "Link speed:"
msgstr "འ�ྲེལ�ལ����ྱོ�ས����:"
-#: ../src/gnome-nettool.glade.h:22
-#: ../src/main.c:778
+#: ../src/gnome-nettool.glade.h:23
+#: ../src/main.c:782
msgid "Lookup"
msgstr "ཡར��ལ��"
-#: ../src/gnome-nettool.glade.h:23
+#: ../src/gnome-nettool.glade.h:24
msgid "MTU:"
msgstr "ཨེ���ི�ཡུ:"
-#: ../src/gnome-nettool.glade.h:24
+#: ../src/gnome-nettool.glade.h:25
msgid "Maximum:"
msgstr "�����འ�:"
-#: ../src/gnome-nettool.glade.h:25
+#: ../src/gnome-nettool.glade.h:26
msgid "Minimum:"
msgstr "�ུ����འ�:"
-#: ../src/gnome-nettool.glade.h:26
+#: ../src/gnome-nettool.glade.h:27
msgid "Multicast Information"
msgstr "སྣ����ར�ྱ���ས�ྲ�ས��རྡ��ོ��"
-#: ../src/gnome-nettool.glade.h:27
+#: ../src/gnome-nettool.glade.h:28
msgid "Multicast:"
msgstr "སྣ����ར�ྱ���ས�ྲ�ས�:"
-#: ../src/gnome-nettool.glade.h:28
+#: ../src/gnome-nettool.glade.h:29
msgid "Netmask:"
msgstr "�ེ�ི��ཱསི��:"
-#: ../src/gnome-nettool.glade.h:29
-#: ../src/main.c:476
+#: ../src/gnome-nettool.glade.h:30
+#: ../src/main.c:480
msgid "Netstat"
msgstr "�ེ�ི�སི�ེ�ི�"
-#: ../src/gnome-nettool.glade.h:30
+#: ../src/gnome-nettool.glade.h:31
msgid "Not Available"
msgstr "�ི�འ�ོ���ས�"
-#: ../src/gnome-nettool.glade.h:31
+#: ../src/gnome-nettool.glade.h:32
msgid "Only"
msgstr "ར�ྱ�����ི��"
-#: ../src/gnome-nettool.glade.h:32
-msgid "Packets loss:"
-msgstr "འ�ྲི������རླ��ས�ོར�:"
-
#: ../src/gnome-nettool.glade.h:33
msgid "Packets received:"
msgstr "འ�ྲི������ོ����:"
@@ -163,7 +163,7 @@ msgid "Packets transmitted:"
msgstr "འ�ྲི�����སྤེལ���ྲ��འ���ཡོ���:"
#: ../src/gnome-nettool.glade.h:35
-#: ../src/main.c:312
+#: ../src/main.c:313
msgid "Ping"
msgstr "�ི���"
@@ -188,7 +188,7 @@ msgid "Routing Table Information"
msgstr "འ�ྲུལ�ལ���ི���ྲ���ི� �རྡ��ོ�������ོ�"
#: ../src/gnome-nettool.glade.h:41
-#: ../src/main.c:659
+#: ../src/main.c:663
msgid "Scan"
msgstr "�ི��ལ��"
@@ -201,80 +201,84 @@ msgid "State:"
msgstr "��ས�ལུ�ས�:"
#: ../src/gnome-nettool.glade.h:44
-#: ../src/main.c:400
+msgid "Successful packets:"
+msgstr "��ར�འ�ྱོལ�����ྱི�འ�ྲི����:"
+
+#: ../src/gnome-nettool.glade.h:45
+#: ../src/main.c:404
msgid "Trace"
msgstr "ར�ེས�འ�ོལ�འ���"
-#: ../src/gnome-nettool.glade.h:45
+#: ../src/gnome-nettool.glade.h:46
msgid "Traceroute"
msgstr "འ�ོལ�ལ��"
-#: ../src/gnome-nettool.glade.h:46
+#: ../src/gnome-nettool.glade.h:47
msgid "Transmission errors:"
msgstr "སྤེལ���ྲ���ྱི�འ�ོལ��:"
-#: ../src/gnome-nettool.glade.h:47
+#: ../src/gnome-nettool.glade.h:48
msgid "Transmitted bytes:"
msgstr "སྤེལ���ྲ��འ���ཡོ���འི��ཱའི�ིསི�:"
-#: ../src/gnome-nettool.glade.h:48
+#: ../src/gnome-nettool.glade.h:49
msgid "Transmitted packets:"
msgstr "སྤེལ���ྲ��འ���ཡོ���འི�འ�ྲི�����:"
-#: ../src/gnome-nettool.glade.h:49
+#: ../src/gnome-nettool.glade.h:50
msgid "Unlimited requests"
msgstr "����ེ���ྱི��ུ���"
-#: ../src/gnome-nettool.glade.h:50
+#: ../src/gnome-nettool.glade.h:51
msgid "User"
msgstr "ལ��ལེ����"
-#: ../src/gnome-nettool.glade.h:51
-#: ../src/main.c:980
+#: ../src/gnome-nettool.glade.h:52
+#: ../src/main.c:984
msgid "Whois"
msgstr "�ུཨིསི�"
-#: ../src/gnome-nettool.glade.h:52
+#: ../src/gnome-nettool.glade.h:53
msgid "_Configure"
msgstr "རི��ས�ྲི��འ���(_C)"
-#: ../src/gnome-nettool.glade.h:53
+#: ../src/gnome-nettool.glade.h:54
msgid "_Domain address:"
msgstr "�ོ��ཱེ�����ྱ��:(_D)"
-#: ../src/gnome-nettool.glade.h:54
+#: ../src/gnome-nettool.glade.h:55
msgid "_Edit"
msgstr "�ུ����(_E)"
-#: ../src/gnome-nettool.glade.h:55
+#: ../src/gnome-nettool.glade.h:56
msgid "_Help"
msgstr "�ྲོ�ས�ར��(_H)"
-#: ../src/gnome-nettool.glade.h:56
+#: ../src/gnome-nettool.glade.h:57
msgid "_Information type:"
msgstr "�རྡ��ོ����ྱེ���:(_I)"
-#: ../src/gnome-nettool.glade.h:57
+#: ../src/gnome-nettool.glade.h:58
msgid "_Network address:"
msgstr "ཡོ�ས�འ�ྲེལ����ྱ�:(_N)"
-#: ../src/gnome-nettool.glade.h:58
+#: ../src/gnome-nettool.glade.h:59
msgid "_Network device:"
msgstr "ཡོ�ས�འ�ྲེལ���ས�འ�ྲུལ�(_N)"
-#: ../src/gnome-nettool.glade.h:59
+#: ../src/gnome-nettool.glade.h:60
msgid "_Tool"
msgstr "ལ���ས�(_T)"
-#: ../src/gnome-nettool.glade.h:60
+#: ../src/gnome-nettool.glade.h:61
msgid "_Username:"
msgstr "ལ��ལེ���འི��ི��:(_U)"
-#: ../src/gnome-nettool.glade.h:61
+#: ../src/gnome-nettool.glade.h:62
msgid "ms"
msgstr "ཨེ��ཨེསི�"
-#: ../src/gnome-nettool.glade.h:62
+#: ../src/gnome-nettool.glade.h:63
msgid "requests"
msgstr "�ུ���"
@@ -319,93 +323,93 @@ msgstr "ཡོà½?སà¼?འà½?ྲེལà¼
msgid "Unknown"
msgstr "��ཤེས��"
-#: ../src/info.c:545
+#: ../src/info.c:554
msgid "Active"
msgstr "ཤུ�ས�ལྡ��"
-#: ../src/info.c:547
+#: ../src/info.c:556
msgid "Inactive"
msgstr "ཤུ�ས��ེ��"
-#: ../src/info.c:552
+#: ../src/info.c:561
msgid "Loopback"
msgstr "ལུ���ེ��"
-#: ../src/info.c:569
+#: ../src/info.c:580
msgid "Enabled"
msgstr "ལ�ོ�ས����"
-#: ../src/info.c:571
+#: ../src/info.c:582
msgid "Disabled"
msgstr "ལ�ོ�ས��ི��"
#. The info output in a text format (to copy on clipboard)
-#: ../src/info.c:708
+#: ../src/info.c:719
#, c-format
msgid "Network device:\t%s\n"
msgstr "ཡོ�ས�འ�ྲེལ���ས�འ�ྲུལ�:\t%s\n"
-#: ../src/info.c:709
+#: ../src/info.c:720
#, c-format
msgid "Hardware address:\t%s\n"
msgstr "སྲ��ས����ྱ��:\t%s\n"
-#: ../src/info.c:710
+#: ../src/info.c:721
#, c-format
msgid "IP address:\t%s\n"
msgstr "ཨའི��ི����ྱ��:\t%s\n"
-#: ../src/info.c:711
+#: ../src/info.c:722
#, c-format
msgid "Netmask:\t%s\n"
msgstr "�ེ�ི��ཱསི��:\t%s\n"
-#: ../src/info.c:712
+#: ../src/info.c:723
#, c-format
msgid "Broadcast:\t%s\n"
msgstr "ར�ྱ���ས�ྲ�ས�:\t%s\n"
-#: ../src/info.c:713
+#: ../src/info.c:724
#, c-format
msgid "Multicast:\t%s\n"
msgstr "སྣ����ར�ྱ���ས�ྲ�ས�:\t%s\n"
-#: ../src/info.c:714
+#: ../src/info.c:725
#, c-format
msgid "MTU:\t%s\n"
msgstr "ཨེ���ི�ཡུ�:\t%s\n"
-#: ../src/info.c:715
+#: ../src/info.c:726
#, c-format
msgid "Link speed:\t%s\n"
msgstr "འ�ྲེལ�ལ����ྱོ�ས����:\t%s\n"
-#: ../src/info.c:716
+#: ../src/info.c:727
#, c-format
msgid "State:\t%s\n"
msgstr "��ས�ལུ�ས�:\t%s\n"
-#: ../src/info.c:718
+#: ../src/info.c:729
#, c-format
msgid "Transmitted packets:\t%s\n"
msgstr "སྤེལ���ྲ��འ����འི�འ�ྲི�����:\t%s\n"
-#: ../src/info.c:719
+#: ../src/info.c:730
#, c-format
msgid "Transmission errors:\t%s\n"
msgstr "སྤེལ���ྲ���ྱི�འ�ོལ���:\t%s\n"
-#: ../src/info.c:720
+#: ../src/info.c:731
#, c-format
msgid "Received packets:\t%s\n"
msgstr "�ོ���འི�འ�ྲི�����:\t%s\n"
-#: ../src/info.c:721
+#: ../src/info.c:732
#, c-format
msgid "Reception errors:\t%s\n"
msgstr "ས�ྲ�འ�ྱོར�འ�ོལ���:\t%s\n"
-#: ../src/info.c:722
+#: ../src/info.c:733
#, c-format
msgid "Collisions:\t%s\n"
msgstr "��ོ���ུ��:\t%s\n"
@@ -510,7 +514,7 @@ msgstr "�ོ��ེ���"
msgid "The file %s doesn't exist, please check if gnome-nettool is correctly installed"
msgstr "ཡི��སྣོ��%s�ེ��ི��འ�ུ�� �ི��ོ��-�ེ�ི�ུལ��ེ� �ེས���ེ��སྦེ� ��ི���ུ�ས�འ�����འ��� �ི����ྱ��འ��������"
-#: ../src/main.c:345
+#: ../src/main.c:346
msgid ""
"Enter the network address to ping.\n"
"For example: www.domain.com or 192.168.2.1"
@@ -518,7 +522,7 @@ msgstr ""
"�ི��ལུ� ཡོ�ས�འ�ྲེལ����ྱ����ུ�ས�\n"
"��ེར���: www.domain.com ཡ���� ༡༩༢.༡༦༨.༢.༡"
-#: ../src/main.c:427
+#: ../src/main.c:431
msgid ""
"Enter the network address to trace a route to.\n"
"For example: www.domain.com or 192.168.2.1"
@@ -526,28 +530,28 @@ msgstr ""
"འ�ྲུལ�ལ��ར�ེས�འ�ོལ��ྱི��ོ��ལུ� ཡོ�ས�འ�ྲེལ����ྱ���ི����ུ�ས�\n"
"��ེར���: www.domain.com ཡ���� ༡༩༢.༡༦༨.༢.༡"
-#: ../src/main.c:512
+#: ../src/main.c:516
#: ../src/netstat.c:443
msgid "Protocol"
msgstr "����སྤེལ�ལ��ལུ�ས�"
-#: ../src/main.c:519
+#: ../src/main.c:523
msgid "IP Address"
msgstr "ཨའི��ི����ྱ���"
-#: ../src/main.c:526
+#: ../src/main.c:530
msgid "Netmask / Prefix"
msgstr "�ེ�ི��ཱསི��/ས�ོ���ི��"
-#: ../src/main.c:533
+#: ../src/main.c:537
msgid "Broadcast"
msgstr "ར�ྱ���ས�ྲ�ས�"
-#: ../src/main.c:540
+#: ../src/main.c:544
msgid "Scope"
msgstr "འོས�ས��ས�"
-#: ../src/main.c:681
+#: ../src/main.c:685
msgid ""
"Enter the network address to scan for open ports.\n"
"For example: www.domain.com or 192.168.2.1"
@@ -555,7 +559,7 @@ msgstr ""
"���ྱེ�ཡོ���ི�འ�ྲེ��ལ���ུ� �ི��ལ��འ����ིའི��ོ��ལུ� ཡོ�ས�འ�ྲེལ��ྱི� ���ྱ����ུ�ས�\n"
"��ེར���: www.domain.com ཡ���� ༡༩༢.༡༦༨.༢.༡"
-#: ../src/main.c:809
+#: ../src/main.c:813
msgid ""
"Enter the network address to lookup.\n"
"For example: www.domain.com or 192.168.2.1"
@@ -563,11 +567,11 @@ msgstr ""
"ལུ��ཨ��ལུ� ཡོ�ས�འ�ྲེལ����ྱ����ུ�ས�\n"
"��ེར���: www.domain.com ཡ���� ༡༩༢.༡༦༨.༢.༡"
-#: ../src/main.c:898
+#: ../src/main.c:902
msgid "Enter the user to finger."
msgstr "ལ��ལེ�����ེ� ��ུ���ོའི������ུ�ས�"
-#: ../src/main.c:925
+#: ../src/main.c:929
msgid ""
"Enter the network address to finger that user.\n"
"For example: auth.domain.com or 192.168.2.1"
@@ -575,7 +579,7 @@ msgstr ""
"ལ��ལེ�����ེ�ལུ� ��ུ���ོ������ིའི��ོ��ལུ� ཡོ�ས�འ�ྲེལ����ྱ���ེ���ུ�ས�\n"
"\"��ེར���:auth.domain.com ཡ���� ༡༩༢.༡༦༨.༢.༡"
-#: ../src/main.c:1012
+#: ../src/main.c:1016
msgid ""
"Enter a domain address to lookup its whois information.\n"
"For example: www.domain.com or 192.168.2.1"
@@ -608,111 +612,120 @@ msgstr "འà½?ྲེà½?à¼?ལà½?à¼?/à½?à
msgid "State"
msgstr "��ས�ལུ�ས�"
-#: ../src/netstat.c:608
+#: ../src/netstat.c:609
msgid "Destination/Prefix"
msgstr "འ�ྲོ�ཡུལ�/ས�ོ���ི��"
-#: ../src/netstat.c:610
+#: ../src/netstat.c:611
msgid "Destination"
msgstr "འ�ྲོ�ཡུལ�"
-#: ../src/netstat.c:617
+#: ../src/netstat.c:618
msgid "Gateway"
msgstr "འ�ུལ�ས�ོ�"
-#: ../src/netstat.c:625
+#: ../src/netstat.c:626
msgid "Netmask"
msgstr "�ེ�ི��ཱསི��"
-#: ../src/netstat.c:633
-#: ../src/netstat.c:739
+#: ../src/netstat.c:634
+#: ../src/netstat.c:741
msgid "Interface"
msgstr "�ོས�འ�ྲ���"
-#: ../src/netstat.c:746
+#: ../src/netstat.c:748
msgid "Member"
msgstr "འ�ུས��ི�"
-#: ../src/netstat.c:754
+#: ../src/netstat.c:756
msgid "Group"
msgstr "སྡེ����"
#. The netstat "Display active network services" output in
#. text format.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/netstat.c:796
+#: ../src/netstat.c:798
msgid "Protocol\tIP Source\tPort/Service\tState\n"
msgstr "����སྤེལ�ལ��ལུ�ས�\tIP Source\tPort/Service\tState\n"
#. The netstat "Display routing" output in text format.
#. This seems as a route table.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/netstat.c:802
+#: ../src/netstat.c:804
msgid "Destination\tGateway\tNetmask\tInterface\n"
msgstr "འ�ྲོ�ཡུལ�\tGateway\tNetmask\tInterface\n"
#. The netstat "Multicast information" output in text format.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/netstat.c:807
+#: ../src/netstat.c:809
msgid "Interface\tMember\tGroup\n"
msgstr "�ོས�འ�ྲ���\tMember\tGroup\n"
-#: ../src/nettool.c:198
+#: ../src/nettool.c:199
msgid "A network address was not specified"
msgstr "ཡོ�ས�འ�ྲེལ����ྱ���ི�� �སལ���ོ����འ����ས�"
-#: ../src/nettool.c:199
-#: ../src/nettool.c:208
+#: ../src/nettool.c:200
+#: ../src/nettool.c:209
msgid "Please enter a valid network address and try again."
msgstr "�ུས�ལྡ���ྱི� ཡོ�ས�འ�ྲེལ����ྱ���ི�� ��ུ�ས��ི���ལས� ལོ��འ��������"
-#: ../src/nettool.c:206
+#: ../src/nettool.c:207
#, c-format
msgid "The address '%s' cannot be found"
msgstr "���ྱ��'%s' �ེ�འ�ོལ����ོ��"
-#: ../src/nettool.c:235
+#: ../src/nettool.c:236
msgid "A domain address was not specified"
msgstr "�ོ��ེ���ྱི����ྱ���ི�� �སལ���ོ����འ����ས�"
-#: ../src/nettool.c:236
+#: ../src/nettool.c:237
msgid "Please enter a valid domain address and try again."
msgstr "�ུས�ལྡ���ྱི� �ོ��ེ�����ྱ���ི����ུ�ས��ི���ལས� ལོ��ས�ེ�འ���རྩོལ��ས�ྱེ�������"
-#: ../src/nettool.c:394
+#: ../src/nettool.c:395
msgid "Information not available"
msgstr "�རྡ��ོ���ི�འ�ོ���ས�"
-#: ../src/nettool.c:512
+#: ../src/nettool.c:513
msgid "Stop"
msgstr "����"
-#: ../src/nettool.c:518
+#: ../src/nettool.c:519
msgid "Run"
msgstr "�ཡོ����ོལ�"
-#: ../src/ping.c:77
+#. Created up here so we can get the geometry info.
+#: ../src/ping.c:151
+msgid "Time (ms):"
+msgstr "�ུས��ོ�(ཨེ��ཨེསི):"
+
+#: ../src/ping.c:171
+msgid "Seq. No.:"
+msgstr "རི��ཨ�.:"
+
+#: ../src/ping.c:253
#, c-format
msgid "Sending ping requests to %s"
msgstr "%s ལུ� �ི���ི��ུ��������ོ�"
-#: ../src/ping.c:397
+#: ../src/ping.c:574
msgid "Bytes"
msgstr "�ཱའི�ིསི�"
-#: ../src/ping.c:404
+#: ../src/ping.c:581
msgid "Source"
msgstr "འ�ྱུ���ུ�ས�"
-#: ../src/ping.c:412
+#: ../src/ping.c:589
msgid "Seq"
msgstr "འ�ྱུ��རི��"
-#: ../src/ping.c:422
+#: ../src/ping.c:599
msgid "Time"
msgstr "�ུས��ོ��"
-#: ../src/ping.c:430
+#: ../src/ping.c:607
msgid "Units"
msgstr "���ྲ��"
@@ -720,40 +733,40 @@ msgstr "���ྲ��"
#. Bytes received, Address Source, Number of Sequence,
#. Round Trip Time (Time), Units of Time.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/ping.c:456
+#: ../src/ping.c:633
msgid "Bytes\tSource\tSeq\tTime\tUnits\n"
msgstr "�འི�ིསི�\tSource\tSeq\tTime\tUnits\n"
#. The ping output in a text format (to copy on clipboard)
-#: ../src/ping.c:471
+#: ../src/ping.c:648
#, c-format
msgid "Time minimum:\t%s ms\n"
msgstr "�ུ����འི��ུས��ོ��:\t%s ms\n"
-#: ../src/ping.c:472
+#: ../src/ping.c:649
#, c-format
msgid "Time average:\t%s ms\n"
msgstr "��ས�ོ�ས��ུས��ོ��:\t%s ms\n"
-#: ../src/ping.c:473
+#: ../src/ping.c:650
#, c-format
msgid "Time maximum:\t%s ms\n"
msgstr "�����འི��ུས��ོ��:\t%s ms\n"
-#: ../src/ping.c:475
+#: ../src/ping.c:652
#, c-format
msgid "Packets transmitted:\t%s\n"
msgstr "འ�ྲི�����སྤེལ���ྲ��འ���ཡོ���:\t%s\n"
-#: ../src/ping.c:477
+#: ../src/ping.c:654
#, c-format
msgid "Packets received:\t%s\n"
msgstr "འ�ྲི������ོ��ཡོ���:\t%s\n"
-#: ../src/ping.c:479
+#: ../src/ping.c:657
#, c-format
-msgid "Packet loss:\t%s\n"
-msgstr "འ�ྲི������རླ��ས�ོར��ུ�ས�ཡོ���:\t%s\n"
+msgid "Successful packets:\t%s\n"
+msgstr "��ར�འ�ྱོལ�����ྱི�འ�ྲི������ུ:\t%s\n"
#: ../src/scan.c:93
#, c-format
@@ -817,11 +830,11 @@ msgstr "ཧོ��\tHostname\tIP\tTime
msgid "In order to use this feature of the program, %s must be installed in your system"
msgstr "ལས�རི��འ�ི��ི��ྱ��རྣ��འ�ི� ལ��ལེ��འ����ིའི��ོ��ལུ� �ྱོ���ྱི�རི��ལུ�ས����%s ��ི���ུ�ས�འ�����ོ"
-#: ../src/gnome-nettool.desktop.in.h:1
+#: ../src/gnome-nettool.desktop.in.in.h:1
msgid "Network Information Tools"
msgstr "ཡོ�ས�འ�ྲེལ��རྡ��ོ��ལ���ས�"
-#: ../src/gnome-nettool.desktop.in.h:2
+#: ../src/gnome-nettool.desktop.in.in.h:2
msgid "Network Tools"
msgstr "ཡོ�ས�འ�ྲེལ�ལ���ས�"
@@ -840,6 +853,10 @@ msgstr "\"%s\"à½?ིà¼?སà¾?ོརà¼?à½
msgid "Getting the whois information of %s"
msgstr "%s�ི� �ུ�ཨིསི��རྡ��ོ���ེ�ལེ���ོ�"
+#~ msgid "Packets loss:"
+#~ msgstr "འ�ྲི������རླ��ས�ོར�:"
+#~ msgid "Packet loss:\t%s\n"
+#~ msgstr "འ�ྲི������རླ��ས�ོར��ུ�ས�ཡོ���:\t%s\n"
#~ msgid "%s: Command not found"
#~ msgstr "%s: �རྡ���ོ�����ོ��"
#~ msgid "Network Tools - Devices"
diff -pruN 2.18.0-2/po/es.po 2.19.90-0ubuntu1/po/es.po
--- 2.18.0-2/po/es.po 2007-02-17 00:54:03.000000000 +0000
+++ 2.19.90-0ubuntu1/po/es.po 2007-08-14 03:43:55.000000000 +0100
@@ -1,32 +1,47 @@
# Spanish translation of gnome-network.
-# Copyright © 1999-2003 Free Software Foundation, Inc.
+# Copyright © 1999-2003, 2007 Free Software Foundation, Inc.
# This file is distributed under the same license as the gnome-network package.
+#
# Pablo Saratxaga <srtxg chanae alphanet ch>, 1999-2000.
# Germán Poo-Caamaño <gpoo ubiobio cl>, 2003.
# Francisco Javier F. Serrador <serrador cvs gnome org>, 2004, 2006.
-#
+# Jorge González <jorgegonz svn gnome org>, 2007.
msgid ""
msgstr ""
-"Project-Id-Version: gnome-nettool-2.16\n"
+"Project-Id-Version: gnome-nettool.HEAD.es\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-11 11:00+0100\n"
-"PO-Revision-Date: 2006-12-11 11:01+0100\n"
-"Last-Translator: Francisco Javier F. Serrador <serrador cvs gnome org>\n"
+"POT-Creation-Date: 2007-08-05 11:45+0100\n"
+"PO-Revision-Date: 2007-08-05 13:31+0200\n"
+"Last-Translator: Jorge González <jorgegonz svn gnome org>\n"
"Language-Team: Spanish <traductores es gnome org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
+"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
#: ../src/callbacks.c:318
msgid "translator-credits"
-msgstr "Francisco F. Serrador <serrador cvs gnome org>"
+msgstr ""
+"Jorge González <jorgegonz svn gnome org>, 2007\n"
+"Francisco F. Serrador <serrador cvs gnome org>, 2004-2006"
-#: ../src/callbacks.c:333
+#. Dear translator: This is the name of the application
+#: ../src/callbacks.c:328 ../src/gnome-nettool.desktop.in.in.h:1
+msgid "Network Tools"
+msgstr "Herramientas de red"
+
+#: ../src/callbacks.c:334
msgid "Graphical user interface for common network utilities"
msgstr "Interfaz gráfico de usuario para utilidades comunes de red"
+#. Dear Translator: This is the Window Title. 'Network Tools' is the
+#. * name of the application
+#: ../src/callbacks.c:445
+#, c-format
+msgid "%s - Network Tools"
+msgstr "%s - Herramientas de red"
+
#: ../src/gnome-nettool.glade.h:1
msgid "0.0"
msgstr "0.0"
@@ -676,15 +691,15 @@ msgstr "No se especificó una dirección
msgid "Please enter a valid domain address and try again."
msgstr "Introduzca una dirección de dominio válida e inténtelo otra vez."
-#: ../src/nettool.c:395
+#: ../src/nettool.c:406
msgid "Information not available"
msgstr "Información no disponible"
-#: ../src/nettool.c:513
+#: ../src/nettool.c:524
msgid "Stop"
msgstr "Detener"
-#: ../src/nettool.c:519
+#: ../src/nettool.c:530
msgid "Run"
msgstr "Ejecutar"
@@ -702,23 +717,23 @@ msgstr "Nº de sec:"
msgid "Sending ping requests to %s"
msgstr "Enviando solicitudes ping a %s"
-#: ../src/ping.c:574
+#: ../src/ping.c:568
msgid "Bytes"
msgstr "Bytes"
-#: ../src/ping.c:581
+#: ../src/ping.c:575
msgid "Source"
msgstr "Origen"
-#: ../src/ping.c:589
+#: ../src/ping.c:583
msgid "Seq"
msgstr "Secuencia"
-#: ../src/ping.c:599
+#: ../src/ping.c:593
msgid "Time"
msgstr "Tiempo"
-#: ../src/ping.c:607
+#: ../src/ping.c:601
msgid "Units"
msgstr "Unidades"
@@ -726,37 +741,37 @@ msgstr "Unidades"
#. Bytes received, Address Source, Number of Sequence,
#. Round Trip Time (Time), Units of Time.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/ping.c:633
+#: ../src/ping.c:627
msgid "Bytes\tSource\tSeq\tTime\tUnits\n"
msgstr "Bytes\tOrigen\tSec.\tHora\tUnidades\n"
#. The ping output in a text format (to copy on clipboard)
-#: ../src/ping.c:648
+#: ../src/ping.c:642
#, c-format
msgid "Time minimum:\t%s ms\n"
msgstr "Tiempo mÃnimo:\t%s ms\n"
-#: ../src/ping.c:649
+#: ../src/ping.c:643
#, c-format
msgid "Time average:\t%s ms\n"
msgstr "Tiempo medio:\t%s ms\n"
-#: ../src/ping.c:650
+#: ../src/ping.c:644
#, c-format
msgid "Time maximum:\t%s ms\n"
msgstr "Tiempo máximo:\t%s ms\n"
-#: ../src/ping.c:652
+#: ../src/ping.c:646
#, c-format
msgid "Packets transmitted:\t%s\n"
msgstr "Paquetes transmitidos:\t%s\n"
-#: ../src/ping.c:654
+#: ../src/ping.c:648
#, c-format
msgid "Packets received:\t%s\n"
msgstr "Paquetes recibidos:\t%s\n"
-#: ../src/ping.c:657
+#: ../src/ping.c:651
#, c-format
msgid "Successful packets:\t%s\n"
msgstr "Paquetes exitosos:\t%s\n"
@@ -790,23 +805,23 @@ msgstr "Puerto\tEstado\tServicio\n"
msgid "Tracing route to %s"
msgstr "Trazando ruta a %s"
-#: ../src/traceroute.c:271
+#: ../src/traceroute.c:265
msgid "Hop"
msgstr "Saltos"
-#: ../src/traceroute.c:279
+#: ../src/traceroute.c:273
msgid "Hostname"
msgstr "Nombre de host"
-#: ../src/traceroute.c:287
+#: ../src/traceroute.c:281
msgid "IP"
msgstr "IP"
-#: ../src/traceroute.c:298
+#: ../src/traceroute.c:292
msgid "Time 1"
msgstr "Tiempo 1"
-#: ../src/traceroute.c:308
+#: ../src/traceroute.c:302
msgid "Time 2"
msgstr "Tiempo 2"
@@ -814,7 +829,7 @@ msgstr "Tiempo 2"
#. Hop count, Hostname, IP, Round Trip Time 1 (Time1),
#. Round Trip Time 2 (Time2),
#. It's a tabular output, and these belongs to the column titles
-#: ../src/traceroute.c:334
+#: ../src/traceroute.c:328
msgid "Hop\tHostname\tIP\tTime 1\tTime 2\n"
msgstr "Salto\thost\tIP\tTiempo1\tTiempo 2\n"
@@ -823,16 +838,11 @@ msgstr "Salto\thost\tIP\tTiempo1\tTiempo
msgid ""
"In order to use this feature of the program, %s must be installed in your "
"system"
-msgstr ""
-"Para usar esta caracterÃstica del programa, debe instalarse %s en su sistema"
-
-#: ../src/gnome-nettool.desktop.in.in.h:1
-msgid "Network Information Tools"
-msgstr "Herramientas de información de red"
+msgstr "Para usar esta caracterÃstica del programa, debe instalarse %s en su sistema"
#: ../src/gnome-nettool.desktop.in.in.h:2
-msgid "Network Tools"
-msgstr "Herramientas de red"
+msgid "View information about your network"
+msgstr "Ver información acerca de su red"
#: ../src/finger.c:62
#, c-format
@@ -849,14 +859,3 @@ msgstr "Obteniendo la información de to
msgid "Getting the whois information of %s"
msgstr "Obteniendo la información whois de %s"
-#~ msgid "Packets loss:"
-#~ msgstr "Pérdida de paquetes:"
-
-#~ msgid "Packet loss:\t%s\n"
-#~ msgstr "Pérdida de paquetes:\t%s\n"
-
-#~ msgid "Network Tools - Devices"
-#~ msgstr "Herramientas de red - Dispositivos"
-
-#~ msgid "%s: Command not found"
-#~ msgstr "%s: Comando no encontrado"
diff -pruN 2.18.0-2/po/eu.po 2.19.90-0ubuntu1/po/eu.po
--- 2.18.0-2/po/eu.po 2007-02-17 00:54:03.000000000 +0000
+++ 2.19.90-0ubuntu1/po/eu.po 2007-08-14 03:43:56.000000000 +0100
@@ -1,21 +1,22 @@
-# translation of gnome-nettool.po to Basque
+# translation of eu.po to Basque
# This file is distributed under the same license as the PACKAGE package.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
+#
# Hizkuntza Politikarako Sailburuordetza <hizkpol ej-gv es>, 2005.
# Iñaki Larrañaga Murgoitio <dooteo euskalgnu org>, 2006.
-#
+# Iñaki Larrañaga Murgoitio <dooteo zundan com>, 2007.
msgid ""
msgstr ""
"Project-Id-Version: eu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-07 16:22+0000\n"
-"PO-Revision-Date: 2006-05-25 09:49+0000\n"
-"Last-Translator: Iñaki Larrañaga Murgoitio <dooteo euskalgnu org>\n"
-"Language-Team: Basque <itzulpena euskalgnu org>\n"
+"POT-Creation-Date: 2007-08-04 11:53+0200\n"
+"PO-Revision-Date: 2007-08-04 11:55+0200\n"
+"Last-Translator: Iñaki Larrañaga Murgoitio <dooteo zundan com>\n"
+"Language-Team: Basque <eu li org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.10.2\n"
+"X-Generator: KBabel 1.11.4\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
"\n"
@@ -78,82 +79,82 @@ msgid "Collisions:"
msgstr "Talkak:"
#: ../src/gnome-nettool.glade.h:13
+msgid "Details"
+msgstr "Xehetasunak"
+
+#: ../src/gnome-nettool.glade.h:14
msgid "Devices"
msgstr "Gailuak"
#. Dear Translator: This is the Window Title
-#: ../src/gnome-nettool.glade.h:15
+#: ../src/gnome-nettool.glade.h:16
msgid "Devices - Network Tools"
msgstr "Gailuak - Sareko tresnak"
-#: ../src/gnome-nettool.glade.h:16
+#: ../src/gnome-nettool.glade.h:17
msgid "Display:"
msgstr "Bistaratu:"
-#: ../src/gnome-nettool.glade.h:17 ../src/main.c:864
+#: ../src/gnome-nettool.glade.h:18 ../src/main.c:868
msgid "Finger"
msgstr "Finger"
-#: ../src/gnome-nettool.glade.h:18
+#: ../src/gnome-nettool.glade.h:19
msgid "Hardware address:"
msgstr "Hardwarearen helbidea:"
-#: ../src/gnome-nettool.glade.h:19
+#: ../src/gnome-nettool.glade.h:20
msgid "Host"
msgstr "Ostalaria"
-#: ../src/gnome-nettool.glade.h:20
+#: ../src/gnome-nettool.glade.h:21
msgid "IP Address:"
msgstr "IP helbidea:"
-#: ../src/gnome-nettool.glade.h:21
+#: ../src/gnome-nettool.glade.h:22
msgid "Link speed:"
msgstr "Esteka-abiadura:"
-#: ../src/gnome-nettool.glade.h:22 ../src/main.c:778
+#: ../src/gnome-nettool.glade.h:23 ../src/main.c:782
msgid "Lookup"
msgstr "Bilatu"
-#: ../src/gnome-nettool.glade.h:23
+#: ../src/gnome-nettool.glade.h:24
msgid "MTU:"
msgstr "MTU:"
-#: ../src/gnome-nettool.glade.h:24
+#: ../src/gnome-nettool.glade.h:25
msgid "Maximum:"
msgstr "Gehienezkoa:"
-#: ../src/gnome-nettool.glade.h:25
+#: ../src/gnome-nettool.glade.h:26
msgid "Minimum:"
msgstr "Gutxienekoa:"
-#: ../src/gnome-nettool.glade.h:26
+#: ../src/gnome-nettool.glade.h:27
msgid "Multicast Information"
msgstr "Multidifusioko informazioa"
-#: ../src/gnome-nettool.glade.h:27
+#: ../src/gnome-nettool.glade.h:28
msgid "Multicast:"
msgstr "Multidifusioa:"
-#: ../src/gnome-nettool.glade.h:28
+#: ../src/gnome-nettool.glade.h:29
msgid "Netmask:"
msgstr "Sare-maskara:"
-#: ../src/gnome-nettool.glade.h:29 ../src/main.c:476
+#: ../src/gnome-nettool.glade.h:30 ../src/main.c:480
msgid "Netstat"
msgstr "Sareko estatistikak"
-#: ../src/gnome-nettool.glade.h:30
+#: ../src/gnome-nettool.glade.h:31
msgid "Not Available"
msgstr "Ez dago erabilgarri"
-#: ../src/gnome-nettool.glade.h:31
+#: ../src/gnome-nettool.glade.h:32
msgid "Only"
msgstr "Soilik"
-#: ../src/gnome-nettool.glade.h:32
-msgid "Packets loss:"
-msgstr "Pakete-galera:"
-
#: ../src/gnome-nettool.glade.h:33
msgid "Packets received:"
msgstr "Jasotako paketeak:"
@@ -162,7 +163,7 @@ msgstr "Jasotako paketeak:"
msgid "Packets transmitted:"
msgstr "Transmititutako paketeak:"
-#: ../src/gnome-nettool.glade.h:35 ../src/main.c:312
+#: ../src/gnome-nettool.glade.h:35 ../src/main.c:313
msgid "Ping"
msgstr "Ping"
@@ -186,7 +187,7 @@ msgstr "Jasotze-erroreak:"
msgid "Routing Table Information"
msgstr "Bideratze-taulen informazioa"
-#: ../src/gnome-nettool.glade.h:41 ../src/main.c:659
+#: ../src/gnome-nettool.glade.h:41 ../src/main.c:663
msgid "Scan"
msgstr "Eskaneatu"
@@ -198,79 +199,83 @@ msgstr "Bidali:"
msgid "State:"
msgstr "Egoera:"
-#: ../src/gnome-nettool.glade.h:44 ../src/main.c:400
+#: ../src/gnome-nettool.glade.h:44
+msgid "Successful packets:"
+msgstr "Pakete arrakastatsuak:"
+
+#: ../src/gnome-nettool.glade.h:45 ../src/main.c:404
msgid "Trace"
msgstr "Aztarna"
-#: ../src/gnome-nettool.glade.h:45
+#: ../src/gnome-nettool.glade.h:46
msgid "Traceroute"
msgstr "Traceroute"
-#: ../src/gnome-nettool.glade.h:46
+#: ../src/gnome-nettool.glade.h:47
msgid "Transmission errors:"
msgstr "Transmisio-erroreak:"
-#: ../src/gnome-nettool.glade.h:47
+#: ../src/gnome-nettool.glade.h:48
msgid "Transmitted bytes:"
msgstr "Transmititutako byteak:"
-#: ../src/gnome-nettool.glade.h:48
+#: ../src/gnome-nettool.glade.h:49
msgid "Transmitted packets:"
msgstr "Transmititutako paketeak:"
-#: ../src/gnome-nettool.glade.h:49
+#: ../src/gnome-nettool.glade.h:50
msgid "Unlimited requests"
msgstr "Mugarik gabeko eskaerak"
-#: ../src/gnome-nettool.glade.h:50
+#: ../src/gnome-nettool.glade.h:51
msgid "User"
msgstr "Erabiltzailea"
-#: ../src/gnome-nettool.glade.h:51 ../src/main.c:980
+#: ../src/gnome-nettool.glade.h:52 ../src/main.c:984
msgid "Whois"
msgstr "Whois"
-#: ../src/gnome-nettool.glade.h:52
+#: ../src/gnome-nettool.glade.h:53
msgid "_Configure"
msgstr "_Konfiguratu"
-#: ../src/gnome-nettool.glade.h:53
+#: ../src/gnome-nettool.glade.h:54
msgid "_Domain address:"
msgstr "_Domeinuaren helbidea:"
-#: ../src/gnome-nettool.glade.h:54
+#: ../src/gnome-nettool.glade.h:55
msgid "_Edit"
msgstr "_Editatu"
-#: ../src/gnome-nettool.glade.h:55
+#: ../src/gnome-nettool.glade.h:56
msgid "_Help"
msgstr "_Laguntza"
-#: ../src/gnome-nettool.glade.h:56
+#: ../src/gnome-nettool.glade.h:57
msgid "_Information type:"
msgstr "_Informazio mota:"
-#: ../src/gnome-nettool.glade.h:57
+#: ../src/gnome-nettool.glade.h:58
msgid "_Network address:"
msgstr "_Sareko helbidea:"
-#: ../src/gnome-nettool.glade.h:58
+#: ../src/gnome-nettool.glade.h:59
msgid "_Network device:"
msgstr "_Sareko gailua:"
-#: ../src/gnome-nettool.glade.h:59
+#: ../src/gnome-nettool.glade.h:60
msgid "_Tool"
msgstr "_Tresna"
-#: ../src/gnome-nettool.glade.h:60
+#: ../src/gnome-nettool.glade.h:61
msgid "_Username:"
msgstr "_Erabiltzaile-izena"
-#: ../src/gnome-nettool.glade.h:61
+#: ../src/gnome-nettool.glade.h:62
msgid "ms"
msgstr "ms"
-#: ../src/gnome-nettool.glade.h:62
+#: ../src/gnome-nettool.glade.h:63
msgid "requests"
msgstr "eskaerak"
@@ -315,93 +320,93 @@ msgstr "Ez da sareko gailurik aurkitu"
msgid "Unknown"
msgstr "Ezezaguna"
-#: ../src/info.c:545
+#: ../src/info.c:554
msgid "Active"
msgstr "Aktibo"
-#: ../src/info.c:547
+#: ../src/info.c:556
msgid "Inactive"
msgstr "Inaktibo"
-#: ../src/info.c:552
+#: ../src/info.c:561
msgid "Loopback"
msgstr "Atzera-begizta"
-#: ../src/info.c:569
+#: ../src/info.c:580
msgid "Enabled"
msgstr "Gaituta"
-#: ../src/info.c:571
+#: ../src/info.c:582
msgid "Disabled"
msgstr "Desgaituta"
#. The info output in a text format (to copy on clipboard)
-#: ../src/info.c:708
+#: ../src/info.c:719
#, c-format
msgid "Network device:\t%s\n"
msgstr "Sareko gailua:\t%s\n"
-#: ../src/info.c:709
+#: ../src/info.c:720
#, c-format
msgid "Hardware address:\t%s\n"
msgstr "Hardwarearen helbidea:\t%s\n"
-#: ../src/info.c:710
+#: ../src/info.c:721
#, c-format
msgid "IP address:\t%s\n"
msgstr "IP helbidea:\t%s\n"
-#: ../src/info.c:711
+#: ../src/info.c:722
#, c-format
msgid "Netmask:\t%s\n"
msgstr "Sare-maskara:\t%s\n"
-#: ../src/info.c:712
+#: ../src/info.c:723
#, c-format
msgid "Broadcast:\t%s\n"
msgstr "Igorpena:\t%s\n"
-#: ../src/info.c:713
+#: ../src/info.c:724
#, c-format
msgid "Multicast:\t%s\n"
msgstr "Multidifusioa:\t%s\n"
-#: ../src/info.c:714
+#: ../src/info.c:725
#, c-format
msgid "MTU:\t%s\n"
msgstr "MTU:\t%s\n"
-#: ../src/info.c:715
+#: ../src/info.c:726
#, c-format
msgid "Link speed:\t%s\n"
msgstr "Esteka-abiadura:\t%s\n"
-#: ../src/info.c:716
+#: ../src/info.c:727
#, c-format
msgid "State:\t%s\n"
msgstr "Egoera:\t%s\n"
-#: ../src/info.c:718
+#: ../src/info.c:729
#, c-format
msgid "Transmitted packets:\t%s\n"
msgstr "Transmititutako paketeak:\t%s\n"
-#: ../src/info.c:719
+#: ../src/info.c:730
#, c-format
msgid "Transmission errors:\t%s\n"
msgstr "Transmisio-erroreak:\t%s\n"
-#: ../src/info.c:720
+#: ../src/info.c:731
#, c-format
msgid "Received packets:\t%s\n"
msgstr "Jasotako paketeak:\t%s\n"
-#: ../src/info.c:721
+#: ../src/info.c:732
#, c-format
msgid "Reception errors:\t%s\n"
msgstr "Jasotze-erroreak:\t%s\n"
-#: ../src/info.c:722
+#: ../src/info.c:733
#, c-format
msgid "Collisions:\t%s\n"
msgstr "Talkak:\t%s\n"
@@ -509,7 +514,7 @@ msgstr ""
"%s fitxategia ez da existitzen, begiratu gnome-nettool ondo instalatuta "
"dagoen"
-#: ../src/main.c:345
+#: ../src/main.c:346
msgid ""
"Enter the network address to ping.\n"
"For example: www.domain.com or 192.168.2.1"
@@ -517,7 +522,7 @@ msgstr ""
"Sartu sareko helbidea, ping egiteko.\n"
"(adibidea: www.domeinua.com edo 192.168.2.1)"
-#: ../src/main.c:427
+#: ../src/main.c:431
msgid ""
"Enter the network address to trace a route to.\n"
"For example: www.domain.com or 192.168.2.1"
@@ -525,27 +530,27 @@ msgstr ""
"Sartu sareko helbidea, bidea egiteko.\n"
"(adibidea: www.domeinua.com edo 192.168.2.1)"
-#: ../src/main.c:512 ../src/netstat.c:443
+#: ../src/main.c:516 ../src/netstat.c:443
msgid "Protocol"
msgstr "Protokoloa"
-#: ../src/main.c:519
+#: ../src/main.c:523
msgid "IP Address"
msgstr "IP helbidea"
-#: ../src/main.c:526
+#: ../src/main.c:530
msgid "Netmask / Prefix"
msgstr "Sare-maskara / Aurrizkia"
-#: ../src/main.c:533
+#: ../src/main.c:537
msgid "Broadcast"
msgstr "Igorpena"
-#: ../src/main.c:540
+#: ../src/main.c:544
msgid "Scope"
msgstr "Esparrua"
-#: ../src/main.c:681
+#: ../src/main.c:685
msgid ""
"Enter the network address to scan for open ports.\n"
"For example: www.domain.com or 192.168.2.1"
@@ -553,7 +558,7 @@ msgstr ""
"Sartu sareko helbidea, irekitako atakak eskaneatzeko.\n"
"(adibidea: www.domeinua.com edo 192.168.2.1)"
-#: ../src/main.c:809
+#: ../src/main.c:813
msgid ""
"Enter the network address to lookup.\n"
"For example: www.domain.com or 192.168.2.1"
@@ -561,11 +566,11 @@ msgstr ""
"Sartu sareko helbidea, bilaketa egiteko.\n"
"(adibidea: www.domeinua.com edo 192.168.2.1)"
-#: ../src/main.c:898
+#: ../src/main.c:902
msgid "Enter the user to finger."
msgstr "Sartu erabiltzailea, finger abiarazteko"
-#: ../src/main.c:925
+#: ../src/main.c:929
msgid ""
"Enter the network address to finger that user.\n"
"For example: auth.domain.com or 192.168.2.1"
@@ -573,7 +578,7 @@ msgstr ""
"Sartu sareko helbidea, erabiltzaile horri finger egiteko.\n"
"Adibidea: egilea.domeinua.com edo 192.168.2.1)"
-#: ../src/main.c:1012
+#: ../src/main.c:1016
msgid ""
"Enter a domain address to lookup its whois information.\n"
"For example: www.domain.com or 192.168.2.1"
@@ -605,51 +610,51 @@ msgstr "Ataka/Zerbitzua"
msgid "State"
msgstr "Egoera"
-#: ../src/netstat.c:608
+#: ../src/netstat.c:609
msgid "Destination/Prefix"
msgstr "Helburua/Aurrizkia"
-#: ../src/netstat.c:610
+#: ../src/netstat.c:611
msgid "Destination"
msgstr "Helburua"
-#: ../src/netstat.c:617
+#: ../src/netstat.c:618
msgid "Gateway"
msgstr "Atebidea"
-#: ../src/netstat.c:625
+#: ../src/netstat.c:626
msgid "Netmask"
msgstr "Sare-maskara"
-#: ../src/netstat.c:633 ../src/netstat.c:739
+#: ../src/netstat.c:634 ../src/netstat.c:741
msgid "Interface"
msgstr "Interfazea"
-#: ../src/netstat.c:746
+#: ../src/netstat.c:748
msgid "Member"
msgstr "Kidea"
-#: ../src/netstat.c:754
+#: ../src/netstat.c:756
msgid "Group"
msgstr "Taldea"
#. The netstat "Display active network services" output in
#. text format.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/netstat.c:796
+#: ../src/netstat.c:798
msgid "Protocol\tIP Source\tPort/Service\tState\n"
msgstr "Protokoloa\tIP iturburua\tAtaka/Zerbitzua\tEgoera\n"
#. The netstat "Display routing" output in text format.
#. This seems as a route table.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/netstat.c:802
+#: ../src/netstat.c:804
msgid "Destination\tGateway\tNetmask\tInterface\n"
msgstr "Helburua\tAtebidea\tSare-maskara\tInterfazea\n"
#. The netstat "Multicast information" output in text format.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/netstat.c:807
+#: ../src/netstat.c:809
msgid "Interface\tMember\tGroup\n"
msgstr "Interfazea\tKidea\tTaldea\n"
@@ -674,40 +679,49 @@ msgstr "Domeinuaren helbidea ez duzu zeh
msgid "Please enter a valid domain address and try again."
msgstr "Sartu domeinuaren helbidea eta saiatu berriro."
-#: ../src/nettool.c:395
+#: ../src/nettool.c:406
msgid "Information not available"
msgstr "Informazioa ez dago erabilgarri"
-#: ../src/nettool.c:513
+#: ../src/nettool.c:524
msgid "Stop"
msgstr "Gelditu"
-#: ../src/nettool.c:519
+#: ../src/nettool.c:530
msgid "Run"
msgstr "Exekutatu"
-#: ../src/ping.c:77
+#. Created up here so we can get the geometry info.
+#: ../src/ping.c:151
+msgid "Time (ms):"
+msgstr "Denbora (ms):"
+
+#: ../src/ping.c:171
+msgid "Seq. No.:"
+msgstr "Sek. zbkia.:"
+
+#: ../src/ping.c:253
#, c-format
msgid "Sending ping requests to %s"
msgstr "Ping eskaera hona bidaltzen: %s"
-#: ../src/ping.c:395
+#: ../src/ping.c:574
msgid "Bytes"
msgstr "Byteak"
-#: ../src/ping.c:402
+#: ../src/ping.c:581
msgid "Source"
msgstr "Iturburua"
-#: ../src/ping.c:410
+#: ../src/ping.c:589
msgid "Seq"
msgstr "Sekuentzia"
-#: ../src/ping.c:420
+#: ../src/ping.c:599
msgid "Time"
msgstr "Denbora"
-#: ../src/ping.c:428
+#: ../src/ping.c:607
msgid "Units"
msgstr "Unitateak"
@@ -715,40 +729,40 @@ msgstr "Unitateak"
#. Bytes received, Address Source, Number of Sequence,
#. Round Trip Time (Time), Units of Time.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/ping.c:454
+#: ../src/ping.c:633
msgid "Bytes\tSource\tSeq\tTime\tUnits\n"
msgstr "Byte\tIturburua\tSekuentzia\tDenbora\tUnitate\n"
#. The ping output in a text format (to copy on clipboard)
-#: ../src/ping.c:469
+#: ../src/ping.c:648
#, c-format
msgid "Time minimum:\t%s ms\n"
msgstr "Gutxieneko denbora:\t%s ms\n"
-#: ../src/ping.c:470
+#: ../src/ping.c:649
#, c-format
msgid "Time average:\t%s ms\n"
msgstr "Batez besteko denbora:\t%s ms\n"
-#: ../src/ping.c:471
+#: ../src/ping.c:650
#, c-format
msgid "Time maximum:\t%s ms\n"
msgstr "Gehienezko denbora:\t%s ms\n"
-#: ../src/ping.c:473
+#: ../src/ping.c:652
#, c-format
msgid "Packets transmitted:\t%s\n"
msgstr "Transmititutako paketeak:\t%s\n"
-#: ../src/ping.c:475
+#: ../src/ping.c:654
#, c-format
msgid "Packets received:\t%s\n"
msgstr "Jasotako paketeak:\t%s\n"
-#: ../src/ping.c:477
+#: ../src/ping.c:657
#, c-format
-msgid "Packet loss:\t%s\n"
-msgstr "Galdutako paketeak:\t%s\n"
+msgid "Successful packets:\t%s\n"
+msgstr "Pakete arrakastatsuak:\t%s\n"
#: ../src/scan.c:93
#, c-format
@@ -814,11 +828,11 @@ msgid ""
"system"
msgstr "%s sisteman instalatu behar da programaren funtzio hau erabiltzeko."
-#: ../src/gnome-nettool.desktop.in.h:1
+#: ../src/gnome-nettool.desktop.in.in.h:1
msgid "Network Information Tools"
msgstr "Sareko informazio-tresnak"
-#: ../src/gnome-nettool.desktop.in.h:2
+#: ../src/gnome-nettool.desktop.in.in.h:2
msgid "Network Tools"
msgstr "Sareko tresnak"
@@ -836,3 +850,4 @@ msgstr "\"%s\"-(e)ko erabiltzaile guztie
#, c-format
msgid "Getting the whois information of %s"
msgstr "%s-(r)en 'whois' informazioa eskuratzen"
+
diff -pruN 2.18.0-2/po/fi.po 2.19.90-0ubuntu1/po/fi.po
--- 2.18.0-2/po/fi.po 2007-02-17 00:54:03.000000000 +0000
+++ 2.19.90-0ubuntu1/po/fi.po 2007-08-14 03:43:55.000000000 +0100
@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: gnome-nettool\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-02-12 20:22+0300\n"
+"POT-Creation-Date: 2007-08-13 19:30+0300\n"
"PO-Revision-Date: 2007-02-12 20:23+0300\n"
"Last-Translator: Ilkka Tuohela <hile iki fi>\n"
"Language-Team: Finnish <gnome-fi-laatu lists sourceforge net>\n"
@@ -25,10 +25,22 @@ msgstr ""
"\n"
"http://gnome.fi/";
-#: ../src/callbacks.c:333
+#. Dear translator: This is the name of the application
+#: ../src/callbacks.c:328 ../src/gnome-nettool.desktop.in.in.h:1
+msgid "Network Tools"
+msgstr "Verkkotyökalut"
+
+#: ../src/callbacks.c:334
msgid "Graphical user interface for common network utilities"
msgstr "Graafinen käyttöliittymä yleisille verkkotyökaluille"
+#. Dear Translator: This is the Window Title. 'Network Tools' is the
+#. * name of the application
+#: ../src/callbacks.c:445
+#, c-format
+msgid "%s - Network Tools"
+msgstr "%s - verkkotyökalut"
+
#: ../src/gnome-nettool.glade.h:1
msgid "0.0"
msgstr "0.0"
@@ -678,15 +690,15 @@ msgstr "Toimialueosoitetta ei määritet
msgid "Please enter a valid domain address and try again."
msgstr "Syötä kelvollinen toimialueosoite ja yritä uudelleen."
-#: ../src/nettool.c:395
+#: ../src/nettool.c:406
msgid "Information not available"
msgstr "Tietoja ei saatavilla"
-#: ../src/nettool.c:513
+#: ../src/nettool.c:524
msgid "Stop"
msgstr "Pysäytä"
-#: ../src/nettool.c:519
+#: ../src/nettool.c:530
msgid "Run"
msgstr "Suorita"
@@ -704,23 +716,23 @@ msgstr "Sekv.nr.:"
msgid "Sending ping requests to %s"
msgstr "Lähetetään tiedustelupaketteja isännälle %s"
-#: ../src/ping.c:574
+#: ../src/ping.c:568
msgid "Bytes"
msgstr "tavua"
-#: ../src/ping.c:581
+#: ../src/ping.c:575
msgid "Source"
msgstr "Lähde"
-#: ../src/ping.c:589
+#: ../src/ping.c:583
msgid "Seq"
msgstr "Sarja"
-#: ../src/ping.c:599
+#: ../src/ping.c:593
msgid "Time"
msgstr "Aika"
-#: ../src/ping.c:607
+#: ../src/ping.c:601
msgid "Units"
msgstr "Yksiköt"
@@ -728,37 +740,37 @@ msgstr "Yksiköt"
#. Bytes received, Address Source, Number of Sequence,
#. Round Trip Time (Time), Units of Time.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/ping.c:633
+#: ../src/ping.c:627
msgid "Bytes\tSource\tSeq\tTime\tUnits\n"
msgstr "Tavua\tLähde\tSarja\tAika\tYksikkö\n"
#. The ping output in a text format (to copy on clipboard)
-#: ../src/ping.c:648
+#: ../src/ping.c:642
#, c-format
msgid "Time minimum:\t%s ms\n"
msgstr "Lyhin aika:\t%s ms\n"
-#: ../src/ping.c:649
+#: ../src/ping.c:643
#, c-format
msgid "Time average:\t%s ms\n"
msgstr "Keskiarvoaika:\t%s ms\n"
-#: ../src/ping.c:650
+#: ../src/ping.c:644
#, c-format
msgid "Time maximum:\t%s ms\n"
msgstr "Pisin aika:\t%s ms\n"
-#: ../src/ping.c:652
+#: ../src/ping.c:646
#, c-format
msgid "Packets transmitted:\t%s\n"
msgstr "Paketteja lähetetty:\t%s\n"
-#: ../src/ping.c:654
+#: ../src/ping.c:648
#, c-format
msgid "Packets received:\t%s\n"
msgstr "Paketteja vastaanotettu:\t%s\n"
-#: ../src/ping.c:657
+#: ../src/ping.c:651
#, c-format
msgid "Successful packets:\t%s\n"
msgstr "Onnistuneet paketit:\t%s\n"
@@ -792,23 +804,23 @@ msgstr "Portti\tTila\tPalvelu\n"
msgid "Tracing route to %s"
msgstr "Jäljitetään reittiä kohteeseen %s"
-#: ../src/traceroute.c:271
+#: ../src/traceroute.c:265
msgid "Hop"
msgstr "Piste"
-#: ../src/traceroute.c:279
+#: ../src/traceroute.c:273
msgid "Hostname"
msgstr "Verkkonimi"
-#: ../src/traceroute.c:287
+#: ../src/traceroute.c:281
msgid "IP"
msgstr "IP"
-#: ../src/traceroute.c:298
+#: ../src/traceroute.c:292
msgid "Time 1"
msgstr "Aika 1"
-#: ../src/traceroute.c:308
+#: ../src/traceroute.c:302
msgid "Time 2"
msgstr "Aika 2"
@@ -816,7 +828,7 @@ msgstr "Aika 2"
#. Hop count, Hostname, IP, Round Trip Time 1 (Time1),
#. Round Trip Time 2 (Time2),
#. It's a tabular output, and these belongs to the column titles
-#: ../src/traceroute.c:334
+#: ../src/traceroute.c:328
msgid "Hop\tHostname\tIP\tTime 1\tTime 2\n"
msgstr "Piste\tVerkkonimi\tIP\tAika 1\tAika 2\n"
@@ -828,13 +840,9 @@ msgid ""
msgstr ""
"%s täytyy olla asennettuna, jotta voit käyttää tätä ohjelman ominaisuutta."
-#: ../src/gnome-nettool.desktop.in.in.h:1
-msgid "Network Information Tools"
-msgstr "Verkkotietotyökalut"
-
#: ../src/gnome-nettool.desktop.in.in.h:2
-msgid "Network Tools"
-msgstr "Verkkotyökalut"
+msgid "View information about your network"
+msgstr "Näytä tietoja verkostasi"
#: ../src/finger.c:62
#, c-format
@@ -851,6 +859,9 @@ msgstr "Haetaan koneelta \"%s\" kaikkien
msgid "Getting the whois information of %s"
msgstr "Haetaan toimialueen %s whois-tiedot"
+#~ msgid "Network Information Tools"
+#~ msgstr "Verkkotietotyökalut"
+
#~ msgid "Packets loss:"
#~ msgstr "Pakettihäviö:"
diff -pruN 2.18.0-2/po/gu.po 2.19.90-0ubuntu1/po/gu.po
--- 2.18.0-2/po/gu.po 2007-03-13 01:18:39.000000000 +0000
+++ 2.19.90-0ubuntu1/po/gu.po 2007-08-14 03:43:56.000000000 +0100
@@ -5,15 +5,16 @@ msgid ""
msgstr ""
"Project-Id-Version: gnome-nettool.HEAD.gu\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-02 04:19+0000\n"
-"PO-Revision-Date: 2007-03-05 19:58+0530\n"
+"POT-Creation-Date: 2007-08-05 11:45+0100\n"
+"PO-Revision-Date: 2007-08-06 16:14+0530\n"
"Last-Translator: Ankit Patel <ankit redhat com>\n"
"Language-Team: Gujarati <fedora-trans-gu redhat com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
-"Plural-Forms: nplurals=2; plural=(n!=1);\n\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n\n"
+"\n"
"\n"
"\n"
"\n"
@@ -24,10 +25,22 @@ msgstr ""
msgid "translator-credits"
msgstr "���િત પ��લ <ankit644 yahoo com>"
-#: ../src/callbacks.c:333
+#. Dear translator: This is the name of the application
+#: ../src/callbacks.c:328 ../src/gnome-nettool.desktop.in.in.h:1
+msgid "Network Tools"
+msgstr "ન��વર�� સાધન�"
+
+#: ../src/callbacks.c:334
msgid "Graphical user interface for common network utilities"
msgstr "સામાન�ય ન��વર�� �પય��િતા� મા�� ��રાફિ�વાળ�� વપરાશ�ર�તા �ન��રફ�સ"
+#. Dear Translator: This is the Window Title. 'Network Tools' is the
+#. * name of the application
+#: ../src/callbacks.c:445
+#, c-format
+msgid "%s - Network Tools"
+msgstr "%s - ન��વર�� સાધન�"
+
#: ../src/gnome-nettool.glade.h:1
msgid "0.0"
msgstr "૦.૦"
@@ -675,15 +688,15 @@ msgstr "ડà«?મà«?àª?ન સરનાà
msgid "Please enter a valid domain address and try again."
msgstr "મહ�રબાન� �ર�ન� માન�ય ડ�મ��ન સરનામ� દા�લ �ર� �ન� ફર�થ� પ�રયત�ન �ર�."
-#: ../src/nettool.c:395
+#: ../src/nettool.c:406
msgid "Information not available"
msgstr "�ાણ�ાર� �પ�લબ�ધ નથ�"
-#: ../src/nettool.c:513
+#: ../src/nettool.c:524
msgid "Stop"
msgstr "બ�ધ �ર�"
-#: ../src/nettool.c:519
+#: ../src/nettool.c:530
msgid "Run"
msgstr "�લાવ�"
@@ -701,23 +714,23 @@ msgstr "àª?નà«?àª?à«?રમ નàª?બà
msgid "Sending ping requests to %s"
msgstr "%s ન� પ��� મ���ર� મ��લ� રહ�યા ���"
-#: ../src/ping.c:574
+#: ../src/ping.c:568
msgid "Bytes"
msgstr "બા���"
-#: ../src/ping.c:581
+#: ../src/ping.c:575
msgid "Source"
msgstr "સ�ર�ત"
-#: ../src/ping.c:589
+#: ../src/ping.c:583
msgid "Seq"
msgstr "Seq"
-#: ../src/ping.c:599
+#: ../src/ping.c:593
msgid "Time"
msgstr "સમય"
-#: ../src/ping.c:607
+#: ../src/ping.c:601
msgid "Units"
msgstr "��મ�"
@@ -725,37 +738,37 @@ msgstr "��મ�"
#. Bytes received, Address Source, Number of Sequence,
#. Round Trip Time (Time), Units of Time.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/ping.c:633
+#: ../src/ping.c:627
msgid "Bytes\tSource\tSeq\tTime\tUnits\n"
msgstr "બા���\tસ�ર�ત\tSeq\tસમય\t��મ�\n"
#. The ping output in a text format (to copy on clipboard)
-#: ../src/ping.c:648
+#: ../src/ping.c:642
#, c-format
msgid "Time minimum:\t%s ms\n"
msgstr "ન�ય�નતમ સમય:\t%s ms\n"
-#: ../src/ping.c:649
+#: ../src/ping.c:643
#, c-format
msgid "Time average:\t%s ms\n"
msgstr "સર�રાશ સમય:\t%s ms\n"
-#: ../src/ping.c:650
+#: ../src/ping.c:644
#, c-format
msgid "Time maximum:\t%s ms\n"
msgstr "મહત�તમ સમય:\t%s ms\n"
-#: ../src/ping.c:652
+#: ../src/ping.c:646
#, c-format
msgid "Packets transmitted:\t%s\n"
msgstr "મ��લાય�લ પ�����:\t%s\n"
-#: ../src/ping.c:654
+#: ../src/ping.c:648
#, c-format
msgid "Packets received:\t%s\n"
msgstr "મ�ળવ�લ પ�����:\t%s\n"
-#: ../src/ping.c:657
+#: ../src/ping.c:651
#, c-format
msgid "Successful packets:\t%s\n"
msgstr "સફળ પ�����:\t%s\n"
@@ -789,23 +802,23 @@ msgstr "પ�ર��\tસ�થિત
msgid "Tracing route to %s"
msgstr "%s ન� ર�� ��ર�સ �ર� રહ�યા ���"
-#: ../src/traceroute.c:271
+#: ../src/traceroute.c:265
msgid "Hop"
msgstr "Hop"
-#: ../src/traceroute.c:279
+#: ../src/traceroute.c:273
msgid "Hostname"
msgstr "ય�માનનામ"
-#: ../src/traceroute.c:287
+#: ../src/traceroute.c:281
msgid "IP"
msgstr "IP"
-#: ../src/traceroute.c:298
+#: ../src/traceroute.c:292
msgid "Time 1"
msgstr "સમય ૧"
-#: ../src/traceroute.c:308
+#: ../src/traceroute.c:302
msgid "Time 2"
msgstr "સમય ૨"
@@ -813,7 +826,7 @@ msgstr "સમય ૨"
#. Hop count, Hostname, IP, Round Trip Time 1 (Time1),
#. Round Trip Time 2 (Time2),
#. It's a tabular output, and these belongs to the column titles
-#: ../src/traceroute.c:334
+#: ../src/traceroute.c:328
msgid "Hop\tHostname\tIP\tTime 1\tTime 2\n"
msgstr "Hop\tય�માનનામ\tIP\tસમય ૧\tસમય ૨\n"
@@ -824,13 +837,9 @@ msgid ""
"system"
msgstr "�ાર�ય��રમન�� � લ��ષણ વાપરવા મા��, %s તમાર� સિસ��મમા� સ�થાપિત થય�લ હ�વ�� � ����"
-#: ../src/gnome-nettool.desktop.in.in.h:1
-msgid "Network Information Tools"
-msgstr "ન��વર�� �ાણ�ાર� સાધન�"
-
#: ../src/gnome-nettool.desktop.in.in.h:2
-msgid "Network Tools"
-msgstr "ન��વર�� સાધન�"
+msgid "View information about your network"
+msgstr "તમારા ન��વર�� વિશ�ન� �ાણ�ાર� ���"
#: ../src/finger.c:62
#, c-format
diff -pruN 2.18.0-2/po/it.po 2.19.90-0ubuntu1/po/it.po
--- 2.18.0-2/po/it.po 2007-02-17 00:54:03.000000000 +0000
+++ 2.19.90-0ubuntu1/po/it.po 2007-08-14 03:43:56.000000000 +0100
@@ -1,25 +1,24 @@
# Italian translation of GNOME-NetTool.
# Copyright (C) 2004 Free Software Foundation, Inc.
-# Francesco Marletta <francesco marletta tiscali it>, 2004-2005.
+# Francesco Marletta <francesco marletta tiscali it>, 2004-2007.
#
msgid ""
msgstr ""
"Project-Id-Version: gnome-nettool\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-04-15 12:42-0400\n"
-"PO-Revision-Date: 2005-09-03 19:27+0200\n"
+"POT-Creation-Date: 2007-04-23 16:01+0200\n"
+"PO-Revision-Date: 2007-03-12 13:09+0100\n"
"Last-Translator: Francesco Marletta <francesco marletta tiscali it>\n"
"Language-Team: italian <tp lists linux it>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-#: ../src/callbacks.c:311
-#, fuzzy
+#: ../src/callbacks.c:318
msgid "translator-credits"
msgstr "Francesco Marletta <francesco marletta tiscali it>"
-#: ../src/callbacks.c:326
+#: ../src/callbacks.c:333
msgid "Graphical user interface for common network utilities"
msgstr "Interfaccia grafica per utilità di rete di uso comune"
@@ -57,212 +56,223 @@ msgid "Average:"
msgstr "Medio:"
#: ../src/gnome-nettool.glade.h:9
+msgid "Beep on ping"
+msgstr "Bip al ping"
+
+#: ../src/gnome-nettool.glade.h:10
msgid "Broadcast:"
msgstr "Broadcast:"
-#: ../src/gnome-nettool.glade.h:10
+#: ../src/gnome-nettool.glade.h:11
msgid "Clear _History"
msgstr "_Pulisci cronologia"
-#: ../src/gnome-nettool.glade.h:11
+#: ../src/gnome-nettool.glade.h:12
msgid "Collisions:"
msgstr "Collisioni:"
-#: ../src/gnome-nettool.glade.h:12
+#: ../src/gnome-nettool.glade.h:13
+msgid "Details"
+msgstr "Dettagli"
+
+#: ../src/gnome-nettool.glade.h:14
msgid "Devices"
msgstr "Interfacce"
#. Dear Translator: This is the Window Title
-#: ../src/gnome-nettool.glade.h:14
-#, fuzzy
+#: ../src/gnome-nettool.glade.h:16
msgid "Devices - Network Tools"
-msgstr "Strumenti di rete"
+msgstr "Dispositivi - Strumenti di rete"
-#: ../src/gnome-nettool.glade.h:15
+#: ../src/gnome-nettool.glade.h:17
msgid "Display:"
msgstr "Mostra:"
-#: ../src/gnome-nettool.glade.h:16 ../src/main.c:857
+#: ../src/gnome-nettool.glade.h:18 ../src/main.c:868
msgid "Finger"
msgstr "Finger"
-#: ../src/gnome-nettool.glade.h:17
+#: ../src/gnome-nettool.glade.h:19
msgid "Hardware address:"
msgstr "Indirizzo hardware:"
-#: ../src/gnome-nettool.glade.h:18
+#: ../src/gnome-nettool.glade.h:20
msgid "Host"
msgstr "Host"
-#: ../src/gnome-nettool.glade.h:19
+#: ../src/gnome-nettool.glade.h:21
msgid "IP Address:"
msgstr "Indirizzo IP:"
-#: ../src/gnome-nettool.glade.h:20
+#: ../src/gnome-nettool.glade.h:22
msgid "Link speed:"
msgstr "Velocità collegamento:"
-#: ../src/gnome-nettool.glade.h:21 ../src/main.c:771
+#: ../src/gnome-nettool.glade.h:23 ../src/main.c:782
msgid "Lookup"
msgstr "Lookup"
-#: ../src/gnome-nettool.glade.h:22
+#: ../src/gnome-nettool.glade.h:24
msgid "MTU:"
msgstr "MTU:"
-#: ../src/gnome-nettool.glade.h:23
+#: ../src/gnome-nettool.glade.h:25
msgid "Maximum:"
msgstr "Massimo:"
-#: ../src/gnome-nettool.glade.h:24
+#: ../src/gnome-nettool.glade.h:26
msgid "Minimum:"
msgstr "Minimo:"
-#: ../src/gnome-nettool.glade.h:25
+#: ../src/gnome-nettool.glade.h:27
msgid "Multicast Information"
msgstr "Informazioni multicast"
-#: ../src/gnome-nettool.glade.h:26
+#: ../src/gnome-nettool.glade.h:28
msgid "Multicast:"
msgstr "Multicast:"
-#: ../src/gnome-nettool.glade.h:27
+#: ../src/gnome-nettool.glade.h:29
msgid "Netmask:"
msgstr "Netmask:"
-#: ../src/gnome-nettool.glade.h:28 ../src/main.c:469
+#: ../src/gnome-nettool.glade.h:30 ../src/main.c:480
msgid "Netstat"
msgstr "Netstat"
-#: ../src/gnome-nettool.glade.h:29
+#: ../src/gnome-nettool.glade.h:31
msgid "Not Available"
msgstr "Non disponibile"
-#: ../src/gnome-nettool.glade.h:30
+#: ../src/gnome-nettool.glade.h:32
msgid "Only"
msgstr "Solo"
-#: ../src/gnome-nettool.glade.h:31
-msgid "Packets loss:"
-msgstr "Pacchetti persi:"
-
-#: ../src/gnome-nettool.glade.h:32
+#: ../src/gnome-nettool.glade.h:33
msgid "Packets received:"
msgstr "Pacchetti ricevuti:"
-#: ../src/gnome-nettool.glade.h:33
+#: ../src/gnome-nettool.glade.h:34
msgid "Packets transmitted:"
msgstr "Pacchetti trasmessi:"
-#: ../src/gnome-nettool.glade.h:34 ../src/main.c:305
+#: ../src/gnome-nettool.glade.h:35 ../src/main.c:313
msgid "Ping"
msgstr "Ping"
-#: ../src/gnome-nettool.glade.h:35
+#: ../src/gnome-nettool.glade.h:36
msgid "Port Scan"
msgstr "Scansione porte"
-#: ../src/gnome-nettool.glade.h:36
+#: ../src/gnome-nettool.glade.h:37
msgid "Received bytes:"
msgstr "Byte ricevuti:"
-#: ../src/gnome-nettool.glade.h:37
+#: ../src/gnome-nettool.glade.h:38
msgid "Received packets:"
msgstr "Pacchetti ricevuti:"
-#: ../src/gnome-nettool.glade.h:38
+#: ../src/gnome-nettool.glade.h:39
msgid "Reception errors:"
msgstr "Errori di ricezione:"
-#: ../src/gnome-nettool.glade.h:39
+#: ../src/gnome-nettool.glade.h:40
msgid "Routing Table Information"
msgstr "Informazioni sulla tabella di instradamento"
-#: ../src/gnome-nettool.glade.h:40 ../src/main.c:652
+#: ../src/gnome-nettool.glade.h:41 ../src/main.c:663
msgid "Scan"
msgstr "Scansiona"
-#: ../src/gnome-nettool.glade.h:41
+#: ../src/gnome-nettool.glade.h:42
msgid "Send:"
msgstr "Invia:"
-#: ../src/gnome-nettool.glade.h:42
+#: ../src/gnome-nettool.glade.h:43
msgid "State:"
msgstr "Stato:"
-#: ../src/gnome-nettool.glade.h:43 ../src/main.c:393
+# [NdT] poiché "successful" -> "che ha successo, buon esito", mi
+# sono trovato a dover scegliere tra usare "con successo"
+# e "con esito positivo". Ho scelto la prima forma in quanto
+# più compatta e dopo c'è un caso in cui la compattezza serve.
+#: ../src/gnome-nettool.glade.h:44
+msgid "Successful packets:"
+msgstr "Pacchetti con successo:"
+
+#: ../src/gnome-nettool.glade.h:45 ../src/main.c:404
msgid "Trace"
msgstr "Traccia"
-#: ../src/gnome-nettool.glade.h:44
+#: ../src/gnome-nettool.glade.h:46
msgid "Traceroute"
msgstr "Traceroute"
-#: ../src/gnome-nettool.glade.h:45
+#: ../src/gnome-nettool.glade.h:47
msgid "Transmission errors:"
msgstr "Errori di trasmissione:"
-#: ../src/gnome-nettool.glade.h:46
+#: ../src/gnome-nettool.glade.h:48
msgid "Transmitted bytes:"
msgstr "Byte trasmessi:"
-#: ../src/gnome-nettool.glade.h:47
+#: ../src/gnome-nettool.glade.h:49
msgid "Transmitted packets:"
msgstr "Pacchetti trasmessi:"
-#: ../src/gnome-nettool.glade.h:48
+#: ../src/gnome-nettool.glade.h:50
msgid "Unlimited requests"
msgstr "Richieste illimitate"
-#: ../src/gnome-nettool.glade.h:49
+#: ../src/gnome-nettool.glade.h:51
msgid "User"
msgstr "Utente"
-#: ../src/gnome-nettool.glade.h:50 ../src/main.c:973
+#: ../src/gnome-nettool.glade.h:52 ../src/main.c:984
msgid "Whois"
msgstr "Whois"
-#: ../src/gnome-nettool.glade.h:51
+#: ../src/gnome-nettool.glade.h:53
msgid "_Configure"
msgstr "_Configura"
-#: ../src/gnome-nettool.glade.h:52
+#: ../src/gnome-nettool.glade.h:54
msgid "_Domain address:"
msgstr "Indirizzo del _dominio:"
-#: ../src/gnome-nettool.glade.h:53
+#: ../src/gnome-nettool.glade.h:55
msgid "_Edit"
msgstr "_Modifica"
-#: ../src/gnome-nettool.glade.h:54
+#: ../src/gnome-nettool.glade.h:56
msgid "_Help"
msgstr "A_iuto"
-#: ../src/gnome-nettool.glade.h:55
+#: ../src/gnome-nettool.glade.h:57
msgid "_Information type:"
msgstr "Tipo di _informazione:"
-#: ../src/gnome-nettool.glade.h:56
+#: ../src/gnome-nettool.glade.h:58
msgid "_Network address:"
msgstr "Indirizzo di _rete:"
-#: ../src/gnome-nettool.glade.h:57
+#: ../src/gnome-nettool.glade.h:59
msgid "_Network device:"
msgstr "Interfaccia di _rete:"
-#: ../src/gnome-nettool.glade.h:58
+#: ../src/gnome-nettool.glade.h:60
msgid "_Tool"
msgstr "_Strumenti"
-#: ../src/gnome-nettool.glade.h:59
+#: ../src/gnome-nettool.glade.h:61
msgid "_Username:"
msgstr "Nome _utente:"
-#: ../src/gnome-nettool.glade.h:60
+#: ../src/gnome-nettool.glade.h:62
msgid "ms"
msgstr "ms"
-#: ../src/gnome-nettool.glade.h:61
+#: ../src/gnome-nettool.glade.h:63
msgid "requests"
msgstr "richieste"
@@ -309,95 +319,95 @@ msgid "Unknown"
msgstr "Sconosciuto"
# [NdT] Si riferisce all'interfaccia
-#: ../src/info.c:545
+#: ../src/info.c:554
msgid "Active"
msgstr "Attiva"
-#: ../src/info.c:547
+#: ../src/info.c:556
msgid "Inactive"
msgstr "Inattiva"
-#: ../src/info.c:552
+#: ../src/info.c:561
msgid "Loopback"
msgstr "Loopback"
-#: ../src/info.c:569
+#: ../src/info.c:580
msgid "Enabled"
msgstr "Abilitata"
# [NdT] Si riferisce all'interfaccia
-#: ../src/info.c:571
+#: ../src/info.c:582
msgid "Disabled"
msgstr "Disabilitata"
# The info output in a text format (to copy on clipboard)
#. The info output in a text format (to copy on clipboard)
-#: ../src/info.c:708
+#: ../src/info.c:719
#, c-format
msgid "Network device:\t%s\n"
msgstr "Interfaccia di rete:\t%s\n"
-#: ../src/info.c:709
+#: ../src/info.c:720
#, c-format
msgid "Hardware address:\t%s\n"
msgstr "Indirizzo hardware:\t%s\n"
-#: ../src/info.c:710
+#: ../src/info.c:721
#, c-format
msgid "IP address:\t%s\n"
msgstr "Indirizzo IP:\t%s\n"
-#: ../src/info.c:711
+#: ../src/info.c:722
#, c-format
msgid "Netmask:\t%s\n"
msgstr "Netmask:\t%s\n"
-#: ../src/info.c:712
+#: ../src/info.c:723
#, c-format
msgid "Broadcast:\t%s\n"
msgstr "Broadcast:\t%s\n"
-#: ../src/info.c:713
+#: ../src/info.c:724
#, c-format
msgid "Multicast:\t%s\n"
msgstr "Multicast:\t%s\n"
-#: ../src/info.c:714
+#: ../src/info.c:725
#, c-format
msgid "MTU:\t%s\n"
msgstr "MTU:\t%s\n"
-#: ../src/info.c:715
+#: ../src/info.c:726
#, c-format
msgid "Link speed:\t%s\n"
msgstr "Velocità collegamento:\t%s\n"
-#: ../src/info.c:716
+#: ../src/info.c:727
#, c-format
msgid "State:\t%s\n"
msgstr "Stato:\t%s\n"
-#: ../src/info.c:718
+#: ../src/info.c:729
#, c-format
msgid "Transmitted packets:\t%s\n"
msgstr "Pacchetti trasmessi:\t%s\n"
-#: ../src/info.c:719
+#: ../src/info.c:730
#, c-format
msgid "Transmission errors:\t%s\n"
msgstr "Errori di trasmissione:\t%s\n"
-#: ../src/info.c:720
+#: ../src/info.c:731
#, c-format
msgid "Received packets:\t%s\n"
msgstr "Pacchetti ricevuti:\t%s\n"
-#: ../src/info.c:721
+#: ../src/info.c:732
#, c-format
msgid "Reception errors:\t%s\n"
msgstr "Errori di ricezione:\t%s\n"
-#: ../src/info.c:722
+#: ../src/info.c:733
#, c-format
msgid "Collisions:\t%s\n"
msgstr "Collisioni:\t%s\n"
@@ -448,61 +458,61 @@ msgstr "Indirizzo"
msgid "Source\tTTL\tAddress Type\tRecord Type1\tResolution\n"
msgstr "Sorgente\tTTL\tTipo di indirizzo\tTipo di record\tRisoluzione\n"
-#: ../src/main.c:80
+#: ../src/main.c:81
msgid "Load information for a network device"
msgstr "Carica le informazioni per una interfaccia di rete"
-#: ../src/main.c:81
+#: ../src/main.c:82
msgid "DEVICE"
msgstr "INTERFACCIA"
-#: ../src/main.c:84
+#: ../src/main.c:85
msgid "Send a ping to a network address"
msgstr "Invia un ping ad un indirizzo di rete"
-#: ../src/main.c:85 ../src/main.c:93 ../src/main.c:97 ../src/main.c:101
+#: ../src/main.c:86 ../src/main.c:94 ../src/main.c:98 ../src/main.c:102
msgid "HOST"
msgstr "HOST"
-#: ../src/main.c:88
+#: ../src/main.c:89
msgid "Get netstat information. Valid options are: route, active, multicast."
msgstr ""
"Recupera le informazioni di netstat. Le opzioni valide sono: route, active, "
"multicast."
-#: ../src/main.c:89
+#: ../src/main.c:90
msgid "COMMAND"
msgstr "COMANDO"
-#: ../src/main.c:92
+#: ../src/main.c:93
msgid "Trace a route to a network address"
msgstr "Traccia il percorso fino ad un indirizzo di rete"
-#: ../src/main.c:96
+#: ../src/main.c:97
msgid "Port scan a network address"
msgstr "Scansiona le porte di un indirizzo di rete"
-#: ../src/main.c:100
+#: ../src/main.c:101
msgid "Look up a network address"
msgstr "Effettua il lookup di un indirizzo di rete"
-#: ../src/main.c:104
+#: ../src/main.c:105
msgid "Finger command to run"
msgstr "Comando finger da eseguire"
-#: ../src/main.c:105
+#: ../src/main.c:106
msgid "USER"
msgstr "UTENTE"
-#: ../src/main.c:108
+#: ../src/main.c:109
msgid "Perform a whois lookup for a network domain"
msgstr "Effettua una interrogazione whois per un dominio di rete"
-#: ../src/main.c:109
+#: ../src/main.c:110
msgid "DOMAIN"
msgstr "DOMINIO"
-#: ../src/main.c:126
+#: ../src/main.c:127
#, c-format
msgid ""
"The file %s doesn't exist, please check if gnome-nettool is correctly "
@@ -511,15 +521,15 @@ msgstr ""
"Il file %s non esiste, controllare che gnome-nettool sia correttamente "
"installato"
-#: ../src/main.c:338
+#: ../src/main.c:346
msgid ""
"Enter the network address to ping.\n"
"For example: www.domain.com or 192.168.2.1"
msgstr ""
"Inserire l'indirizzo di rete a cui fare ping.\n"
-"Per esempio: www.dominio.com o 192.168.2.1"
+"Per esempio: www.dominio.it o 192.168.2.1"
-#: ../src/main.c:420
+#: ../src/main.c:431
msgid ""
"Enter the network address to trace a route to.\n"
"For example: www.domain.com or 192.168.2.1"
@@ -527,27 +537,27 @@ msgstr ""
"Inserire l'indirizzo di rete di cui tracciare il percorso.\n"
"Per esempio: www.dominio.it o 192.168.2.1"
-#: ../src/main.c:505 ../src/netstat.c:443
+#: ../src/main.c:516 ../src/netstat.c:443
msgid "Protocol"
msgstr "Protocollo"
-#: ../src/main.c:512
+#: ../src/main.c:523
msgid "IP Address"
msgstr "Indirizzo IP"
-#: ../src/main.c:519
+#: ../src/main.c:530
msgid "Netmask / Prefix"
msgstr "Netmask / Prefisso"
-#: ../src/main.c:526
+#: ../src/main.c:537
msgid "Broadcast"
msgstr "Broadcast"
-#: ../src/main.c:533
+#: ../src/main.c:544
msgid "Scope"
msgstr "Portata"
-#: ../src/main.c:674
+#: ../src/main.c:685
msgid ""
"Enter the network address to scan for open ports.\n"
"For example: www.domain.com or 192.168.2.1"
@@ -555,7 +565,7 @@ msgstr ""
"Inserire l'indirizzo di rete da scansionare in cerca di porte aperte.\n"
"Per esempio: www.dominio.it o 192.168.2.1"
-#: ../src/main.c:802
+#: ../src/main.c:813
msgid ""
"Enter the network address to lookup.\n"
"For example: www.domain.com or 192.168.2.1"
@@ -563,20 +573,19 @@ msgstr ""
"Inserire l'indirizzo di rete di cui fare il lookup.\n"
"Per esempio: www.dominio.it o 192.168.2.1"
-#: ../src/main.c:891
+#: ../src/main.c:902
msgid "Enter the user to finger."
msgstr "Inserire l'utente di cui fare finger."
-#: ../src/main.c:918
-#, fuzzy
+#: ../src/main.c:929
msgid ""
"Enter the network address to finger that user.\n"
"For example: auth.domain.com or 192.168.2.1"
msgstr ""
"Inserire l'indirizzo di rete su cui fare finger per l'utente.\n"
-"Per esempio: www.dominio.it o 192.168.2.1"
+"Per esempio: auth.dominio.it o 192.168.2.1"
-#: ../src/main.c:1005
+#: ../src/main.c:1016
msgid ""
"Enter a domain address to lookup its whois information.\n"
"For example: www.domain.com or 192.168.2.1"
@@ -604,35 +613,35 @@ msgstr "IP sorgente"
msgid "Port/Service"
msgstr "Porta/Servizio"
-#: ../src/netstat.c:466 ../src/scan.c:298
+#: ../src/netstat.c:466 ../src/scan.c:312
msgid "State"
msgstr "Stato"
-#: ../src/netstat.c:608
+#: ../src/netstat.c:609
msgid "Destination/Prefix"
msgstr "Destinazione/Prefisso"
-#: ../src/netstat.c:610
+#: ../src/netstat.c:611
msgid "Destination"
msgstr "Destinazione"
-#: ../src/netstat.c:617
+#: ../src/netstat.c:618
msgid "Gateway"
msgstr "Gateway"
-#: ../src/netstat.c:625
+#: ../src/netstat.c:626
msgid "Netmask"
msgstr "Netmask"
-#: ../src/netstat.c:633 ../src/netstat.c:739
+#: ../src/netstat.c:634 ../src/netstat.c:741
msgid "Interface"
msgstr "Interfaccia"
-#: ../src/netstat.c:746
+#: ../src/netstat.c:748
msgid "Member"
msgstr "Membro"
-#: ../src/netstat.c:754
+#: ../src/netstat.c:756
msgid "Group"
msgstr "Gruppo"
@@ -642,7 +651,7 @@ msgstr "Gruppo"
#. The netstat "Display active network services" output in
#. text format.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/netstat.c:796
+#: ../src/netstat.c:798
msgid "Protocol\tIP Source\tPort/Service\tState\n"
msgstr "Protocollo\tIP sorgente\tPorta/Servizio\tStato\n"
@@ -652,7 +661,7 @@ msgstr "Protocollo\tIP sorgente\tPorta/S
#. The netstat "Display routing" output in text format.
#. This seems as a route table.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/netstat.c:802
+#: ../src/netstat.c:804
msgid "Destination\tGateway\tNetmask\tInterface\n"
msgstr "Destinazione\tGateway\tNetmask\tInterfaccia\n"
@@ -660,65 +669,74 @@ msgstr "Destinazione\tGateway\tNetmask\t
# It's a tabular output, and these belongs to the column titles
#. The netstat "Multicast information" output in text format.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/netstat.c:807
+#: ../src/netstat.c:809
msgid "Interface\tMember\tGroup\n"
msgstr "Interfaccia\tMembro\tGruppo\n"
-#: ../src/nettool.c:198
+#: ../src/nettool.c:199
msgid "A network address was not specified"
msgstr "Non è stato specificato un indirizzo di rete"
-#: ../src/nettool.c:199 ../src/nettool.c:208
+#: ../src/nettool.c:200 ../src/nettool.c:209
msgid "Please enter a valid network address and try again."
msgstr "Inserire un indirizzo di rete valido e provare di nuovo."
-#: ../src/nettool.c:206
+#: ../src/nettool.c:207
#, c-format
msgid "The address '%s' cannot be found"
msgstr "L'indirizzo \"%s\" non può essere trovato"
-#: ../src/nettool.c:235
+#: ../src/nettool.c:236
msgid "A domain address was not specified"
msgstr "Non è stato specificato un indirizzo di dominio"
-#: ../src/nettool.c:236
+#: ../src/nettool.c:237
msgid "Please enter a valid domain address and try again."
msgstr "Inserire un indirizzo di dominio valido e provare di nuovo."
-#: ../src/nettool.c:394
+#: ../src/nettool.c:406
msgid "Information not available"
msgstr "Informazione non disponibile"
-#: ../src/nettool.c:512
+#: ../src/nettool.c:524
msgid "Stop"
msgstr "Ferma"
-#: ../src/nettool.c:518
+#: ../src/nettool.c:530
msgid "Run"
msgstr "Esegui"
-#: ../src/ping.c:77
+#. Created up here so we can get the geometry info.
+#: ../src/ping.c:151
+msgid "Time (ms):"
+msgstr "Tempo (ms):"
+
+#: ../src/ping.c:171
+msgid "Seq. No.:"
+msgstr "Num. Seq.:"
+
+#: ../src/ping.c:253
#, c-format
msgid "Sending ping requests to %s"
msgstr "Invio di richieste ping a %s in corso"
-#: ../src/ping.c:385
+#: ../src/ping.c:574
msgid "Bytes"
msgstr "Byte"
-#: ../src/ping.c:392
+#: ../src/ping.c:581
msgid "Source"
msgstr "Sorgente"
-#: ../src/ping.c:400
+#: ../src/ping.c:589
msgid "Seq"
msgstr "Seq"
-#: ../src/ping.c:410
+#: ../src/ping.c:599
msgid "Time"
msgstr "Tempo"
-#: ../src/ping.c:418
+#: ../src/ping.c:607
msgid "Units"
msgstr "Unità "
@@ -730,56 +748,56 @@ msgstr "Unità "
#. Bytes received, Address Source, Number of Sequence,
#. Round Trip Time (Time), Units of Time.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/ping.c:444
+#: ../src/ping.c:633
msgid "Bytes\tSource\tSeq\tTime\tUnits\n"
msgstr "Byte\tSorgente\tSeq\tTempo\tUnità \n"
# The ping output in a text format (to copy on clipboard)
#. The ping output in a text format (to copy on clipboard)
-#: ../src/ping.c:459
+#: ../src/ping.c:648
#, c-format
msgid "Time minimum:\t%s ms\n"
msgstr "Tempo minimo:\t%s ms\n"
-#: ../src/ping.c:460
+#: ../src/ping.c:649
#, c-format
msgid "Time average:\t%s ms\n"
msgstr "Tempo medio:\t%s ms\n"
-#: ../src/ping.c:461
+#: ../src/ping.c:650
#, c-format
msgid "Time maximum:\t%s ms\n"
msgstr "Tempo massimo:\t%s ms\n"
-#: ../src/ping.c:463
+#: ../src/ping.c:652
#, c-format
msgid "Packets transmitted:\t%s\n"
msgstr "Pacchetti trasmessi:\t%s\n"
-#: ../src/ping.c:465
+#: ../src/ping.c:654
#, c-format
msgid "Packets received:\t%s\n"
msgstr "Pacchetti ricevuti:\t%s\n"
-#: ../src/ping.c:467
+#: ../src/ping.c:657
#, c-format
-msgid "Packet loss:\t%s\n"
-msgstr "Pacchetti persi:\t%s\n"
+msgid "Successful packets:\t%s\n"
+msgstr "Pacchetti con successo:\t%s\n"
-#: ../src/scan.c:86
+#: ../src/scan.c:93
#, c-format
msgid "Scanning %s for open ports"
msgstr "Scansione di %s alla ricerca di porte aperte"
-#: ../src/scan.c:161
+#: ../src/scan.c:168
msgid "unknown"
msgstr "sconosciuto"
-#: ../src/scan.c:290
+#: ../src/scan.c:304
msgid "Port"
msgstr "Porta"
-#: ../src/scan.c:306
+#: ../src/scan.c:320
msgid "Service"
msgstr "Servizio"
@@ -789,9 +807,9 @@ msgstr "Servizio"
#. The portscan output in text format:
#. Port, State, Service.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/scan.c:328
+#: ../src/scan.c:342
msgid "Port\tState\tService\n"
-msgstr "Porta\tStato\tServizion\n"
+msgstr "Porta\tStato\tServizio\n"
#: ../src/traceroute.c:62
#, c-format
@@ -832,14 +850,18 @@ msgstr "Passo\tNome host\tIP\tTempo 1\tT
#: ../src/utils.c:227
#, c-format
-msgid "%s: Command not found"
-msgstr "%s: comando non trovato"
+msgid ""
+"In order to use this feature of the program, %s must be installed in your "
+"system"
+msgstr ""
+"Affinché sia possibile usare questa funzionalità del programma, è necessario "
+"che %s sia installato nel sistema"
-#: ../src/gnome-nettool.desktop.in.h:1
+#: ../src/gnome-nettool.desktop.in.in.h:1
msgid "Network Information Tools"
msgstr "Strumenti di informazione sulla rete"
-#: ../src/gnome-nettool.desktop.in.h:2
+#: ../src/gnome-nettool.desktop.in.in.h:2
msgid "Network Tools"
msgstr "Strumenti di rete"
@@ -857,6 +879,3 @@ msgstr "Recupero delle informazioni di t
#, c-format
msgid "Getting the whois information of %s"
msgstr "Recupero delle informazioni whois di %s in corso"
-
-#~ msgid "Network Tools - Devices"
-#~ msgstr "Strumenti di rete - Interfacce"
diff -pruN 2.18.0-2/po/LINGUAS 2.19.90-0ubuntu1/po/LINGUAS
--- 2.18.0-2/po/LINGUAS 2007-02-17 00:54:03.000000000 +0000
+++ 2.19.90-0ubuntu1/po/LINGUAS 2007-08-14 03:43:55.000000000 +0100
@@ -44,6 +44,7 @@ ms
nb
ne
nl
+oc
or
pa
pl
@@ -59,6 +60,7 @@ sr
sr Latn
sv
ta
+te
th
tr
uk
diff -pruN 2.18.0-2/po/Makefile.in.in 2.19.90-0ubuntu1/po/Makefile.in.in
--- 2.18.0-2/po/Makefile.in.in 2007-03-13 01:48:36.000000000 +0000
+++ 2.19.90-0ubuntu1/po/Makefile.in.in 2007-08-14 03:44:43.000000000 +0100
@@ -25,7 +25,7 @@ SHELL = /bin/sh
srcdir = @srcdir@
top_srcdir = @top_srcdir@
-top_builddir = ..
+top_builddir = @top_builddir@
VPATH = @srcdir@
prefix = @prefix@
@@ -56,15 +56,19 @@ ALL_LINGUAS = @ALL_LINGUAS@
PO_LINGUAS=$(shell if test -r $(srcdir)/LINGUAS; then grep -v "^\#" $(srcdir)/LINGUAS; fi)
-POFILES=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.po "; done)
+USER_LINGUAS=$(shell if test -n "$(LINGUAS)"; then LLINGUAS="$(LINGUAS)"; ALINGUAS="$(ALL_LINGUAS)"; for lang in $$LLINGUAS; do if test -n "`grep ^$$lang$$ $(srcdir)/LINGUAS`" -o -n "`echo $$ALINGUAS|grep ' ?$$lang ?'`"; then printf "$$lang "; fi; done; fi)
+
+USE_LINGUAS=$(shell if test -n "$(USER_LINGUAS)"; then LLINGUAS="$(USER_LINGUAS)"; else if test -n "$(PO_LINGUAS)"; then LLINGUAS="$(PO_LINGUAS)"; else LLINGUAS="$(ALL_LINGUAS)"; fi; fi; for lang in $$LLINGUAS; do printf "$$lang "; done)
+
+POFILES=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.po "; done)
DISTFILES = ChangeLog Makefile.in.in POTFILES.in $(POFILES)
EXTRA_DISTFILES = POTFILES.skip Makevars LINGUAS
POTFILES = \
-#This Gets Replace for some reason
+# This comment gets stripped out
-CATALOGS=$(shell if test -n "$(PO_LINGUAS)"; then LINGUAS="$(PO_LINGUAS)"; else LINGUAS="$(ALL_LINGUAS)"; fi; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
+CATALOGS=$(shell LINGUAS="$(USE_LINGUAS)"; for lang in $$LINGUAS; do printf "$$lang.gmo "; done)
.SUFFIXES:
.SUFFIXES: .po .pox .gmo .mo .msg .cat
@@ -98,11 +102,7 @@ install-data: install-data- USE_NLS@
install-data-no: all
install-data-yes: all
$(mkdir_p) $(DESTDIR)$(itlocaledir)
- if test -n "$(PO_LINGUAS)"; then \
- linguas="$(PO_LINGUAS)"; \
- else \
- linguas="$(ALL_LINGUAS)"; \
- fi; \
+ linguas="$(USE_LINGUAS)"; \
for lang in $$linguas; do \
dir=$(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES; \
$(mkdir_p) $$dir; \
@@ -136,17 +136,18 @@ dvi info tags TAGS ID:
installcheck:
uninstall:
- if test -n "$(PO_LINGUAS)"; then \
- linguas="$(PO_LINGUAS)"; \
- else \
- linguas="$(ALL_LINGUAS)"; \
- fi; \
+ linguas="$(USE_LINGUAS)"; \
for lang in $$linguas; do \
rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo; \
rm -f $(DESTDIR)$(itlocaledir)/$$lang/LC_MESSAGES/$(GETTEXT_PACKAGE).mo.m; \
done
check: all $(GETTEXT_PACKAGE).pot
+ rm -f missing notexist
+ srcdir=$(srcdir) $(INTLTOOL_UPDATE) -m
+ if [ -r missing -o -r notexist ]; then \
+ exit 1; \
+ fi
mostlyclean:
rm -f *.pox $(GETTEXT_PACKAGE).pot *.old.po cat-id-tbl.tmp
@@ -179,11 +180,7 @@ dist distdir: $(DISTFILES)
update-po: Makefile
$(MAKE) $(GETTEXT_PACKAGE).pot
tmpdir=`pwd`; \
- if test -n "$(PO_LINGUAS)"; then \
- linguas="$(PO_LINGUAS)"; \
- else \
- linguas="$(ALL_LINGUAS)"; \
- fi; \
+ linguas="$(USE_LINGUAS)"; \
for lang in $$linguas; do \
echo "$$lang:"; \
result="`$(MSGMERGE) -o $$tmpdir/$$lang.new.po $$lang`"; \
@@ -211,8 +208,8 @@ Makefile POTFILES: stamp-it
$(MAKE) stamp-it; \
fi
-stamp-it: Makefile.in.in ../config.status POTFILES.in
- cd .. \
+stamp-it: Makefile.in.in $(top_builddir)/config.status POTFILES.in
+ cd $(top_builddir) \
&& CONFIG_FILES=$(subdir)/Makefile.in CONFIG_HEADERS= CONFIG_LINKS= \
$(SHELL) ./config.status
diff -pruN 2.18.0-2/po/nb.po 2.19.90-0ubuntu1/po/nb.po
--- 2.18.0-2/po/nb.po 2007-02-17 00:54:03.000000000 +0000
+++ 2.19.90-0ubuntu1/po/nb.po 2007-08-14 03:43:55.000000000 +0100
@@ -6,8 +6,8 @@ msgid ""
msgstr ""
"Project-Id-Version: gnome-nettool 2.15.x\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-11 01:40+0100\n"
-"PO-Revision-Date: 2006-12-11 01:41+0100\n"
+"POT-Creation-Date: 2007-08-09 11:12+0200\n"
+"PO-Revision-Date: 2007-08-09 11:13+0200\n"
"Last-Translator: Kjartan Maraas <kmaraas gnome org>\n"
"Language-Team: Norwegian <i18n-nb lister ping uio no>\n"
"MIME-Version: 1.0\n"
@@ -18,10 +18,22 @@ msgstr ""
msgid "translator-credits"
msgstr "Kjartan Maraas <kmaraas gnome org>"
-#: ../src/callbacks.c:333
+#. Dear translator: This is the name of the application
+#: ../src/callbacks.c:328 ../src/gnome-nettool.desktop.in.in.h:1
+msgid "Network Tools"
+msgstr "Nettverksverktøy"
+
+#: ../src/callbacks.c:334
msgid "Graphical user interface for common network utilities"
msgstr "Grafisk brukergrensesnitt for vanlige nettverksverktøy"
+#. Dear Translator: This is the Window Title. 'Network Tools' is the
+#. * name of the application
+#: ../src/callbacks.c:445
+#, c-format
+msgid "%s - Network Tools"
+msgstr "%s - Nettverksverktøy"
+
#: ../src/gnome-nettool.glade.h:1
msgid "0.0"
msgstr "0.0"
@@ -669,15 +681,15 @@ msgstr "En domeneadresse ble ikke oppgit
msgid "Please enter a valid domain address and try again."
msgstr "Vennligst oppgi en gyldig adresse for domenet og prøv igjen."
-#: ../src/nettool.c:395
+#: ../src/nettool.c:406
msgid "Information not available"
msgstr "Informasjon ikke tilgjengelig"
-#: ../src/nettool.c:513
+#: ../src/nettool.c:524
msgid "Stop"
msgstr "Stopp"
-#: ../src/nettool.c:519
+#: ../src/nettool.c:530
msgid "Run"
msgstr "Kjør"
@@ -695,23 +707,23 @@ msgstr "Sekv. nr.:"
msgid "Sending ping requests to %s"
msgstr "Sender ping-forespørsler til %s"
-#: ../src/ping.c:574
+#: ../src/ping.c:568
msgid "Bytes"
msgstr "Bytes"
-#: ../src/ping.c:581
+#: ../src/ping.c:575
msgid "Source"
msgstr "Kilde"
-#: ../src/ping.c:589
+#: ../src/ping.c:583
msgid "Seq"
msgstr "Sekv"
-#: ../src/ping.c:599
+#: ../src/ping.c:593
msgid "Time"
msgstr "Tid"
-#: ../src/ping.c:607
+#: ../src/ping.c:601
msgid "Units"
msgstr "Enheter"
@@ -719,37 +731,37 @@ msgstr "Enheter"
#. Bytes received, Address Source, Number of Sequence,
#. Round Trip Time (Time), Units of Time.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/ping.c:633
+#: ../src/ping.c:627
msgid "Bytes\tSource\tSeq\tTime\tUnits\n"
msgstr "Bytes\tKilde\tSekvens\tTid\tEnheter\n"
#. The ping output in a text format (to copy on clipboard)
-#: ../src/ping.c:648
+#: ../src/ping.c:642
#, c-format
msgid "Time minimum:\t%s ms\n"
msgstr "Minste tid:\t%s ms\n"
-#: ../src/ping.c:649
+#: ../src/ping.c:643
#, c-format
msgid "Time average:\t%s ms\n"
msgstr "Gjennomsnittstid:\t%s ms\n"
-#: ../src/ping.c:650
+#: ../src/ping.c:644
#, c-format
msgid "Time maximum:\t%s ms\n"
msgstr "Maksimumstid:\t%s ms\n"
-#: ../src/ping.c:652
+#: ../src/ping.c:646
#, c-format
msgid "Packets transmitted:\t%s\n"
msgstr "Pakker sendt:\t%s\n"
-#: ../src/ping.c:654
+#: ../src/ping.c:648
#, c-format
msgid "Packets received:\t%s\n"
msgstr "Pakker mottatt:\t%s\n"
-#: ../src/ping.c:657
+#: ../src/ping.c:651
#, c-format
msgid "Successful packets:\t%s\n"
msgstr "Pakker mottatt:\t%s\n"
@@ -783,23 +795,23 @@ msgstr "Port\tTilstand\tTjeneste\n"
msgid "Tracing route to %s"
msgstr "Følger ruten til %s"
-#: ../src/traceroute.c:271
+#: ../src/traceroute.c:265
msgid "Hop"
msgstr "Hopp"
-#: ../src/traceroute.c:279
+#: ../src/traceroute.c:273
msgid "Hostname"
msgstr "Vertsnavn"
-#: ../src/traceroute.c:287
+#: ../src/traceroute.c:281
msgid "IP"
msgstr "IP"
-#: ../src/traceroute.c:298
+#: ../src/traceroute.c:292
msgid "Time 1"
msgstr "Tid 1"
-#: ../src/traceroute.c:308
+#: ../src/traceroute.c:302
msgid "Time 2"
msgstr "Tid 2"
@@ -807,7 +819,7 @@ msgstr "Tid 2"
#. Hop count, Hostname, IP, Round Trip Time 1 (Time1),
#. Round Trip Time 2 (Time2),
#. It's a tabular output, and these belongs to the column titles
-#: ../src/traceroute.c:334
+#: ../src/traceroute.c:328
msgid "Hop\tHostname\tIP\tTime 1\tTime 2\n"
msgstr "Hop\tVertsnavn\tIP\tTid 1\tTid 2\n"
@@ -818,13 +830,9 @@ msgid ""
"system"
msgstr "For å bruke denne funksjonen må %s være installert på ditt system"
-#: ../src/gnome-nettool.desktop.in.in.h:1
-msgid "Network Information Tools"
-msgstr "Verktøy for nettverksinformasjon"
-
#: ../src/gnome-nettool.desktop.in.in.h:2
-msgid "Network Tools"
-msgstr "Nettverksverktøy"
+msgid "View information about your network"
+msgstr "Vis informasjon om ditt nettverk"
#: ../src/finger.c:62
#, c-format
diff -pruN 2.18.0-2/po/oc.po 2.19.90-0ubuntu1/po/oc.po
--- 2.18.0-2/po/oc.po 1970-01-01 01:00:00.000000000 +0100
+++ 2.19.90-0ubuntu1/po/oc.po 2007-08-14 03:43:56.000000000 +0100
@@ -0,0 +1,833 @@
+# Occitan translation of gnome-nettool.
+# Copyright (C) 1998-2007 Free Software Foundation, Inc.
+# This file is distributed under the GNU General Public License 2.0.
+#
+# Yannig MARCHEGAY (yannig marchegay org) - 2006-2007
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gnome-nettool 2.15.92\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-02-05 22:57+0100\n"
+"PO-Revision-Date: 2007-05-23 10:15+0200\n"
+"Last-Translator: Yannig MARCHEGAY <yannig marchegay org>\n"
+"Language-Team: Occitan (post 1500) <ubuntu-l10n-oci lists ubuntu com>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);"
+
+#: ../src/callbacks.c:318
+msgid "translator-credits"
+msgstr ""
+"La còla occitana de revirada d'Ubuntu, 2007 - ubuntu-l10n-oci lists ubuntu com"
+
+#: ../src/callbacks.c:333
+msgid "Graphical user interface for common network utilities"
+msgstr ""
+
+#: ../src/gnome-nettool.glade.h:1
+msgid "0.0"
+msgstr "0.0"
+
+#: ../src/gnome-nettool.glade.h:2
+msgid "<b>IP Information</b>"
+msgstr "<b>Informacions sus l'IP</b>"
+
+#: ../src/gnome-nettool.glade.h:3
+msgid "<b>Interface Information</b>"
+msgstr "<b>Informacions sus l'interfaç</b>"
+
+#: ../src/gnome-nettool.glade.h:4
+msgid "<b>Interface Statistics</b>"
+msgstr "<b>Estadisticas de l'interfaç</b>"
+
+#: ../src/gnome-nettool.glade.h:5
+msgid "<b>Round Trip Time Statistics</b>"
+msgstr ""
+
+#: ../src/gnome-nettool.glade.h:6
+msgid "<b>Transmission Statistics</b>"
+msgstr ""
+
+#: ../src/gnome-nettool.glade.h:7
+msgid "Active Network Services"
+msgstr ""
+
+#: ../src/gnome-nettool.glade.h:8
+msgid "Average:"
+msgstr "Mejana :"
+
+#: ../src/gnome-nettool.glade.h:9
+msgid "Beep on ping"
+msgstr ""
+
+#: ../src/gnome-nettool.glade.h:10
+msgid "Broadcast:"
+msgstr ""
+
+#: ../src/gnome-nettool.glade.h:11
+msgid "Clear _History"
+msgstr ""
+
+#: ../src/gnome-nettool.glade.h:12
+msgid "Collisions:"
+msgstr ""
+
+#: ../src/gnome-nettool.glade.h:13
+msgid "Details"
+msgstr "Detalhs"
+
+#: ../src/gnome-nettool.glade.h:14
+msgid "Devices"
+msgstr "Periferiques"
+
+#. Dear Translator: This is the Window Title
+#: ../src/gnome-nettool.glade.h:16
+msgid "Devices - Network Tools"
+msgstr "Periferics - Espleches ret"
+
+#: ../src/gnome-nettool.glade.h:17
+msgid "Display:"
+msgstr ""
+
+#: ../src/gnome-nettool.glade.h:18 ../src/main.c:868
+msgid "Finger"
+msgstr ""
+
+#: ../src/gnome-nettool.glade.h:19
+msgid "Hardware address:"
+msgstr ""
+
+#: ../src/gnome-nettool.glade.h:20
+msgid "Host"
+msgstr "Ã?ste"
+
+#: ../src/gnome-nettool.glade.h:21
+msgid "IP Address:"
+msgstr "Adreça IP :"
+
+#: ../src/gnome-nettool.glade.h:22
+msgid "Link speed:"
+msgstr "Velocitat del ligam :"
+
+#: ../src/gnome-nettool.glade.h:23 ../src/main.c:782
+msgid "Lookup"
+msgstr ""
+
+#: ../src/gnome-nettool.glade.h:24
+msgid "MTU:"
+msgstr ""
+
+#: ../src/gnome-nettool.glade.h:25
+msgid "Maximum:"
+msgstr ""
+
+#: ../src/gnome-nettool.glade.h:26
+msgid "Minimum:"
+msgstr ""
+
+#: ../src/gnome-nettool.glade.h:27
+msgid "Multicast Information"
+msgstr ""
+
+#: ../src/gnome-nettool.glade.h:28
+msgid "Multicast:"
+msgstr ""
+
+#: ../src/gnome-nettool.glade.h:29
+msgid "Netmask:"
+msgstr "Masqueta ret :"
+
+#: ../src/gnome-nettool.glade.h:30 ../src/main.c:480
+msgid "Netstat"
+msgstr ""
+
+#: ../src/gnome-nettool.glade.h:31
+msgid "Not Available"
+msgstr "Pas disponible"
+
+#: ../src/gnome-nettool.glade.h:32
+msgid "Only"
+msgstr "Sonque"
+
+#: ../src/gnome-nettool.glade.h:33
+msgid "Packets received:"
+msgstr "Paquetes recebuts :"
+
+#: ../src/gnome-nettool.glade.h:34
+msgid "Packets transmitted:"
+msgstr "Paquetes transmeses :"
+
+#: ../src/gnome-nettool.glade.h:35 ../src/main.c:313
+msgid "Ping"
+msgstr "Ping"
+
+#: ../src/gnome-nettool.glade.h:36
+msgid "Port Scan"
+msgstr ""
+
+#: ../src/gnome-nettool.glade.h:37
+msgid "Received bytes:"
+msgstr "Octets recebuts :"
+
+#: ../src/gnome-nettool.glade.h:38
+msgid "Received packets:"
+msgstr "Paquetes recebuts :"
+
+#: ../src/gnome-nettool.glade.h:39
+msgid "Reception errors:"
+msgstr ""
+
+#: ../src/gnome-nettool.glade.h:40
+msgid "Routing Table Information"
+msgstr ""
+
+#: ../src/gnome-nettool.glade.h:41 ../src/main.c:663
+msgid "Scan"
+msgstr ""
+
+#: ../src/gnome-nettool.glade.h:42
+msgid "Send:"
+msgstr "Enviar :"
+
+#: ../src/gnome-nettool.glade.h:43
+msgid "State:"
+msgstr "Estat :"
+
+#: ../src/gnome-nettool.glade.h:44
+msgid "Successful packets:"
+msgstr ""
+
+#: ../src/gnome-nettool.glade.h:45 ../src/main.c:404
+msgid "Trace"
+msgstr ""
+
+#: ../src/gnome-nettool.glade.h:46
+msgid "Traceroute"
+msgstr ""
+
+#: ../src/gnome-nettool.glade.h:47
+msgid "Transmission errors:"
+msgstr ""
+
+#: ../src/gnome-nettool.glade.h:48
+msgid "Transmitted bytes:"
+msgstr "Octets transmeses :"
+
+#: ../src/gnome-nettool.glade.h:49
+msgid "Transmitted packets:"
+msgstr "Paquetes transmeses"
+
+#: ../src/gnome-nettool.glade.h:50
+msgid "Unlimited requests"
+msgstr ""
+
+#: ../src/gnome-nettool.glade.h:51
+msgid "User"
+msgstr "Usuari"
+
+#: ../src/gnome-nettool.glade.h:52 ../src/main.c:984
+msgid "Whois"
+msgstr "Whois"
+
+#: ../src/gnome-nettool.glade.h:53
+msgid "_Configure"
+msgstr "_Configurar"
+
+#: ../src/gnome-nettool.glade.h:54
+msgid "_Domain address:"
+msgstr "Adreça del _domeni"
+
+#: ../src/gnome-nettool.glade.h:55
+msgid "_Edit"
+msgstr "_Edicion"
+
+#: ../src/gnome-nettool.glade.h:56
+msgid "_Help"
+msgstr "_Ajuda"
+
+#: ../src/gnome-nettool.glade.h:57
+msgid "_Information type:"
+msgstr "Tipe d'_informacions :"
+
+#: ../src/gnome-nettool.glade.h:58
+msgid "_Network address:"
+msgstr "Adreça de la _ret :"
+
+#: ../src/gnome-nettool.glade.h:59
+msgid "_Network device:"
+msgstr "Periferic _ret :"
+
+#: ../src/gnome-nettool.glade.h:60
+msgid "_Tool"
+msgstr "_Esplech"
+
+#: ../src/gnome-nettool.glade.h:61
+msgid "_Username:"
+msgstr "_Nom d'utilizaire :"
+
+#: ../src/gnome-nettool.glade.h:62
+msgid "ms"
+msgstr "ms"
+
+#: ../src/gnome-nettool.glade.h:63
+msgid "requests"
+msgstr "requèstas"
+
+#. Interface Name Interface Type icon Device prefix Pixbuf
+#: ../src/info.c:57
+msgid "Other type"
+msgstr "Autre tipe"
+
+#: ../src/info.c:58
+msgid "Ethernet Interface"
+msgstr "Interfaç Ethernet"
+
+#: ../src/info.c:59
+msgid "Wireless Interface"
+msgstr "Interfaç inalambrica"
+
+#: ../src/info.c:60
+msgid "Modem Interface"
+msgstr ""
+
+#: ../src/info.c:61
+msgid "Parallel Line Interface"
+msgstr ""
+
+#: ../src/info.c:62
+msgid "Infrared Interface"
+msgstr ""
+
+#: ../src/info.c:63
+msgid "Loopback Interface"
+msgstr ""
+
+#: ../src/info.c:64
+msgid "Unknown Interface"
+msgstr "Interfaç desconeguda"
+
+#: ../src/info.c:162
+msgid "Network Devices Not Found"
+msgstr ""
+
+#: ../src/info.c:385
+msgid "Unknown"
+msgstr "Desconegut"
+
+#: ../src/info.c:554
+msgid "Active"
+msgstr "Actiu"
+
+#: ../src/info.c:556
+msgid "Inactive"
+msgstr "Inactiu"
+
+#: ../src/info.c:561
+msgid "Loopback"
+msgstr ""
+
+#: ../src/info.c:580
+msgid "Enabled"
+msgstr "Activat"
+
+#: ../src/info.c:582
+msgid "Disabled"
+msgstr "Desactivat"
+
+#. The info output in a text format (to copy on clipboard)
+#: ../src/info.c:719
+#, c-format
+msgid "Network device:\t%s\n"
+msgstr "Periferic ret :\t%s\n"
+
+#: ../src/info.c:720
+#, c-format
+msgid "Hardware address:\t%s\n"
+msgstr ""
+
+#: ../src/info.c:721
+#, c-format
+msgid "IP address:\t%s\n"
+msgstr "Adreça IP :\t%s\n"
+
+#: ../src/info.c:722
+#, c-format
+msgid "Netmask:\t%s\n"
+msgstr ""
+
+#: ../src/info.c:723
+#, c-format
+msgid "Broadcast:\t%s\n"
+msgstr ""
+
+#: ../src/info.c:724
+#, c-format
+msgid "Multicast:\t%s\n"
+msgstr ""
+
+#: ../src/info.c:725
+#, c-format
+msgid "MTU:\t%s\n"
+msgstr ""
+
+#: ../src/info.c:726
+#, c-format
+msgid "Link speed:\t%s\n"
+msgstr "Velocitat del ligam :\t%s\n"
+
+#: ../src/info.c:727
+#, c-format
+msgid "State:\t%s\n"
+msgstr "Estat : \t%s\n"
+
+#: ../src/info.c:729
+#, c-format
+msgid "Transmitted packets:\t%s\n"
+msgstr "Paquetes transmeses : \t%s\n"
+
+#: ../src/info.c:730
+#, c-format
+msgid "Transmission errors:\t%s\n"
+msgstr ""
+
+#: ../src/info.c:731
+#, c-format
+msgid "Received packets:\t%s\n"
+msgstr "Paquetes recebuts : \t%s\n"
+
+#: ../src/info.c:732
+#, c-format
+msgid "Reception errors:\t%s\n"
+msgstr ""
+
+#: ../src/info.c:733
+#, c-format
+msgid "Collisions:\t%s\n"
+msgstr ""
+
+#: ../src/info.h:27
+msgid "not available"
+msgstr "pas disponible"
+
+#: ../src/lookup.c:80
+#, c-format
+msgid "Looking up %s"
+msgstr ""
+
+#: ../src/lookup.c:278
+msgid "Name"
+msgstr "Nom"
+
+#. Time To Live of a hostname in a name server
+#: ../src/lookup.c:287
+msgid "TTL"
+msgstr ""
+
+#: ../src/lookup.c:296
+msgid "Address Type"
+msgstr "Tipe d'adreça"
+
+#: ../src/lookup.c:306
+msgid "Record Type"
+msgstr ""
+
+#: ../src/lookup.c:315
+msgid "Address"
+msgstr "Adreça"
+
+#. The lookup output in text format:
+#. Source of query (hostname/ip address),
+#. Time To Live (TTL), Address Type,
+#. Record Type (A, PTR, HINFO, NS, TXT, etc.),
+#. Resolution (results of the query)
+#. It's a tabular output, and these belongs to the column titles
+#: ../src/lookup.c:343
+msgid "Source\tTTL\tAddress Type\tRecord Type1\tResolution\n"
+msgstr ""
+
+#: ../src/main.c:81
+msgid "Load information for a network device"
+msgstr ""
+
+#: ../src/main.c:82
+msgid "DEVICE"
+msgstr "PERIFERIC"
+
+#: ../src/main.c:85
+msgid "Send a ping to a network address"
+msgstr ""
+
+#: ../src/main.c:86 ../src/main.c:94 ../src/main.c:98 ../src/main.c:102
+msgid "HOST"
+msgstr "Ã?STE"
+
+#: ../src/main.c:89
+msgid "Get netstat information. Valid options are: route, active, multicast."
+msgstr ""
+
+#: ../src/main.c:90
+msgid "COMMAND"
+msgstr "COMANDA"
+
+#: ../src/main.c:93
+msgid "Trace a route to a network address"
+msgstr ""
+
+#: ../src/main.c:97
+msgid "Port scan a network address"
+msgstr ""
+
+#: ../src/main.c:101
+msgid "Look up a network address"
+msgstr ""
+
+#: ../src/main.c:105
+msgid "Finger command to run"
+msgstr ""
+
+#: ../src/main.c:106
+msgid "USER"
+msgstr "UTILIZAIRE"
+
+#: ../src/main.c:109
+msgid "Perform a whois lookup for a network domain"
+msgstr ""
+
+#: ../src/main.c:110
+msgid "DOMAIN"
+msgstr "DOMENI"
+
+#: ../src/main.c:127
+#, c-format
+msgid ""
+"The file %s doesn't exist, please check if gnome-nettool is correctly "
+"installed"
+msgstr ""
+
+#: ../src/main.c:346
+msgid ""
+"Enter the network address to ping.\n"
+"For example: www.domain.com or 192.168.2.1"
+msgstr ""
+
+#: ../src/main.c:431
+msgid ""
+"Enter the network address to trace a route to.\n"
+"For example: www.domain.com or 192.168.2.1"
+msgstr ""
+
+#: ../src/main.c:516 ../src/netstat.c:443
+msgid "Protocol"
+msgstr "Protocòl"
+
+#: ../src/main.c:523
+msgid "IP Address"
+msgstr "Adreça IP"
+
+#: ../src/main.c:530
+msgid "Netmask / Prefix"
+msgstr ""
+
+#: ../src/main.c:537
+msgid "Broadcast"
+msgstr ""
+
+#: ../src/main.c:544
+msgid "Scope"
+msgstr ""
+
+#: ../src/main.c:685
+msgid ""
+"Enter the network address to scan for open ports.\n"
+"For example: www.domain.com or 192.168.2.1"
+msgstr ""
+
+#: ../src/main.c:813
+msgid ""
+"Enter the network address to lookup.\n"
+"For example: www.domain.com or 192.168.2.1"
+msgstr ""
+
+#: ../src/main.c:902
+msgid "Enter the user to finger."
+msgstr ""
+
+#: ../src/main.c:929
+msgid ""
+"Enter the network address to finger that user.\n"
+"For example: auth.domain.com or 192.168.2.1"
+msgstr ""
+
+#: ../src/main.c:1016
+msgid ""
+"Enter a domain address to lookup its whois information.\n"
+"For example: www.domain.com or 192.168.2.1"
+msgstr ""
+
+#: ../src/netstat.c:122
+msgid "Getting routing table"
+msgstr ""
+
+#: ../src/netstat.c:137
+msgid "Getting active Internet connections"
+msgstr ""
+
+#: ../src/netstat.c:146
+msgid "Getting group memberships"
+msgstr ""
+
+#: ../src/netstat.c:450
+msgid "IP Source"
+msgstr ""
+
+#: ../src/netstat.c:458
+msgid "Port/Service"
+msgstr "Pòrt/servici"
+
+#: ../src/netstat.c:466 ../src/scan.c:312
+msgid "State"
+msgstr "Estat"
+
+#: ../src/netstat.c:609
+msgid "Destination/Prefix"
+msgstr ""
+
+#: ../src/netstat.c:611
+msgid "Destination"
+msgstr "Destinacion"
+
+#: ../src/netstat.c:618
+msgid "Gateway"
+msgstr ""
+
+#: ../src/netstat.c:626
+msgid "Netmask"
+msgstr ""
+
+#: ../src/netstat.c:634 ../src/netstat.c:741
+msgid "Interface"
+msgstr "Interfaç"
+
+#: ../src/netstat.c:748
+msgid "Member"
+msgstr "Sòci"
+
+#: ../src/netstat.c:756
+msgid "Group"
+msgstr "Grop"
+
+#. The netstat "Display active network services" output in
+#. text format.
+#. It's a tabular output, and these belongs to the column titles
+#: ../src/netstat.c:798
+msgid "Protocol\tIP Source\tPort/Service\tState\n"
+msgstr ""
+
+#. The netstat "Display routing" output in text format.
+#. This seems as a route table.
+#. It's a tabular output, and these belongs to the column titles
+#: ../src/netstat.c:804
+msgid "Destination\tGateway\tNetmask\tInterface\n"
+msgstr ""
+
+#. The netstat "Multicast information" output in text format.
+#. It's a tabular output, and these belongs to the column titles
+#: ../src/netstat.c:809
+msgid "Interface\tMember\tGroup\n"
+msgstr ""
+
+#: ../src/nettool.c:199
+msgid "A network address was not specified"
+msgstr ""
+
+#: ../src/nettool.c:200 ../src/nettool.c:209
+msgid "Please enter a valid network address and try again."
+msgstr ""
+
+#: ../src/nettool.c:207
+#, c-format
+msgid "The address '%s' cannot be found"
+msgstr "Impossible de trobar l'adreça '%s'"
+
+#: ../src/nettool.c:236
+msgid "A domain address was not specified"
+msgstr ""
+
+#: ../src/nettool.c:237
+msgid "Please enter a valid domain address and try again."
+msgstr ""
+
+#: ../src/nettool.c:395
+msgid "Information not available"
+msgstr ""
+
+#: ../src/nettool.c:513
+msgid "Stop"
+msgstr "Arrèst"
+
+#: ../src/nettool.c:519
+msgid "Run"
+msgstr "Executar"
+
+#. Created up here so we can get the geometry info.
+#: ../src/ping.c:151
+msgid "Time (ms):"
+msgstr ""
+
+#: ../src/ping.c:171
+msgid "Seq. No.:"
+msgstr ""
+
+#: ../src/ping.c:253
+#, c-format
+msgid "Sending ping requests to %s"
+msgstr ""
+
+#: ../src/ping.c:574
+msgid "Bytes"
+msgstr "Octets"
+
+#: ../src/ping.c:581
+msgid "Source"
+msgstr "Sorga"
+
+#: ../src/ping.c:589
+msgid "Seq"
+msgstr ""
+
+#: ../src/ping.c:599
+msgid "Time"
+msgstr "Ora"
+
+#: ../src/ping.c:607
+msgid "Units"
+msgstr "Unitats"
+
+#. The ping output in text format:
+#. Bytes received, Address Source, Number of Sequence,
+#. Round Trip Time (Time), Units of Time.
+#. It's a tabular output, and these belongs to the column titles
+#: ../src/ping.c:633
+msgid "Bytes\tSource\tSeq\tTime\tUnits\n"
+msgstr ""
+
+#. The ping output in a text format (to copy on clipboard)
+#: ../src/ping.c:648
+#, c-format
+msgid "Time minimum:\t%s ms\n"
+msgstr ""
+
+#: ../src/ping.c:649
+#, c-format
+msgid "Time average:\t%s ms\n"
+msgstr ""
+
+#: ../src/ping.c:650
+#, c-format
+msgid "Time maximum:\t%s ms\n"
+msgstr ""
+
+#: ../src/ping.c:652
+#, c-format
+msgid "Packets transmitted:\t%s\n"
+msgstr ""
+
+#: ../src/ping.c:654
+#, c-format
+msgid "Packets received:\t%s\n"
+msgstr ""
+
+#: ../src/ping.c:657
+#, c-format
+msgid "Successful packets:\t%s\n"
+msgstr ""
+
+#: ../src/scan.c:93
+#, c-format
+msgid "Scanning %s for open ports"
+msgstr ""
+
+#: ../src/scan.c:168
+msgid "unknown"
+msgstr "desconegut"
+
+#: ../src/scan.c:304
+msgid "Port"
+msgstr "Pòrt"
+
+#: ../src/scan.c:320
+msgid "Service"
+msgstr "Servici"
+
+#. The portscan output in text format:
+#. Port, State, Service.
+#. It's a tabular output, and these belongs to the column titles
+#: ../src/scan.c:342
+msgid "Port\tState\tService\n"
+msgstr ""
+
+#: ../src/traceroute.c:62
+#, c-format
+msgid "Tracing route to %s"
+msgstr ""
+
+#: ../src/traceroute.c:271
+msgid "Hop"
+msgstr ""
+
+#: ../src/traceroute.c:279
+msgid "Hostname"
+msgstr "Nom d'òste"
+
+#: ../src/traceroute.c:287
+msgid "IP"
+msgstr "IP"
+
+#: ../src/traceroute.c:298
+msgid "Time 1"
+msgstr ""
+
+#: ../src/traceroute.c:308
+msgid "Time 2"
+msgstr ""
+
+#. The traceroute output in text format:
+#. Hop count, Hostname, IP, Round Trip Time 1 (Time1),
+#. Round Trip Time 2 (Time2),
+#. It's a tabular output, and these belongs to the column titles
+#: ../src/traceroute.c:334
+msgid "Hop\tHostname\tIP\tTime 1\tTime 2\n"
+msgstr ""
+
+#: ../src/utils.c:227
+#, c-format
+msgid ""
+"In order to use this feature of the program, %s must be installed in your "
+"system"
+msgstr ""
+
+#: ../src/gnome-nettool.desktop.in.in.h:1
+msgid "Network Information Tools"
+msgstr ""
+
+#: ../src/gnome-nettool.desktop.in.in.h:2
+msgid "Network Tools"
+msgstr "Espleches ret"
+
+#: ../src/finger.c:62
+#, c-format
+msgid "Getting information of %s on \"%s\""
+msgstr ""
+
+#: ../src/finger.c:66
+#, c-format
+msgid "Getting information of all users on \"%s\""
+msgstr ""
+
+#: ../src/whois.c:58
+#, c-format
+msgid "Getting the whois information of %s"
+msgstr "Obténer las informacions whois de %s"
+
diff -pruN 2.18.0-2/po/POTFILES.skip 2.19.90-0ubuntu1/po/POTFILES.skip
--- 2.18.0-2/po/POTFILES.skip 1970-01-01 01:00:00.000000000 +0100
+++ 2.19.90-0ubuntu1/po/POTFILES.skip 2007-08-14 03:43:56.000000000 +0100
@@ -0,0 +1,3 @@
+# List of source files that should *not* be translated.
+# Please keep this file sorted alphabetically.
+src/gnome-nettool.desktop.in
diff -pruN 2.18.0-2/po/sv.po 2.19.90-0ubuntu1/po/sv.po
--- 2.18.0-2/po/sv.po 2007-02-17 00:54:03.000000000 +0000
+++ 2.19.90-0ubuntu1/po/sv.po 2007-08-14 03:43:55.000000000 +0100
@@ -1,16 +1,14 @@
# Swedish translation of gnome-nettool.
-# Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc.
-# Daniel Nylander <po danielnylander se>, 2006.
+# Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+# Daniel Nylander <po danielnylander se>, 2006, 2007.
# Christian Rose <menthos menthos com>, 2004, 2005.
#
-# $Id: sv.po,v 1.13 2006/12/11 07:06:32 dnylande Exp $
-#
msgid ""
msgstr ""
"Project-Id-Version: gnome-nettool\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-10 18:55+0100\n"
-"PO-Revision-Date: 2006-12-11 00:12+0100\n"
+"POT-Creation-Date: 2007-08-06 20:55+0200\n"
+"PO-Revision-Date: 2007-08-06 20:56+0100\n"
"Last-Translator: Daniel Nylander <po danielnylander se>\n"
"Language-Team: Swedish <tp-sv listor tp-sv se>\n"
"MIME-Version: 1.0\n"
@@ -26,10 +24,23 @@ msgstr ""
"Skicka synpunkter på översättningen till\n"
"tp-sv listor tp-sv se"
-#: ../src/callbacks.c:333
+#. Dear translator: This is the name of the application
+#: ../src/callbacks.c:328
+#: ../src/gnome-nettool.desktop.in.in.h:1
+msgid "Network Tools"
+msgstr "Nätverksverktyg"
+
+#: ../src/callbacks.c:334
msgid "Graphical user interface for common network utilities"
msgstr "Grafiskt användargränssnitt för vanliga nätverksverktyg"
+#. Dear Translator: This is the Window Title. 'Network Tools' is the
+#. * name of the application
+#: ../src/callbacks.c:445
+#, c-format
+msgid "%s - Network Tools"
+msgstr "%s - Nätverksverktyg"
+
#: ../src/gnome-nettool.glade.h:1
msgid "0.0"
msgstr "0.0"
@@ -692,15 +703,15 @@ msgstr "En domänadress angavs inte"
msgid "Please enter a valid domain address and try again."
msgstr "Ange en giltig domänadress och försök igen."
-#: ../src/nettool.c:395
+#: ../src/nettool.c:406
msgid "Information not available"
msgstr "Information inte tillgänglig"
-#: ../src/nettool.c:513
+#: ../src/nettool.c:524
msgid "Stop"
msgstr "Stoppa"
-#: ../src/nettool.c:519
+#: ../src/nettool.c:530
msgid "Run"
msgstr "Kör"
@@ -718,23 +729,23 @@ msgstr "Sekvensnr.:"
msgid "Sending ping requests to %s"
msgstr "Skickar pingbegäranden till %s"
-#: ../src/ping.c:574
+#: ../src/ping.c:568
msgid "Bytes"
msgstr "Byte"
-#: ../src/ping.c:581
+#: ../src/ping.c:575
msgid "Source"
msgstr "Källa"
-#: ../src/ping.c:589
+#: ../src/ping.c:583
msgid "Seq"
msgstr "Sekvens"
-#: ../src/ping.c:599
+#: ../src/ping.c:593
msgid "Time"
msgstr "Tid"
-#: ../src/ping.c:607
+#: ../src/ping.c:601
msgid "Units"
msgstr "Enheter"
@@ -742,37 +753,37 @@ msgstr "Enheter"
#. Bytes received, Address Source, Number of Sequence,
#. Round Trip Time (Time), Units of Time.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/ping.c:633
+#: ../src/ping.c:627
msgid "Bytes\tSource\tSeq\tTime\tUnits\n"
msgstr "Byte\tKälla\tSekvens\tTid\tEnheter\n"
#. The ping output in a text format (to copy on clipboard)
-#: ../src/ping.c:648
+#: ../src/ping.c:642
#, c-format
msgid "Time minimum:\t%s ms\n"
msgstr "Minimal tid:\t%s ms\n"
-#: ../src/ping.c:649
+#: ../src/ping.c:643
#, c-format
msgid "Time average:\t%s ms\n"
msgstr "Medeltid:\t%s ms\n"
-#: ../src/ping.c:650
+#: ../src/ping.c:644
#, c-format
msgid "Time maximum:\t%s ms\n"
msgstr "Maximal tid:\t%s ms\n"
-#: ../src/ping.c:652
+#: ../src/ping.c:646
#, c-format
msgid "Packets transmitted:\t%s\n"
msgstr "�verförda paket:\t%s\n"
-#: ../src/ping.c:654
+#: ../src/ping.c:648
#, c-format
msgid "Packets received:\t%s\n"
msgstr "Mottagna paket:\t%s\n"
-#: ../src/ping.c:657
+#: ../src/ping.c:651
#, c-format
msgid "Successful packets:\t%s\n"
msgstr "Lyckade paket:\t%s\n"
@@ -806,23 +817,23 @@ msgstr "Port\tTillstånd\tTjänst\n"
msgid "Tracing route to %s"
msgstr "Spårar väg till %s"
-#: ../src/traceroute.c:271
+#: ../src/traceroute.c:265
msgid "Hop"
msgstr "Hopp"
-#: ../src/traceroute.c:279
+#: ../src/traceroute.c:273
msgid "Hostname"
msgstr "Värdnamn"
-#: ../src/traceroute.c:287
+#: ../src/traceroute.c:281
msgid "IP"
msgstr "IP"
-#: ../src/traceroute.c:298
+#: ../src/traceroute.c:292
msgid "Time 1"
msgstr "Tid 1"
-#: ../src/traceroute.c:308
+#: ../src/traceroute.c:302
msgid "Time 2"
msgstr "Tid 2"
@@ -830,7 +841,7 @@ msgstr "Tid 2"
#. Hop count, Hostname, IP, Round Trip Time 1 (Time1),
#. Round Trip Time 2 (Time2),
#. It's a tabular output, and these belongs to the column titles
-#: ../src/traceroute.c:334
+#: ../src/traceroute.c:328
msgid "Hop\tHostname\tIP\tTime 1\tTime 2\n"
msgstr "Hopp\tVärdnamn\tIP\tTid 1\tTid 2\n"
@@ -839,13 +850,9 @@ msgstr "Hopp\tVärdnamn\tIP\tTid 1\tTid
msgid "In order to use this feature of the program, %s must be installed in your system"
msgstr "För att kunna använda denna programfunktion måste %s vara installerat på ditt system"
-#: ../src/gnome-nettool.desktop.in.in.h:1
-msgid "Network Information Tools"
-msgstr "Nätverksinformationsverktyg"
-
#: ../src/gnome-nettool.desktop.in.in.h:2
-msgid "Network Tools"
-msgstr "Nätverksverktyg"
+msgid "View information about your network"
+msgstr "Visa information om ditt nätverk"
#: ../src/finger.c:62
#, c-format
@@ -862,6 +869,8 @@ msgstr "Hämtar information om alla anvÃ
msgid "Getting the whois information of %s"
msgstr "Hämtar \"whois\"-informationen om %s"
+#~ msgid "Network Information Tools"
+#~ msgstr "Nätverksinformationsverktyg"
#~ msgid "Packets loss:"
#~ msgstr "Paketförluster:"
#~ msgid "Packet loss:\t%s\n"
diff -pruN 2.18.0-2/po/ta.po 2.19.90-0ubuntu1/po/ta.po
--- 2.18.0-2/po/ta.po 2007-02-17 00:54:03.000000000 +0000
+++ 2.19.90-0ubuntu1/po/ta.po 2007-08-14 03:43:55.000000000 +0100
@@ -1,23 +1,24 @@
-# translation of gnome-nettool.HEAD.ta.po to Tamil
-# translation of ta.po to Tamil
+# translation of gnome-nettool.HEAD.po to TAMIL
# This file is distributed under the same license as the PACKAGE package.
# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER.
+#
# Jayaradha N <jaya pune redhat com>, 2004.
# Felix <ifelix redhat com>, 2006.
-#
+# Dr.T.Vasudevan <agnihot3 gmail com>, 2007.
msgid ""
msgstr ""
-"Project-Id-Version: gnome-nettool.HEAD.ta\n"
+"Project-Id-Version: gnome-nettool.HEAD\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-09-01 06:15+0200\n"
-"PO-Revision-Date: 2006-09-01 14:59+0530\n"
-"Last-Translator: Felix <ifelix redhat com>\n"
-"Language-Team: Tamil <ta li org>\n"
+"POT-Creation-Date: 2007-01-02 04:19+0000\n"
+"PO-Revision-Date: 2007-06-15 14:58+0530\n"
+"Last-Translator: Dr.T.Vasudevan <agnihot3 gmail com>\n"
+"Language-Team: TAMIL <ubuntu-l10n-tam lists ubuntu com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
-"X-Generator: KBabel 1.9.1\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n\n"
+"X-Generator: KBabel 1.11.4\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"\n"
"\n"
#: ../src/callbacks.c:318
@@ -77,82 +78,82 @@ msgid "Collisions:"
msgstr "ம�தல�:"
#: ../src/gnome-nettool.glade.h:13
+msgid "Details"
+msgstr "விவர���ள�"
+
+#: ../src/gnome-nettool.glade.h:14
msgid "Devices"
msgstr "�ாதன���ள�"
#. Dear Translator: This is the Window Title
-#: ../src/gnome-nettool.glade.h:15
+#: ../src/gnome-nettool.glade.h:16
msgid "Devices - Network Tools"
msgstr "�ாதன���ள� - பிண�ய �ர�வி�ள�"
-#: ../src/gnome-nettool.glade.h:16
+#: ../src/gnome-nettool.glade.h:17
msgid "Display:"
msgstr "�ா���ி:"
-#: ../src/gnome-nettool.glade.h:17 ../src/main.c:864
+#: ../src/gnome-nettool.glade.h:18 ../src/main.c:868
msgid "Finger"
msgstr "விரல�"
-#: ../src/gnome-nettool.glade.h:18
+#: ../src/gnome-nettool.glade.h:19
msgid "Hardware address:"
msgstr "வன�ப�ர�ள� ம��வரி"
-#: ../src/gnome-nettool.glade.h:19
+#: ../src/gnome-nettool.glade.h:20
msgid "Host"
msgstr "ப�ரவலம�"
-#: ../src/gnome-nettool.glade.h:20
+#: ../src/gnome-nettool.glade.h:21
msgid "IP Address:"
msgstr "IP ம��வரி:"
-#: ../src/gnome-nettool.glade.h:21
+#: ../src/gnome-nettool.glade.h:22
msgid "Link speed:"
msgstr "�ண�ப�ப� வ��ம�:"
-#: ../src/gnome-nettool.glade.h:22 ../src/main.c:778
+#: ../src/gnome-nettool.glade.h:23 ../src/main.c:782
msgid "Lookup"
msgstr "பார�வ�"
-#: ../src/gnome-nettool.glade.h:23
+#: ../src/gnome-nettool.glade.h:24
msgid "MTU:"
msgstr "MTU:"
-#: ../src/gnome-nettool.glade.h:24
+#: ../src/gnome-nettool.glade.h:25
msgid "Maximum:"
msgstr "�தி� ப���:"
-#: ../src/gnome-nettool.glade.h:25
+#: ../src/gnome-nettool.glade.h:26
msgid "Minimum:"
msgstr "��ற�ந�தப���"
-#: ../src/gnome-nettool.glade.h:26
+#: ../src/gnome-nettool.glade.h:27
msgid "Multicast Information"
msgstr "த�ல� �லிபரப�ப�த�த�வல�"
-#: ../src/gnome-nettool.glade.h:27
+#: ../src/gnome-nettool.glade.h:28
msgid "Multicast:"
msgstr "த�ல� �லிபரப�ப�"
-#: ../src/gnome-nettool.glade.h:28
+#: ../src/gnome-nettool.glade.h:29
msgid "Netmask:"
msgstr "ந���மாஸ���:"
-#: ../src/gnome-nettool.glade.h:29 ../src/main.c:476
+#: ../src/gnome-nettool.glade.h:30 ../src/main.c:480
msgid "Netstat"
msgstr "வல�ப�ள�ளிவிவரம�"
-#: ../src/gnome-nettool.glade.h:30
+#: ../src/gnome-nettool.glade.h:31
msgid "Not Available"
msgstr "�ி�����வில�ல�"
-#: ../src/gnome-nettool.glade.h:31
+#: ../src/gnome-nettool.glade.h:32
msgid "Only"
msgstr "ம����ம�"
-#: ../src/gnome-nettool.glade.h:32
-msgid "Packets loss:"
-msgstr "�ழ���ப�ப��� ������ள�:"
-
#: ../src/gnome-nettool.glade.h:33
msgid "Packets received:"
msgstr "ப�றப�ப��� ������ள�:"
@@ -161,7 +162,7 @@ msgstr "பà¯?றபà¯?பà®?à¯?à®? à®?à
msgid "Packets transmitted:"
msgstr "�ன�ப�பப�ப��� ������ள�:"
-#: ../src/gnome-nettool.glade.h:35 ../src/main.c:312
+#: ../src/gnome-nettool.glade.h:35 ../src/main.c:313
msgid "Ping"
msgstr "�ழ�"
@@ -185,7 +186,7 @@ msgstr "பà¯?à®±à¯?தலà¯? பிழà
msgid "Routing Table Information"
msgstr "வழி�ா���ி ����வண� த�வல�"
-#: ../src/gnome-nettool.glade.h:41 ../src/main.c:659
+#: ../src/gnome-nettool.glade.h:41 ../src/main.c:663
msgid "Scan"
msgstr "த���"
@@ -197,79 +198,83 @@ msgstr "�ன�ப�ப�:"
msgid "State:"
msgstr "நில�:"
-#: ../src/gnome-nettool.glade.h:44 ../src/main.c:400
+#: ../src/gnome-nettool.glade.h:44
+msgid "Successful packets:"
+msgstr "வ�ற�றி�ரமான ������ள�:"
+
+#: ../src/gnome-nettool.glade.h:45 ../src/main.c:404
msgid "Trace"
msgstr "த�த�த� த���"
-#: ../src/gnome-nettool.glade.h:45
+#: ../src/gnome-nettool.glade.h:46
msgid "Traceroute"
msgstr "த�ம�"
-#: ../src/gnome-nettool.glade.h:46
+#: ../src/gnome-nettool.glade.h:47
msgid "Transmission errors:"
msgstr "�ன�ப�பல� பிழ�"
-#: ../src/gnome-nettool.glade.h:47
+#: ../src/gnome-nettool.glade.h:48
msgid "Transmitted bytes:"
msgstr "�ன�ப�பப�ப��� ப����ள�"
-#: ../src/gnome-nettool.glade.h:48
+#: ../src/gnome-nettool.glade.h:49
msgid "Transmitted packets:"
msgstr "�ன�ப�பப�ப��� ������ள�"
-#: ../src/gnome-nettool.glade.h:49
+#: ../src/gnome-nettool.glade.h:50
msgid "Unlimited requests"
msgstr "�ண���ில�லா ��ரி�����ள�"
-#: ../src/gnome-nettool.glade.h:50
+#: ../src/gnome-nettool.glade.h:51
msgid "User"
msgstr "பயன����ாளர�"
-#: ../src/gnome-nettool.glade.h:51 ../src/main.c:980
+#: ../src/gnome-nettool.glade.h:52 ../src/main.c:984
msgid "Whois"
msgstr "யாரத�"
-#: ../src/gnome-nettool.glade.h:52
+#: ../src/gnome-nettool.glade.h:53
msgid "_Configure"
msgstr "(_C)�ம�ப�ப�"
-#: ../src/gnome-nettool.glade.h:53
+#: ../src/gnome-nettool.glade.h:54
msgid "_Domain address:"
msgstr "(_D)��ம�ன� ம��வரி:"
-#: ../src/gnome-nettool.glade.h:54
+#: ../src/gnome-nettool.glade.h:55
msgid "_Edit"
msgstr "த������வ�ம� (_E)"
-#: ../src/gnome-nettool.glade.h:55
+#: ../src/gnome-nettool.glade.h:56
msgid "_Help"
msgstr "�தவி (_H)"
-#: ../src/gnome-nettool.glade.h:56
+#: ../src/gnome-nettool.glade.h:57
msgid "_Information type:"
msgstr "(_I)த�வல� வ��:"
-#: ../src/gnome-nettool.glade.h:57
+#: ../src/gnome-nettool.glade.h:58
msgid "_Network address:"
msgstr "(_N)வல�ப�பின�னல� ம��வரி:"
-#: ../src/gnome-nettool.glade.h:58
+#: ../src/gnome-nettool.glade.h:59
msgid "_Network device:"
msgstr "(_N)வல�ப�பின�னல� �ாதனம�:"
-#: ../src/gnome-nettool.glade.h:59
+#: ../src/gnome-nettool.glade.h:60
msgid "_Tool"
msgstr "(_T)�ர�வி"
-#: ../src/gnome-nettool.glade.h:60
+#: ../src/gnome-nettool.glade.h:61
msgid "_Username:"
msgstr "(_U)பயன����ாளர� ப�யர�:"
-#: ../src/gnome-nettool.glade.h:61
+#: ../src/gnome-nettool.glade.h:62
msgid "ms"
msgstr "ms"
-#: ../src/gnome-nettool.glade.h:62
+#: ../src/gnome-nettool.glade.h:63
msgid "requests"
msgstr "�ழ�ப�ப��ள�"
@@ -314,93 +319,93 @@ msgstr "பிணà¯?ய à®?ாதனதà
msgid "Unknown"
msgstr "த�ரியாத"
-#: ../src/info.c:550
+#: ../src/info.c:554
msgid "Active"
msgstr "��யலில� �ள�ள"
-#: ../src/info.c:552
+#: ../src/info.c:556
msgid "Inactive"
msgstr "��யலில� �ல�லாத"
-#: ../src/info.c:557
+#: ../src/info.c:561
msgid "Loopback"
msgstr "ல�ப�ப���"
-#: ../src/info.c:574
+#: ../src/info.c:580
msgid "Enabled"
msgstr "��யல�ப��த�தப�ப���"
-#: ../src/info.c:576
+#: ../src/info.c:582
msgid "Disabled"
msgstr "��யலில� �ல�லாத"
#. The info output in a text format (to copy on clipboard)
-#: ../src/info.c:713
+#: ../src/info.c:719
#, c-format
msgid "Network device:\t%s\n"
msgstr "வல�ப�பின�னல� �ாதனம�:\t%s\n"
-#: ../src/info.c:714
+#: ../src/info.c:720
#, c-format
msgid "Hardware address:\t%s\n"
msgstr "வன�ப�ர�ள� ம��வரி:\t%s\n"
-#: ../src/info.c:715
+#: ../src/info.c:721
#, c-format
msgid "IP address:\t%s\n"
msgstr "IP ம��வரி:\t%s\n"
-#: ../src/info.c:716
+#: ../src/info.c:722
#, c-format
msgid "Netmask:\t%s\n"
msgstr "ந���மாஸ���:\t%s\n"
-#: ../src/info.c:717
+#: ../src/info.c:723
#, c-format
msgid "Broadcast:\t%s\n"
msgstr "�லிபரப�ப�:\t%s\n"
-#: ../src/info.c:718
+#: ../src/info.c:724
#, c-format
msgid "Multicast:\t%s\n"
msgstr "த�ல� �லிபரப�ப�:\t%s\n"
-#: ../src/info.c:719
+#: ../src/info.c:725
#, c-format
msgid "MTU:\t%s\n"
msgstr "MTU:\t%s\n"
-#: ../src/info.c:720
+#: ../src/info.c:726
#, c-format
msgid "Link speed:\t%s\n"
msgstr "�ண�ப�ப� வ��ம�:\t%s\n"
-#: ../src/info.c:721
+#: ../src/info.c:727
#, c-format
msgid "State:\t%s\n"
msgstr "நில�:\t%s\n"
-#: ../src/info.c:723
+#: ../src/info.c:729
#, c-format
msgid "Transmitted packets:\t%s\n"
msgstr "�ன�ப�பப�ப��� ������ள�:\t%s\n"
-#: ../src/info.c:724
+#: ../src/info.c:730
#, c-format
msgid "Transmission errors:\t%s\n"
msgstr "�ன�ப�பல� பிழ�:\t%s\n"
-#: ../src/info.c:725
+#: ../src/info.c:731
#, c-format
msgid "Received packets:\t%s\n"
msgstr "ப�றப�ப��� ������ள�:\t%s\n"
-#: ../src/info.c:726
+#: ../src/info.c:732
#, c-format
msgid "Reception errors:\t%s\n"
msgstr "ப�ற�ற�����ள�ள�ம� ப�த� பிழ�:\t%s\n"
-#: ../src/info.c:727
+#: ../src/info.c:733
#, c-format
msgid "Collisions:\t%s\n"
msgstr "ம�தல�:\t%s\n"
@@ -506,7 +511,7 @@ msgid ""
"installed"
msgstr "��ப�ப� %s� �ாணவில�ல�, gnome-netinfo �ரியா� நிற�வப�ப���தா �ன�பத� �ரிபார����வ�ம�"
-#: ../src/main.c:345
+#: ../src/main.c:346
msgid ""
"Enter the network address to ping.\n"
"For example: www.domain.com or 192.168.2.1"
@@ -514,7 +519,7 @@ msgstr ""
"பி�� ��ய�ய வல�ப�பின�னல� ம��வரிய� �ள�ளி�வ�ம�\n"
"�தாரணம�: www.domain.com or 192.168.2.1"
-#: ../src/main.c:427
+#: ../src/main.c:431
msgid ""
"Enter the network address to trace a route to.\n"
"For example: www.domain.com or 192.168.2.1"
@@ -522,27 +527,27 @@ msgstr ""
"வழி�ாண வல�ப�பின�னல� ம��வரிய� �ள�ளி�வ�ம�\n"
"�தாரணம�: www.domain.com or 192.168.2.1"
-#: ../src/main.c:512 ../src/netstat.c:443
+#: ../src/main.c:516 ../src/netstat.c:443
msgid "Protocol"
msgstr "விதிம�ற��ள�"
-#: ../src/main.c:519
+#: ../src/main.c:523
msgid "IP Address"
msgstr "IP ம��வரி"
-#: ../src/main.c:526
+#: ../src/main.c:530
msgid "Netmask / Prefix"
msgstr "ந���மாஸ��� / ம�ன�ன�����"
-#: ../src/main.c:533
+#: ../src/main.c:537
msgid "Broadcast"
msgstr "�லிபரப�ப�"
-#: ../src/main.c:540
+#: ../src/main.c:544
msgid "Scope"
msgstr "ந����ம�"
-#: ../src/main.c:681
+#: ../src/main.c:685
msgid ""
"Enter the network address to scan for open ports.\n"
"For example: www.domain.com or 192.168.2.1"
@@ -550,7 +555,7 @@ msgstr ""
"வழிய� திறந�த� த�� வல�ப�பின�னல� ம��வரிய� �ள�ளி�வ�ம�\n"
"�தாரணம�: www.domain.com or 192.168.2.1"
-#: ../src/main.c:809
+#: ../src/main.c:813
msgid ""
"Enter the network address to lookup.\n"
"For example: www.domain.com or 192.168.2.1"
@@ -558,11 +563,11 @@ msgstr ""
"மற�பார�வ����� வல�ப�பின�னல� ம��வரிய� �ள�ளி�வ�ம�\n"
"�தாரணம�: www.domain.com or 192.168.2.1"
-#: ../src/main.c:898
+#: ../src/main.c:902
msgid "Enter the user to finger."
msgstr "�ண���பி�ி��� வ�ண��ிய பயன����ாளர� �ள�ளி�வ�ம�"
-#: ../src/main.c:925
+#: ../src/main.c:929
msgid ""
"Enter the network address to finger that user.\n"
"For example: auth.domain.com or 192.168.2.1"
@@ -570,7 +575,7 @@ msgstr ""
"பயனர� �ாண பிண�ய ம��வரிய� �ள�ளி�வ�ம�.\n"
"���த�த����ா���ா�: auth.domain.com or 192.168.2.1"
-#: ../src/main.c:1012
+#: ../src/main.c:1016
msgid ""
"Enter a domain address to lookup its whois information.\n"
"For example: www.domain.com or 192.168.2.1"
@@ -602,51 +607,51 @@ msgstr "பாத�/��வ�"
msgid "State"
msgstr "நில�"
-#: ../src/netstat.c:608
+#: ../src/netstat.c:609
msgid "Destination/Prefix"
msgstr "�ல����/ம�ன� �����"
-#: ../src/netstat.c:610
+#: ../src/netstat.c:611
msgid "Destination"
msgstr "�ல����"
-#: ../src/netstat.c:617
+#: ../src/netstat.c:618
msgid "Gateway"
msgstr "ந�ழ�வாயில�"
-#: ../src/netstat.c:625
+#: ../src/netstat.c:626
msgid "Netmask"
msgstr "ந���மாஸ���"
-#: ../src/netstat.c:633 ../src/netstat.c:740
+#: ../src/netstat.c:634 ../src/netstat.c:741
msgid "Interface"
msgstr "���ம��ம�"
-#: ../src/netstat.c:747
+#: ../src/netstat.c:748
msgid "Member"
msgstr "�ற�ப�பினர�"
-#: ../src/netstat.c:755
+#: ../src/netstat.c:756
msgid "Group"
msgstr "��ழ�"
#. The netstat "Display active network services" output in
#. text format.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/netstat.c:797
+#: ../src/netstat.c:798
msgid "Protocol\tIP Source\tPort/Service\tState\n"
msgstr "விதிம�ற�\tIP ம�லம�\tவழி/��வ�\tநில�\n"
#. The netstat "Display routing" output in text format.
#. This seems as a route table.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/netstat.c:803
+#: ../src/netstat.c:804
msgid "Destination\tGateway\tNetmask\tInterface\n"
msgstr "�ல����\tந�ழ�வாயில�\tந���மாஸ���\t���ம��ம�\n"
#. The netstat "Multicast information" output in text format.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/netstat.c:808
+#: ../src/netstat.c:809
msgid "Interface\tMember\tGroup\n"
msgstr "���ம��ம�\t�ற�ப�பினர�\t��ழ�\n"
@@ -683,28 +688,37 @@ msgstr "நிற�த�த�"
msgid "Run"
msgstr "�ய����"
-#: ../src/ping.c:77
+#. Created up here so we can get the geometry info.
+#: ../src/ping.c:151
+msgid "Time (ms):"
+msgstr "ந�ரம� (மில�லி.���ண���):"
+
+#: ../src/ping.c:171
+msgid "Seq. No.:"
+msgstr "வரி�� �ண�:"
+
+#: ../src/ping.c:253
#, c-format
msgid "Sending ping requests to %s"
msgstr "பி�� ��ரி����ய� %s ���� �ன�ப�ப��ிறத�"
-#: ../src/ping.c:395
+#: ../src/ping.c:574
msgid "Bytes"
msgstr "ப����ள�"
-#: ../src/ping.c:402
+#: ../src/ping.c:581
msgid "Source"
msgstr "ம�லம�"
-#: ../src/ping.c:410
+#: ../src/ping.c:589
msgid "Seq"
msgstr "Seq"
-#: ../src/ping.c:420
+#: ../src/ping.c:599
msgid "Time"
msgstr "ந�ரம�"
-#: ../src/ping.c:428
+#: ../src/ping.c:607
msgid "Units"
msgstr "�ல���ள�"
@@ -712,40 +726,40 @@ msgstr "�ல���ள�"
#. Bytes received, Address Source, Number of Sequence,
#. Round Trip Time (Time), Units of Time.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/ping.c:454
+#: ../src/ping.c:633
msgid "Bytes\tSource\tSeq\tTime\tUnits\n"
msgstr "ப����ள�\tம�லம�\tவரி��\tந�ரம�\t�ல��\n"
#. The ping output in a text format (to copy on clipboard)
-#: ../src/ping.c:469
+#: ../src/ping.c:648
#, c-format
msgid "Time minimum:\t%s ms\n"
msgstr "��ற�ந�தப��� ந�ரம�:\t%s ms\n"
-#: ../src/ping.c:470
+#: ../src/ping.c:649
#, c-format
msgid "Time average:\t%s ms\n"
msgstr "�ரா�ரி ந�ரம�:\t%s ms\n"
-#: ../src/ping.c:471
+#: ../src/ping.c:650
#, c-format
msgid "Time maximum:\t%s ms\n"
msgstr "�தி�ப��� ந�ரம�:\t%s ms\n"
-#: ../src/ping.c:473
+#: ../src/ping.c:652
#, c-format
msgid "Packets transmitted:\t%s\n"
msgstr "�ன�ப�பப��� ������ள�:\t%s\n"
-#: ../src/ping.c:475
+#: ../src/ping.c:654
#, c-format
msgid "Packets received:\t%s\n"
msgstr "ப�றப�ப��� ������ள�:\t%s\n"
-#: ../src/ping.c:477
+#: ../src/ping.c:657
#, c-format
-msgid "Packet loss:\t%s\n"
-msgstr "�ழ���ப�ப��� ������ள�:\t%s\n"
+msgid "Successful packets:\t%s\n"
+msgstr "வ�ற�றி�ரமான ������ள�:\t%s\n"
#: ../src/scan.c:93
#, c-format
diff -pruN 2.18.0-2/po/te.po 2.19.90-0ubuntu1/po/te.po
--- 2.18.0-2/po/te.po 1970-01-01 01:00:00.000000000 +0100
+++ 2.19.90-0ubuntu1/po/te.po 2007-08-14 03:43:56.000000000 +0100
@@ -0,0 +1,849 @@
+# Telugu translation of gnome-nettool.
+# Copyright (C) Swecha Telugu Localisation Team <localisation swecha org>
+# This file is distributed under the same license as the gnome-nettool package.
+# Pramod <pramod swecha net>, 2007.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: gnome-nettool\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2007-08-09 21:41+0530\n"
+"PO-Revision-Date: 2007-08-09 21:59+0530\n"
+"Last-Translator: Pramod <pramod swecha net>\n"
+"Language-Team: Swecha Telugu Localisation Team <localisation swecha org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../src/callbacks.c:318
+msgid "translator-credits"
+msgstr "Pramod <pramod swecha net>"
+
+#. Dear translator: This is the name of the application
+#: ../src/callbacks.c:328 ../src/gnome-nettool.desktop.in.in.h:1
+msgid "Network Tools"
+msgstr "�ల�లి� పనిమ���ల�"
+
+#: ../src/callbacks.c:334
+msgid "Graphical user interface for common network utilities"
+msgstr "సాధారణమà±?à°¨ à°?à°²à±?లిà°? à°¸à±?à°²à°à±?యాల à°?à±?à°°à°?à±? à°?à°¿à°¤à±?à°°à°°à±?à°ª వినియà±?à°?దారà±? à°¸à°?విధానà°?"
+
+#. Dear Translator: This is the Window Title. 'Network Tools' is the
+#. * name of the application
+#: ../src/callbacks.c:445
+#, c-format
+msgid "%s - Network Tools"
+msgstr "%s - �ల�లి� పనిమ���ల�"
+
+#: ../src/gnome-nettool.glade.h:1
+msgid "0.0"
+msgstr "0.0"
+
+#: ../src/gnome-nettool.glade.h:2
+msgid "<b>IP Information</b>"
+msgstr "<b>IP సమా�ారమ�</b>"
+
+#: ../src/gnome-nettool.glade.h:3
+msgid "<b>Interface Information</b>"
+msgstr "<b>స�విధాన సమా�ారమ�</b>"
+
+#: ../src/gnome-nettool.glade.h:4
+msgid "<b>Interface Statistics</b>"
+msgstr "<b>స�విధాన �ణా��ాల�</b>"
+
+#: ../src/gnome-nettool.glade.h:5
+msgid "<b>Round Trip Time Statistics</b>"
+msgstr "<b>���డ�రని యాత�ర సమయ �ణా��ాల�</b>"
+
+#: ../src/gnome-nettool.glade.h:6
+msgid "<b>Transmission Statistics</b>"
+msgstr "<b>ప�రసరణ �ణా��ాల�</b>"
+
+#: ../src/gnome-nettool.glade.h:7
+msgid "Active Network Services"
+msgstr "�ల�లి� స�వన� ��రియాశ�ల���య�"
+
+#: ../src/gnome-nettool.glade.h:8
+msgid "Average:"
+msgstr "స���:"
+
+#: ../src/gnome-nettool.glade.h:9
+msgid "Beep on ping"
+msgstr "పి��� ప� బ�ప� శబ�ధ�"
+
+#: ../src/gnome-nettool.glade.h:10
+msgid "Broadcast:"
+msgstr "ప�రసారమ�:"
+
+#: ../src/gnome-nettool.glade.h:11
+msgid "Clear _History"
+msgstr "_à°?à°°à°¿à°¤à±?à°° à°¶à±?à°à±?à°°à°?à°?à±?à°¯à±?"
+
+#: ../src/gnome-nettool.glade.h:12
+msgid "Collisions:"
+msgstr "ఢ���న��:"
+
+#: ../src/gnome-nettool.glade.h:13
+msgid "Details"
+msgstr "వివరమ�ల�"
+
+#: ../src/gnome-nettool.glade.h:14
+msgid "Devices"
+msgstr "పరి�రాల�"
+
+#. Dear Translator: This is the Window Title
+#: ../src/gnome-nettool.glade.h:16
+msgid "Devices - Network Tools"
+msgstr "పరి�రాల� - �ల�లి� పనిమ���ల�"
+
+#: ../src/gnome-nettool.glade.h:17
+msgid "Display:"
+msgstr "ప�రదర�శి���:"
+
+#: ../src/gnome-nettool.glade.h:18 ../src/main.c:868
+msgid "Finger"
+msgstr "వ�ల�"
+
+#: ../src/gnome-nettool.glade.h:19
+msgid "Hardware address:"
+msgstr "����ిసర��� సమా�ారమ�:"
+
+#: ../src/gnome-nettool.glade.h:20
+msgid "Host"
+msgstr "�తిథ�య�"
+
+#: ../src/gnome-nettool.glade.h:21
+msgid "IP Address:"
+msgstr "IP �ిర�నామా:"
+
+#: ../src/gnome-nettool.glade.h:22
+msgid "Link speed:"
+msgstr "��డి వ��మ�:"
+
+#: ../src/gnome-nettool.glade.h:23 ../src/main.c:782
+msgid "Lookup"
+msgstr "వ�త������"
+
+#: ../src/gnome-nettool.glade.h:24
+msgid "MTU:"
+msgstr "���ియ�:"
+
+#: ../src/gnome-nettool.glade.h:25
+msgid "Maximum:"
+msgstr "�త�యధి�:"
+
+#: ../src/gnome-nettool.glade.h:26
+msgid "Minimum:"
+msgstr "�త�యల�ప:"
+
+#: ../src/gnome-nettool.glade.h:27
+msgid "Multicast Information"
+msgstr "�����య� సమా�ారమ�"
+
+#: ../src/gnome-nettool.glade.h:28
+msgid "Multicast:"
+msgstr "�����య�:"
+
+#: ../src/gnome-nettool.glade.h:29
+msgid "Netmask:"
+msgstr "న��� మాస���:"
+
+#: ../src/gnome-nettool.glade.h:30 ../src/main.c:480
+msgid "Netstat"
+msgstr "న��� స��ా��"
+
+#: ../src/gnome-nettool.glade.h:31
+msgid "Not Available"
+msgstr "à°²à°à°¿à°?à°?à°²à±?à°¦à±?"
+
+#: ../src/gnome-nettool.glade.h:32
+msgid "Only"
+msgstr "మాత�రమ�"
+
+#: ../src/gnome-nettool.glade.h:33
+msgid "Packets received:"
+msgstr "ప���లాల� త�స���నబడినవి:"
+
+#: ../src/gnome-nettool.glade.h:34
+msgid "Packets transmitted:"
+msgstr "ప���లాల� ప�రసరి�పబడినవి:"
+
+#: ../src/gnome-nettool.glade.h:35 ../src/main.c:313
+msgid "Ping"
+msgstr "పి���"
+
+#: ../src/gnome-nettool.glade.h:36
+msgid "Port Scan"
+msgstr "ర�వ� స�శ�ధన"
+
+#: ../src/gnome-nettool.glade.h:37
+msgid "Received bytes:"
+msgstr "త�స���నబడిన బ���స�:"
+
+#: ../src/gnome-nettool.glade.h:38
+msgid "Received packets:"
+msgstr "త�స���నబడిన ప���లాల�:"
+
+#: ../src/gnome-nettool.glade.h:39
+msgid "Reception errors:"
+msgstr "స�వ��రి��ిన ద�షాల�:"
+
+#: ../src/gnome-nettool.glade.h:40
+msgid "Routing Table Information"
+msgstr "త�ర�వ��ప� ప���ి� సమా�ారమ�"
+
+#: ../src/gnome-nettool.glade.h:41 ../src/main.c:663
+msgid "Scan"
+msgstr "స�శ�ధన"
+
+#: ../src/gnome-nettool.glade.h:42
+msgid "Send:"
+msgstr "ప�ప�:"
+
+#: ../src/gnome-nettool.glade.h:43
+msgid "State:"
+msgstr "స�థితి:"
+
+#: ../src/gnome-nettool.glade.h:44
+msgid "Successful packets:"
+msgstr "వి�యవ�తమ�న ప���లాల�:"
+
+#: ../src/gnome-nettool.glade.h:45 ../src/main.c:404
+msgid "Trace"
+msgstr "�ాడ"
+
+#: ../src/gnome-nettool.glade.h:46
+msgid "Traceroute"
+msgstr "�ాడ త�ర�వ వ�త���"
+
+#: ../src/gnome-nettool.glade.h:47
+msgid "Transmission errors:"
+msgstr "ప�రసరణ ద�షమ�:"
+
+#: ../src/gnome-nettool.glade.h:48
+msgid "Transmitted bytes:"
+msgstr "ప�రసరి��బడిన బ���స�:"
+
+#: ../src/gnome-nettool.glade.h:49
+msgid "Transmitted packets:"
+msgstr "ప�రసరి��బడిన ప���లాల�:"
+
+#: ../src/gnome-nettool.glade.h:50
+msgid "Unlimited requests"
+msgstr "హద�ద�ల�ల�ని మనవిల�"
+
+#: ../src/gnome-nettool.glade.h:51
+msgid "User"
+msgstr "వినియ��దార�"
+
+#: ../src/gnome-nettool.glade.h:52 ../src/main.c:984
+msgid "Whois"
+msgstr "హ�యిస�"
+
+#: ../src/gnome-nettool.glade.h:53
+msgid "_Configure"
+msgstr "_ర�ప�రణ"
+
+#: ../src/gnome-nettool.glade.h:54
+msgid "_Domain address:"
+msgstr "_�ధి�ార��ష�త�ర �ిర�నామా:"
+
+#: ../src/gnome-nettool.glade.h:55
+msgid "_Edit"
+msgstr "_సరి��య�"
+
+#: ../src/gnome-nettool.glade.h:56
+msgid "_Help"
+msgstr "_సహాయమ�"
+
+#: ../src/gnome-nettool.glade.h:57
+msgid "_Information type:"
+msgstr "_సమా�ార ర�మ�:"
+
+#: ../src/gnome-nettool.glade.h:58
+msgid "_Network address:"
+msgstr "_�ల�లి� �ిర�నామా:"
+
+#: ../src/gnome-nettool.glade.h:59
+msgid "_Network device:"
+msgstr "_�ల�లి� పరి�ర�:"
+
+#: ../src/gnome-nettool.glade.h:60
+msgid "_Tool"
+msgstr "_పనిమ���ల�"
+
+#: ../src/gnome-nettool.glade.h:61
+msgid "_Username:"
+msgstr "_వినియ��దార� నామమ�:"
+
+#: ../src/gnome-nettool.glade.h:62
+msgid "ms"
+msgstr "ms"
+
+#: ../src/gnome-nettool.glade.h:63
+msgid "requests"
+msgstr "మనవిల�"
+
+#. Interface Name Interface Type icon Device prefix Pixbuf
+#: ../src/info.c:57
+msgid "Other type"
+msgstr "వ�ర�� ర�మ�"
+
+#: ../src/info.c:58
+msgid "Ethernet Interface"
+msgstr "�థర� న��� స�విధాన�"
+
+#: ../src/info.c:59
+msgid "Wireless Interface"
+msgstr "త��ల�ని స�విధాన�"
+
+#: ../src/info.c:60
+msgid "Modem Interface"
+msgstr "మ�డ�మ� స�విధాన�"
+
+#: ../src/info.c:61
+msgid "Parallel Line Interface"
+msgstr "సమా�తర ర��ా స�విధాన�"
+
+#: ../src/info.c:62
+msgid "Infrared Interface"
+msgstr "�ద�శ�య�ర స�విధాన�"
+
+#: ../src/info.c:63
+msgid "Loopback Interface"
+msgstr "ల�ప� వ�న�� స�విధాన�"
+
+#: ../src/info.c:64
+msgid "Unknown Interface"
+msgstr "త�లియని స�విధాన�"
+
+#: ../src/info.c:162
+msgid "Network Devices Not Found"
+msgstr "�ల�లి� పరి�రాల� ద�ర�ల�ద�"
+
+#: ../src/info.c:385
+msgid "Unknown"
+msgstr "త�లియనిది"
+
+#: ../src/info.c:554
+msgid "Active"
+msgstr "��రియాశ�ల���య�"
+
+#: ../src/info.c:556
+msgid "Inactive"
+msgstr "��రియాహ�న���య�"
+
+#: ../src/info.c:561
+msgid "Loopback"
+msgstr "ల�ప� వ�న���ి"
+
+#: ../src/info.c:580
+msgid "Enabled"
+msgstr "�పయ��ి���"
+
+#: ../src/info.c:582
+msgid "Disabled"
+msgstr "నిర�పయ��ి���"
+
+#. The info output in a text format (to copy on clipboard)
+#: ../src/info.c:719
+#, c-format
+msgid "Network device:\t%s\n"
+msgstr "�ల�లి� పరి�ర�:\t%s\n"
+
+#: ../src/info.c:720
+#, c-format
+msgid "Hardware address:\t%s\n"
+msgstr "�ిర�నామా:\t%s\n"
+
+#: ../src/info.c:721
+#, c-format
+msgid "IP address:\t%s\n"
+msgstr "IP �ిర�నామా:\t%s\n"
+
+#: ../src/info.c:722
+#, c-format
+msgid "Netmask:\t%s\n"
+msgstr "న��� మాస���:\t%s\n"
+
+#: ../src/info.c:723
+#, c-format
+msgid "Broadcast:\t%s\n"
+msgstr "ప�రసారమ�:\t%s\n"
+
+#: ../src/info.c:724
+#, c-format
+msgid "Multicast:\t%s\n"
+msgstr "�����య�:\t%s\n"
+
+#: ../src/info.c:725
+#, c-format
+msgid "MTU:\t%s\n"
+msgstr "���ియ�:\t%s\n"
+
+#: ../src/info.c:726
+#, c-format
+msgid "Link speed:\t%s\n"
+msgstr "��డి వ��మ�:\t%s\n"
+
+#: ../src/info.c:727
+#, c-format
+msgid "State:\t%s\n"
+msgstr "స�థితి:\t%s\n"
+
+#: ../src/info.c:729
+#, c-format
+msgid "Transmitted packets:\t%s\n"
+msgstr "ప�రసరి�పబడిన ప���లాల�:\t%s\n"
+
+#: ../src/info.c:730
+#, c-format
+msgid "Transmission errors:\t%s\n"
+msgstr "ప�రసరి�పబడిన ద�షాల�:\t%s\n"
+
+#: ../src/info.c:731
+#, c-format
+msgid "Received packets:\t%s\n"
+msgstr "త�స���నబడిన ప���లాల�:\t%s\n"
+
+#: ../src/info.c:732
+#, c-format
+msgid "Reception errors:\t%s\n"
+msgstr "స�వ��రి��� ద�షమ�ల�:\t%s\n"
+
+#: ../src/info.c:733
+#, c-format
+msgid "Collisions:\t%s\n"
+msgstr "ఢ��������ల�:\t%s\n"
+
+#: ../src/info.h:27
+msgid "not available"
+msgstr "à°²à°à°¿à°?à°?à°²à±?à°¦à±?"
+
+#: ../src/lookup.c:80
+#, c-format
+msgid "Looking up %s"
+msgstr "%s వ�త������"
+
+#: ../src/lookup.c:278
+msgid "Name"
+msgstr "నామమ�"
+
+#. Time To Live of a hostname in a name server
+#: ../src/lookup.c:287
+msgid "TTL"
+msgstr "�ి�ియల�"
+
+#: ../src/lookup.c:296
+msgid "Address Type"
+msgstr "�ిర�నామా విధమ�"
+
+#: ../src/lookup.c:306
+msgid "Record Type"
+msgstr "రి�ార�డ� ర�మ�"
+
+#: ../src/lookup.c:315
+msgid "Address"
+msgstr "�ిర�నామా"
+
+#. The lookup output in text format:
+#. Source of query (hostname/ip address),
+#. Time To Live (TTL), Address Type,
+#. Record Type (A, PTR, HINFO, NS, TXT, etc.),
+#. Resolution (results of the query)
+#. It's a tabular output, and these belongs to the column titles
+#: ../src/lookup.c:343
+msgid "Source\tTTL\tAddress Type\tRecord Type1\tResolution\n"
+msgstr "వనర�\t�ి�ియల�\t�ిర�నామా ర�మ�\tరి�ార�డ� ర�మ�1\tనిశ��యమ�\n"
+
+#: ../src/main.c:81
+msgid "Load information for a network device"
+msgstr "�ల�లి� పరి�రమ�ల ��ర�� సమా�ారమ�న� ని�ప�మ�"
+
+#: ../src/main.c:82
+msgid "DEVICE"
+msgstr "పరి�ర�"
+
+#: ../src/main.c:85
+msgid "Send a ping to a network address"
+msgstr "�ల�లి� �ిర�నామా�� పి��� ప�ప�మ�"
+
+#: ../src/main.c:86 ../src/main.c:94 ../src/main.c:98 ../src/main.c:102
+msgid "HOST"
+msgstr "�తిథ�య�"
+
+#: ../src/main.c:89
+msgid "Get netstat information. Valid options are: route, active, multicast."
+msgstr "న��� స��ా�� సమా�ారమ�న� ప��ద�మ�. వర�తి��� ����ాప�ర�వ�మ�ల�: త�ర�వ, ��రియాశ�ల�, మల�����యాస���."
+
+#: ../src/main.c:90
+msgid "COMMAND"
+msgstr "�ద�శమ�"
+
+#: ../src/main.c:93
+msgid "Trace a route to a network address"
+msgstr "�� �ల�లి� �ిర�నామా�� �ాడ త�ర�వ వ�త���"
+
+#: ../src/main.c:97
+msgid "Port scan a network address"
+msgstr "�ల�లి� �ిర�నామా�� ర�వ� స�శ�ధి���"
+
+#: ../src/main.c:101
+msgid "Look up a network address"
+msgstr "�ల�లి� �ిర�నామా�� వ�త������"
+
+#: ../src/main.c:105
+msgid "Finger command to run"
+msgstr "పని��య���� వ�ర�ల� �ద�శ�"
+
+#: ../src/main.c:106
+msgid "USER"
+msgstr "వినియ��దార�"
+
+#: ../src/main.c:109
+msgid "Perform a whois lookup for a network domain"
+msgstr "�� �ల�లి� �ధి�ార��ష�త�ర� ��ర�� హ�యిస� వ�త����న� ప�రదర�శి���"
+
+#: ../src/main.c:110
+msgid "DOMAIN"
+msgstr "�థి�ార��ష�త�ర�"
+
+#: ../src/main.c:127
+#, c-format
+msgid ""
+"The file %s doesn't exist, please check if gnome-nettool is correctly "
+"installed"
+msgstr "%s �లి�ి ల�ద�, దయ��సి ��వ�ళ ��న� మ�-న��� పనిమ����� సరియ�న విధ��ా న�ల��ల�పబడినదా తని����య�మ�"
+
+#: ../src/main.c:346
+msgid ""
+"Enter the network address to ping.\n"
+"For example: www.domain.com or 192.168.2.1"
+msgstr ""
+"పి��� �� �ల�లి� �ిర�నామాన� ��ర���మ�.\n"
+"�దాహరణ ��ర��: www.domain.com ల�దా 192.168.2.1"
+
+#: ../src/main.c:431
+msgid ""
+"Enter the network address to trace a route to.\n"
+"For example: www.domain.com or 192.168.2.1"
+msgstr ""
+"�ల�లి� �ిర�నామా�� �ాడ త�ర�వన� వ�త������ ��ర���మ�.\n"
+"�దాహరణ ��ర��: www.domain.com ల�దా 192.168.2.1"
+
+#: ../src/main.c:516 ../src/netstat.c:443
+msgid "Protocol"
+msgstr "ప�ర����ాల�"
+
+#: ../src/main.c:523
+msgid "IP Address"
+msgstr "IP �ిర�నామా"
+
+#: ../src/main.c:530
+msgid "Netmask / Prefix"
+msgstr "న��� మాస��� / �పసర��"
+
+#: ../src/main.c:537
+msgid "Broadcast"
+msgstr "ప�రసార���య�"
+
+#: ../src/main.c:544
+msgid "Scope"
+msgstr "ల��ష�య�"
+
+#: ../src/main.c:685
+msgid ""
+"Enter the network address to scan for open ports.\n"
+"For example: www.domain.com or 192.168.2.1"
+msgstr ""
+"ర��ల� త�ర������ స�శ�ధన�� �ల�లి� �ిర�నామాన� ��ర���మ�.\n"
+"�దాహరణ ��ర��: www.domain.com ల�దా 192.168.2.1"
+
+#: ../src/main.c:813
+msgid ""
+"Enter the network address to lookup.\n"
+"For example: www.domain.com or 192.168.2.1"
+msgstr ""
+"������� �ల�లి� �ిర�నామాన� ��ర���మ�.\n"
+"�దాహరణ ��ర��: www.domain.com ల�దా 192.168.2.1"
+
+#: ../src/main.c:902
+msgid "Enter the user to finger."
+msgstr "వ�ర�ల��� వినియ��దార�డిని ��ర���మ�."
+
+#: ../src/main.c:929
+msgid ""
+"Enter the network address to finger that user.\n"
+"For example: auth.domain.com or 192.168.2.1"
+msgstr ""
+"� వినియ��దార�ని వ�ర�ల��� �ల�లి� �ిర�నామాన� ��ర���మ�.\n"
+"�దాహరణ ��ర��: auth.domain.com ల�దా 192.168.2.1"
+
+#: ../src/main.c:1016
+msgid ""
+"Enter a domain address to lookup its whois information.\n"
+"For example: www.domain.com or 192.168.2.1"
+msgstr ""
+"దాని య���� హ�యిస� సమా�ారమ� ������� �ధి�ార��ష�త�ర �ిర�నామా�� ��ర���మ�.\n"
+"�దాహరణ ��ర��: www.domain.com ల�దా 192.168.2.1"
+
+#: ../src/netstat.c:122
+msgid "Getting routing table"
+msgstr "త�ర�వ��ప� ప���ి� ప��ద���న�నది"
+
+#: ../src/netstat.c:137
+msgid "Getting active Internet connections"
+msgstr "��రియాశ�లి��� ���ర� న��� స�విధానమ�ల� ప��ద���న�నది"
+
+#: ../src/netstat.c:146
+msgid "Getting group memberships"
+msgstr "సమà±?దాయ à°¸à°à±?యతà±?వమà±?à°¨à±? à°ªà±?à°?à°¦à±?à°?à±?à°¨à±?నది"
+
+#: ../src/netstat.c:450
+msgid "IP Source"
+msgstr "IP వనర�"
+
+#: ../src/netstat.c:458
+msgid "Port/Service"
+msgstr "ర�వ�/స�వ"
+
+#: ../src/netstat.c:466 ../src/scan.c:312
+msgid "State"
+msgstr "స�థితి"
+
+#: ../src/netstat.c:609
+msgid "Destination/Prefix"
+msgstr "�మ�య�/�పసర��"
+
+#: ../src/netstat.c:611
+msgid "Destination"
+msgstr "�మ�య�"
+
+#: ../src/netstat.c:618
+msgid "Gateway"
+msgstr "సి�హాద�వారమ�"
+
+#: ../src/netstat.c:626
+msgid "Netmask"
+msgstr "న��� మాస���"
+
+#: ../src/netstat.c:634 ../src/netstat.c:741
+msgid "Interface"
+msgstr "స�విధాన�"
+
+#: ../src/netstat.c:748
+msgid "Member"
+msgstr "à°¸à°à±?à°¯à±?à°¡à±?"
+
+#: ../src/netstat.c:756
+msgid "Group"
+msgstr "సమ�దాయ�"
+
+#. The netstat "Display active network services" output in
+#. text format.
+#. It's a tabular output, and these belongs to the column titles
+#: ../src/netstat.c:798
+msgid "Protocol\tIP Source\tPort/Service\tState\n"
+msgstr "ప�ర����ాల�\tIP వనర�\tర�వ�/స�వ\tస�థితి\n"
+
+#. The netstat "Display routing" output in text format.
+#. This seems as a route table.
+#. It's a tabular output, and these belongs to the column titles
+#: ../src/netstat.c:804
+msgid "Destination\tGateway\tNetmask\tInterface\n"
+msgstr "�మ�య�\tసి�హాద�వారమ�\tన��� మాస���\tస�విధాన�\n"
+
+#. The netstat "Multicast information" output in text format.
+#. It's a tabular output, and these belongs to the column titles
+#: ../src/netstat.c:809
+msgid "Interface\tMember\tGroup\n"
+msgstr "à°¸à°?విధానà°?\tà°¸à°à±?à°¯à±?à°¡à±?\tసమà±?దాయà°?\n"
+
+#: ../src/nettool.c:199
+msgid "A network address was not specified"
+msgstr "�ల�లి� �ిర�నామా నిర�థ�శి��బడల�ద�"
+
+#: ../src/nettool.c:200 ../src/nettool.c:209
+msgid "Please enter a valid network address and try again."
+msgstr "దయ��సి వర�తి��� �ల�లి� �ిర�నామాన� ��ర���మ� మరియ� మరలా ప�రయత�ని���మ�."
+
+#: ../src/nettool.c:207
+#, c-format
+msgid "The address '%s' cannot be found"
+msgstr "'%s' �ిర�నామా ద�ర�ల�ద�"
+
+#: ../src/nettool.c:236
+msgid "A domain address was not specified"
+msgstr "�ధి�ార��ష�త�ర �ిర�నామా నిర�థ�శి�పబడల�ద�"
+
+#: ../src/nettool.c:237
+msgid "Please enter a valid domain address and try again."
+msgstr "దయ��సి వర�తి��� �ధి�ార��ష�త�ర �ిర�నామాన� ��ర���మ� మరియ� మరలా ప�రయత�ని���."
+
+#: ../src/nettool.c:406
+msgid "Information not available"
+msgstr "సమాà°?ారమà±? à°²à°à°¿à°?à°?à°²à±?à°¦à±?"
+
+#: ../src/nettool.c:524
+msgid "Stop"
+msgstr "à°?à°?à±?"
+
+#: ../src/nettool.c:530
+msgid "Run"
+msgstr "పర���"
+
+#. Created up here so we can get the geometry info.
+#: ../src/ping.c:151
+msgid "Time (ms):"
+msgstr "సమయ�(ms):"
+
+#: ../src/ping.c:171
+msgid "Seq. No.:"
+msgstr "Seq. No.:"
+
+#: ../src/ping.c:253
+#, c-format
+msgid "Sending ping requests to %s"
+msgstr "%s �� పి��� మనవిల� ప�ప���న�నది"
+
+#: ../src/ping.c:568
+msgid "Bytes"
+msgstr "బ���స�"
+
+#: ../src/ping.c:575
+msgid "Source"
+msgstr "వనర�"
+
+#: ../src/ping.c:583
+msgid "Seq"
+msgstr "Seq"
+
+#: ../src/ping.c:593
+msgid "Time"
+msgstr "సమయ�"
+
+#: ../src/ping.c:601
+msgid "Units"
+msgstr "ప�రమాణాల�"
+
+#. The ping output in text format:
+#. Bytes received, Address Source, Number of Sequence,
+#. Round Trip Time (Time), Units of Time.
+#. It's a tabular output, and these belongs to the column titles
+#: ../src/ping.c:627
+msgid "Bytes\tSource\tSeq\tTime\tUnits\n"
+msgstr "బ���స�\tవనర�\tSeq\tసమయ�\tUnits\n"
+
+#. The ping output in a text format (to copy on clipboard)
+#: ../src/ping.c:642
+#, c-format
+msgid "Time minimum:\t%s ms\n"
+msgstr "�త�యల�ప సమయ�:\t%s ms\n"
+
+#: ../src/ping.c:643
+#, c-format
+msgid "Time average:\t%s ms\n"
+msgstr "సమయ స���:\t%s ms\n"
+
+#: ../src/ping.c:644
+#, c-format
+msgid "Time maximum:\t%s ms\n"
+msgstr "�త�యధి� సమయ�:\t%s ms\n"
+
+#: ../src/ping.c:646
+#, c-format
+msgid "Packets transmitted:\t%s\n"
+msgstr "ప���లాల� ప�రసరి��బడినవి:\t%s\n"
+
+#: ../src/ping.c:648
+#, c-format
+msgid "Packets received:\t%s\n"
+msgstr "ప���లాల� స�వ��రి��బడినది:\t%s\n"
+
+#: ../src/ping.c:651
+#, c-format
+msgid "Successful packets:\t%s\n"
+msgstr "వి�యవ�తమ�న ప���లాల�:\t%s\n"
+
+#: ../src/scan.c:93
+#, c-format
+msgid "Scanning %s for open ports"
+msgstr "ర�వ�ల� త�ర���� ��ర�� %s స�శ�ధి���"
+
+#: ../src/scan.c:168
+msgid "unknown"
+msgstr "త�లియనిది"
+
+#: ../src/scan.c:304
+msgid "Port"
+msgstr "ర�వ�"
+
+#: ../src/scan.c:320
+msgid "Service"
+msgstr "స�వ"
+
+#. The portscan output in text format:
+#. Port, State, Service.
+#. It's a tabular output, and these belongs to the column titles
+#: ../src/scan.c:342
+msgid "Port\tState\tService\n"
+msgstr "ర�వ�\tస�థితి\tస�వ\n"
+
+#: ../src/traceroute.c:62
+#, c-format
+msgid "Tracing route to %s"
+msgstr "%s �� త�ర�వ ��డి�����న�నది"
+
+#: ../src/traceroute.c:265
+msgid "Hop"
+msgstr "హాప�"
+
+#: ../src/traceroute.c:273
+msgid "Hostname"
+msgstr "�తిథ�య నామమ�"
+
+#: ../src/traceroute.c:281
+msgid "IP"
+msgstr "IP"
+
+#: ../src/traceroute.c:292
+msgid "Time 1"
+msgstr "సమయ� 1"
+
+#: ../src/traceroute.c:302
+msgid "Time 2"
+msgstr "సమయ� 2"
+
+#. The traceroute output in text format:
+#. Hop count, Hostname, IP, Round Trip Time 1 (Time1),
+#. Round Trip Time 2 (Time2),
+#. It's a tabular output, and these belongs to the column titles
+#: ../src/traceroute.c:328
+msgid "Hop\tHostname\tIP\tTime 1\tTime 2\n"
+msgstr "హప�\t�తిథ�య నామమ�\tIP\tసమయ� 1\tసమయ� 2\n"
+
+#: ../src/utils.c:227
+#, c-format
+msgid ""
+"In order to use this feature of the program, %s must be installed in your "
+"system"
+msgstr "� �ార�య��రమ� య���� విశిష��తన� ��రమ�ల� వాడ�� ��ర��, మ� య���� వ�యవస�థల� �శ��ిత��ా %sన�ల��ల�పబడాలి"
+
+#: ../src/gnome-nettool.desktop.in.in.h:2
+msgid "View information about your network"
+msgstr "మ� య���� �ల�లి� ��రి��ి సమా�ారమ�న� దర�శి���మ�"
+
+#: ../src/finger.c:62
+#, c-format
+msgid "Getting information of %s on \"%s\""
+msgstr "\"%s\" ప� %s సమా�ారమ� ప��ద�త�న�నది"
+
+#: ../src/finger.c:66
+#, c-format
+msgid "Getting information of all users on \"%s\""
+msgstr "\"%s\" ప� ��దరి వినియ��దార�ల య���� సమా�ారమ� ప��ద�త�న�నది"
+
+#: ../src/whois.c:58
+#, c-format
+msgid "Getting the whois information of %s"
+msgstr "%s య���� సమా�ారమ� ప��ద�త�న�నది"
diff -pruN 2.18.0-2/po/th.po 2.19.90-0ubuntu1/po/th.po
--- 2.18.0-2/po/th.po 2007-02-17 00:54:03.000000000 +0000
+++ 2.19.90-0ubuntu1/po/th.po 2007-08-14 03:43:56.000000000 +0100
@@ -1,16 +1,16 @@
# Thai translation of gnome-nettool.
-# Copyright (C) 2005-2006 Free Software Foundation, Inc.
+# Copyright (C) 2005-2007 Free Software Foundation, Inc.
# This file is distributed under the same license as the gnome-nettool package.
-# Theppitak Karoonboonyanan <thep linux thai net>, 2005-2006.
+# Theppitak Karoonboonyanan <thep linux thai net>, 2005-2007.
#
msgid ""
msgstr ""
"Project-Id-Version: gnome-nettool 1.1.0\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-12-14 18:18+0700\n"
-"PO-Revision-Date: 2006-12-14 18:22+0700\n"
+"POT-Creation-Date: 2007-08-06 15:44+0700\n"
+"PO-Revision-Date: 2007-08-06 15:46+0700\n"
"Last-Translator: Theppitak Karoonboonyanan <thep linux thai net>\n"
-"Language-Team: Thai <l10n opentle org>\n"
+"Language-Team: Thai <thai-l10n googlegroups com>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
@@ -19,10 +19,22 @@ msgstr ""
msgid "translator-credits"
msgstr "����ิ�ั�ษ� �ารุ��ุ��า�ั��� <thep linux thai net>"
-#: ../src/callbacks.c:333
+#. Dear translator: This is the name of the application
+#: ../src/callbacks.c:328 ../src/gnome-nettool.desktop.in.in.h:1
+msgid "Network Tools"
+msgstr "à¹?à¸?รืà¹?à¸à¸?มืà¸à¸?รวà¸?สà¸à¸?à¹?à¸?รืà¸à¸?à¹?าย"
+
+#: ../src/callbacks.c:334
msgid "Graphical user interface for common network utilities"
msgstr "à¹?à¸?รืà¹?à¸à¸?มืà¸à¸?รวà¸?สà¸à¸?à¹?à¸?รืà¸à¸?à¹?ายà¹?à¸?à¹?à¸?à¸?à¸?ราà¸?ิà¸?"
+#. Dear Translator: This is the Window Title. 'Network Tools' is the
+#. * name of the application
+#: ../src/callbacks.c:445
+#, c-format
+msgid "%s - Network Tools"
+msgstr "%s - à¹?à¸?รืà¹?à¸à¸?มืà¸à¸?รวà¸?สà¸à¸?à¹?à¸?รืà¸à¸?à¹?าย"
+
#: ../src/gnome-nettool.glade.h:1
msgid "0.0"
msgstr "0.0"
@@ -668,15 +680,15 @@ msgstr "à¹?มà¹?à¹?à¸?à¹?à¸?ำหà¸?à¸
msgid "Please enter a valid domain address and try again."
msgstr "à¸?รุà¸?าà¸?à¹?à¸à¸?à¸?ีà¹?à¸à¸¢à¸¹à¹?à¹?à¸?à¹?มà¸?à¸?ีà¹?à¸?ูà¸?à¸?à¹?à¸à¸?à¹?ลà¹?วลà¸à¸?à¹?หมà¹?à¸à¸µà¸?à¸?รัà¹?à¸?"
-#: ../src/nettool.c:395
+#: ../src/nettool.c:406
msgid "Information not available"
msgstr "à¹?มà¹?มีà¸?à¹?à¸à¸¡à¸¹à¸¥"
-#: ../src/nettool.c:513
+#: ../src/nettool.c:524
msgid "Stop"
msgstr "หยุ�"
-#: ../src/nettool.c:519
+#: ../src/nettool.c:530
msgid "Run"
msgstr "�ำ�า�"
@@ -694,23 +706,23 @@ msgstr "ลำ�ั��ี�:"
msgid "Sending ping requests to %s"
msgstr "à¸?ำลัà¸?สà¹?à¸?à¸?à¹?à¸à¸?วาม ping à¹?à¸?ยัà¸? %s"
-#: ../src/ping.c:574
+#: ../src/ping.c:568
msgid "Bytes"
msgstr "�ำ�ว�����"
-#: ../src/ping.c:581
+#: ../src/ping.c:575
msgid "Source"
msgstr "����า�"
-#: ../src/ping.c:589
+#: ../src/ping.c:583
msgid "Seq"
msgstr "ลำ�ั�"
-#: ../src/ping.c:599
+#: ../src/ping.c:593
msgid "Time"
msgstr "�วลา"
-#: ../src/ping.c:607
+#: ../src/ping.c:601
msgid "Units"
msgstr "ห��วย"
@@ -718,37 +730,37 @@ msgstr "ห��วย"
#. Bytes received, Address Source, Number of Sequence,
#. Round Trip Time (Time), Units of Time.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/ping.c:633
+#: ../src/ping.c:627
msgid "Bytes\tSource\tSeq\tTime\tUnits\n"
msgstr "�ำ�ว�����\t����า�\tลำ�ั�\t�วลา\tห��วย\n"
#. The ping output in a text format (to copy on clipboard)
-#: ../src/ping.c:648
+#: ../src/ping.c:642
#, c-format
msgid "Time minimum:\t%s ms\n"
msgstr "�วลา��ำสุ�:\t%s ms\n"
-#: ../src/ping.c:649
+#: ../src/ping.c:643
#, c-format
msgid "Time average:\t%s ms\n"
msgstr "�วลา��ลี�ย:\t%s ms\n"
-#: ../src/ping.c:650
+#: ../src/ping.c:644
#, c-format
msgid "Time maximum:\t%s ms\n"
msgstr "�วลาสู�สุ�:\t%s ms\n"
-#: ../src/ping.c:652
+#: ../src/ping.c:646
#, c-format
msgid "Packets transmitted:\t%s\n"
msgstr "�ำ�ว����������ี�ส��:\t%s\n"
-#: ../src/ping.c:654
+#: ../src/ping.c:648
#, c-format
msgid "Packets received:\t%s\n"
msgstr "�ำ�ว����������ี����รั�:\t%s\n"
-#: ../src/ping.c:657
+#: ../src/ping.c:651
#, c-format
msgid "Successful packets:\t%s\n"
msgstr "�ำ�ว����������ี�สำ�ร��:\t%s\n"
@@ -782,23 +794,23 @@ msgstr "à¸?à¸à¸£à¹?à¸?\tสà¸?าà¸?ะ
msgid "Tracing route to %s"
msgstr "�ำลั���ะ�ส���า���ยั� %s"
-#: ../src/traceroute.c:271
+#: ../src/traceroute.c:265
msgid "Hop"
msgstr "ฮà¹?à¸à¸?"
-#: ../src/traceroute.c:279
+#: ../src/traceroute.c:273
msgid "Hostname"
msgstr "à¸?ืà¹?à¸à¹?à¸?รืà¹?à¸à¸?"
-#: ../src/traceroute.c:287
+#: ../src/traceroute.c:281
msgid "IP"
msgstr "à¹?à¸à¸?ี"
-#: ../src/traceroute.c:298
+#: ../src/traceroute.c:292
msgid "Time 1"
msgstr "�วลา 1"
-#: ../src/traceroute.c:308
+#: ../src/traceroute.c:302
msgid "Time 2"
msgstr "�วลา 2"
@@ -806,7 +818,7 @@ msgstr "�วลา 2"
#. Hop count, Hostname, IP, Round Trip Time 1 (Time1),
#. Round Trip Time 2 (Time2),
#. It's a tabular output, and these belongs to the column titles
-#: ../src/traceroute.c:334
+#: ../src/traceroute.c:328
msgid "Hop\tHostname\tIP\tTime 1\tTime 2\n"
msgstr "ฮà¹?à¸à¸?\tà¸?ืà¹?à¸à¹?à¸?รืà¹?à¸à¸?\tà¹?à¸à¸?ี\tà¹?วลา 1\tà¹?วลา 2\n"
@@ -817,13 +829,9 @@ msgid ""
"system"
msgstr "หาà¸?à¸?ะà¹?à¸?à¹?à¸?วามสามารà¸?à¸?ีà¹?à¸?à¸à¸?à¹?à¸?รà¹?à¸?รม à¸?ะà¸?à¹?à¸à¸?à¸?ิà¸?à¸?ัà¹?à¸? %s à¹?à¸?ระà¸?à¸?à¸?à¸à¸?à¸?ุà¸?à¸?à¹?วย"
-#: ../src/gnome-nettool.desktop.in.in.h:1
-msgid "Network Information Tools"
-msgstr "à¹?à¸?รืà¹?à¸à¸?มืà¸à¸?รวà¸?สà¸à¸?à¸?à¹?à¸à¸¡à¸¹à¸¥à¹?à¸?รืà¸à¸?à¹?าย"
-
#: ../src/gnome-nettool.desktop.in.in.h:2
-msgid "Network Tools"
-msgstr "à¹?à¸?รืà¹?à¸à¸?มืà¸à¸?รวà¸?สà¸à¸?à¹?à¸?รืà¸à¸?à¹?าย"
+msgid "View information about your network"
+msgstr "à¸?ูà¸?à¹?à¸à¸¡à¸¹à¸¥à¹?à¸?ีà¹?ยวà¸?ัà¸?à¹?à¸?รืà¸à¸?à¹?ายà¸?à¸à¸?à¸?ุà¸?"
#: ../src/finger.c:62
#, c-format
@@ -840,6 +848,9 @@ msgstr "à¸?ำลัà¸?à¸à¹?าà¸?à¸?à¹
msgid "Getting the whois information of %s"
msgstr "à¸?ำลัà¸?à¸à¹?าà¸?à¸?à¹?à¸à¸¡à¸¹à¸¥ whois à¸?à¸à¸? %s"
+#~ msgid "Network Information Tools"
+#~ msgstr "à¹?à¸?รืà¹?à¸à¸?มืà¸à¸?รวà¸?สà¸à¸?à¸?à¹?à¸à¸¡à¸¹à¸¥à¹?à¸?รืà¸à¸?à¹?าย"
+
#~ msgid "Packets loss:"
#~ msgstr "�ำ�ว���������สู�หาย:"
diff -pruN 2.18.0-2/po/zh_CN.po 2.19.90-0ubuntu1/po/zh_CN.po
--- 2.18.0-2/po/zh_CN.po 2007-02-17 00:54:03.000000000 +0000
+++ 2.19.90-0ubuntu1/po/zh_CN.po 2007-08-14 03:43:55.000000000 +0100
@@ -6,9 +6,9 @@ msgid ""
msgstr ""
"Project-Id-Version: gnome-nettool\n"
"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2006-08-20 08:53+0200\n"
-"PO-Revision-Date: 2006-08-20 15:51+0800\n"
-"Last-Translator: Funda Wang <fundawang linux net cn>\n"
+"POT-Creation-Date: 2007-03-14 03:14+0000\n"
+"PO-Revision-Date: 2007-04-20 16:07+0700\n"
+"Last-Translator: Yang Zhang <zyangmath gmail com>\n"
"Language-Team: zh_CN <i18n-translation lists linux net cn>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
@@ -71,82 +71,85 @@ msgid "Collisions:"
msgstr "���"
#: ../src/gnome-nettool.glade.h:13
+msgid "Details"
+msgstr "ç»?è??"
+
+#: ../src/gnome-nettool.glade.h:14
msgid "Devices"
msgstr "设�"
#. Dear Translator: This is the Window Title
-#: ../src/gnome-nettool.glade.h:15
+#: ../src/gnome-nettool.glade.h:16
msgid "Devices - Network Tools"
msgstr "设� - ��工�"
-#: ../src/gnome-nettool.glade.h:16
+#: ../src/gnome-nettool.glade.h:17
msgid "Display:"
msgstr "�示�"
-#: ../src/gnome-nettool.glade.h:17 ../src/main.c:864
+#: ../src/gnome-nettool.glade.h:18
+#: ../src/main.c:868
msgid "Finger"
msgstr "Finger"
-#: ../src/gnome-nettool.glade.h:18
+#: ../src/gnome-nettool.glade.h:19
msgid "Hardware address:"
msgstr "硬件å?°å??ï¼?"
-#: ../src/gnome-nettool.glade.h:19
+#: ../src/gnome-nettool.glade.h:20
msgid "Host"
msgstr "主�"
-#: ../src/gnome-nettool.glade.h:20
+#: ../src/gnome-nettool.glade.h:21
msgid "IP Address:"
msgstr "IP å?°å??ï¼?"
-#: ../src/gnome-nettool.glade.h:21
+#: ../src/gnome-nettool.glade.h:22
msgid "Link speed:"
msgstr "é?¾æ?¥é??度ï¼?"
-#: ../src/gnome-nettool.glade.h:22 ../src/main.c:778
+#: ../src/gnome-nettool.glade.h:23
+#: ../src/main.c:782
msgid "Lookup"
msgstr "æ?¥é??"
-#: ../src/gnome-nettool.glade.h:23
+#: ../src/gnome-nettool.glade.h:24
msgid "MTU:"
msgstr "MTUï¼?"
-#: ../src/gnome-nettool.glade.h:24
+#: ../src/gnome-nettool.glade.h:25
msgid "Maximum:"
msgstr "æ??大ï¼?"
-#: ../src/gnome-nettool.glade.h:25
+#: ../src/gnome-nettool.glade.h:26
msgid "Minimum:"
msgstr "æ??å°?ï¼?"
-#: ../src/gnome-nettool.glade.h:26
+#: ../src/gnome-nettool.glade.h:27
msgid "Multicast Information"
msgstr "å¤?æ?ä¿¡æ?¯"
-#: ../src/gnome-nettool.glade.h:27
+#: ../src/gnome-nettool.glade.h:28
msgid "Multicast:"
msgstr "å¤?æ?ï¼?"
-#: ../src/gnome-nettool.glade.h:28
+#: ../src/gnome-nettool.glade.h:29
msgid "Netmask:"
msgstr "ç½?ç»?æ?©ç ?ï¼?"
-#: ../src/gnome-nettool.glade.h:29 ../src/main.c:476
+#: ../src/gnome-nettool.glade.h:30
+#: ../src/main.c:480
msgid "Netstat"
msgstr "���计"
-#: ../src/gnome-nettool.glade.h:30
+#: ../src/gnome-nettool.glade.h:31
msgid "Not Available"
msgstr "���"
-#: ../src/gnome-nettool.glade.h:31
+#: ../src/gnome-nettool.glade.h:32
msgid "Only"
msgstr "ä»?"
-#: ../src/gnome-nettool.glade.h:32
-msgid "Packets loss:"
-msgstr "丢失å??æ?°ï¼?"
-
#: ../src/gnome-nettool.glade.h:33
msgid "Packets received:"
msgstr "æ?¶å?°å??æ?°ï¼?"
@@ -155,7 +158,8 @@ msgstr "æ?¶å?°å??æ?°ï¼?"
msgid "Packets transmitted:"
msgstr "ä¼ é??å??æ?°ï¼?"
-#: ../src/gnome-nettool.glade.h:35 ../src/main.c:312
+#: ../src/gnome-nettool.glade.h:35
+#: ../src/main.c:313
msgid "Ping"
msgstr "Ping"
@@ -179,7 +183,8 @@ msgstr "æ?¥æ?¶é??误æ?°ï¼?"
msgid "Routing Table Information"
msgstr "路�表信�"
-#: ../src/gnome-nettool.glade.h:41 ../src/main.c:659
+#: ../src/gnome-nettool.glade.h:41
+#: ../src/main.c:663
msgid "Scan"
msgstr "æ?«æ??"
@@ -191,79 +196,85 @@ msgstr "å??é??ï¼?"
msgid "State:"
msgstr "ç?¶æ??ï¼?"
-#: ../src/gnome-nettool.glade.h:44 ../src/main.c:400
+#: ../src/gnome-nettool.glade.h:44
+msgid "Successful packets:"
+msgstr "æ??å??ä¼ é??ç??å??æ?°ï¼?"
+
+#: ../src/gnome-nettool.glade.h:45
+#: ../src/main.c:404
msgid "Trace"
msgstr "�踪"
-#: ../src/gnome-nettool.glade.h:45
+#: ../src/gnome-nettool.glade.h:46
msgid "Traceroute"
msgstr "Traceroute"
-#: ../src/gnome-nettool.glade.h:46
+#: ../src/gnome-nettool.glade.h:47
msgid "Transmission errors:"
msgstr "ä¼ é??é??误æ?°ï¼?"
-#: ../src/gnome-nettool.glade.h:47
+#: ../src/gnome-nettool.glade.h:48
msgid "Transmitted bytes:"
msgstr "ä¼ é??å?è??æ?°ï¼?"
-#: ../src/gnome-nettool.glade.h:48
+#: ../src/gnome-nettool.glade.h:49
msgid "Transmitted packets:"
msgstr "ä¼ é??å??æ?°ï¼?"
-#: ../src/gnome-nettool.glade.h:49
+#: ../src/gnome-nettool.glade.h:50
msgid "Unlimited requests"
msgstr "å??é??æ? é??å?¶è¯·æ±?"
-#: ../src/gnome-nettool.glade.h:50
+#: ../src/gnome-nettool.glade.h:51
msgid "User"
msgstr "��"
-#: ../src/gnome-nettool.glade.h:51 ../src/main.c:980
+#: ../src/gnome-nettool.glade.h:52
+#: ../src/main.c:984
msgid "Whois"
msgstr "Whois"
-#: ../src/gnome-nettool.glade.h:52
+#: ../src/gnome-nettool.glade.h:53
msgid "_Configure"
msgstr "é??ç½®(_C)"
-#: ../src/gnome-nettool.glade.h:53
+#: ../src/gnome-nettool.glade.h:54
msgid "_Domain address:"
msgstr "å??å?°å??(_D)ï¼?"
-#: ../src/gnome-nettool.glade.h:54
+#: ../src/gnome-nettool.glade.h:55
msgid "_Edit"
msgstr "ç¼?è¾?(_E)"
-#: ../src/gnome-nettool.glade.h:55
+#: ../src/gnome-nettool.glade.h:56
msgid "_Help"
msgstr "帮�(_H)"
-#: ../src/gnome-nettool.glade.h:56
+#: ../src/gnome-nettool.glade.h:57
msgid "_Information type:"
msgstr "ä¿¡æ?¯ç±»å??(_I)ï¼?"
-#: ../src/gnome-nettool.glade.h:57
+#: ../src/gnome-nettool.glade.h:58
msgid "_Network address:"
msgstr "ç½?ç»?å?°å??(_N)ï¼?"
-#: ../src/gnome-nettool.glade.h:58
+#: ../src/gnome-nettool.glade.h:59
msgid "_Network device:"
msgstr "��设�(_N)�"
-#: ../src/gnome-nettool.glade.h:59
+#: ../src/gnome-nettool.glade.h:60
msgid "_Tool"
msgstr "工�(_T)"
-#: ../src/gnome-nettool.glade.h:60
+#: ../src/gnome-nettool.glade.h:61
msgid "_Username:"
msgstr "ç?¨æ?·å??(_U)ï¼?"
-#: ../src/gnome-nettool.glade.h:61
+#: ../src/gnome-nettool.glade.h:62
msgid "ms"
msgstr "毫�"
-#: ../src/gnome-nettool.glade.h:62
+#: ../src/gnome-nettool.glade.h:63
msgid "requests"
msgstr "请�"
@@ -308,93 +319,93 @@ msgstr "��设����"
msgid "Unknown"
msgstr "��"
-#: ../src/info.c:545
+#: ../src/info.c:554
msgid "Active"
msgstr "活�"
-#: ../src/info.c:547
+#: ../src/info.c:556
msgid "Inactive"
msgstr "�活�"
-#: ../src/info.c:552
+#: ../src/info.c:561
msgid "Loopback"
msgstr "å??ç?¯"
-#: ../src/info.c:569
+#: ../src/info.c:580
msgid "Enabled"
msgstr "已��"
-#: ../src/info.c:571
+#: ../src/info.c:582
msgid "Disabled"
msgstr "已��"
#. The info output in a text format (to copy on clipboard)
-#: ../src/info.c:708
+#: ../src/info.c:719
#, c-format
msgid "Network device:\t%s\n"
msgstr "��设��\t%s\n"
-#: ../src/info.c:709
+#: ../src/info.c:720
#, c-format
msgid "Hardware address:\t%s\n"
msgstr "硬件å?°å??ï¼?\t%s\n"
-#: ../src/info.c:710
+#: ../src/info.c:721
#, c-format
msgid "IP address:\t%s\n"
msgstr "IP å?°å??ï¼?\t%s\n"
-#: ../src/info.c:711
+#: ../src/info.c:722
#, c-format
msgid "Netmask:\t%s\n"
msgstr "ç½?ç»?æ?©ç ?ï¼?\t%s\n"
-#: ../src/info.c:712
+#: ../src/info.c:723
#, c-format
msgid "Broadcast:\t%s\n"
msgstr "广æ?ï¼?\t%s\n"
-#: ../src/info.c:713
+#: ../src/info.c:724
#, c-format
msgid "Multicast:\t%s\n"
msgstr "å¤?æ?ï¼?\t%s\n"
-#: ../src/info.c:714
+#: ../src/info.c:725
#, c-format
msgid "MTU:\t%s\n"
msgstr "MTUï¼?\t%s\n"
-#: ../src/info.c:715
+#: ../src/info.c:726
#, c-format
msgid "Link speed:\t%s\n"
msgstr "è¿?æ?¥é??度ï¼?\t%s\n"
-#: ../src/info.c:716
+#: ../src/info.c:727
#, c-format
msgid "State:\t%s\n"
msgstr "ç?¶æ??ï¼?\t%s\n"
-#: ../src/info.c:718
+#: ../src/info.c:729
#, c-format
msgid "Transmitted packets:\t%s\n"
msgstr "ä¼ é??å??æ?°ï¼?\t%s\n"
-#: ../src/info.c:719
+#: ../src/info.c:730
#, c-format
msgid "Transmission errors:\t%s\n"
msgstr "ä¼ é??é??误æ?°ï¼?\t%s\n"
-#: ../src/info.c:720
+#: ../src/info.c:731
#, c-format
msgid "Received packets:\t%s\n"
msgstr "æ?¥æ?¶å??æ?°ï¼?\t%s\n"
-#: ../src/info.c:721
+#: ../src/info.c:732
#, c-format
msgid "Reception errors:\t%s\n"
msgstr "æ?¥æ?¶é??误æ?°ï¼?\t%s\n"
-#: ../src/info.c:722
+#: ../src/info.c:733
#, c-format
msgid "Collisions:\t%s\n"
msgstr "���\t%s\n"
@@ -451,7 +462,10 @@ msgstr "设�"
msgid "Send a ping to a network address"
msgstr "å??ç½?ç»?å?°å??å??é?? ping"
-#: ../src/main.c:86 ../src/main.c:94 ../src/main.c:98 ../src/main.c:102
+#: ../src/main.c:86
+#: ../src/main.c:94
+#: ../src/main.c:98
+#: ../src/main.c:102
msgid "HOST"
msgstr "主�"
@@ -493,12 +507,10 @@ msgstr "å??"
#: ../src/main.c:127
#, c-format
-msgid ""
-"The file %s doesn't exist, please check if gnome-nettool is correctly "
-"installed"
+msgid "The file %s doesn't exist, please check if gnome-nettool is correctly installed"
msgstr "æ??件 %s ä¸?å?å?¨ï¼?请æ£?æ?¥ gnome-nettool æ?¯å?¦å®?è£?æ£ç¡®"
-#: ../src/main.c:345
+#: ../src/main.c:346
msgid ""
"Enter the network address to ping.\n"
"For example: www.domain.com or 192.168.2.1"
@@ -506,7 +518,7 @@ msgstr ""
"è¾?å?¥è¦? ping ç??ç½?ç»?å?°å??ã??\n"
"ä¾?å¦?ï¼?www.domain.com æ?? 192.168.2.1"
-#: ../src/main.c:427
+#: ../src/main.c:431
msgid ""
"Enter the network address to trace a route to.\n"
"For example: www.domain.com or 192.168.2.1"
@@ -514,27 +526,28 @@ msgstr ""
"è¾?å?¥è¦?è·?踪路ç?±ç??ç½?ç»?å?°å??ã??\n"
"ä¾?å¦?ï¼?www.domain.com æ?? 192.168.2.1"
-#: ../src/main.c:512 ../src/netstat.c:443
+#: ../src/main.c:516
+#: ../src/netstat.c:443
msgid "Protocol"
msgstr "å??è®®"
-#: ../src/main.c:519
+#: ../src/main.c:523
msgid "IP Address"
msgstr "IP å?°å??"
-#: ../src/main.c:526
+#: ../src/main.c:530
msgid "Netmask / Prefix"
msgstr "ç½?ç»?æ?©ç ?/å??ç¼?"
-#: ../src/main.c:533
+#: ../src/main.c:537
msgid "Broadcast"
msgstr "广æ?"
-#: ../src/main.c:540
+#: ../src/main.c:544
msgid "Scope"
msgstr "è??å?´"
-#: ../src/main.c:681
+#: ../src/main.c:685
msgid ""
"Enter the network address to scan for open ports.\n"
"For example: www.domain.com or 192.168.2.1"
@@ -542,7 +555,7 @@ msgstr ""
"è¾?å?¥è¦?æ?«æ??å¼?æ?¾ç«¯å?£ç??ç½?ç»?å?°å??ã??\n"
"ä¾?å¦?ï¼?www.domain.com æ?? 192.168.2.1"
-#: ../src/main.c:809
+#: ../src/main.c:813
msgid ""
"Enter the network address to lookup.\n"
"For example: www.domain.com or 192.168.2.1"
@@ -550,11 +563,11 @@ msgstr ""
"è¾?å?¥è¦?æ?¥é??ç??ç½?ç»?å?°å??ã??\n"
"ä¾?å¦?ï¼?www.domain.com æ?? 192.168.2.1"
-#: ../src/main.c:898
+#: ../src/main.c:902
msgid "Enter the user to finger."
msgstr "è¾?å?¥è¦? finger ç??ç?¨æ?·ã??"
-#: ../src/main.c:925
+#: ../src/main.c:929
msgid ""
"Enter the network address to finger that user.\n"
"For example: auth.domain.com or 192.168.2.1"
@@ -562,7 +575,7 @@ msgstr ""
"è¾?å?¥è¦? finger ç?¨æ?·ç??ç½?ç»?å?°å??ã??\n"
"ä¾?å¦?ï¼?auth.domain.com æ?? 192.168.2.1"
-#: ../src/main.c:1012
+#: ../src/main.c:1016
msgid ""
"Enter a domain address to lookup its whois information.\n"
"For example: www.domain.com or 192.168.2.1"
@@ -590,42 +603,44 @@ msgstr "IP �"
msgid "Port/Service"
msgstr "端å?£/æ??å?¡"
-#: ../src/netstat.c:466 ../src/scan.c:312
+#: ../src/netstat.c:466
+#: ../src/scan.c:312
msgid "State"
msgstr "ç?¶æ??"
-#: ../src/netstat.c:608
+#: ../src/netstat.c:609
msgid "Destination/Prefix"
msgstr "ç?®ç??/å??ç¼?"
-#: ../src/netstat.c:610
+#: ../src/netstat.c:611
msgid "Destination"
msgstr "ç?®ç??"
-#: ../src/netstat.c:617
+#: ../src/netstat.c:618
msgid "Gateway"
msgstr "ç½?å?³"
-#: ../src/netstat.c:625
+#: ../src/netstat.c:626
msgid "Netmask"
msgstr "ç½?ç»?æ?©ç ?"
-#: ../src/netstat.c:633 ../src/netstat.c:739
+#: ../src/netstat.c:634
+#: ../src/netstat.c:741
msgid "Interface"
msgstr "��"
-#: ../src/netstat.c:746
+#: ../src/netstat.c:748
msgid "Member"
msgstr "æ??å??"
-#: ../src/netstat.c:754
+#: ../src/netstat.c:756
msgid "Group"
msgstr "ç»?"
#. The netstat "Display active network services" output in
#. text format.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/netstat.c:796
+#: ../src/netstat.c:798
msgid "Protocol\tIP Source\tPort/Service\tState\n"
msgstr ""
"å??è®®\tIP æº?\n"
@@ -634,13 +649,13 @@ msgstr ""
#. The netstat "Display routing" output in text format.
#. This seems as a route table.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/netstat.c:802
+#: ../src/netstat.c:804
msgid "Destination\tGateway\tNetmask\tInterface\n"
msgstr "ç?®ç??\tç½?å?³\tç½?ç»?æ?©ç ?\tæ?¥å?£\n"
#. The netstat "Multicast information" output in text format.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/netstat.c:807
+#: ../src/netstat.c:809
msgid "Interface\tMember\tGroup\n"
msgstr "æ?¥å?£\tæ??å??\tç»?\n"
@@ -648,7 +663,8 @@ msgstr "æ?¥å?£\tæ??å??\tç»?\n"
msgid "A network address was not specified"
msgstr "ç½?ç»?å?°å??æ?ªæ??å®?"
-#: ../src/nettool.c:200 ../src/nettool.c:209
+#: ../src/nettool.c:200
+#: ../src/nettool.c:209
msgid "Please enter a valid network address and try again."
msgstr "请è¾?å?¥æ??æ??ç??ç½?ç»?å?°å??ç?¶å??å??è¯?ä¸?次ã??"
@@ -677,28 +693,37 @@ msgstr "å??æ¢"
msgid "Run"
msgstr "è¿?è¡?"
-#: ../src/ping.c:77
+#. Created up here so we can get the geometry info.
+#: ../src/ping.c:151
+msgid "Time (ms):"
+msgstr "��(毫�)�"
+
+#: ../src/ping.c:171
+msgid "Seq. No.:"
+msgstr "���"
+
+#: ../src/ping.c:253
#, c-format
msgid "Sending ping requests to %s"
msgstr "å?? %s å??é?? ping 请æ±?"
-#: ../src/ping.c:395
+#: ../src/ping.c:574
msgid "Bytes"
msgstr "å?è??"
-#: ../src/ping.c:402
+#: ../src/ping.c:581
msgid "Source"
msgstr "�"
-#: ../src/ping.c:410
+#: ../src/ping.c:589
msgid "Seq"
msgstr "åº?å??"
-#: ../src/ping.c:420
+#: ../src/ping.c:599
msgid "Time"
msgstr "��"
-#: ../src/ping.c:428
+#: ../src/ping.c:607
msgid "Units"
msgstr "å??ä½?"
@@ -706,40 +731,40 @@ msgstr "å??ä½?"
#. Bytes received, Address Source, Number of Sequence,
#. Round Trip Time (Time), Units of Time.
#. It's a tabular output, and these belongs to the column titles
-#: ../src/ping.c:454
+#: ../src/ping.c:633
msgid "Bytes\tSource\tSeq\tTime\tUnits\n"
msgstr "å?è??\tæº?\tåº?å??\tæ?¶é?´\tå??ä½?\n"
#. The ping output in a text format (to copy on clipboard)
-#: ../src/ping.c:469
+#: ../src/ping.c:648
#, c-format
msgid "Time minimum:\t%s ms\n"
msgstr "æ??å°?æ?¶é?´ï¼?\t%s 毫ç§?\n"
-#: ../src/ping.c:470
+#: ../src/ping.c:649
#, c-format
msgid "Time average:\t%s ms\n"
msgstr "å¹³å??æ?¶é?´ï¼?\t%s 毫ç§?\n"
-#: ../src/ping.c:471
+#: ../src/ping.c:650
#, c-format
msgid "Time maximum:\t%s ms\n"
msgstr "æ??大æ?¶é?´ï¼?\t%s 毫ç§?\n"
-#: ../src/ping.c:473
+#: ../src/ping.c:652
#, c-format
msgid "Packets transmitted:\t%s\n"
msgstr "ä¼ é??å??æ?°ï¼?\t%s\n"
-#: ../src/ping.c:475
+#: ../src/ping.c:654
#, c-format
msgid "Packets received:\t%s\n"
msgstr "æ?¥æ?¶å??æ?°ï¼?\t%s\n"
-#: ../src/ping.c:477
+#: ../src/ping.c:657
#, c-format
-msgid "Packet loss:\t%s\n"
-msgstr "丢失å??æ?°ï¼?\t%s\n"
+msgid "Successful packets:\t%s\n"
+msgstr "æ??å??ä¼ é??ç??å??æ?°ï¼?\t%s\n"
#: ../src/scan.c:93
#, c-format
@@ -800,16 +825,14 @@ msgstr "Hop\t主æ?ºå??\tIP\tæ?¶é?´1\tæ?¶
#: ../src/utils.c:227
#, c-format
-msgid ""
-"In order to use this feature of the program, %s must be installed in your "
-"system"
+msgid "In order to use this feature of the program, %s must be installed in your system"
msgstr "为äº?使ç?¨æ¤ç¨?åº?ç??å??è?½ï¼?æ?¨ç??ç³»ç»?ä¸å¿?é¡»å®?è£? %s"
-#: ../src/gnome-nettool.desktop.in.h:1
+#: ../src/gnome-nettool.desktop.in.in.h:1
msgid "Network Information Tools"
msgstr "��信�工�"
-#: ../src/gnome-nettool.desktop.in.h:2
+#: ../src/gnome-nettool.desktop.in.in.h:2
msgid "Network Tools"
msgstr "��工�"
@@ -828,3 +851,8 @@ msgstr "è?·å??â??%sâ??ä¸?å?¨é?¨ç?¨æ?·ç??
msgid "Getting the whois information of %s"
msgstr "è?·å?? %s ç?? whois ä¿¡æ?¯"
+#~ msgid "Packets loss:"
+#~ msgstr "丢失å??æ?°ï¼?"
+#~ msgid "Packet loss:\t%s\n"
+#~ msgstr "丢失å??æ?°ï¼?\t%s\n"
+
diff -pruN 2.18.0-2/src/callbacks.c 2.19.90-0ubuntu1/src/callbacks.c
--- 2.18.0-2/src/callbacks.c 2007-02-17 00:53:16.000000000 +0000
+++ 2.19.90-0ubuntu1/src/callbacks.c 2007-08-14 03:43:09.000000000 +0100
@@ -324,7 +324,8 @@ on_about_activate (GtkWidget *menu_item,
g_sprintf (copyright, "Copyright \xc2\xa9 2003-2004 %s", "Germán Poo Caamaño");
gtk_show_about_dialog (parent,
- "name", "Network Tools",
+ /* Dear translator: This is the name of the application */
+ "name", _("Network Tools"),
"logo-icon-name", "gnome-nettool",
"authors", authors,
"documenters", documentors,
@@ -439,8 +440,9 @@ on_page_switch (GtkNotebook * notebo
gtk_statusbar_pop (GTK_STATUSBAR (netinfo->status_bar), 0);
}
- /* Dear Translator: This is the Window Title */
- title = g_strdup_printf ("%s - Network Tools",
+ /* Dear Translator: This is the Window Title. 'Network Tools' is the
+ * name of the application */
+ title = g_strdup_printf (_("%s - Network Tools"),
gtk_label_get_text (GTK_LABEL (netinfo->page_label)));
gtk_window_set_title (GTK_WINDOW (netinfo->main_window), title);
g_free (title);
diff -pruN 2.18.0-2/src/gnome-nettool.desktop.in 2.19.90-0ubuntu1/src/gnome-nettool.desktop.in
--- 2.18.0-2/src/gnome-nettool.desktop.in 2007-03-13 01:48:54.000000000 +0000
+++ 2.19.90-0ubuntu1/src/gnome-nettool.desktop.in 2007-08-14 03:45:04.000000000 +0100
@@ -1,7 +1,7 @@
[Desktop Entry]
Encoding=UTF-8
_Name=Network Tools
-_Comment=Network Information Tools
+_Comment=View information about your network
Exec=gnome-nettool
Icon=gnome-nettool
Terminal=false
@@ -11,4 +11,4 @@ StartupNotify=true
X-GNOME-Bugzilla-Bugzilla=GNOME
X-GNOME-Bugzilla-Product=gnome-nettool
X-GNOME-Bugzilla-Component=general
-X-GNOME-Bugzilla-Version=2.18.0
+X-GNOME-Bugzilla-Version=2.19.90
diff -pruN 2.18.0-2/src/gnome-nettool.desktop.in.in 2.19.90-0ubuntu1/src/gnome-nettool.desktop.in.in
--- 2.18.0-2/src/gnome-nettool.desktop.in.in 2007-03-13 01:18:37.000000000 +0000
+++ 2.19.90-0ubuntu1/src/gnome-nettool.desktop.in.in 2007-08-14 03:43:09.000000000 +0100
@@ -1,7 +1,7 @@
[Desktop Entry]
Encoding=UTF-8
_Name=Network Tools
-_Comment=Network Information Tools
+_Comment=View information about your network
Exec=gnome-nettool
Icon=gnome-nettool
Terminal=false
diff -pruN 2.18.0-2/src/Makefile.in 2.19.90-0ubuntu1/src/Makefile.in
--- 2.18.0-2/src/Makefile.in 2007-03-13 01:48:45.000000000 +0000
+++ 2.19.90-0ubuntu1/src/Makefile.in 2007-08-14 03:44:51.000000000 +0100
@@ -122,12 +122,12 @@ ENABLE_SK_TRUE = @ENABLE_SK_TRUE@
EXEEXT = @EXEEXT@
F77 = @F77@
FFLAGS = @FFLAGS@
-GDU_MODULE_VERSION_CHECK_CFLAGS = @GDU_MODULE_VERSION_CHECK_CFLAGS@
-GDU_MODULE_VERSION_CHECK_LIBS = @GDU_MODULE_VERSION_CHECK_LIBS@
GETTEXT_PACKAGE = @GETTEXT_PACKAGE@
GMOFILES = @GMOFILES@
GMSGFMT = @GMSGFMT@
GREP = @GREP@
+HAVE_GNOME_DOC_UTILS_FALSE = @HAVE_GNOME_DOC_UTILS_FALSE@
+HAVE_GNOME_DOC_UTILS_TRUE = @HAVE_GNOME_DOC_UTILS_TRUE@
HELP_DIR = @HELP_DIR@
INSTALL_DATA = @INSTALL_DATA@
INSTALL_PROGRAM = @INSTALL_PROGRAM@
@@ -173,6 +173,7 @@ MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_
MAKEINFO = @MAKEINFO@
MKINSTALLDIRS = @MKINSTALLDIRS@
MSGFMT = @MSGFMT@
+MSGFMT_OPTS = @MSGFMT_OPTS@
NETTOOL_CFLAGS = @NETTOOL_CFLAGS@
NETTOOL_LIBS = @NETTOOL_LIBS@
OBJEXT = @OBJEXT@
diff -pruN 2.18.0-2/src/nettool.c 2.19.90-0ubuntu1/src/nettool.c
--- 2.18.0-2/src/nettool.c 2007-02-17 00:53:16.000000000 +0000
+++ 2.19.90-0ubuntu1/src/nettool.c 2007-08-14 03:43:09.000000000 +0100
@@ -265,6 +265,8 @@ netinfo_text_buffer_insert (Netinfo * ne
gchar *dir = g_get_current_dir ();
gint child_pid, pout; /* , perr; */
GIOChannel *channel;
+ const gchar *charset;
+ GIOStatus status;
GError *err = NULL;
g_return_if_fail (netinfo != NULL);
@@ -284,17 +286,26 @@ netinfo_text_buffer_insert (Netinfo * ne
/*netinfo->pipe_err = perr; */
+ g_get_charset(&charset);
channel = g_io_channel_unix_new (pout);
- g_io_add_watch (channel,
- G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL,
- netinfo_io_text_buffer_dialog, netinfo);
- g_io_channel_unref (channel);
-
- /*channel = g_io_channel_unix_new (perr);
- g_io_add_watch (channel,
- G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL,
- netinfo_io_text_buffer_dialog, netinfo);
- g_io_channel_unref (channel); */
+ status = g_io_channel_set_encoding(channel,
+ charset,
+ &err);
+ if (G_IO_STATUS_NORMAL == status) {
+ g_io_add_watch (channel,
+ G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL,
+ netinfo_io_text_buffer_dialog, netinfo);
+ g_io_channel_unref (channel);
+
+ /*channel = g_io_channel_unix_new (perr);
+ g_io_add_watch (channel,
+ G_IO_IN | G_IO_HUP | G_IO_ERR | G_IO_NVAL,
+ netinfo_io_text_buffer_dialog, netinfo);
+ g_io_channel_unref (channel); */
+ } else {
+ g_warning ("Error: %s\n", err->message);
+ g_error_free (err);
+ }
} else {
gint len = strlen (err->message);
diff -pruN 2.18.0-2/src/ping.c 2.19.90-0ubuntu1/src/ping.c
--- 2.18.0-2/src/ping.c 2007-02-17 00:53:16.000000000 +0000
+++ 2.19.90-0ubuntu1/src/ping.c 2007-08-14 03:43:09.000000000 +0100
@@ -379,7 +379,7 @@ void
ping_foreach_with_tree (Netinfo * netinfo, gchar * line, gint len,
gpointer user_data)
{
- GtkTreeIter iter, sibling;
+ GtkTreeIter iter;
GList *columns;
GtkTreePath *path;
GtkTreeModel *model;
@@ -434,17 +434,8 @@ ping_foreach_with_tree (Netinfo * netinf
data.srtt, data.unit);
#endif /* DEBUG */
- if (path != NULL) {
- gtk_tree_model_get_iter (model, &sibling,
- path);
- gtk_list_store_insert_after (GTK_LIST_STORE
- (model),
- &iter,
- &sibling);
- } else {
- gtk_list_store_append (GTK_LIST_STORE
- (model), &iter);
- }
+ gtk_list_store_append (GTK_LIST_STORE
+ (model), &iter);
gtk_list_store_set (GTK_LIST_STORE (model), &iter,
BYTES_COLUMN, data.bytes,
@@ -455,10 +446,13 @@ ping_foreach_with_tree (Netinfo * netinf
gtk_tree_view_set_model (GTK_TREE_VIEW (widget),
model);
- path = gtk_tree_model_get_path (model, &iter);
- gtk_tree_view_set_cursor (GTK_TREE_VIEW (widget),
- path, NULL, FALSE);
- gtk_tree_path_free (path);
+
+ if (path) {
+ gtk_tree_view_set_cursor (
+ GTK_TREE_VIEW (widget),
+ path, NULL, FALSE);
+ gtk_tree_path_free (path);
+ }
rtt = g_ascii_strtod (data.srtt, NULL);
rttmin = (rttmin > 0.0) ? MIN (rttmin, rtt) : rtt;
diff -pruN 2.18.0-2/src/traceroute.c 2.19.90-0ubuntu1/src/traceroute.c
--- 2.18.0-2/src/traceroute.c 2007-02-17 00:53:16.000000000 +0000
+++ 2.19.90-0ubuntu1/src/traceroute.c 2007-08-14 03:43:09.000000000 +0100
@@ -139,7 +139,7 @@ void
traceroute_foreach_with_tree (Netinfo * netinfo, gchar * line, gint len,
gpointer user_data)
{
- GtkTreeIter iter, sibling;
+ GtkTreeIter iter;
GList *columns;
GtkTreePath *path;
GtkTreeModel *model;
@@ -181,17 +181,8 @@ traceroute_foreach_with_tree (Netinfo *
gtk_tree_view_get_cursor (GTK_TREE_VIEW (widget),
&path, NULL);
- if (path != NULL) {
- gtk_tree_model_get_iter (model, &sibling,
- path);
- gtk_list_store_insert_after (GTK_LIST_STORE
- (model),
- &iter,
- &sibling);
- } else {
- gtk_list_store_append (GTK_LIST_STORE
- (model), &iter);
- }
+ gtk_list_store_append (GTK_LIST_STORE
+ (model), &iter);
gtk_list_store_set (GTK_LIST_STORE (model), &iter,
TRACE_HOP, data.hop_count,
@@ -203,10 +194,13 @@ traceroute_foreach_with_tree (Netinfo *
gtk_tree_view_set_model (GTK_TREE_VIEW (widget),
model);
- path = gtk_tree_model_get_path (model, &iter);
- gtk_tree_view_set_cursor (GTK_TREE_VIEW (widget),
- path, NULL, FALSE);
- gtk_tree_path_free (path);
+
+ if (path) {
+ gtk_tree_view_set_cursor (
+ GTK_TREE_VIEW (widget),
+ path, NULL, FALSE);
+ gtk_tree_path_free (path);
+ }
}
}
while (gtk_events_pending ()) {
[
Date Prev][Date Next] [
Thread Prev][Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
