rev 11904 - in kde-extras/krusader/tags: . 1.90.0-2 1.90.0-2/debian 1.90.0-2/debian/patches
Fathi Boudra
fabo at alioth.debian.org
Sun Aug 10 17:01:45 UTC 2008
Author: fabo
Date: 2008-08-10 17:01:44 +0000 (Sun, 10 Aug 2008)
New Revision: 11904
Added:
kde-extras/krusader/tags/1.90.0-2/
kde-extras/krusader/tags/1.90.0-2/debian/changelog
kde-extras/krusader/tags/1.90.0-2/debian/compat
kde-extras/krusader/tags/1.90.0-2/debian/control
kde-extras/krusader/tags/1.90.0-2/debian/copyright
kde-extras/krusader/tags/1.90.0-2/debian/menu
kde-extras/krusader/tags/1.90.0-2/debian/patches/01_krusader_branch_r5981.diff
kde-extras/krusader/tags/1.90.0-2/debian/patches/02_autotools_update.diff
kde-extras/krusader/tags/1.90.0-2/debian/patches/03_libtool_update.diff
kde-extras/krusader/tags/1.90.0-2/debian/patches/11_add_useractions_examples.diff
kde-extras/krusader/tags/1.90.0-2/debian/patches/series
kde-extras/krusader/tags/1.90.0-2/debian/rules
Removed:
kde-extras/krusader/tags/1.90.0-2/debian/README.Debian
kde-extras/krusader/tags/1.90.0-2/debian/changelog
kde-extras/krusader/tags/1.90.0-2/debian/compat
kde-extras/krusader/tags/1.90.0-2/debian/control
kde-extras/krusader/tags/1.90.0-2/debian/copyright
kde-extras/krusader/tags/1.90.0-2/debian/krusader.lintian-overrides
kde-extras/krusader/tags/1.90.0-2/debian/menu
kde-extras/krusader/tags/1.90.0-2/debian/patches/02_autotools_update.diff
kde-extras/krusader/tags/1.90.0-2/debian/patches/03_libtool_update.diff
kde-extras/krusader/tags/1.90.0-2/debian/patches/11_add_useractions_examples.diff
kde-extras/krusader/tags/1.90.0-2/debian/rules
Log:
Tagging krusader 1.90.0-2
Copied: kde-extras/krusader/tags/1.90.0-2 (from rev 11895, kde-extras/krusader/trunk)
Property changes on: kde-extras/krusader/tags/1.90.0-2
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: kde-extras/krusader/tags/1.90.0-2/debian/README.Debian
Deleted: kde-extras/krusader/tags/1.90.0-2/debian/changelog
Copied: kde-extras/krusader/tags/1.90.0-2/debian/changelog (from rev 11903, kde-extras/krusader/trunk/debian/changelog)
===================================================================
--- kde-extras/krusader/tags/1.90.0-2/debian/changelog (rev 0)
+++ kde-extras/krusader/tags/1.90.0-2/debian/changelog 2008-08-10 17:01:44 UTC (rev 11904)
@@ -0,0 +1,311 @@
+krusader (1.90.0-2) unstable; urgency=low
+
+ * Add krusader branch pull patch:
+ * Update french and ukrainian translations.
+ * Update credits in the About box.
+ * Fix Availability restrictions of UserActions. (Closes: #492955)
+ * Bump compat/debhelper to 6.
+ * Switch to quilt patch system: add quilt build dependency.
+ * Use su-to-root instead of kdesu. Add menu dependency. (Closes: #479821)
+ * Bump Standard-Version to 3.8.0 (no changes needed).
+ * Use Vcs-Browser and Vcs-Svn fields.
+
+ -- Fathi Boudra <fabo at debian.org> Sun, 10 Aug 2008 17:00:07 +0200
+
+krusader (1.90.0-1) unstable; urgency=low
+
+ [ Ana Beatriz Guerrero Lopez ]
+
+ * New upstream release:
+ - GCC 4.3 compatibility (Closes: #455657)
+ * Update Debian menu section to new policy.
+ * Replace GFDL full license text in debian/copyright for a pointer
+ to /usr/share/common-licenses/GFDL-1.2
+
+ [ Fathi Boudra ]
+
+ * Update my e-mail address.
+ * Remove Angel Ramos from Uploaders field.
+ * Bump Standard-Version to 3.7.3.
+ * Add kdebase-bin versioned dependency.
+
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org> Sun, 23 Mar 2008 15:54:15 +0100
+
+krusader (1.80.0-1) unstable; urgency=low
+
+ * New upstream release.
+
+ -- Fathi Boudra <fboudra at free.fr> Sun, 22 Jul 2007 20:22:02 +0200
+
+krusader (1.80.0~beta2-1) unstable; urgency=low
+
+ * New upstream release.
+
+ [Fathi Boudra]
+ * Update copyright.
+ * Remove gcc4.2 support patch. Merged upstream.
+ * Update useractions examples patch.
+
+ [Mark Purcell]
+ * Update debian/watch.
+ * Robust get-orig-source target.
+
+ -- Fathi Boudra <fboudra at free.fr> Fri, 11 May 2007 18:12:49 +0200
+
+krusader (1.80.0~beta1-1) experimental; urgency=low
+
+ * Add debug package
+ * Add automake1.9 to Build-Depends
+ * Clean up rules:
+ * remove DEB_BUILDDIR
+ * add DEB_DESTDIR
+ * remove desktop files freedesktop compliant hack
+ * Update watch
+
+ -- Fathi Boudra <fboudra at free.fr> Sun, 7 Jan 2007 16:11:37 +0100
+
+krusader (1.70.1-1) unstable; urgency=low
+
+ * New upstream release
+ * fix cleartext in the bookmark file CVE-2006-3816 (Closes: #380063)
+ * Convert package to cdbs
+ * New maintainers:
+ * Maintainer: KDE Extras Team
+ * Uploaders: Angel Ramos, Mark Purcell and Fathi Boudra
+ * compat: bumped to 5
+ * control:
+ * removed unneeded Build-depends
+ * bumped Standards-Version to 3.7.2
+ * Suggests updated
+ * Description updated
+ * copyright: added missing copyrights and documentations license
+ * docs: added FAQ
+ * Added watch file
+ * Added some popular useractions to Useractions.xml, patch by Vaclav Juza
+ * Added krusader-rootmode to debian menu,thanks to Vaclav Juza
+ * Added gcc 4.2 support patch by Martin Michlmayr (Closes: #361933)
+ * Fix desktop files path to be freedesktop compliant (Closes: #378138)
+
+ -- Fathi Boudra <fboudra at free.fr> Sat, 19 Aug 2006 12:37:05 +0200
+
+krusader (1.70.0-1) unstable; urgency=low
+
+ * New upstream release (Closes: #352574, #336169, #343960, #342717, #349874, #351527, #345097, #345098, #349873, #328466, #352367, #347126).
+ * It's not clear rar/unrar suggest violates DFSG #4 (Closes: #340706).
+ * Krusader doesn't crash now (Closes: #349784, #350890, #355464, #355871).
+ * Krusader new upstream doesn't crash viewing .gz files (Closes: #288661).
+ * Viewer Window too big appears not be caused by krusader (Closes: #349870).
+ * Imposible reproduce white stripe problem (Closes: #349872).
+ * Added libkjsembed-dev and libkonq4-dev as build-depends (Closes: #331130).
+
+ -- Angel Ramos <seamus at debian.org> Sat, 11 Mar 2006 16:43:05 +0100
+
+krusader (1.60.0-3.1) unstable; urgency=low
+
+ * Non-maintainer upload.
+ * Remove Build-Dependency on xlibs-dev (Closes: #347126).
+ * Credit and Big Thanks to Justin Pryzby <justinpryzby at users.sourceforge.net>
+ for the patch and testing.
+
+ -- Amaya Rodrigo Sastre <amaya at debian.org> Sat, 21 Jan 2006 21:01:08 +0100
+
+krusader (1.60.0-3) unstable; urgency=low
+
+ * Fixed gcc-4.0 compiling problem (Closes: #326789).
+ * Fixed autoconf m68k and mipsel problem (Closes: #310669).
+ * de.po corrected (Closes: #313785).
+ * Added kdebase-kio-plugins as suggest header (Closes: #322764).
+ * The problem with ps/pdf files is a kghostview problem, not
+ krusader (Closes: #325130)
+ * No segfault on closing the viewer with krusader 1.60 (Closes: #325170).
+ * No crash when user switches desktops on krusader 1.60 (Closes: #320297).
+
+ -- Angel Ramos <seamus at debian.org> Mon, 12 Sep 2005 17:25:48 +0100
+
+krusader (1.60.0-2) unstable; urgency=low
+
+ * Fixed FTBFS on all archs (Closes: #306756).
+
+ -- Angel Ramos <seamus at debian.org> Wed, 24 May 2005 17:38:48 +0200
+
+krusader (1.60.0-1) unstable; urgency=low
+
+ * New upstream release (Closes: #305494).
+ * Package description and suggests update. Thanks Frank Schoolmeesters
+ for the help and reports! (Closes: #291617, #297991).
+ * Fixed problem opening documentation (Closes: #291611).
+ * Not reporting read-only fs is a kde problem not krusader
+ (Closes: #291811).
+
+ -- Angel Ramos <seamus at debian.org> Wed, 27 Apr 2005 18:12:48 +0200
+
+krusader (1.51-1) unstable; urgency=low
+
+ * New upstream release (Closes: #280037, #287015).
+ * Moved from section utils to kde (Closes: #286748).
+ * Renamed dk.po to da.po (Closes: #269414).
+
+ -- Angel Ramos <seamus at debian.org> Thu, 30 Dec 2004 16:18:26 +0100
+
+krusader (1.40-1) unstable; urgency=low
+
+ * New upstream release (Closes: #260824).
+
+ -- Angel Ramos <seamus at debian.org> Wed, 18 Aug 2004 17:20:27 +0200
+
+krusader (1.30-2) unstable; urgency=low
+
+ * Renamed dk.po to da.po (Closes: #238872).
+ * Updated libtool (Closes: #246354).
+ * x-ace.desktop problems solved (Closes: #245663, #238052).
+
+ -- Angel Ramos <seamus at debian.org> Fri, 30 Apr 2004 18:35:00 +0200
+
+krusader (1.30-1.2) unstable; urgency=low
+
+ * NMU to fix broken previous NMU
+ * really remove x-ace.desktop this time
+
+ -- Andreas Barth <aba at not.so.argh.org> Fri, 23 Apr 2004 07:49:35 +0200
+
+krusader (1.30-1.1) unstable; urgency=low
+
+ * NMU during BSP
+ * remove x-ace.desktop, which is also in kdelibs-data. Closes: #238052
+
+ -- Andreas Barth <aba at not.so.argh.org> Sun, 18 Apr 2004 11:39:32 +0200
+
+krusader (1.30-1) unstable; urgency=low
+
+ * New upstream release (Closes: #201496).
+ * Remove unzip-crypt and zip-crypt from the Suggests line
+ (Closes: #190765).
+ * Fixed segfault when trying to view files with no read access
+ (Closes: #198298).
+
+ -- Angel Ramos <seamus at debian.org> Mon, 5 Jan 2004 21:06:23 +0100
+
+krusader (1.11-1) unstable; urgency=low
+
+ * New upstream release.
+ * Updated config.guess and config.sub (Closes: #168658).
+
+ -- Angel Ramos <seamus at debian.org> Thu, 27 Feb 2003 16:31:00 +0200
+
+krusader (1.00-2) unstable; urgency=low
+
+ * Added autoconf2.13 as build dep in order the package can be built
+ (Closes: #164973).
+ * Added kmail and xxdiff as suggest (Closes: #153999).
+
+ -- Angel Ramos <seamus at debian.org> Wed, 23 Oct 2002 21:35:06 +0200
+
+krusader (1.00-1) unstable; urgency=low
+
+ * New upstream release (Closes: #127984).
+ * Fixed admin/debianrules on the source.
+
+ -- Angel Ramos <seamus at debian.org> Tue, 8 Jan 2002 10:50:06 +0100
+
+krusader (0.99-1.1) unstable; urgency=low
+
+ * Fixed spelling error in description (Closes: #124850).
+
+ -- Angel Ramos <seamus at debian.org> Tue, 18 Dec 2001 02:07:00 +0100
+
+krusader (0.99-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Angel Ramos <seamus at debian.org> Tue, 11 Dec 2001 13:13:41 +0100
+
+krusader (0.98-3) unstable; urgency=low
+
+ * Added automake and autoconf as build-deps to solve the build problems
+ on some architectures (Closes: #121664).
+
+ -- Angel Ramos <seamus at debian.org> Thu, 29 Nov 2001 10:37:20 +0100
+
+krusader (0.98-2) unstable; urgency=low
+
+ * Changes on debian/rules in order to add right alpha compiler flags
+ for alpha builds (Closes: #121376).
+
+ -- Angel Ramos <seamus at debian.org> Wed, 28 Nov 2001 11:48:03 +0100
+
+krusader (0.98-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- Angel Ramos <seamus at debian.org> Tue, 30 Oct 2001 11:42:37 +0100
+
+krusader (0.97-1) unstable; urgency=low
+
+ * New upstream release
+ * Solved problems with broken docbook file (Closes: #115337).
+
+ -- Angel Ramos <seamus at debian.org> Mon, 15 Oct 2001 13:16:38 +0200
+
+krusader (0.95-3) unstable; urgency=low
+
+ *Fixed config.sub and config.guess on the source in order to
+ support hppa architecture (Closes: #108276).
+ *Symlink from locolor icon to highcolor created (Closes: #110453).
+
+ -- Angel Ramos <seamus at debian.org> Wed, 29 Aug 2001 10:12:22 +0200
+
+krusader (0.95-2) unstable; urgency=low
+
+ *Fixed architecture bug on control file (Closes: #110344).
+ *Solved some problems with wrong link files.
+
+ -- Angel Ramos <seamus at debian.org> Tue, 28 Aug 2001 09:35:49 +0200
+
+krusader (0.95-1) unstable; urgency=low
+
+ *New Maintainer (Closes: #84536).
+ *New upstream release.
+
+ -- Angel Ramos <seamus at debian.org> Fri, 24 Aug 2001 13:05:22 +0200
+
+krusader (0.75-2) unstable; urgency=low
+
+ * Maintainer set to Debian QA Group <packages at qa.debian.org>.
+ * Added a build dependency on automake.
+
+ -- Adrian Bunk <bunk at fs.tum.de> Wed, 22 Aug 2001 23:56:27 +0200
+
+krusader (0.75-1.2) unstable; urgency=low
+
+ * NMU
+ * Build against new qt/kdelibs
+ * update build-depends
+
+ -- Ivan E. Moore II <rkrusty at debian.org> Tue, 27 Feb 2001 13:35:16 -0700
+
+krusader (0.75-1.1) unstable; urgency=low
+
+ * Rebuilt package to remove wrong dependency on xlibs (Closes: #80199).
+
+ -- Martin Michlmayr <tbm at cyrius.com> Thu, 21 Dec 2000 19:39:16 +0100
+
+krusader (0.75-1) unstable; urgency=low
+
+ * New upstream release.
+ * Fixed install destinations in misc/Makefile.am.
+ * Minor changes in rules.
+ * Changed title in krusader.doc-base.
+ * Build-Depends: removed docbook, docbook-stylesheets, jade and
+ sgml-base (not used now).
+ * Recommends: added tar and gzip.
+ * Upload sponsored by Martin Michlmayr <tbm at debian.org>.
+
+ -- Mariusz Przygodzki <dune at home.pl> Mon, 11 Dec 2000 18:49:22 +0100
+
+krusader (0.70-1) unstable; urgency=low
+
+ * Initial Release. Closes: #75893
+ * Changed krusader.desktop and its location.
+ * Upload sponsored by Martin Michlmayr <tbm at debian.org>.
+
+ -- Mariusz Przygodzki <dune at home.pl> Sat, 9 Dec 2000 15:57:15 +0100
Deleted: kde-extras/krusader/tags/1.90.0-2/debian/compat
Copied: kde-extras/krusader/tags/1.90.0-2/debian/compat (from rev 11903, kde-extras/krusader/trunk/debian/compat)
===================================================================
--- kde-extras/krusader/tags/1.90.0-2/debian/compat (rev 0)
+++ kde-extras/krusader/tags/1.90.0-2/debian/compat 2008-08-10 17:01:44 UTC (rev 11904)
@@ -0,0 +1 @@
+6
Deleted: kde-extras/krusader/tags/1.90.0-2/debian/control
Copied: kde-extras/krusader/tags/1.90.0-2/debian/control (from rev 11903, kde-extras/krusader/trunk/debian/control)
===================================================================
--- kde-extras/krusader/tags/1.90.0-2/debian/control (rev 0)
+++ kde-extras/krusader/tags/1.90.0-2/debian/control 2008-08-10 17:01:44 UTC (rev 11904)
@@ -0,0 +1,47 @@
+Source: krusader
+Section: kde
+Priority: optional
+Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
+Uploaders: Fathi Boudra <fabo at debian.org>, Mark Purcell <msp at debian.org>
+Build-Depends: cdbs, debhelper (>= 6), quilt, automake1.9,
+ libkonq4-dev, libkjsembed-dev
+Standards-Version: 3.8.0
+Homepage: http://krusader.sourceforge.net
+Vcs-Browser: http://svn.debian.org/wsvn/pkg-kde/kde-extras/krusader/?op=log
+Vcs-Svn: svn://svn.debian.org/pkg-kde/kde-extras/krusader/trunk
+
+Package: krusader
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}, menu
+Suggests: md5deep | cfv, kedit, khexedit, konsole, kmail,
+ krename, kdiff3 | kompare | xxdiff, ark, arj, bzip2, cpio, lha,
+ unrar | unrar-free | rar, rpm, unace, unzip, zip, p7zip, kdebase-bin (<< 4:4.0.0-1),
+ kdebase-kio-plugins
+Description: twin-panel (commander-style) file manager for KDE (and other desktops)
+ Krusader is a simple, easy, powerful, twin-panel (commander-style) file
+ manager for KDE and other desktops, similar to Midnight Commander (C) or Total
+ Commander (C).
+ .
+ It provides all the file management features you could possibly want.
+ .
+ Plus: extensive archive handling, mounted filesystem support, FTP,
+ advanced search module, viewer/editor, directory synchronisation,
+ file content comparisons, powerful batch renaming and much more.
+ .
+ It supports archive formats: ace, arj, bzip2, deb, iso, lha, rar, rpm, tar,
+ zip and 7-zip.
+ .
+ It handles KIOSlaves such as smb:// or fish://.
+ .
+ Almost completely customizable, Krusader is very user friendly, fast and looks
+ great on your desktop.
+
+Package: krusader-dbg
+Section: devel
+Architecture: any
+Priority: extra
+Depends: krusader (= ${binary:Version})
+Description: debugging symbols for krusader
+ This package contains the debugging symbols associated with krusader.
+ They will automatically be used by gdb for debugging krusader-related
+ issues.
Deleted: kde-extras/krusader/tags/1.90.0-2/debian/copyright
Copied: kde-extras/krusader/tags/1.90.0-2/debian/copyright (from rev 11903, kde-extras/krusader/trunk/debian/copyright)
===================================================================
--- kde-extras/krusader/tags/1.90.0-2/debian/copyright (rev 0)
+++ kde-extras/krusader/tags/1.90.0-2/debian/copyright 2008-08-10 17:01:44 UTC (rev 11904)
@@ -0,0 +1,80 @@
+This package was debianized by Angel Ramos <seamus at debian.org> on
+Fri, 24 Aug 2001 12:57:14 +0100.
+
+It was downloaded from http://krusader.sourceforge.net
+
+Upstream Authors:
+ Shie Erlich <erlich at users.sourceforge.net>
+ Rafi Yanai <yanai at users.sourceforge.net>
+ Dirk Eschler <deschler at users.sourceforge.net>
+ Richard Holt <richard.holt at gmail.com>
+ Heiner Eichmann <h.eichmann at gmx.de>
+ Frank Schoolmeesters <frank.schoolmeesters at gmail.com>
+ Csaba Karai <cskarai at freemail.hu>
+ Jonas Bähr <jonas.baehr at web.de>
+ Matej Urbancic <matej at amis.net>
+
+iso is based on tar from kdebase:
+ © David Faure <faure at kde.org>
+
+kiso is based on ktar from kdelibs:
+ © Torben Weis <weis at kde.org>
+ © David Faure <faure at kde.org>
+
+krremoteencodingmenu is based on KRemoteEncodingPlugin from kdebase:
+ © Dawit Alemayehu <adawit at kde.org>
+
+paneltabbar is based on code from k3b:
+ © Sebastian Trueg <trueg at k3b.org>
+
+kimagefilepreview is based on code from kdelibs:
+ © 2001 Martin R. Jones <mjones at kde.org>
+ © 2001 Carsten Pfeiffer <pfeiffer at kde.org>
+
+kdiskfreesp is based on code from kdelibs:
+ © 1999 Michael Kropfberger <michael.kropfberger at gmx.net>
+
+krprogress code is bases on code from kdelibs:
+ © 2000 Matej Koss <koss at miesto.sk>
+
+Copyright for libisofs, licensed under the GPL:
+ © 2002 György Szombathelyi <gyurco at users.sourceforge.net>
+
+Copyright for kcmdmodebutton class:
+ © 2006 Vaclav Juza <vaclavjuza at gmail.com>
+
+License:
+
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this package; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.
+
+The Debian packaging is © 2006-2008, Fathi Boudra <fabo at debian.org> and
+is licensed under the GPL, see above.
+
+The documentations provided with krusader is distributed under
+the GNU Free Documentation License (FDL). They are considered free with
+regards to the Debian Free Software Guidelines (DFSG) because they don't
+contain any unmodifiable parts (invariant sections).
+
+ Permission is granted to copy, distribute and/or modify this
+ document under the terms of the GNU Free Documentation License,
+ Version 1.1 or any later version published by the Free Software
+ Foundation; with no Invariant Sections, with no Front-Cover Texts,
+ and with no Back-Cover Texts.
+
+A copy of the GNU Free Documentation License (Version 1.2) is
+located in /usr/share/common-licenses/GFDL-1.2
Deleted: kde-extras/krusader/tags/1.90.0-2/debian/krusader.lintian-overrides
Deleted: kde-extras/krusader/tags/1.90.0-2/debian/menu
Copied: kde-extras/krusader/tags/1.90.0-2/debian/menu (from rev 11903, kde-extras/krusader/trunk/debian/menu)
===================================================================
--- kde-extras/krusader/tags/1.90.0-2/debian/menu (rev 0)
+++ kde-extras/krusader/tags/1.90.0-2/debian/menu 2008-08-10 17:01:44 UTC (rev 11904)
@@ -0,0 +1,17 @@
+?package(krusader):\
+ needs="X11"\
+ section="Applications/Network/File Transfer"\
+ hints="KDE"\
+ title="krusader (File Manager)"\
+ icon32x32="/usr/share/pixmaps/krusader_user.xpm"\
+ icon16x16="/usr/share/pixmaps/krusader_user-16.xpm"\
+ command="/usr/bin/krusader"
+
+?package(krusader):\
+ needs="X11"\
+ section="Applications/Network/File Transfer"\
+ hints="KDE"\
+ title="krusader - root-mode (File Manager)"\
+ icon32x32="/usr/share/pixmaps/krusader_root.xpm"\
+ icon16x16="/usr/share/pixmaps/krusader_root-16.xpm"\
+ command="su-to-root -X -c /usr/bin/krusader"
Copied: kde-extras/krusader/tags/1.90.0-2/debian/patches/01_krusader_branch_r5981.diff (from rev 11903, kde-extras/krusader/trunk/debian/patches/01_krusader_branch_r5981.diff)
===================================================================
--- kde-extras/krusader/tags/1.90.0-2/debian/patches/01_krusader_branch_r5981.diff (rev 0)
+++ kde-extras/krusader/tags/1.90.0-2/debian/patches/01_krusader_branch_r5981.diff 2008-08-10 17:01:44 UTC (rev 11904)
@@ -0,0 +1,8524 @@
+--- a/ChangeLog
++++ b/ChangeLog
+@@ -1,3 +1,8 @@
++ I18N: Updated Ukrainian translation (thanks to Yuri Chornoivan)
++ I18N: Updated French translation (thanks Tourneur Henry-Nicolas)
++ ADDED: credit for Václav in the about box
++
++
+ 1.90.0 "Power Stone"
+ ====================
+
+--- a/doc/en/release-overview.docbook
++++ b/doc/en/release-overview.docbook
+@@ -55,7 +55,8 @@
+ </row>
+ <row>
+ <entry>
+- <para>1.90.0 "Power Stone"</para>
++ <para><ulink url="http://www.krusader.org/phpBB/viewtopic.php?t=2061">
++ 1.90.0 "Power Stone"</ulink></para>
+ </entry>
+ <entry>
+ <para>2008-03-?? under construction</para>
+--- a/krusader/main.cpp
++++ b/krusader/main.cpp
+@@ -112,7 +112,7 @@
+ KAboutData aboutData( "krusader", ( geteuid() ? I18N_NOOP("Krusader") :
+ I18N_NOOP("Krusader - ROOT PRIVILEGES")),
+ versionName.latin1(), description, KAboutData::License_GPL,
+- "(c) 2000-2003, Shie Erlich, Rafi Yanai\n(c) 2004-2007, Krusader Krew",
++ "(c) 2000-2003, Shie Erlich, Rafi Yanai\n(c) 2004-2008, Krusader Krew",
+ I18N_NOOP("Feedback\nhttp://www.krusader.org/phpBB/\n\n"
+ "IRC\nserver: irc.freenode.net, channel: #krusader"),
+ "http://www.krusader.org",
+@@ -123,6 +123,7 @@
+ aboutData.addAuthor("Karai Csaba", "Developer", "ckarai at users.sourceforge.net", 0);
+ aboutData.addAuthor("Heiner Eichmann","Developer", "h.eichmann at gmx.de", 0);
+ aboutData.addAuthor("Jonas Baehr", "Developer", "jonas.baehr at web.de", 0);
++ aboutData.addAuthor("Václav Juza", "Developer", "vaclavjuza at gmail.com", 0);
+ aboutData.addAuthor("Dirk Eschler", "Webmaster and i18n coordinator", "deschler at users.sourceforge.net", 0);
+ aboutData.addAuthor("Frank Schoolmeesters", "Documentation and marketing coordinator", "frank_schoolmeesters at yahoo.com", 0);
+ aboutData.addAuthor("Richard Holt", "Documentation & Proofing", "richard.holt at gmail.com", 0);
+--- a/po/fr.po
++++ b/po/fr.po
+@@ -1,26 +1,25 @@
+ # Translation of krusader.pot to French
+ #
+ # Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
+-# Copyright (C) 2004-2007, Krusader Krew
++# Copyright (C) 2004-2008, Krusader Krew
+ # This file is distributed under the same license as the Krusader package
+ #
+ # Rene-Pierre Lehmann <ripi at lepi.org>, 2002.
+ # Frank Schoolmeesters <frank_schoolmeesters at fastmail.fm>, 2004.
+ # Guillerm David <dguillerm at gmail.com>, 2005, 2006.
+-# Tourneur Henry-Nicolas <henry.nicolas at tourneur.be>, 2007.
++# Tourneur Henry-Nicolas <henry.nicolas at tourneur.be>, 2007, 2008.
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: krusader-1.80.0\n"
++"Project-Id-Version: krusader-1.90.0\n"
+ "Report-Msgid-Bugs-To: Dirk Eschler <deschler at users.sourceforge.net>\n"
+ "POT-Creation-Date: 2007-03-27 15:16+0200\n"
+-"PO-Revision-Date: 2007-09-14 18:22+0200\n"
++"PO-Revision-Date: 2008-04-18 17:20+0200\n"
+ "Last-Translator: Tourneur Henry-Nicolas <henry.nicolas at tourneur.be>\n"
+ "Language-Team: krusader-i18n <krusader-i18n at googlegroups.com>\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"
++"Plural-Forms: nplurals=2; plural=(n > 1);"
+
+ #: GUI/dirhistorybutton.cpp:35
+ msgid "Open the directory history list"
+@@ -52,7 +51,7 @@
+
+ #: GUI/profilemanager.cpp:112
+ msgid "Enter the profile name:"
+-msgstr "Entrez le nom du profil : "
++msgstr "Entrez le nom du profil : "
+
+ #: GUI/krremoteencodingmenu.cpp:97
+ msgid "Reload"
+@@ -150,8 +149,8 @@
+ "Krusader obeys.</p><p><b>Tip</b>: Move within command line history with <"
+ "Up> and <Down> arrows.</p></qt>"
+ msgstr ""
+-"<qt><p>Bien, c'est très simple : Vous tapez votre commande ici et "
+-"Krusader obéit.</p><p><b>Astuce</b> :Déplacez vous dans l'historique "
++"<qt><p>Bien, c'est très simple : Vous tapez votre commande ici et "
++"Krusader obéit.</p><p><b>Astuce</b> :Déplacez vous dans l'historique "
+ "des commandes avec les flèches <Haut> et <Bas>.</p></qt>"
+
+ #: ActionMan/actionpropertybase.cpp:418 GUI/kcmdline.cpp:102
+@@ -282,7 +281,7 @@
+ "Malformed URL:\n"
+ "%1"
+ msgstr ""
+-"URL mal formée :\n"
++"URL mal formée :\n"
+ "%1"
+
+ #: VFS/ftp_vfs.cpp:167
+@@ -301,13 +300,13 @@
+ "Protocol not supported by Krusader:\n"
+ "%1"
+ msgstr ""
+-"Krusader ne supporte pas le protocol :\n"
++"Krusader ne supporte pas le protocol :\n"
+ "%1"
+
+ #: VFS/arc_vfs.cpp:217
+ msgid "<qt>Can't read <b>%1</b>. Archive might be corrupted!</qt>"
+ msgstr ""
+-"<qt>Impossible de lire <b>%1</b>. L'archive est peut-être corrompue !</"
++"<qt>Impossible de lire <b>%1</b>. L'archive est peut-être corrompue !</"
+ "qt>"
+
+ #: VFS/arc_vfs.cpp:322 VFS/arc_vfs.cpp:579
+@@ -324,7 +323,7 @@
+
+ #: VFS/normal_vfs.cpp:90
+ msgid "Directory %1 does not exist!"
+-msgstr "Dossier %1 inexistant !"
++msgstr "Dossier %1 inexistant !"
+
+ #: BookMan/krbookmarkhandler.cpp:172 BookMan/krbookmarkhandler.cpp:268
+ #: Konfigurator/kgcolors.cpp:508 Konfigurator/kgcolors.cpp:525
+@@ -339,7 +338,7 @@
+
+ #: Synchronizer/synchronizerdirlist.cpp:101 VFS/normal_vfs.cpp:100
+ msgid "Can't open the %1 directory!"
+-msgstr "Ouverture du dossier %1 impossible !"
++msgstr "Ouverture du dossier %1 impossible !"
+
+ #: VFS/normal_vfs.cpp:106
+ msgid "Access denied to"
+@@ -402,7 +401,7 @@
+
+ #: VFS/krarchandler.cpp:205
+ msgid "Failed to list the content of the archive (%1)!"
+-msgstr "Echec pour lister le contenu de l'archive (%1) !"
++msgstr "Echec pour lister le contenu de l'archive (%1) !"
+
+ #: VFS/krarchandler.cpp:225
+ msgid "Failed to unpack"
+@@ -410,11 +409,11 @@
+
+ #: VFS/krarchandler.cpp:262
+ msgid "Failed to convert rpm (%1) to cpio!"
+-msgstr "Echec de conversion du rpm (%1) vers cpio !"
++msgstr "Echec de conversion du rpm (%1) vers cpio !"
+
+ #: VFS/krarchandler.cpp:279
+ msgid "Failed to convert deb (%1) to tar!"
+-msgstr "Echec de la conversion deb (%1) vers tar !"
++msgstr "Echec de la conversion deb (%1) vers tar !"
+
+ #: VFS/krarchandler.cpp:313
+ msgid "Unpacking File(s)"
+@@ -422,7 +421,7 @@
+
+ #: VFS/krarchandler.cpp:339
+ msgid "Failed to unpack %1!"
+-msgstr "Impossible de décompresser %1 !"
++msgstr "Impossible de décompresser %1 !"
+
+ #: VFS/krarchandler.cpp:340 VFS/krarchandler.cpp:509
+ msgid "User cancelled."
+@@ -438,15 +437,15 @@
+
+ #: VFS/krarchandler.cpp:508
+ msgid "Failed to pack %1!"
+-msgstr "Impossible de compresser %1 !"
++msgstr "Impossible de compresser %1 !"
+
+ #: VFS/krarchandler.cpp:517
+ msgid "Failed to pack: "
+-msgstr "Impossible de compresser le(s) fichier(s) : "
++msgstr "Impossible de compresser le(s) fichier(s) : "
+
+ #: VFS/krarchandler.cpp:548
+ msgid "This archive is encrypted, please supply the password:"
+-msgstr "L'archive est protégée, veuillez entrez le mot de passe :"
++msgstr "L'archive est protégée, veuillez entrez le mot de passe :"
+
+ #: KrJS/krjs.cpp:65
+ msgid ""
+@@ -454,7 +453,7 @@
+ "Uncaught JavaScript exception '%2'\n"
+ "%3"
+ msgstr ""
+-"Dans %1 :\n"
++"Dans %1 :\n"
+ "Exception Javascript '%2'\n"
+ "%3"
+
+@@ -464,7 +463,7 @@
+ "Uncaught JavaScript exception '%2' at line %3\n"
+ "%4"
+ msgstr ""
+-"Dans %1 :\n"
++"Dans %1 :\n"
+ "Exception JavaScript '%2' à la ligne %3\n"
+ "%4"
+
+@@ -477,7 +476,7 @@
+ "In %1:\n"
+ "There is an error in the JavaScript"
+ msgstr ""
+-"Dans %1 :\n"
++"Dans %1 :\n"
+ "Il y a une erreur Javascript"
+
+ #: Filter/filtertabs.cpp:44
+@@ -503,7 +502,7 @@
+
+ #: Filter/generalfilter.cpp:70
+ msgid "Search &for:"
+-msgstr "Chercher &pour :"
++msgstr "Chercher &pour :"
+
+ #: Filter/generalfilter.cpp:81 Synchronizer/synchronizergui.cpp:1165
+ msgid ""
+@@ -518,8 +517,8 @@
+ "search all files/directories, but recursive search goes through/excludes the "
+ "directories that name is <code>pattern</code></li></ul><p></p><p>It's "
+ "allowed to use quotation marks for names that contain space. Filter <code>"
+-"\"Program Files\"</code> searches out those files/directories that name "
+-"is <code>Program Files</code>.</p><p>Examples:<ul><code><li>*.o</"
++"\"Program Files\"</code> searches out those files/directories that name "
++"is <code>Program Files</code>.</p><p>Examples:<ul><code><li>*.o</"
+ "li><li>*.h *.c??</li><li>*.cpp *.h | *.moc.cpp</li><li>* | CVS/ .svn/</li></"
+ "code></ul><b>Note</b>: the search term '<code>text</code>' is equivalent to "
+ "'<code>*text*</code>'.</p>"
+@@ -537,15 +536,15 @@
+ "fichiers/dossiers mais que les recherches récursive se font en ignorant et "
+ "en passant à travers <code>modèle</code></li> </ul><p></p><p>Vous pouvez "
+ "utiliser des guillemets pour les noms contenant des espaces. Le filtre<code>"
+-"\"Program Files\"</code> recherche les fichiers/dossiers dont le nom "
+-"est <code>Program Files</code>.</p> <p>Exemples :<ul><code> <li>*."
++"\"Program Files\"</code> recherche les fichiers/dossiers dont le nom "
++"est <code>Program Files</code>.</p> <p>Exemples :<ul><code> <li>*."
+ "o</li> <li>*.h *.c??</li> <li>*.cpp *.h | *.moc.cpp</li> <li>* | CVS/ .svn/</"
+-"li> </code></ul><b>Note</b> : le terme de recherche '<code>text</code>' "
++"li> </code></ul><b>Note</b> : le terme de recherche '<code>text</code>' "
+ "est un équivalent de '<code>*text*</code>'.</p>"
+
+ #: Filter/generalfilter.cpp:86
+ msgid "&Of type:"
+-msgstr "&Filtre :"
++msgstr "&Filtre :"
+
+ #: Filter/generalfilter.cpp:93 Filter/generalfilter.cpp:352
+ msgid "All Files"
+@@ -585,7 +584,7 @@
+
+ #: Filter/generalfilter.cpp:210
+ msgid "&Text:"
+-msgstr "&Texte :"
++msgstr "&Texte :"
+
+ #: Filter/generalfilter.cpp:230
+ msgid "&Remote content search"
+@@ -613,7 +612,7 @@
+
+ #: Filter/generalfilter.cpp:335
+ msgid "No search criteria entered!"
+-msgstr "Aucun critère de recherche défini !"
++msgstr "Aucun critère de recherche défini !"
+
+ #: Filter/generalfilter.cpp:371
+ msgid "Please specify a location to search in."
+@@ -748,7 +747,7 @@
+
+ #: Filter/advancedfilter.cpp:334
+ msgid "Note: a '?' is a wildcard"
+-msgstr "NB : '?' est un caractère générique"
++msgstr "NB : '?' est un caractère générique"
+
+ #: Filter/advancedfilter.cpp:474
+ msgid "Invalid date entered."
+@@ -764,7 +763,7 @@
+
+ #: Filter/advancedfilter.cpp:508
+ msgid "Specified sizes are inconsistent!"
+-msgstr "Les tailles spécifiées sont incohérentes !"
++msgstr "Les tailles spécifiées sont incohérentes !"
+
+ #: Filter/advancedfilter.cpp:509
+ msgid ""
+@@ -776,7 +775,7 @@
+
+ #: Filter/advancedfilter.cpp:526 Filter/advancedfilter.cpp:584
+ msgid "Dates are inconsistent!"
+-msgstr "Dates incohérentes !"
++msgstr "Dates incohérentes !"
+
+ #: Filter/advancedfilter.cpp:527
+ msgid ""
+@@ -802,7 +801,7 @@
+
+ #: UserAction/expander.cpp:70
+ msgid "Expander: Bad argument to %1: %2 is not valid item specifier"
+-msgstr "Extenseur : mauvais argument à %1 : %2 n'est pas une valeur valide"
++msgstr "Extenseur : mauvais argument à %1 : %2 n'est pas une valeur valide"
+
+ #: UserAction/expander.cpp:357
+ msgid "Panel's Path..."
+@@ -820,12 +819,12 @@
+
+ #: UserAction/expander.cpp:383
+ msgid "Count:"
+-msgstr "Total :"
++msgstr "Total :"
+
+ #: UserAction/expander.cpp:398
+ msgid "Expander: Bad argument to Count: %1 is not valid item specifier"
+ msgstr ""
+-"Extenseur : mauvais argument à Count : %1 n'est pas une valeur "
++"Extenseur : mauvais argument à Count : %1 n'est pas une valeur "
+ "valide"
+
+ #: UserAction/expander.cpp:407
+@@ -848,16 +847,16 @@
+ #: UserAction/expander.cpp:452 UserAction/expander.cpp:484
+ #: UserAction/expander.cpp:772
+ msgid "Which items:"
+-msgstr "Quels objets :"
++msgstr "Quels objets :"
+
+ #: UserAction/expander.cpp:453
+ msgid "Separator between the items (optional):"
+-msgstr "Séparateur entre les objets (optionnel) :"
++msgstr "Séparateur entre les objets (optionnel) :"
+
+ #: UserAction/expander.cpp:455 UserAction/expander.cpp:487
+ #: UserAction/expander.cpp:774
+ msgid "Mask (optional, all but 'Selected'):"
+-msgstr "Filtre (optionnel, tout mais 'Sélectionné') :"
++msgstr "Filtre (optionnel, tout mais 'Sélectionné') :"
+
+ #: UserAction/expander.cpp:481
+ msgid "Filename of an Item List..."
+@@ -869,7 +868,7 @@
+
+ #: UserAction/expander.cpp:504
+ msgid "Expander: tempfile couldn't be opened (%1)"
+-msgstr "Extenseur : Le fichier temporaire ne peut être ouvert (%1)"
++msgstr "Extenseur : Le fichier temporaire ne peut être ouvert (%1)"
+
+ #: UserAction/expander.cpp:524
+ msgid "Manipulate the Selection..."
+@@ -877,11 +876,11 @@
+
+ #: UserAction/expander.cpp:527
+ msgid "Selection mask:"
+-msgstr "Masque de sélection :"
++msgstr "Masque de sélection :"
+
+ #: UserAction/expander.cpp:528
+ msgid "Manipulate in which way:"
+-msgstr "Manipuler dans dans quel sens :"
++msgstr "Manipuler dans dans quel sens :"
+
+ #: UserAction/expander.cpp:553
+ msgid "Jump to a Location..."
+@@ -889,7 +888,7 @@
+
+ #: UserAction/expander.cpp:556
+ msgid "Choose a path:"
+-msgstr "Veuillez choisir un chemin :"
++msgstr "Veuillez choisir un chemin :"
+
+ #: UserAction/expander.cpp:557
+ msgid "Open location in a new tab"
+@@ -901,15 +900,15 @@
+
+ #: UserAction/expander.cpp:596
+ msgid "Question:"
+-msgstr "Question :"
++msgstr "Question :"
+
+ #: UserAction/expander.cpp:597
+ msgid "Preset (optional):"
+-msgstr "Initialisation (optionnel) :"
++msgstr "Initialisation (optionnel) :"
+
+ #: UserAction/expander.cpp:598
+ msgid "Caption (optional):"
+-msgstr "Intitulé (optionnel) :"
++msgstr "Intitulé (optionnel) :"
+
+ #: UserAction/expander.cpp:604
+ msgid "User Action"
+@@ -921,17 +920,17 @@
+
+ #: UserAction/expander.cpp:632 UserAction/expander.cpp:655
+ msgid "What to copy:"
+-msgstr "Quoi copier :"
++msgstr "Quoi copier :"
+
+ #: UserAction/expander.cpp:633
+ msgid "Append to current clipboard content with this separator (optional):"
+ msgstr ""
+ "Ajouter au contenu courant du presse-papiers avec ce séparateur (optionnel)"
+-" :"
++" :"
+
+ #: UserAction/expander.cpp:639
+ msgid "Expander: %Each% may not be in the second argument of %Clipboard%"
+-msgstr "Extenseur : %Each% ne devrait pas être le second argument de %Clipboard%"
++msgstr "Extenseur : %Each% ne devrait pas être le second argument de %Clipboard%"
+
+ #: UserAction/expander.cpp:652
+ msgid "Copy a File/Folder..."
+@@ -939,15 +938,15 @@
+
+ #: UserAction/expander.cpp:656
+ msgid "Where to copy:"
+-msgstr "Où cela doit-il être copié :"
++msgstr "Où cela doit-il être copié :"
+
+ #: UserAction/expander.cpp:663
+ msgid "Expander: %Each% may not be in the second argument of %Copy%"
+-msgstr "Extenseur : %Each% ne devrait pas être le second argument de %Move%"
++msgstr "Extenseur : %Each% ne devrait pas être le second argument de %Move%"
+
+ #: UserAction/expander.cpp:673
+ msgid "Expander: invalid URL's in %_Copy(\"src\", \"dest\")%"
+-msgstr "Extenseur : URL invalide dans %_Copy(\"src\",\"dest\")%"
++msgstr "Extenseur : URL invalide dans %_Copy(\"src\",\"dest\")%"
+
+ #: UserAction/expander.cpp:684
+ msgid "Move/Rename a File/Folder..."
+@@ -955,11 +954,11 @@
+
+ #: UserAction/expander.cpp:687
+ msgid "What to move/rename:"
+-msgstr "Quoi déplacer/renommer :"
++msgstr "Quoi déplacer/renommer :"
+
+ #: UserAction/expander.cpp:688
+ msgid "New target/name:"
+-msgstr "Nouveau nom/cible :"
++msgstr "Nouveau nom/cible :"
+
+ #: UserAction/expander.cpp:694
+ msgid "%Each% may not be in the second argument of %Move%"
+@@ -967,7 +966,7 @@
+
+ #: UserAction/expander.cpp:704
+ msgid "Expander: invalid URL's in %_Move(\"src\", \"dest\")%"
+-msgstr "Extenseur : URL invalide dans %Move(\"src\",\"dest\")%"
++msgstr "Extenseur : URL invalide dans %Move(\"src\",\"dest\")%"
+
+ #: UserAction/expander.cpp:715
+ msgid "Load a Synchronizer Profile..."
+@@ -976,11 +975,11 @@
+ #: UserAction/expander.cpp:718 UserAction/expander.cpp:736
+ #: UserAction/expander.cpp:754
+ msgid "Choose a profile:"
+-msgstr "Choisir un profil :"
++msgstr "Choisir un profil :"
+
+ #: UserAction/expander.cpp:722
+ msgid "Expander: no profile specified for %_Sync(profile)%"
+-msgstr "Extenseur : pas de profile spécifié pour %_Sync(profile)%"
++msgstr "Extenseur : pas de profile spécifié pour %_Sync(profile)%"
+
+ #: UserAction/expander.cpp:733
+ msgid "Load a Searchmodule Profile..."
+@@ -988,7 +987,7 @@
+
+ #: UserAction/expander.cpp:740
+ msgid "Expander: no profile specified for %_NewSearch(profile)%"
+-msgstr "Extenseur : pas de profile spécifié pour %_NewSearch(profile)%"
++msgstr "Extenseur : pas de profile spécifié pour %_NewSearch(profile)%"
+
+ #: UserAction/expander.cpp:751
+ msgid "Load a Panel Profile..."
+@@ -997,7 +996,7 @@
+ #: UserAction/expander.cpp:758
+ msgid "Expander: no profile specified for %_Profile(profile)%; abort..."
+ msgstr ""
+-"Extenseur : pas de profile spécifié pour %_Profile(profile); "
++"Extenseur : pas de profile spécifié pour %_Profile(profile); "
+ "annulation..."
+
+ #: UserAction/expander.cpp:769
+@@ -1010,19 +1009,19 @@
+
+ #: UserAction/expander.cpp:804
+ msgid "Choose a column:"
+-msgstr "Choisir une colonne :"
++msgstr "Choisir une colonne :"
+
+ #: UserAction/expander.cpp:805
+ msgid "Choose a sort sequence:"
+-msgstr "Choisir la séquence de tri :"
++msgstr "Choisir la séquence de tri :"
+
+ #: UserAction/expander.cpp:811
+ msgid "Expander: no column specified for %_ColSort(column)%"
+-msgstr "Extenseur : pas de colonne renseignée pour %_ColSort(colunm)%"
++msgstr "Extenseur : pas de colonne renseignée pour %_ColSort(colunm)%"
+
+ #: UserAction/expander.cpp:883
+ msgid "Expander: unknown column specified for %_ColSort(%1)%"
+-msgstr "Extenseur : spécificateur de colonne inconnu pour %_ColSort(%1)%"
++msgstr "Extenseur : spécificateur de colonne inconnu pour %_ColSort(%1)%"
+
+ #: UserAction/expander.cpp:895
+ msgid "Set Relation Between the Panels..."
+@@ -1030,14 +1029,14 @@
+
+ #: UserAction/expander.cpp:898
+ msgid "Set the new size in percent:"
+-msgstr "Nouvelle taille en pourcentage :"
++msgstr "Nouvelle taille en pourcentage :"
+
+ #: UserAction/expander.cpp:910
+ msgid ""
+ "Expander: Value %1 out of range for %_PanelSize(percent)%. The first "
+ "parameter has to be >0 and <100"
+ msgstr ""
+-"Extenseur : Valeur %1 hors des limites pour %_PanelSize(percent)%. Le "
++"Extenseur : Valeur %1 hors des limites pour %_PanelSize(percent)%. Le "
+ "premier paramètre doit être compris entre 0 et 100 (bornes exclues)"
+
+ #: UserAction/expander.cpp:934
+@@ -1058,7 +1057,7 @@
+
+ #: UserAction/expander.cpp:942
+ msgid "Expander: no script specified for %_Script(script)%"
+-msgstr "Extenseur : pas de script spécifier pour %_Script(script)%"
++msgstr "Extenseur : pas de script spécifier pour %_Script(script)%"
+
+ #: UserAction/expander.cpp:984
+ msgid "View File with Krusader's Internal Viewer..."
+@@ -1066,19 +1065,19 @@
+
+ #: UserAction/expander.cpp:987
+ msgid "Which file to view (normally '%aCurrent%'):"
+-msgstr "Quel fichier visualiser (normalement '%Current%') :"
++msgstr "Quel fichier visualiser (normalement '%Current%') :"
+
+ #: UserAction/expander.cpp:988
+ msgid "Choose a view mode:"
+-msgstr "Choisir un mode de vue :"
++msgstr "Choisir un mode de vue :"
+
+ #: UserAction/expander.cpp:991
+ msgid "Choose a window mode:"
+-msgstr "Choisir un mode fenêtré :"
++msgstr "Choisir un mode fenêtré :"
+
+ #: UserAction/expander.cpp:995
+ msgid "Expander: no file to view in %_View(filename)%"
+-msgstr "Extenseur : pas de fichier à visualiser dans %_View(filename)%"
++msgstr "Extenseur : pas de fichier à visualiser dans %_View(filename)%"
+
+ #: UserAction/expander.cpp:1032
+ #, c-format
+@@ -1092,15 +1091,15 @@
+ #: UserAction/expander.cpp:1082
+ #, c-format
+ msgid "Error: unterminated % in Expander::expandCurrent"
+-msgstr "Erreur : % non terminé dans l'extenseur expandCurrent"
++msgstr "Erreur : % non terminé dans l'extenseur expandCurrent"
+
+ #: UserAction/expander.cpp:1112
+ msgid "Error: unrecognized %%%1%2%% in Expander::expand"
+-msgstr "Erreur : %%%1%2%% non reconnu dans l'extenseur expandCurrent"
++msgstr "Erreur : %%%1%2%% non reconnu dans l'extenseur expandCurrent"
+
+ #: UserAction/expander.cpp:1148
+ msgid "Error: missing ')' in Expander::separateParameter"
+-msgstr "Erreur : ')' manquante dans l'extenseur separateParameter"
++msgstr "Erreur : ')' manquante dans l'extenseur separateParameter"
+
+ #: UserAction/kractionbase.cpp:51
+ msgid "Confirm execution"
+@@ -1108,7 +1107,7 @@
+
+ #: UserAction/kractionbase.cpp:52
+ msgid "Command being executed:"
+-msgstr "Commande en cours :"
++msgstr "Commande en cours :"
+
+ #: Konfigurator/konfigurator.cpp:69 Search/krsearchdialog.cpp:139
+ #: Synchronizer/synchronizergui.cpp:1471 UserAction/kraction.cpp:49
+@@ -1157,11 +1156,11 @@
+ "Do you want to overwrite it or append the output?"
+ msgstr ""
+ "Ce fichier existe déjà.\n"
+-"Voulez-vous l'écraser ou écrire en fin de fichier ?"
++"Voulez-vous l'écraser ou écrire en fin de fichier ?"
+
+ #: UserAction/kraction.cpp:140
+ msgid "Overwrite or append?"
+-msgstr "Écraser ou ajouter ?"
++msgstr "Écraser ou ajouter ?"
+
+ #: ActionMan/useractionpage.cpp:248 ActionMan/useractionpage.cpp:257
+ #: Dialogs/checksumdlg.cpp:573 Dialogs/krkeydialog.cpp:135
+@@ -1178,12 +1177,12 @@
+ "Can't open %1 for writing!\n"
+ "Nothing exported."
+ msgstr ""
+-"Impossible d'ouvrir %1 pour écriture !\n"
++"Impossible d'ouvrir %1 pour écriture !\n"
+ "Rien n'a été exporté."
+
+ #: ActionMan/useractionpage.cpp:272 UserAction/kraction.cpp:155
+ msgid "Export failed!"
+-msgstr "Echec de l'exportation !"
++msgstr "Echec de l'exportation !"
+
+ #: UserAction/kraction.cpp:200
+ msgid ""
+@@ -1206,7 +1205,7 @@
+ #: UserAction/useraction.cpp:101 UserAction/useraction.cpp:112
+ #: UserAction/useraction.cpp:124
+ msgid "UserActions - can't read from file!"
+-msgstr "Actions utilisateur - Lecture impossible à partir du fichier !"
++msgstr "Actions utilisateur - Lecture impossible à partir du fichier !"
+
+ #: UserAction/useraction.cpp:123
+ #, c-format
+@@ -1218,7 +1217,7 @@
+ "Action without name detected. This action will not be imported!\n"
+ "This is an error in the file, you may want to correct it."
+ msgstr ""
+-"Action sans nom détectée. Cette action ne sera pas importée !\n"
++"Action sans nom détectée. Cette action ne sera pas importée !\n"
+ "C'est une erreur dans le fichier, vous devriez le corriger."
+
+ #: UserAction/useraction.cpp:141
+@@ -1258,7 +1257,7 @@
+ "current directory: Total size, free space, type of filesystem, etc."
+ msgstr ""
+ "La barre d'état affiche des informations sur le système de fichiers auquel "
+-"appartient le dossier actif : Taille totale, espace libre, type de "
++"appartient le dossier actif : Taille totale, espace libre, type de "
+ "système de fichiers, etc."
+
+ #: Panel/listpanel.cpp:149
+@@ -1366,7 +1365,7 @@
+
+ #: Panel/listpanel.cpp:724
+ msgid "Mt.Man: working ..."
+-msgstr "Mt.Man : opération en cours..."
++msgstr "Mt.Man : opération en cours..."
+
+ #: Panel/listpanel.cpp:738
+ msgid "unknown"
+@@ -1408,7 +1407,7 @@
+
+ #: Panel/listpanel.cpp:1069
+ msgid "Reading: "
+-msgstr "Lecture : "
++msgstr "Lecture : "
+
+ #: Panel/krdetailedview.cpp:104 Panel/krdetailedview.cpp:1423
+ msgid "Ext"
+@@ -1451,7 +1450,7 @@
+
+ #: Panel/krviewitem.cpp:60
+ msgid "(broken link !)"
+-msgstr "(lien rompu !)"
++msgstr "(lien rompu !)"
+
+ #: Panel/krviewitem.cpp:61
+ msgid "%1 (Link)"
+@@ -1471,35 +1470,35 @@
+
+ #: Panel/krview.cpp:325
+ msgid " to:"
+-msgstr " vers :"
++msgstr " vers :"
+
+ #: Panel/panelpopup.cpp:66
+ msgid "Tree Panel: a tree view of the local file system"
+ msgstr ""
+-"Panneau hiérarchique : Une vue hiérarchique du système de fichiers "
++"Panneau hiérarchique : Une vue hiérarchique du système de fichiers "
+ "locaux"
+
+ #: Panel/panelpopup.cpp:74
+ msgid "Preview Panel: display a preview of the current file"
+-msgstr "Panneau d'aperçu : Afficher un aperçu du fichier courant"
++msgstr "Panneau d'aperçu : Afficher un aperçu du fichier courant"
+
+ #: Panel/panelpopup.cpp:81
+ msgid "Quick Panel: quick way to perform actions"
+-msgstr "Panneau rapide : méthode rapide pour faire des actions"
++msgstr "Panneau rapide : méthode rapide pour faire des actions"
+
+ #: Panel/panelpopup.cpp:88
+ msgid "View Panel: view the current file"
+-msgstr "Panneau de vue : vue du fichier courant"
++msgstr "Panneau de vue : vue du fichier courant"
+
+ #: Panel/panelpopup.cpp:95
+ msgid "Disk Usage Panel: view the usage of a directory"
+ msgstr ""
+-"Panneau d'espace disque utilisé : visualiser l'espace occupé par un "
++"Panneau d'espace disque utilisé : visualiser l'espace occupé par un "
+ "dossier de façon graphique"
+
+ #: Panel/panelpopup.cpp:147 Panel/panelpopup.cpp:335
+ msgid "Disk Usage: "
+-msgstr "Espace disque occupé : "
++msgstr "Espace disque occupé : "
+
+ #: Panel/panelpopup.cpp:156
+ msgid "Quick Select"
+@@ -1519,31 +1518,31 @@
+
+ #: Panel/panelpopup.cpp:286
+ msgid "Tree:"
+-msgstr "Hiérarchie :"
++msgstr "Hiérarchie :"
+
+ #: Panel/panelpopup.cpp:291
+ msgid "Preview:"
+-msgstr "Aperçu :"
++msgstr "Aperçu :"
+
+ #: Panel/panelpopup.cpp:295
+ msgid "Quick Select:"
+-msgstr "Sélection rapide :"
++msgstr "Sélection rapide :"
+
+ #: Panel/panelpopup.cpp:300
+ msgid "View:"
+-msgstr "Vue :"
++msgstr "Vue :"
+
+ #: Panel/panelpopup.cpp:306
+ msgid "Disk Usage:"
+-msgstr "Espace disque occupé :"
++msgstr "Espace disque occupé :"
+
+ #: Panel/panelpopup.cpp:324
+ msgid "Preview: "
+-msgstr "Aperçu : "
++msgstr "Aperçu : "
+
+ #: Panel/panelpopup.cpp:328
+ msgid "View: "
+-msgstr "Voir : "
++msgstr "Voir : "
+
+ #: Panel/krcalcspacedialog.cpp:95
+ msgid "Calculate Occupied Space"
+@@ -1551,12 +1550,12 @@
+
+ #: Panel/krcalcspacedialog.cpp:146
+ msgid "Name: "
+-msgstr "Nom : "
++msgstr "Nom : "
+
+ #: Panel/krcalcspacedialog.cpp:147
+ #, c-format
+ msgid "Total occupied space: %1"
+-msgstr "Espace total occupé : %1"
++msgstr "Espace total occupé : %1"
+
+ #: Panel/krcalcspacedialog.cpp:151
+ #, c-format
+@@ -1688,8 +1687,8 @@
+ "<qt>Do you really want to shred <b>%1</b>? Once shred, the file is gone "
+ "forever!</qt>"
+ msgstr ""
+-"<qt>Voulez-vous réellement supprimer <b>%1</b> ? Une fois coupé, le "
+-"fichier est irrécupérable !</qt>"
++"<qt>Voulez-vous réellement supprimer <b>%1</b> ? Une fois coupé, le "
++"fichier est irrécupérable !</qt>"
+
+ #: Panel/krpopupmenu.cpp:339
+ msgid "Can't open \"%1\""
+@@ -1709,15 +1708,15 @@
+
+ #: Panel/panelfunc.cpp:289
+ msgid "Please enter the new link destination:"
+-msgstr "Entrez la nouvelle cible du lien :"
++msgstr "Entrez la nouvelle cible du lien :"
+
+ #: Panel/panelfunc.cpp:296
+ msgid "Can't remove old link: "
+-msgstr "Impossible d'effacer l'ancien lien : "
++msgstr "Impossible d'effacer l'ancien lien : "
+
+ #: Panel/panelfunc.cpp:301 Panel/panelfunc.cpp:341
+ msgid "Failed to create a new link: "
+-msgstr "Impossible de créer un nouveau lien : "
++msgstr "Impossible de créer un nouveau lien : "
+
+ #: Panel/panelfunc.cpp:308
+ msgid "You can create links only on local file systems"
+@@ -1729,7 +1728,7 @@
+
+ #: Panel/panelfunc.cpp:317
+ msgid "Create a new link to: "
+-msgstr "Créer un nouveau lien vers : "
++msgstr "Créer un nouveau lien vers : "
+
+ #: Panel/panelfunc.cpp:325 Panel/panelfunc.cpp:511
+ msgid "A directory or a file with this name already exists."
+@@ -1737,11 +1736,11 @@
+
+ #: Panel/panelfunc.cpp:337
+ msgid "Failed to create a new symlink: "
+-msgstr "Impossible de créer un nouveau lien symbolique : "
++msgstr "Impossible de créer un nouveau lien symbolique : "
+
+ #: Panel/panelfunc.cpp:338 Panel/panelfunc.cpp:342
+ msgid " To: "
+-msgstr " Vers : "
++msgstr " Vers : "
+
+ #: Panel/panelfunc.cpp:356
+ msgid "No permissions to view this file."
+@@ -1765,7 +1764,7 @@
+
+ #: Panel/panelfunc.cpp:426
+ msgid "Move %1 to:"
+-msgstr "Déplacer %1 vers :"
++msgstr "Déplacer %1 vers :"
+
+ #: Panel/panelfunc.cpp:428
+ #, c-format
+@@ -1773,8 +1772,8 @@
+ "_n: Move %n file to:\n"
+ "Move %n files to:"
+ msgstr ""
+-"Déplacer un fichier vers :\n"
+-"Déplacer %n fichiers vers :"
++"Déplacer un fichier vers :\n"
++"Déplacer %n fichiers vers :"
+
+ #: Panel/panelfunc.cpp:472
+ msgid "You can't move files to this file system"
+@@ -1786,11 +1785,11 @@
+
+ #: Panel/panelfunc.cpp:498
+ msgid "Directory's name:"
+-msgstr "Nom du dossier : "
++msgstr "Nom du dossier : "
+
+ #: Panel/panelfunc.cpp:581
+ msgid "Copy %1 to:"
+-msgstr "Copier %1 vers :"
++msgstr "Copier %1 vers :"
+
+ #: Panel/panelfunc.cpp:583
+ #, c-format
+@@ -1798,8 +1797,8 @@
+ "_n: Copy %n file to:\n"
+ "Copy %n files to:"
+ msgstr ""
+-"Copier un fichier vers :\n"
+-"Copier %n fichiers vers :"
++"Copier un fichier vers :\n"
++"Copier %n fichiers vers :"
+
+ #: Panel/panelfunc.cpp:619
+ msgid "You can't copy files to this file system"
+@@ -1815,8 +1814,8 @@
+ "_n: Do you really want to move this item to the trash?\n"
+ "Do you really want to move these %n items to the trash?"
+ msgstr ""
+-"Voulez vous vraiment déplacer cet objet vers la corbeille ?\n"
+-"Voulez vous vraiment déplacer ces %n objets vers la corbeille ?"
++"Voulez vous vraiment déplacer cet objet vers la corbeille ?\n"
++"Voulez vous vraiment déplacer ces %n objets vers la corbeille ?"
+
+ #: DiskUsage/diskusage.cpp:597 Panel/panelfunc.cpp:649
+ msgid "&Trash"
+@@ -1830,9 +1829,9 @@
+ "untouched)?"
+ msgstr ""
+ "Voulez vous vraiment effacer cet objet virtuel (l'objet physique reste)"
+-" ?\n"
++" ?\n"
+ "Voulez vous vraiment effacer ces %n objets virtuels (les objets physiques "
+-"restent) ?"
++"restent) ?"
+
+ #: DiskUsage/diskusage.cpp:600 DiskUsage/radialMap/widgetEvents.cpp:172
+ #: DiskUsage/radialMap/widgetEvents.cpp:194 Panel/panelfunc.cpp:652
+@@ -1849,9 +1848,9 @@
+ "removing them from the virtual items)?</qt>"
+ msgstr ""
+ "<qt>Voulez vous réellement supprimer cet objet <b>physiquement</b> (ne pas "
+-"simplement le retirer des objets virtuels) ?</qt>\n"
++"simplement le retirer des objets virtuels) ?</qt>\n"
+ "<qt>Voulez vous réellement supprimer ces %n objets <b>physiquement</b> (ne "
+-"pas simplement les retirer des objets virtuels) ?</qt>"
++"pas simplement les retirer des objets virtuels) ?</qt>"
+
+ #: Panel/panelfunc.cpp:657
+ #, c-format
+@@ -1859,8 +1858,8 @@
+ "_n: Do you really want to delete this item?\n"
+ "Do you really want to delete these %n items?"
+ msgstr ""
+-"Voulez vous vraiment effacer cet objet ?\n"
+-"Voulez vous vraiment effacer ces %n objets ?"
++"Voulez vous vraiment effacer cet objet ?\n"
++"Voulez vous vraiment effacer ces %n objets ?"
+
+ #: Dialogs/checksumdlg.cpp:573 Dialogs/krkeydialog.cpp:135
+ #: DiskUsage/diskusage.cpp:607 Konfigurator/kgcolors.cpp:523
+@@ -1873,8 +1872,8 @@
+ "<qt><p>Directory <b>%1</b> is not empty!</p><p>Skip this one or Delete All?</"
+ "p></qt>"
+ msgstr ""
+-"<qt><p>Le dossier <b>%1</b> n'est pas vide !</p> <p>Ignorer ce "
+-"dossier ou tout supprimer ?</p></qt>"
++"<qt><p>Le dossier <b>%1</b> n'est pas vide !</p> <p>Ignorer ce "
++"dossier ou tout supprimer ?</p></qt>"
+
+ #: Panel/panelfunc.cpp:683
+ msgid "&Skip"
+@@ -1886,14 +1885,14 @@
+
+ #: Panel/panelfunc.cpp:797
+ msgid "Cannot pack files onto a virtual destination!"
+-msgstr "Impossible de compresser des fichiers sur une destination virtuelle !"
++msgstr "Impossible de compresser des fichiers sur une destination virtuelle !"
+
+ #: Panel/panelfunc.cpp:809
+ msgid ""
+ "<qt><p>The archive <b>%1.%2</b> already exists. Do you want to overwrite it?"
+ "</p><p>All data in the previous archive will be lost!</p></qt>"
+ msgstr ""
+-"<qt><p>L'archive <b>%1.%2</b> existe déjà. Voulez-vous l'écraser ?</"
++"<qt><p>L'archive <b>%1.%2</b> existe déjà. Voulez-vous l'écraser ?</"
+ "p><p>Toutes les données de l'archive précédente seront perdues</p></qt>"
+
+ #: Panel/panelfunc.cpp:811
+@@ -1902,7 +1901,7 @@
+ "</p><p>Zip will replace identically named entries in the zip archive or add "
+ "entries for new names.</p></qt>"
+ msgstr ""
+-"<qt><p>L'archive <b>%1.%2</b> existe déjà. Voulez-vous l'écraser ?</"
++"<qt><p>L'archive <b>%1.%2</b> existe déjà. Voulez-vous l'écraser ?</"
+ "p><p>(ZIP va replacer les entrées identiques dans l'archive zip ou ajouter "
+ "des entrées pour les nouveaux noms)</p></qt>"
+
+@@ -1913,7 +1912,7 @@
+ #: Panel/panelfunc.cpp:878 Panel/panelfunc.cpp:939 krslots.cpp:194
+ #: krslots.cpp:200
+ msgid "Krusader is unable to download: "
+-msgstr "Krusader ne peut pas télécharge r: "
++msgstr "Krusader ne peut pas télécharge r: "
+
+ #: Panel/panelfunc.cpp:890
+ msgid "%1, unknown archive type."
+@@ -1925,11 +1924,11 @@
+
+ #: Panel/panelfunc.cpp:900
+ msgid "%1, test failed!"
+-msgstr "%1, échec du test !"
++msgstr "%1, échec du test !"
+
+ #: Panel/panelfunc.cpp:916
+ msgid "Unpack %1 to:"
+-msgstr "Décompresser %1 vers :"
++msgstr "Décompresser %1 vers :"
+
+ #: Panel/panelfunc.cpp:918
+ #, c-format
+@@ -1937,8 +1936,8 @@
+ "_n: Unpack %n file to:\n"
+ "Unpack %n files to:"
+ msgstr ""
+-"Décompresse le fichier vers :\n"
+-"Décompresser %n fichiers vers :"
++"Décompresse le fichier vers :\n"
++"Décompresser %n fichiers vers :"
+
+ #: Panel/panelfunc.cpp:964
+ msgid "%1, unknown archive type"
+@@ -1946,11 +1945,11 @@
+
+ #: Panel/panelfunc.cpp:1147
+ msgid "Cannot cut a virtual URL collection to the clipboard!"
+-msgstr "Impossible de couper l'URL d'une collection virtuelle vers le presse-papiers !"
++msgstr "Impossible de couper l'URL d'une collection virtuelle vers le presse-papiers !"
+
+ #: Panel/panelfunc.cpp:1149
+ msgid "Cannot copy a virtual URL collection onto the clipboard!"
+-msgstr "Impossible de copier l'URL d'une collection virtuelle vers le presse-papiers !"
++msgstr "Impossible de copier l'URL d'une collection virtuelle vers le presse-papiers !"
+
+ #: Locate/locate.cpp:101 Locate/locate.cpp:241 Search/krsearchdialog.cpp:135
+ #: Synchronizer/synchronizergui.cpp:1455
+@@ -1971,7 +1970,7 @@
+
+ #: Locate/locate.cpp:111
+ msgid "Search for:"
+-msgstr "Chercher :"
++msgstr "Chercher :"
+
+ #: Locate/locate.cpp:128
+ msgid "Don't search in path"
+@@ -1992,7 +1991,7 @@
+ #: Locate/locate.cpp:231
+ msgid "Can't start 'locate'! Check the 'Dependencies' page in konfigurator."
+ msgstr ""
+-"Démarrage de 'locate' impossible ! Vérifiez la page de dépendances dans "
++"Démarrage de 'locate' impossible ! Vérifiez la page de dépendances dans "
+ "konfigurator."
+
+ #: Locate/locate.cpp:269
+@@ -2000,12 +1999,12 @@
+ "Locate produced the following error message:\n"
+ "\n"
+ msgstr ""
+-"Locate a renvoyé le message d'erreur suivant :\n"
++"Locate a renvoyé le message d'erreur suivant :\n"
+ "\n"
+
+ #: Locate/locate.cpp:272
+ msgid "Error during the start of 'locate' process!"
+-msgstr "Erreur pendant le démarrage du programme 'locate' !"
++msgstr "Erreur pendant le démarrage du programme 'locate' !"
+
+ #: Locate/locate.cpp:282 Search/krsearchdialog.cpp:124
+ #: Synchronizer/synchronizergui.cpp:1460
+@@ -2038,7 +2037,7 @@
+
+ #: Locate/locate.cpp:487 Locate/locate.cpp:504
+ msgid "Search string not found!"
+-msgstr "Impossible de trouver la chaîne cherchée !"
++msgstr "Impossible de trouver la chaîne cherchée !"
+
+ #: Locate/locate.cpp:576
+ msgid "Locate results"
+@@ -2068,7 +2067,7 @@
+ msgstr ""
+ "Une configuration 1.51 ou plus ancienne a été détectée. Krusader doit "
+ "réinitialiser votre configuration avec les valeurs par défaut.\n"
+-"Note : Vos favoris et raccourcis clavier seront intacts.\n"
++"Note : Vos favoris et raccourcis clavier seront intacts.\n"
+ " Krusader va maintenant lancer Konfigurator."
+
+ #: krusader.cpp:442
+@@ -2077,7 +2076,7 @@
+ "will now be checked for external applications. Then the Konfigurator will be "
+ "launched where you can customize Krusader to your needs.</p></qt>"
+ msgstr ""
+-"<qt><b>Bienvenue sur Krusader !</b><p>Comme c'est votre premier "
++"<qt><b>Bienvenue sur Krusader !</b><p>Comme c'est votre premier "
+ "lancement, votre machine va maintenant être vérifier pour les applications "
+ "externes. Ensuite le Konfigurator sera lancé pour vous permettre de "
+ "paramétrer Krusader selon vos désirs.</p></qt>"
+@@ -2088,7 +2087,7 @@
+
+ #: krusader.cpp:511
+ msgid "Tab: switch panel"
+-msgstr "Onglet : Basculer sur le panneau"
++msgstr "Onglet : Basculer sur le panneau"
+
+ #: krusader.cpp:534
+ msgid "&Reload"
+@@ -2469,7 +2468,7 @@
+
+ #: krusader.cpp:932
+ msgid "Are you sure you want to quit?"
+-msgstr "Êtes vous sûr de vouloir quitter ?"
++msgstr "Êtes vous sûr de vouloir quitter ?"
+
+ #: KViewer/panelviewer.cpp:33
+ msgid "No file selected or selected file can't be displayed."
+@@ -2479,7 +2478,7 @@
+
+ #: KViewer/krviewer.cpp:649 KViewer/panelviewer.cpp:151
+ msgid "KrViewer is unable to download: "
+-msgstr "KrViewer est incapable de télécharger : "
++msgstr "KrViewer est incapable de télécharger : "
+
+ #: KViewer/krviewer.cpp:85
+ msgid "&Generic viewer"
+@@ -2561,7 +2560,7 @@
+
+ #: Search/krsearchdialog.cpp:222
+ msgid "Text found:"
+-msgstr "Texte trouvé :"
++msgstr "Texte trouvé :"
+
+ #: Search/krsearchdialog.cpp:232
+ msgid "&Results"
+@@ -2578,7 +2577,7 @@
+ "archives."
+ msgstr ""
+ "Sachez que si vous choisissez de chercher aussi dans les archives, notez les "
+-"limitations suivantes :\n"
++"limitations suivantes :\n"
+ "Vous ne pouvez pas chercher du texte (grep) pendant la recherche qui "
+ "contient des archives."
+
+@@ -2636,7 +2635,7 @@
+ #: BookMan/krbookmarkhandler.cpp:268
+ #, c-format
+ msgid "Error reading bookmarks file: %1"
+-msgstr "Erreur durant la lecture du fichier de favoris : %1"
++msgstr "Erreur durant la lecture du fichier de favoris : %1"
+
+ #: BookMan/krbookmarkhandler.cpp:332 BookMan/krbookmarkhandler.cpp:485
+ msgid "Popular URLs"
+@@ -2676,24 +2675,24 @@
+
+ #: BookMan/kraddbookmarkdlg.cpp:26 DiskUsage/diskusage.cpp:1030
+ msgid "Name:"
+-msgstr "Nom :"
++msgstr "Nom :"
+
+ #: BookMan/kraddbookmarkdlg.cpp:33
+ msgid "URL:"
+-msgstr "URL :"
++msgstr "URL :"
+
+ #: BookMan/kraddbookmarkdlg.cpp:40
+ msgid "Create in:"
+-msgstr "Créer dans :"
++msgstr "Créer dans :"
+
+ #: BookMan/kraddbookmarkdlg.cpp:103
+ msgid "Folder name:"
+-msgstr "Nom de dossier :"
++msgstr "Nom de dossier :"
+
+ #: MountMan/kmountman.cpp:197
+ msgid "Error ejecting device! You need to have 'eject' in your path."
+ msgstr ""
+-"Erreur éjection périphérique ! Vous devez avoir 'eject' dans votre "
++"Erreur éjection périphérique ! Vous devez avoir 'eject' dans votre "
+ "variable PATH."
+
+ #: MountMan/kmountman.cpp:224
+@@ -2838,11 +2837,11 @@
+ "http://www.krusader.org/phpBB/\n"
+ "\n"
+ "IRC\n"
+-"serveur :·irc.freenode.net,·canal :·#krusader"
++"serveur :·irc.freenode.net,·canal :·#krusader"
+
+ #: main.cpp:202
+ msgid "Application already running!\n"
+-msgstr "L'application est déjà en cours d'éxecution !\n"
++msgstr "L'application est déjà en cours d'éxecution !\n"
+
+ #: krusaderview.cpp:86
+ msgid "Function keys allow performing fast operations on files."
+@@ -2858,15 +2857,15 @@
+
+ #: Dialogs/krdialogs.cpp:158
+ msgid "Base URL:"
+-msgstr "URL :"
++msgstr "URL :"
+
+ #: Dialogs/krprogress.cpp:59
+ msgid "Source:"
+-msgstr "Source :"
++msgstr "Source :"
+
+ #: Dialogs/krprogress.cpp:64 Dialogs/krprogress.cpp:244
+ msgid "Destination:"
+-msgstr "Destination :"
++msgstr "Destination :"
+
+ #: Dialogs/krprogress.cpp:112
+ msgid "Krusader Progress"
+@@ -2950,7 +2949,7 @@
+
+ #: Dialogs/krmaskchoice.cpp:82
+ msgid "Select the following files:"
+-msgstr "Sélectionner les fichiers suivants :"
++msgstr "Sélectionner les fichiers suivants :"
+
+ #: Dialogs/krmaskchoice.cpp:87
+ msgid "Predefined Selections"
+@@ -2968,7 +2967,7 @@
+ msgstr ""
+ "Une sélection prédéfinie est un filtre de fichiers que vous utilisez "
+ "souvent,\n"
+-"par exemple : \"*.c, *.h\", \"*.c, *.o\", etc.\n"
++"par exemple : \"*.c, *.h\", \"*.c, *.o\", etc.\n"
+ "Vous pouvez ajouter ces filtres à la liste en les entrant ci-dessous et "
+ "cliquer sur le bouton Ajouter.\n"
+ "'Supprimer' permet de supprimer une sélection prédéfinie et 'Tout supprimer' "
+@@ -3010,15 +3009,15 @@
+
+ #: Dialogs/newftpgui.cpp:70
+ msgid "Protocol:"
+-msgstr "Protocole :"
++msgstr "Protocole :"
+
+ #: Dialogs/newftpgui.cpp:71 RemoteMan/remotemanbase.cpp:193
+ msgid "Host:"
+-msgstr "Hôte :"
++msgstr "Hôte :"
+
+ #: Dialogs/newftpgui.cpp:72
+ msgid "Port:"
+-msgstr "Port :"
++msgstr "Port :"
+
+ #: Dialogs/newftpgui.cpp:78 RemoteMan/remotemanbase.cpp:201
+ msgid "ftp://"
+@@ -3038,11 +3037,11 @@
+
+ #: Dialogs/newftpgui.cpp:113
+ msgid "Username:"
+-msgstr "Nom d'utilisateur :"
++msgstr "Nom d'utilisateur :"
+
+ #: Dialogs/newftpgui.cpp:115 RemoteMan/remotemanbase.cpp:100
+ msgid "Password:"
+-msgstr "Mot de Passe :"
++msgstr "Mot de Passe :"
+
+ #: Dialogs/newftpgui.cpp:127
+ msgid "&Connect"
+@@ -3063,19 +3062,19 @@
+
+ #: Dialogs/popularurls.cpp:245
+ msgid " &Search: "
+-msgstr "&Chercher : "
++msgstr "&Chercher : "
+
+ #: Dialogs/krspecialwidgets.cpp:103
+ msgid "Capacity: "
+-msgstr "Capacité : "
++msgstr "Capacité : "
+
+ #: Dialogs/krspecialwidgets.cpp:113
+ msgid "Used: "
+-msgstr "Util. : "
++msgstr "Util. : "
+
+ #: Dialogs/krspecialwidgets.cpp:114
+ msgid "Free: "
+-msgstr "Libre : "
++msgstr "Libre : "
+
+ #: Dialogs/krspecialwidgets.cpp:141
+ msgid "Not mounted."
+@@ -3116,11 +3115,11 @@
+ msgstr ""
+ "Ce fichier ne semble pas avoir un codage du clavier valide.\n"
+ "Ce doit être un vieux format de codage. L'importation sera "
+-"irréversible !"
++"irréversible !"
+
+ #: Dialogs/krkeydialog.cpp:73
+ msgid "Try to import legacy format?"
+-msgstr "Essayer d'importer d'anciens formats ?"
++msgstr "Essayer d'importer d'anciens formats ?"
+
+ #: Dialogs/krkeydialog.cpp:74
+ msgid "Import anyway"
+@@ -3132,7 +3131,7 @@
+ "import this keymap?"
+ msgstr ""
+ "L'information suivante est attachée au mapping des touches. Êtes vous sur de "
+-"vouloir importer ce mapping ?"
++"vouloir importer ce mapping ?"
+
+ #: Dialogs/krkeydialog.cpp:122
+ msgid "Please restart this dialog in order to see the changes"
+@@ -3146,11 +3145,11 @@
+ msgid "<qt>File <b>%1</b> already exists. Do you really want to overwrite it?</qt>"
+ msgstr ""
+ "<qt>Le fichier <b>%1</b> existe déjà.\n"
+-"Êtes-vous sûr de vouloir l'écraser ?</qt>"
++"Êtes-vous sûr de vouloir l'écraser ?</qt>"
+
+ #: Dialogs/krkeydialog.cpp:143
+ msgid "<qt>Can't open <b>%1</b> for writing!</qt>"
+-msgstr "<qt>Impossible d'ouvrir <b>%1</b> en écriture !</qt>"
++msgstr "<qt>Impossible d'ouvrir <b>%1</b> en écriture !</qt>"
+
+ #: Dialogs/packguibase.cpp:68 Dialogs/packguibase.cpp:122
+ msgid "Pack"
+@@ -3170,7 +3169,7 @@
+
+ #: Dialogs/packguibase.cpp:156 DiskUsage/diskusage.cpp:1032
+ msgid "Size:"
+-msgstr "Taille :"
++msgstr "Taille :"
+
+ #: Dialogs/packguibase.cpp:174
+ msgid "Set compression level"
+@@ -3198,7 +3197,7 @@
+
+ #: Dialogs/packguibase.cpp:251
+ msgid "Command line switches:"
+-msgstr "Options de la ligne de commande :"
++msgstr "Options de la ligne de commande :"
+
+ #: Dialogs/packguibase.cpp:284
+ msgid "Ok"
+@@ -3218,37 +3217,37 @@
+
+ #: Dialogs/packguibase.cpp:379
+ msgid "Cannot pack! The passwords are different!"
+-msgstr "Impossible de compresser ! Les mots de passe sont différents !"
++msgstr "Impossible de compresser ! Les mots de passe sont différents !"
+
+ #: Dialogs/packguibase.cpp:404
+ msgid "Invalid volume size!"
+-msgstr "Taille du volume invalide !"
++msgstr "Taille du volume invalide !"
+
+ #: Dialogs/packguibase.cpp:434
+ msgid ""
+ "Invalid command line switch!\n"
+ "Switch must start with '-'!"
+ msgstr ""
+-"Option de la ligne de commande invalide !\n"
+-"Les options doivent commencer par '-' !"
++"Option de la ligne de commande invalide !\n"
++"Les options doivent commencer par '-' !"
+
+ #: Dialogs/packguibase.cpp:446
+ msgid ""
+ "Invalid command line switch!\n"
+ "Backslash cannot be the last character"
+ msgstr ""
+-"Option de la ligne de commande invalide !\"l'antislash ne peut pas être "
++"Option de la ligne de commande invalide !\"l'antislash ne peut pas être "
+ "le dernier caractère"
+
+ #: Dialogs/packguibase.cpp:454
+ msgid ""
+ "Invalid command line switch!\n"
+ "Unclosed quotation mark!"
+-msgstr "Option de la ligne de commande invalide !\"Guillemets non fermés !"
++msgstr "Option de la ligne de commande invalide !\"Guillemets non fermés !"
+
+ #: Dialogs/krspwidgets.cpp:151
+ msgid "Enter a selection:"
+-msgstr "Entrez une sélection :"
++msgstr "Entrez une sélection :"
+
+ #: Dialogs/krspwidgets.cpp:187 Dialogs/krspwidgets.cpp:214
+ msgid "compare mode"
+@@ -3289,7 +3288,7 @@
+ "checksum tool installed. Krusader currently supports <i>md5deep, sha1deep, "
+ "sha256deep, tigerdeep and cfv</i></qt>"
+ msgstr ""
+-"<qt><b>Note</b> : vous avez sélectionné des dossiers, et il n'y a "
++"<qt><b>Note</b> : vous avez sélectionné des dossiers, et il n'y a "
+ "probablement pas d'outil récursif de somme de contrôle installé. Krusader supporte "
+ "actuellement <i>md5deep, sha1deep, sha256deep, tigerdeep et cfv</i></qt>"
+
+@@ -3299,11 +3298,11 @@
+
+ #: Dialogs/checksumdlg.cpp:236 Dialogs/checksumdlg.cpp:337
+ msgid " and folders:"
+-msgstr " et dossiers :"
++msgstr " et dossiers :"
+
+ #: Dialogs/checksumdlg.cpp:249
+ msgid "Select the checksum method:"
+-msgstr "Sélectionnez la méthode de somme de contrôle :"
++msgstr "Sélectionnez la méthode de somme de contrôle :"
+
+ #: Dialogs/checksumdlg.cpp:270
+ msgid "Calculating checksums ..."
+@@ -3336,7 +3335,7 @@
+
+ #: Dialogs/checksumdlg.cpp:350
+ msgid "Checksum file:"
+-msgstr "Fichier de somme de contrôle :"
++msgstr "Fichier de somme de contrôle :"
+
+ #: Dialogs/checksumdlg.cpp:364
+ msgid ""
+@@ -3369,7 +3368,7 @@
+
+ #: Dialogs/checksumdlg.cpp:450
+ msgid "The following files have failed:"
+-msgstr "Les fichiers suivants ont échoués :"
++msgstr "Les fichiers suivants ont échoués :"
+
+ #: Dialogs/checksumdlg.cpp:481
+ msgid "Errors were detected while creating the checksums"
+@@ -3381,7 +3380,7 @@
+
+ #: Dialogs/checksumdlg.cpp:489
+ msgid "Here are the calculated checksums:"
+-msgstr "Voici les sommes de contrôle calculées :"
++msgstr "Voici les sommes de contrôle calculées :"
+
+ #: Dialogs/checksumdlg.cpp:495
+ msgid "Hash"
+@@ -3397,11 +3396,11 @@
+
+ #: Dialogs/checksumdlg.cpp:522
+ msgid "Here are the errors received:"
+-msgstr "Voici les erreurs reçues :"
++msgstr "Voici les erreurs reçues :"
+
+ #: Dialogs/checksumdlg.cpp:536
+ msgid "Save checksum to file:"
+-msgstr "Sauver la somme de contrôle dans le fichier :"
++msgstr "Sauver la somme de contrôle dans le fichier :"
+
+ #: Dialogs/checksumdlg.cpp:550
+ msgid "Checksum file for each source file"
+@@ -3413,7 +3412,7 @@
+ "Are you sure you want to overwrite it?"
+ msgstr ""
+ "Le fichier %1 existe déjà.\n"
+-"Êtes-vous sûr de vouloir l'écraser ?"
++"Êtes-vous sûr de vouloir l'écraser ?"
+
+ #: Dialogs/checksumdlg.cpp:575
+ msgid "Select a file to save to"
+@@ -3470,15 +3469,15 @@
+
+ #: ActionMan/useractionpage.cpp:126
+ msgid "The current action has been modified. Do you want to apply these changes?"
+-msgstr "La page courante a changé. Voulez vous appliquer ces changements ?"
++msgstr "La page courante a changé. Voulez vous appliquer ces changements ?"
+
+ #: ActionMan/useractionpage.cpp:203
+ msgid "Are you sure that you want to remove all selected actions?"
+-msgstr "Êtes vous sûr de vouloir supprimer toutes lesactions sélectionnées ?"
++msgstr "Êtes vous sûr de vouloir supprimer toutes lesactions sélectionnées ?"
+
+ #: ActionMan/useractionpage.cpp:204
+ msgid "Remove selected actions?"
+-msgstr "Suppression des actions sélectionnées ?"
++msgstr "Suppression des actions sélectionnées ?"
+
+ #: ActionMan/useractionpage.cpp:205
+ msgid "Remove"
+@@ -3491,11 +3490,11 @@
+ msgstr ""
+ "Ce fichier contient des actions utilisateur.\n"
+ "Voulez vous récrire par dessus ou bien l'ajouter avec les actions "
+-"sélectionnées ?"
++"sélectionnées ?"
+
+ #: ActionMan/useractionpage.cpp:247
+ msgid "Overwrite or merge?"
+-msgstr "Écraser ou ajouter ?"
++msgstr "Écraser ou ajouter ?"
+
+ #: ActionMan/useractionpage.cpp:249
+ msgid "Merge"
+@@ -3503,11 +3502,11 @@
+
+ #: ActionMan/useractionpage.cpp:255
+ msgid "This file already exists. Do you want to overwrite it?"
+-msgstr "Ce fichier existe déjà. Voulez-vous l'écraser ?"
++msgstr "Ce fichier existe déjà. Voulez-vous l'écraser ?"
+
+ #: ActionMan/useractionpage.cpp:256
+ msgid "Overwrite existing file?"
+-msgstr "Écraser le fichier existant ?"
++msgstr "Écraser le fichier existant ?"
+
+ #: ActionMan/actionproperty.cpp:294
+ msgid "New protocol"
+@@ -3515,7 +3514,7 @@
+
+ #: ActionMan/actionproperty.cpp:295
+ msgid "Set a protocol:"
+-msgstr "Définir un protocole :"
++msgstr "Définir un protocole :"
+
+ #: ActionMan/actionproperty.cpp:310
+ msgid "Edit protocol"
+@@ -3523,7 +3522,7 @@
+
+ #: ActionMan/actionproperty.cpp:311
+ msgid "Set another protocol:"
+-msgstr "Définir un autre protocole :"
++msgstr "Définir un autre protocole :"
+
+ #: ActionMan/actionproperty.cpp:341
+ msgid "Edit path"
+@@ -3531,7 +3530,7 @@
+
+ #: ActionMan/actionproperty.cpp:342
+ msgid "Set another path:"
+-msgstr "Définir un autre chemin :"
++msgstr "Définir un autre chemin :"
+
+ #: ActionMan/actionproperty.cpp:361
+ msgid "New mime-type"
+@@ -3539,7 +3538,7 @@
+
+ #: ActionMan/actionproperty.cpp:362
+ msgid "Set a mime-type:"
+-msgstr "Définir un type mime :"
++msgstr "Définir un type mime :"
+
+ #: ActionMan/actionproperty.cpp:377
+ msgid "Edit mime-type"
+@@ -3547,7 +3546,7 @@
+
+ #: ActionMan/actionproperty.cpp:378
+ msgid "Set another mime-type:"
+-msgstr "Définir un autre type mime :"
++msgstr "Définir un autre type mime :"
+
+ #: ActionMan/actionproperty.cpp:397
+ msgid "New filename"
+@@ -3555,7 +3554,7 @@
+
+ #: ActionMan/actionproperty.cpp:398
+ msgid "Set a filename:"
+-msgstr "Définir un nom de fichier :"
++msgstr "Définir un nom de fichier :"
+
+ #: ActionMan/actionproperty.cpp:413
+ msgid "Edit filename"
+@@ -3563,7 +3562,7 @@
+
+ #: ActionMan/actionproperty.cpp:414
+ msgid "Set another filename:"
+-msgstr "Définir un autre nom de fichier :"
++msgstr "Définir un autre nom de fichier :"
+
+ #: ActionMan/actionproperty.cpp:433
+ msgid "Please set a unique name for the useraction"
+@@ -3601,7 +3600,7 @@
+
+ #: ActionMan/actionpropertybase.cpp:388 RemoteMan/remotemanbase.cpp:142
+ msgid "Description:"
+-msgstr "Description :"
++msgstr "Description :"
+
+ #: ActionMan/actionpropertybase.cpp:389 ActionMan/actionpropertybase.cpp:419
+ msgid ""
+@@ -3638,7 +3637,7 @@
+
+ #: ActionMan/actionpropertybase.cpp:396
+ msgid "Title:"
+-msgstr "Titre :"
++msgstr "Titre :"
+
+ #: ActionMan/actionpropertybase.cpp:398
+ msgid ""
+@@ -3648,7 +3647,7 @@
+ msgstr ""
+ "Nom unique de <b>l'action utilisateur</b>. Utilisé uniquement dans le "
+ "<i>Konfigurator</i> et n'apparaît pas dans d'autres menus.<p><b>Note</"
+-"b> : Le <i>Titre</i> montré dans le <b>Menu Utilisateur</b> peut être "
++"b> : Le <i>Titre</i> montré dans le <b>Menu Utilisateur</b> peut être "
+ "défini ci-dessous."
+
+ #: ActionMan/actionpropertybase.cpp:399 ActionMan/actionpropertybase.cpp:416
+@@ -3674,7 +3673,7 @@
+
+ #: ActionMan/actionpropertybase.cpp:402
+ msgid "Identifier:"
+-msgstr "Identifiant :"
++msgstr "Identifiant :"
+
+ #: ActionMan/actionpropertybase.cpp:403
+ msgid ""
+@@ -3684,12 +3683,12 @@
+ msgstr ""
+ "<p>Nom unique de <b>l'action utilisateur</b>. Utilisé uniquement dans le "
+ "<i>Konfigurator</i> et n'apparaît pas dans d'autres menus.</p><p><b>Note</"
+-"b> : Le <i>Titre</i> montré dans le <b>Menu Utilisateur</b> peut être "
++"b> : Le <i>Titre</i> montré dans le <b>Menu Utilisateur</b> peut être "
+ "défini ci-dessous.</p>"
+
+ #: ActionMan/actionpropertybase.cpp:404
+ msgid "Command:"
+-msgstr "Commande :"
++msgstr "Commande :"
+
+ #: ActionMan/actionpropertybase.cpp:405
+ msgid ""
+@@ -3703,7 +3702,7 @@
+ "<p>La <i>Commande</i> définit la commande qui sera exécutée quand "
+ "<b>l'action Utilisateur</b> est utilisée. Cela peut être une simple commande "
+ "shell ou une séquence complexe de commandes avec des <b>variables spéciales</"
+-"b>.</p><p>Exemples :<ul><code><li>eject /mnt/cdrom</li><li>amarok --"
++"b>.</p><p>Exemples :<ul><code><li>eject /mnt/cdrom</li><li>amarok --"
+ "append %aList(\"Selected\")%</li></code></ul>\n"
+ "Consulter le manuel pour plus d'informations sur la syntaxe.</p>"
+
+@@ -3725,7 +3724,7 @@
+
+ #: ActionMan/actionpropertybase.cpp:409
+ msgid "Tooltip:"
+-msgstr "Tooltip :"
++msgstr "Tooltip :"
+
+ #: ActionMan/actionpropertybase.cpp:412
+ msgid ""
+@@ -3739,21 +3738,21 @@
+ "La <i>Commande</i> définit la commande qui sera exécutée quand <b>l'action "
+ "utilisateur</b> est utilisée. Cela peut être une simple commande shell ou "
+ "une séquence complexe de commandes avec des <b>variables spéciales</b>.<p>\n"
+-"Exemples :<ul><code><li>eject /mnt/cdrom</li><li>amarok --append %aList"
++"Exemples :<ul><code><li>eject /mnt/cdrom</li><li>amarok --append %aList"
+ "(\"Selected\")%</li></code></ul>\n"
+ "Consulter le manuel pour plus d'informations sur la syntaxe."
+
+ #: ActionMan/actionpropertybase.cpp:415
+ msgid "Category:"
+-msgstr "Catégorie :"
++msgstr "Catégorie :"
+
+ #: ActionMan/actionpropertybase.cpp:420
+ msgid "Workdir:"
+-msgstr "Dossier de travail :"
++msgstr "Dossier de travail :"
+
+ #: ActionMan/actionpropertybase.cpp:422
+ msgid "Default shortcut:"
+-msgstr "Raccourci par défaut :"
++msgstr "Raccourci par défaut :"
+
+ #: ActionMan/actionpropertybase.cpp:423
+ msgid "None"
+@@ -3837,7 +3836,7 @@
+ "wildcards '<code>?</code>' and '<code>*</code>' can be used."
+ msgstr ""
+ "Montre <b>l'action Utilisateur</b> uniquement pour les fichiers définis ici. "
+-"Les caractères '<code> ?</code>' et '<code>*</code>' peuvent être "
++"Les caractères '<code> ?</code>' et '<code>*</code>' peuvent être "
+ "utilisés."
+
+ #: ActionMan/actionpropertybase.cpp:454
+@@ -3854,7 +3853,7 @@
+
+ #: ActionMan/actionpropertybase.cpp:457
+ msgid "Run as different user:"
+-msgstr "Lancer sous un utilisateur différent :"
++msgstr "Lancer sous un utilisateur différent :"
+
+ #: ActionMan/actionpropertybase.cpp:458 ActionMan/actionpropertybase.cpp:459
+ msgid "Execute the <i>Command</i> under a different user-id."
+@@ -3894,7 +3893,7 @@
+
+ #: ActionMan/addplaceholderpopup.cpp:143
+ msgid "This placeholder allows some parameter:"
+-msgstr "Cette chaîne spéciale accepte des paramètres :"
++msgstr "Cette chaîne spéciale accepte des paramètres :"
+
+ #: ActionMan/addplaceholderpopup.cpp:259 ActionMan/addplaceholderpopup.cpp:445
+ msgid "add"
+@@ -3918,15 +3917,15 @@
+
+ #: RemoteMan/remoteman.cpp:360
+ msgid "Are you sure you want to delete this item ???"
+-msgstr "Êtes-vous sûr de vouloir supprimer cet élément ?"
++msgstr "Êtes-vous sûr de vouloir supprimer cet élément ?"
+
+ #: RemoteMan/remotemanbase.cpp:41
+ msgid "RemoteMan: Connection Manager"
+-msgstr "RemoteMan : Gestionnaire de connexions"
++msgstr "RemoteMan : Gestionnaire de connexions"
+
+ #: RemoteMan/remotemanbase.cpp:52
+ msgid "Session name:"
+-msgstr "Nom de session :"
++msgstr "Nom de session :"
+
+ #: RemoteMan/remotemanbase.cpp:67
+ msgid "&More"
+@@ -3934,7 +3933,7 @@
+
+ #: RemoteMan/remotemanbase.cpp:109
+ msgid "User name:"
+-msgstr "Nom d'utilisateur :"
++msgstr "Nom d'utilisateur :"
+
+ #: RemoteMan/remotemanbase.cpp:119
+ msgid "Anonymous"
+@@ -3942,7 +3941,7 @@
+
+ #: RemoteMan/remotemanbase.cpp:129
+ msgid "Remote directory:"
+-msgstr "Dossier distant :"
++msgstr "Dossier distant :"
+
+ #: RemoteMan/remotemanbase.cpp:162
+ msgid "Co&nnect"
+@@ -3958,11 +3957,11 @@
+
+ #: RemoteMan/remotemanbase.cpp:225
+ msgid "Port: "
+-msgstr "Port : "
++msgstr "Port : "
+
+ #: RemoteMan/remotemanbase.cpp:235
+ msgid "* Warning: Storing your password is not secure !!!"
+-msgstr "* Attention: Enregistrer votre mot de passe n'est pas sécurisé !"
++msgstr "* Attention: Enregistrer votre mot de passe n'est pas sécurisé !"
+
+ #: UserMenu/usermenu.cpp:51
+ msgid "User Menu"
+@@ -3982,7 +3981,7 @@
+
+ #: Synchronizer/synchronizergui.cpp:1126
+ msgid "File &Filter:"
+-msgstr "&Filtre Fichier :"
++msgstr "&Filtre Fichier :"
+
+ #: Synchronizer/synchronizergui.cpp:1148
+ msgid "The left base directory used during the synchronisation process."
+@@ -4032,7 +4031,7 @@
+ "useful if the files are located on network filesystems or in archives.</p>"
+ msgstr ""
+ "<p>Ignorer l'information de date pendant la comparaison.</p><p><b>Note</"
+-"b> : utile si les fichiers sont situés sur un réseau ou dans des "
++"b> : utile si les fichiers sont situés sur un réseau ou dans des "
+ "archives.</p>"
+
+ #: Synchronizer/synchronizergui.cpp:1201
+@@ -4049,7 +4048,7 @@
+ "<p><b>Mode asymétrique</b></p><p>Le coté gauche est la destination, le coté "
+ "droit est le dossier source.Seuls les fichiers existants dans le coté "
+ "gauche seront effacés, les autres différents seront copiés de droite à "
+-"gauche.</p><p><b>Note</b> : utile pour la mise à jour d'un dossier à "
++"gauche.</p><p><b>Note</b> : utile pour la mise à jour d'un dossier à "
+ "partir d'un serveur.</p>"
+
+ #: Synchronizer/synchronizergui.cpp:1204
+@@ -4062,7 +4061,7 @@
+ "synchronizing Windows filesystems.</p>"
+ msgstr ""
+ "<p>Comparaison de fichiers sans tenir compte de la casse.</p><p><b>Note</"
+-"b> : Utile pour synchronisation avec des systèmes de fichiers Windows.</"
++"b> : Utile pour synchronisation avec des systèmes de fichiers Windows.</"
+ "p>"
+
+ #: Synchronizer/synchronizergui.cpp:1211
+@@ -4123,11 +4122,11 @@
+
+ #: Synchronizer/synchronizergui.cpp:1364
+ msgid "Parallel threads:"
+-msgstr "Processus parallèles :"
++msgstr "Processus parallèles :"
+
+ #: Synchronizer/synchronizergui.cpp:1375
+ msgid "Equality threshold:"
+-msgstr "Seuil de tolérance :"
++msgstr "Seuil de tolérance :"
+
+ #: Synchronizer/synchronizergui.cpp:1383 Synchronizer/synchronizergui.cpp:1398
+ msgid "sec"
+@@ -4147,7 +4146,7 @@
+
+ #: Synchronizer/synchronizergui.cpp:1389
+ msgid "Time shift (right-left):"
+-msgstr "Décalage horaire (droite-gauche) :"
++msgstr "Décalage horaire (droite-gauche) :"
+
+ #: Synchronizer/synchronizergui.cpp:1408
+ msgid "Ignore hidden files"
+@@ -4179,41 +4178,41 @@
+
+ #: Synchronizer/synchronizergui.cpp:1578
+ msgid "Selected files from targ&et directory:"
+-msgstr "Sélectionner tous les fichiers du dossier cibl&e :"
++msgstr "Sélectionner tous les fichiers du dossier cibl&e :"
+
+ #: Synchronizer/synchronizergui.cpp:1579
+ msgid "Selected files from sou&rce directory:"
+-msgstr "Sélectionner tous les fichiers du dossier sou&rce :"
++msgstr "Sélectionner tous les fichiers du dossier sou&rce :"
+
+ #: Synchronizer/synchronizergui.cpp:1583
+ msgid "Selected files from &left directory:"
+-msgstr "Sé&lectionner les fichies du dossier de gauche :"
++msgstr "Sé&lectionner les fichies du dossier de gauche :"
+
+ #: Synchronizer/synchronizergui.cpp:1584
+ msgid "Selected files from &right directory:"
+-msgstr "Sélectionner les fichies du dossier de d&roite :"
++msgstr "Sélectionner les fichies du dossier de d&roite :"
+
+ #: Synchronizer/synchronizergui.cpp:1588
+ msgid "Targ&et directory:"
+-msgstr "Dossier cibl&e :"
++msgstr "Dossier cibl&e :"
+
+ #: Synchronizer/synchronizergui.cpp:1589
+ msgid "Sou&rce directory:"
+-msgstr "Dossier sou&rce : "
++msgstr "Dossier sou&rce : "
+
+ #: Synchronizer/synchronizergui.cpp:1593
+ msgid "&Left directory:"
+-msgstr "Dossier &gauche :"
++msgstr "Dossier &gauche :"
+
+ #: Synchronizer/synchronizergui.cpp:1594
+ msgid "&Right directory:"
+-msgstr "&Dossier droite :"
++msgstr "&Dossier droite :"
+
+ #: Synchronizer/synchronizergui.cpp:1629
+ msgid "URL must be the descendant of either the left or the right base URL!"
+ msgstr ""
+ "L'URL doit être le descendant de la partie de gauche ou droite de l'URL de "
+-"base !"
++"base !"
+
+ #: Synchronizer/synchronizergui.cpp:1688
+ msgid "Synchronize Directories"
+@@ -4289,7 +4288,7 @@
+
+ #: Synchronizer/synchronizergui.cpp:2143
+ msgid "Synchronizer has nothing to do!"
+-msgstr "Le synchronisateur n'a rien a faire !"
++msgstr "Le synchronisateur n'a rien a faire !"
+
+ #: Synchronizer/synchronizergui.cpp:2289
+ msgid ""
+@@ -4298,15 +4297,15 @@
+ msgstr ""
+ "La fenêtre du synchroniser contient des données de la comparaison "
+ "précédente. SI vous quittez, ces données seront perdues. Voulez-vous "
+-"vraiment quitter ?"
++"vraiment quitter ?"
+
+ #: Synchronizer/synchronizertask.cpp:134 Synchronizer/synchronizertask.cpp:141
+ msgid "Error at opening %1!"
+-msgstr "Erreur à l'ouverture de %1 !"
++msgstr "Erreur à l'ouverture de %1 !"
+
+ #: Synchronizer/synchronizertask.cpp:302
+ msgid "IO error at comparing file %1 with %2!"
+-msgstr "Erreur d'E/S lors de la comparaison du fichier %1 avec %2 !"
++msgstr "Erreur d'E/S lors de la comparaison du fichier %1 avec %2 !"
+
+ #: Synchronizer/synchronizertask.cpp:339
+ msgid "Comparing file %1 (%2)..."
+@@ -4322,8 +4321,8 @@
+ "_n: Right to left: Copy 1 file\n"
+ "Right to left: Copy %n files"
+ msgstr ""
+-"Droite à gauche : Copier 1 fichier\n"
+-"Gauche à droite : Copier %n fichiers"
++"Droite à gauche : Copier 1 fichier\n"
++"Gauche à droite : Copier %n fichiers"
+
+ #: Synchronizer/synchronizedialog.cpp:54 Synchronizer/synchronizedialog.cpp:67
+ #: Synchronizer/synchronizedialog.cpp:80
+@@ -4341,8 +4340,8 @@
+ "_n: Ready: %1/1 file, %3/%4\n"
+ "Ready: %1/%n files, %3/%4"
+ msgstr ""
+-"Prêt : %1/1 fichier, %3/%4\n"
+-"Prêt : %1/%n fichiers, %3/%4"
++"Prêt : %1/1 fichier, %3/%4\n"
++"Prêt : %1/%n fichiers, %3/%4"
+
+ #: Synchronizer/synchronizedialog.cpp:66
+ #, c-format
+@@ -4350,8 +4349,8 @@
+ "_n: Left to right: Copy 1 file\n"
+ "Left to right: Copy %n files"
+ msgstr ""
+-"Gauche à droite : Copier 1 fichier\n"
+-"Droite à gauche : Copier %n fichiers"
++"Gauche à droite : Copier 1 fichier\n"
++"Droite à gauche : Copier %n fichiers"
+
+ #: Synchronizer/synchronizedialog.cpp:79
+ #, c-format
+@@ -4359,8 +4358,8 @@
+ "_n: Left: Delete 1 file\n"
+ "Left: Delete %n files"
+ msgstr ""
+-"Gauche : Effacer 1 fichiers\n"
+-"Gauche : Effacer %n fichiers"
++"Gauche : Effacer 1 fichiers\n"
++"Gauche : Effacer %n fichiers"
+
+ #: Synchronizer/synchronizedialog.cpp:101
+ msgid "Confirm overwrites"
+@@ -4378,7 +4377,7 @@
+ #: Synchronizer/synchronizedialog.cpp:161
+ #: Synchronizer/synchronizedialog.cpp:164
+ msgid "\tReady: %1/%2 files, %3/%4"
+-msgstr "\tPrêt : %1/%2 fichiers, %3/%4"
++msgstr "\tPrêt : %1/%2 fichiers, %3/%4"
+
+ #: Synchronizer/synchronizedialog.cpp:186 Synchronizer/synchronizer.cpp:1343
+ #: Synchronizer/synchronizer.cpp:1353
+@@ -4392,12 +4391,12 @@
+ #: Synchronizer/synchronizer.cpp:157 Synchronizer/synchronizer.cpp:648
+ #, c-format
+ msgid "Number of files: %1"
+-msgstr "Nombre de fichiers :·%1"
++msgstr "Nombre de fichiers :·%1"
+
+ #: Synchronizer/synchronizer.cpp:188
+ #, c-format
+ msgid "Number of compared directories: %1"
+-msgstr "Nombre de dossiers comparés : %1"
++msgstr "Nombre de dossiers comparés : %1"
+
+ #: Synchronizer/synchronizer.cpp:1151 Synchronizer/synchronizer.cpp:1164
+ msgid "File Already Exists"
+@@ -4405,11 +4404,11 @@
+
+ #: Synchronizer/synchronizer.cpp:1209 Synchronizer/synchronizer.cpp:1214
+ msgid "Error at copying file %1 to %2!"
+-msgstr "Erreur lors de la copie du fichier %1 vers %2 !"
++msgstr "Erreur lors de la copie du fichier %1 vers %2 !"
+
+ #: Synchronizer/synchronizer.cpp:1219
+ msgid "Error at deleting file %1!"
+-msgstr "Erreur lors de la suppression du fichier %1 !"
++msgstr "Erreur lors de la suppression du fichier %1 !"
+
+ #: Synchronizer/synchronizer.cpp:1398
+ msgid "Krusader::Synchronizer"
+@@ -4429,7 +4428,7 @@
+
+ #: Synchronizer/feedtolistboxdialog.cpp:87
+ msgid "No elements to feed!"
+-msgstr "Aucun éléments à remplir !"
++msgstr "Aucun éléments à remplir !"
+
+ #: Synchronizer/feedtolistboxdialog.cpp:101
+ msgid "Synchronize results"
+@@ -4437,7 +4436,7 @@
+
+ #: Synchronizer/feedtolistboxdialog.cpp:120
+ msgid "Side to feed:"
+-msgstr "Coté à remplir :"
++msgstr "Coté à remplir :"
+
+ #: Synchronizer/feedtolistboxdialog.cpp:125
+ msgid "Left"
+@@ -4457,7 +4456,7 @@
+
+ #: Synchronizer/feedtolistboxdialog.cpp:191
+ msgid "Cannot open %1!"
+-msgstr "Ouverture de %1 impossible !"
++msgstr "Ouverture de %1 impossible !"
+
+ #: Konfigurator/kglookfeel.cpp:121 paneltabbar.cpp:35
+ msgid "Panel"
+@@ -4485,20 +4484,20 @@
+ "<b>permanently</b> deleted!</qt>"
+ msgstr ""
+ "<qt>Le dossier à <i>'%1'</i>sera <b>récursivement</b> et "
+-"<b>définitivement</b>supprimé !</qt>"
++"<b>définitivement</b>supprimé !</qt>"
+
+ #: DiskUsage/radialMap/widgetEvents.cpp:193
+ msgid "<qt><i>'%1'</i> will be <b>permanently</b> deleted!</qt>"
+-msgstr "<qt><i>'%1'</i> sera <b>définitivement</b> effacé !</qt>"
++msgstr "<qt><i>'%1'</i> sera <b>définitivement</b> effacé !</qt>"
+
+ #: DiskUsage/radialMap/builder.cpp:134
+ msgid "%1 files: ~ %2"
+-msgstr "%1 fichiers : ~ %2"
++msgstr "%1 fichiers : ~ %2"
+
+ #: DiskUsage/radialMap/segmentTip.cpp:103
+ #, c-format
+ msgid "Files: %1"
+-msgstr "Fichiers : %1"
++msgstr "Fichiers : %1"
+
+ #: DiskUsage/dulines.cpp:234
+ msgid "Line View"
+@@ -4602,7 +4601,7 @@
+
+ #: DiskUsage/diskusagegui.cpp:219
+ msgid "Viewing the usage of directory:"
+-msgstr "Visualiser l'utilisation de dossier :"
++msgstr "Visualiser l'utilisation de dossier :"
+
+ #: DiskUsage/dulistview.cpp:62
+ msgid "Total size"
+@@ -4618,15 +4617,15 @@
+
+ #: DiskUsage/diskusage.cpp:106
+ msgid "Files:"
+-msgstr "Fichiers :"
++msgstr "Fichiers :"
+
+ #: DiskUsage/diskusage.cpp:111
+ msgid "Directories:"
+-msgstr "Dossiers :"
++msgstr "Dossiers :"
+
+ #: DiskUsage/diskusage.cpp:116
+ msgid "Total Size:"
+-msgstr "Taille totale :"
++msgstr "Taille totale :"
+
+ #: DiskUsage/diskusage.cpp:243
+ msgid "Loading the disk usage information..."
+@@ -4638,7 +4637,7 @@
+ "\" URL. Do you wish to continue?"
+ msgstr ""
+ "Se déplacer dans le dossier parent implique le chargement du contenu de "
+-"\"%1\". Voulez-vous continuer ?"
++"\"%1\". Voulez-vous continuer ?"
+
+ #: DiskUsage/diskusage.cpp:415
+ msgid "Krusader::DiskUsage"
+@@ -4647,12 +4646,12 @@
+ #: DiskUsage/diskusage.cpp:596
+ msgid "Do you really want to move this item to the trash?"
+ msgstr ""
+-"Voulez-vous vraiment effacer cet objet ?\n"
+-"Voulez vous vraiment effacer ces %n objets ?"
++"Voulez-vous vraiment effacer cet objet ?\n"
++"Voulez vous vraiment effacer ces %n objets ?"
+
+ #: DiskUsage/diskusage.cpp:599
+ msgid "Do you really want to delete this item?"
+-msgstr "Voulez-vous vraiment supprimer cet élément ?"
++msgstr "Voulez-vous vraiment supprimer cet élément ?"
+
+ #: DiskUsage/diskusage.cpp:611
+ msgid "Deleting %1..."
+@@ -4661,7 +4660,7 @@
+ #: DiskUsage/diskusage.cpp:727
+ msgid "Current directory:%1, Total size:%2, Own size:%3"
+ msgstr ""
+-"Dossier courant :%1, Taille totale :%2, Taille propre : %"
++"Dossier courant :%1, Taille totale :%2, Taille propre : %"
+ "3"
+
+ #: DiskUsage/diskusage.cpp:753
+@@ -4706,23 +4705,23 @@
+
+ #: DiskUsage/diskusage.cpp:1031
+ msgid "Type:"
+-msgstr "Type :"
++msgstr "Type :"
+
+ #: DiskUsage/diskusage.cpp:1035
+ msgid "Own size:"
+-msgstr "Taille propre :"
++msgstr "Taille propre :"
+
+ #: DiskUsage/diskusage.cpp:1037
+ msgid "Last modified:"
+-msgstr "Modifié récemment :"
++msgstr "Modifié récemment :"
+
+ #: DiskUsage/diskusage.cpp:1038
+ msgid "Permissions:"
+-msgstr "Permissions :"
++msgstr "Permissions :"
+
+ #: DiskUsage/diskusage.cpp:1039
+ msgid "Owner:"
+-msgstr "Propriétaire :"
++msgstr "Propriétaire :"
+
+ #. i18n: file krusaderui.rc line 4
+ #: rc.cpp:3
+@@ -4841,19 +4840,19 @@
+
+ #: Konfigurator/kggeneral.cpp:76
+ msgid "Editor:"
+-msgstr "Éditeur de texte :"
++msgstr "Éditeur de texte :"
+
+ #: Konfigurator/kggeneral.cpp:82
+ msgid ""
+ "Hint: use 'internal editor' if you want to use Krusader's fast built-in "
+ "editor"
+ msgstr ""
+-"Astuce : Utilisez l'éditeur interne si vous voulez utiliser l'éditeur "
++"Astuce : Utilisez l'éditeur interne si vous voulez utiliser l'éditeur "
+ "rapide de Krusader"
+
+ #: Konfigurator/kggeneral.cpp:93
+ msgid "Default viewer mode:"
+-msgstr "Mode de visualisation par défaut :"
++msgstr "Mode de visualisation par défaut :"
+
+ #: Konfigurator/kggeneral.cpp:97
+ msgid "Generic mode"
+@@ -4897,11 +4896,11 @@
+
+ #: Konfigurator/kggeneral.cpp:115
+ msgid "Atomic extensions:"
+-msgstr "Extensions atomiques :"
++msgstr "Extensions atomiques :"
+
+ #: Konfigurator/kggeneral.cpp:143
+ msgid "Terminal:"
+-msgstr "Terminal :"
++msgstr "Terminal :"
+
+ #: Konfigurator/kggeneral.cpp:150
+ msgid "Terminal Emulator sends Chdir on panel change"
+@@ -4918,13 +4917,13 @@
+
+ #: Konfigurator/kggeneral.cpp:159
+ msgid "Temp Directory:"
+-msgstr "Dossier temporaire :"
++msgstr "Dossier temporaire :"
+
+ #: Konfigurator/kggeneral.cpp:167
+ msgid "Note: you must have full permissions for the temporary directory!"
+ msgstr ""
+-"Note : Vous devez avoir toutes les permissions pour le dossier "
+-"temporaire !"
++"Note : Vous devez avoir toutes les permissions pour le dossier "
++"temporaire !"
+
+ #: Konfigurator/kggeneral.cpp:186
+ msgid "Searching for tools..."
+@@ -4942,7 +4941,7 @@
+
+ #: Konfigurator/kggeneral.cpp:195
+ msgid "Extension: "
+-msgstr "Extension : "
++msgstr "Extension : "
+
+ #: Konfigurator/kggeneral.cpp:200
+ msgid ""
+@@ -5047,7 +5046,7 @@
+
+ #: Konfigurator/konfigurator.cpp:104
+ msgid "Be sure you know what you're doing!"
+-msgstr "Soyez bien sûr de savoir ce que vous faites !"
++msgstr "Soyez bien sûr de savoir ce que vous faites !"
+
+ #: Konfigurator/konfigurator.cpp:107
+ msgid "Customize the way Krusader deals with archives"
+@@ -5075,7 +5074,7 @@
+
+ #: Konfigurator/konfigurator.cpp:185
+ msgid "The current page has been changed. Do you want to apply changes?"
+-msgstr "La page courante a changé; Voulez vous appliquer ces changements ?"
++msgstr "La page courante a changé; Voulez vous appliquer ces changements ?"
+
+ #: Konfigurator/kglookfeel.cpp:73
+ msgid "Operation"
+@@ -5183,11 +5182,11 @@
+
+ #: Konfigurator/kglookfeel.cpp:130
+ msgid "Panel font:"
+-msgstr "Police :"
++msgstr "Police :"
+
+ #: Konfigurator/kglookfeel.cpp:136
+ msgid "Filelist icon size:"
+-msgstr "Taille des icônes (listes de fichiers) :"
++msgstr "Taille des icônes (listes de fichiers) :"
+
+ #: Konfigurator/kglookfeel.cpp:139
+ msgid "16"
+@@ -5257,7 +5256,7 @@
+
+ #: Konfigurator/kglookfeel.cpp:172
+ msgid "Default panel type:"
+-msgstr "Type de panneau par défaut :"
++msgstr "Type de panneau par défaut :"
+
+ #: Konfigurator/kglookfeel.cpp:175
+ msgid "Brief"
+@@ -5392,7 +5391,7 @@
+
+ #: Konfigurator/kglookfeel.cpp:251
+ msgid "Design your own selection mode!"
+-msgstr "Définissez votre propre mode de sélection !"
++msgstr "Définissez votre propre mode de sélection !"
+
+ #: Konfigurator/kglookfeel.cpp:261
+ msgid "Details"
+@@ -5419,7 +5418,7 @@
+ "<p>Use KDE's global setting:</p><p><i>KDE Control Center -> Peripherals -> "
+ "Mouse</i></p>"
+ msgstr ""
+-"<p>Utiliser les configurations globales de KDE :</p><p><i>Centre de "
++"<p>Utiliser les configurations globales de KDE :</p><p><i>Centre de "
+ "contrôle de KDE -> Périphériques -> Souris</i></p>"
+
+ #: Konfigurator/kglookfeel.cpp:282
+@@ -5460,7 +5459,7 @@
+ "Note: This is meaningless if 'Left Button Selects' is checked."
+ msgstr ""
+ "Si activé, un clic gauche + shift/ctrl sélectionne les objets. \n"
+-" Note : ceci est sans effet si 'Sélection par bouton gauche' est activé."
++" Note : ceci est sans effet si 'Sélection par bouton gauche' est activé."
+
+ #: Konfigurator/kglookfeel.cpp:294
+ msgid "Right mouse button selects"
+@@ -5492,7 +5491,7 @@
+ "Note: This is meaningless if 'Right Button Selects' is checked."
+ msgstr ""
+ "Si activé, un clic droit + shift/ctrl sélectionne les objets. \n"
+-"Note : ceci est sans effet si 'Sélection par bouton droit' est activé."
++"Note : ceci est sans effet si 'Sélection par bouton droit' est activé."
+
+ #: Konfigurator/kglookfeel.cpp:303
+ msgid "Spacebar moves down"
+@@ -5565,9 +5564,9 @@
+ msgstr ""
+ "Krusader essayera de préverver tout les attributs (temps, propriétaire, "
+ "groupe) des fichiers locaux selon la source dépendante de vos propres "
+-"permissions : <ul><li>Préserver les utilisateurs si vous êtes root</li> "
++"permissions : <ul><li>Préserver les utilisateurs si vous êtes root</li> "
+ "<li>Préserver les groupes si vous êtes root ou membre du groupe</li> "
+-"<li>Préserver le timestamp</li></ul> <b> Note</b> : Ceci peut ralentir "
++"<li>Préserver le timestamp</li></ul> <b> Note</b> : Ceci peut ralentir "
+ "le processus de copie."
+
+ #: Konfigurator/kgadvanced.cpp:64
+@@ -5598,7 +5597,7 @@
+
+ #: Konfigurator/kgadvanced.cpp:74
+ msgid "MountMan won't (un)mount the following mount-points:"
+-msgstr "MountMan ne (de)montera pas les points de montages suivants :"
++msgstr "MountMan ne (de)montera pas les points de montages suivants :"
+
+ #: Konfigurator/kgadvanced.cpp:88
+ msgid "Confirmations"
+@@ -5606,7 +5605,7 @@
+
+ #: Konfigurator/kgadvanced.cpp:91
+ msgid "Request user confirmation for the following operations:"
+-msgstr "Demande d'une confirmation utilisateur pour les opérations suivantes :"
++msgstr "Demande d'une confirmation utilisateur pour les opérations suivantes :"
+
+ #: Konfigurator/kgadvanced.cpp:96
+ msgid "Deleting non-empty directories"
+@@ -5646,7 +5645,7 @@
+
+ #: Konfigurator/kgadvanced.cpp:116
+ msgid "Icon cache size (KB):"
+-msgstr "Taille du cache d'icônes (KB) :"
++msgstr "Taille du cache d'icônes (KB) :"
+
+ #: Konfigurator/kgadvanced.cpp:117 Konfigurator/kgadvanced.cpp:121
+ msgid ""
+@@ -5659,7 +5658,7 @@
+
+ #: Konfigurator/kgadvanced.cpp:125
+ msgid "Arguments of updatedb:"
+-msgstr "Arguments de updatedb :"
++msgstr "Arguments de updatedb :"
+
+ #: Konfigurator/kgprotocols.cpp:67
+ msgid "Links"
+@@ -5824,11 +5823,11 @@
+
+ #: Konfigurator/kgcolors.cpp:97 Konfigurator/kgcolors.cpp:132
+ msgid "Foreground:"
+-msgstr "Texte défaut :"
++msgstr "Texte défaut :"
+
+ #: Konfigurator/kgcolors.cpp:98 Konfigurator/kgcolors.cpp:134
+ msgid "Directory foreground:"
+-msgstr "Dossier :"
++msgstr "Dossier :"
+
+ #: Konfigurator/kgcolors.cpp:98 Konfigurator/kgcolors.cpp:99
+ #: Konfigurator/kgcolors.cpp:100 Konfigurator/kgcolors.cpp:101
+@@ -5838,19 +5837,19 @@
+
+ #: Konfigurator/kgcolors.cpp:99 Konfigurator/kgcolors.cpp:135
+ msgid "Executable foreground:"
+-msgstr "Exécutable :"
++msgstr "Exécutable :"
+
+ #: Konfigurator/kgcolors.cpp:100 Konfigurator/kgcolors.cpp:136
+ msgid "Symbolic link foreground:"
+-msgstr "Lien symbolique :"
++msgstr "Lien symbolique :"
+
+ #: Konfigurator/kgcolors.cpp:101 Konfigurator/kgcolors.cpp:137
+ msgid "Invalid symlink foreground:"
+-msgstr "Lien symbolique invalide :"
++msgstr "Lien symbolique invalide :"
+
+ #: Konfigurator/kgcolors.cpp:102 Konfigurator/kgcolors.cpp:138
+ msgid "Background:"
+-msgstr "Fond :"
++msgstr "Fond :"
+
+ #: Konfigurator/kgcolors.cpp:103 Konfigurator/kgcolors.cpp:139
+ msgid "Same as background"
+@@ -5858,15 +5857,15 @@
+
+ #: Konfigurator/kgcolors.cpp:104 Konfigurator/kgcolors.cpp:140
+ msgid "Alternate background:"
+-msgstr "Second fond :"
++msgstr "Second fond :"
+
+ #: Konfigurator/kgcolors.cpp:105 Konfigurator/kgcolors.cpp:141
+ msgid "Selected foreground:"
+-msgstr "Avant plan de la sélection :"
++msgstr "Avant plan de la sélection :"
+
+ #: Konfigurator/kgcolors.cpp:106 Konfigurator/kgcolors.cpp:142
+ msgid "Selected background:"
+-msgstr "Arrière plan de la sélection :"
++msgstr "Arrière plan de la sélection :"
+
+ #: Konfigurator/kgcolors.cpp:107 Konfigurator/kgcolors.cpp:143
+ msgid "Same as alt. background"
+@@ -5874,7 +5873,7 @@
+
+ #: Konfigurator/kgcolors.cpp:108 Konfigurator/kgcolors.cpp:145
+ msgid "Alternate selected background:"
+-msgstr "Arrière plan alternatif (sélection) :"
++msgstr "Arrière plan alternatif (sélection) :"
+
+ #: Konfigurator/kgcolors.cpp:108 Konfigurator/kgcolors.cpp:144
+ msgid "Same as selected background"
+@@ -5882,7 +5881,7 @@
+
+ #: Konfigurator/kgcolors.cpp:109 Konfigurator/kgcolors.cpp:146
+ msgid "Current foreground:"
+-msgstr "Courant (texte) :"
++msgstr "Courant (texte) :"
+
+ #: Konfigurator/kgcolors.cpp:109 Konfigurator/kgcolors.cpp:111
+ #: Konfigurator/kgcolors.cpp:112
+@@ -5895,11 +5894,11 @@
+
+ #: Konfigurator/kgcolors.cpp:111 Konfigurator/kgcolors.cpp:148
+ msgid "Selected current foreground:"
+-msgstr "Avant plan courant sélectionné :"
++msgstr "Avant plan courant sélectionné :"
+
+ #: Konfigurator/kgcolors.cpp:112 Konfigurator/kgcolors.cpp:149
+ msgid "Current background:"
+-msgstr "Courant (fond) :"
++msgstr "Courant (fond) :"
+
+ #: Konfigurator/kgcolors.cpp:122
+ msgid "Inactive"
+@@ -5917,11 +5916,11 @@
+
+ #: Konfigurator/kgcolors.cpp:168
+ msgid "Dim target color:"
+-msgstr "Couleur d'adoucissement :"
++msgstr "Couleur d'adoucissement :"
+
+ #: Konfigurator/kgcolors.cpp:171
+ msgid "Dim factor:"
+-msgstr "Facteur d'adoucissement :"
++msgstr "Facteur d'adoucissement :"
+
+ #: Konfigurator/kgcolors.cpp:184
+ msgid "Synchronizer"
+@@ -5933,43 +5932,43 @@
+
+ #: Konfigurator/kgcolors.cpp:195
+ msgid "Equals foreground:"
+-msgstr "Avant plan identiques :"
++msgstr "Avant plan identiques :"
+
+ #: Konfigurator/kgcolors.cpp:196
+ msgid "Equals background:"
+-msgstr "Fond identiques :"
++msgstr "Fond identiques :"
+
+ #: Konfigurator/kgcolors.cpp:197
+ msgid "Differing foreground:"
+-msgstr "Avant plan du différé :"
++msgstr "Avant plan du différé :"
+
+ #: Konfigurator/kgcolors.cpp:198
+ msgid "Differing background:"
+-msgstr "Arrière plan du différé :"
++msgstr "Arrière plan du différé :"
+
+ #: Konfigurator/kgcolors.cpp:199
+ msgid "Copy to left foreground:"
+-msgstr "Copier vers avant plan gauche :"
++msgstr "Copier vers avant plan gauche :"
+
+ #: Konfigurator/kgcolors.cpp:200
+ msgid "Copy to left background:"
+-msgstr "Copier vers fond gauche :"
++msgstr "Copier vers fond gauche :"
+
+ #: Konfigurator/kgcolors.cpp:201
+ msgid "Copy to right foreground:"
+-msgstr "Copier vers avant plan droit :"
++msgstr "Copier vers avant plan droit :"
+
+ #: Konfigurator/kgcolors.cpp:202
+ msgid "Copy to right background:"
+-msgstr "Copier vers le fond droit :"
++msgstr "Copier vers le fond droit :"
+
+ #: Konfigurator/kgcolors.cpp:203
+ msgid "Delete foreground:"
+-msgstr "Efface Avant plan :"
++msgstr "Efface Avant plan :"
+
+ #: Konfigurator/kgcolors.cpp:204
+ msgid "Delete background:"
+-msgstr "Efface le fond :"
++msgstr "Efface le fond :"
+
+ #: Konfigurator/kgcolors.cpp:228
+ msgid "Import color-scheme"
+@@ -6029,7 +6028,7 @@
+
+ #: Konfigurator/kgcolors.cpp:508
+ msgid "Error: unable to read from file"
+-msgstr "Erreur : Lecture du fichier impossible"
++msgstr "Erreur : Lecture du fichier impossible"
+
+ #: Konfigurator/kgcolors.cpp:518
+ msgid "Select a color scheme file"
+@@ -6041,11 +6040,11 @@
+
+ #: Konfigurator/kgcolors.cpp:522
+ msgid " already exists. Are you sure you want to overwrite it?"
+-msgstr " existe déjà, êtes-vous sûr de vouloir l'écraser ?"
++msgstr " existe déjà, êtes-vous sûr de vouloir l'écraser ?"
+
+ #: Konfigurator/kgcolors.cpp:525
+ msgid "Error: unable to write to file"
+-msgstr "Erreur : Impossible d'écrire dans le fichier"
++msgstr "Erreur : Impossible d'écrire dans le fichier"
+
+ #: Konfigurator/kgstartup.cpp:50
+ msgid ""
+@@ -6055,14 +6054,14 @@
+ "saved automatically when Krusader is closed."
+ msgstr ""
+ "Défini le profil de panneau utilisé au démarrage. Un profil panneau "
+-"contient : <ul><li>tout les onglets dossiers</li><li>l'onglet "
++"contient : <ul><li>tout les onglets dossiers</li><li>l'onglet "
+ "courant</li><li>le panneau actif</li></ul><b><Dernière session></b> "
+ "est un profil de panneau spécial qui est sauvé automatiquement quand "
+ "Krusader est fermé."
+
+ #: Konfigurator/kgstartup.cpp:51
+ msgid "Startup profile:"
+-msgstr "Profil de démarrage :"
++msgstr "Profil de démarrage :"
+
+ #: Konfigurator/kgstartup.cpp:56
+ msgid "Last session"
+@@ -6175,7 +6174,7 @@
+
+ #: Konfigurator/kgarchives.cpp:54
+ msgid "Krusader transparently handles the following types of archives:"
+-msgstr "Krusader gère de façon transparente les types d'archives suivants :"
++msgstr "Krusader gère de façon transparente les types d'archives suivants :"
+
+ #: Konfigurator/kgarchives.cpp:59
+ msgid "Tar"
+@@ -6286,7 +6285,7 @@
+
+ #: Konfigurator/kguseractions.cpp:68
+ msgid "Terminal for UserActions:"
+-msgstr "Terminal pour les actions utilisateur :"
++msgstr "Terminal pour les actions utilisateur :"
+
+ #: Konfigurator/kguseractions.cpp:78
+ msgid "Output collection"
+@@ -6294,11 +6293,11 @@
+
+ #: Konfigurator/kguseractions.cpp:83
+ msgid "Normal font:"
+-msgstr "Fonte par défaut :"
++msgstr "Fonte par défaut :"
+
+ #: Konfigurator/kguseractions.cpp:89
+ msgid "Font with fixed width:"
+-msgstr "Fontes à largeur fixe :"
++msgstr "Fontes à largeur fixe :"
+
+ #: Konfigurator/kguseractions.cpp:95
+ msgid "Use fixed width font as default"
+@@ -6314,7 +6313,7 @@
+
+ #: krslots.cpp:113
+ msgid "Sending file: "
+-msgstr "Envoie le fichier : "
++msgstr "Envoie le fichier : "
+
+ #: krslots.cpp:149
+ msgid "Don't know which files to compare."
+@@ -6327,7 +6326,7 @@
+ "in the active panel.</li><li>Make sure there is a file in the other panel, "
+ "with the same name as the current file in the active panel.</li></ul>"
+ msgstr ""
+-"Pour comparer deux fichiers par contenu vous pouvez soit :"
++"Pour comparer deux fichiers par contenu vous pouvez soit :"
+ "<ul><li>Sélectionner un fichier dans le panneau de gauche et un fichier "
+ "dans le panneau de droite.</li><li>Sélectionner exactement deux fichiers "
+ "dans le panneau actif.</li><li>Vous assurer qu'il y a un autre fichier dans "
+@@ -6339,7 +6338,7 @@
+ "to your path. Hint: Krusader supports Kompare, Kdiff3 and Xxdiff."
+ msgstr ""
+ "Krusader n'a pas trouvé d'interface supportées pour le programme diff. "
+-"Veuillez en installer un. Note : Krusader supporte Kompare, Kdiff3 et "
++"Veuillez en installer un. Note : Krusader supporte Kompare, Kdiff3 et "
+ "Xxdiff."
+
+ #: krslots.cpp:441
+@@ -6359,18 +6358,18 @@
+ "Try the new bookmark-manager: open a new remote connection, once done, press "
+ "the bookmark button, select 'Add bookmark' and that's it!"
+ msgstr ""
+-"Important : RemoteMan a été remplacé par notre nouveau gestionnaire de "
++"Important : RemoteMan a été remplacé par notre nouveau gestionnaire de "
+ "favoris. Le nouveau gestionnaire gère les fichiers locaux ainsi que les URL "
+ "distantes. RemoveMan a été mis de coté pour vous permettre une transition "
+-"simple et de déplacer vos favoris. IL SERA SUPPRIMÉ BIENTÔT !\n"
+-"Essayez le nouveau gestionnaire de favoris : ouvrez une nouvelle "
++"simple et de déplacer vos favoris. IL SERA SUPPRIMÉ BIENTÔT !\n"
++"Essayez le nouveau gestionnaire de favoris : ouvrez une nouvelle "
+ "connexion distante, sitôt fait appuyez sur le bouton Favoris, sélectionnez "
+-"'Ajouter Favoris' et c'est tout !"
++"'Ajouter Favoris' et c'est tout !"
+
+ #: krslots.cpp:477
+ msgid "Can't start 'mount'! Check the 'Dependencies' page in konfigurator."
+ msgstr ""
+-"Démarrage de 'mount' impossible ! Vérifiez les dépendances dans "
++"Démarrage de 'mount' impossible ! Vérifiez les dépendances dans "
+ "Konfigurator."
+
+ #: krslots.cpp:509
+@@ -6394,15 +6393,15 @@
+ msgstr ""
+ "Le démarrage de Krusader en mode superutilisateur est impossible, parce que "
+ "Krusader ou kdesu est manquant dans le PATH. Veuillez configurer les "
+-"dépendances dans Konfigurator !"
++"dépendances dans Konfigurator !"
+
+ #: krslots.cpp:602
+ msgid "Enter a URL to view:"
+-msgstr "Entrer une URL à afficher :"
++msgstr "Entrer une URL à afficher :"
+
+ #: krslots.cpp:613
+ msgid "Enter the filename to edit:"
+-msgstr "Valide nom du fichier Éditeur :"
++msgstr "Valide nom du fichier Éditeur :"
+
+ #: krslots.cpp:670
+ msgid "Don't know which file to split."
+@@ -6410,7 +6409,7 @@
+
+ #: krslots.cpp:679
+ msgid "You can't split a directory!"
+-msgstr "Vous ne pouvez pas fractionner un dossier !"
++msgstr "Vous ne pouvez pas fractionner un dossier !"
+
+ #: krslots.cpp:710
+ msgid "Don't know which files to combine."
+@@ -6418,23 +6417,23 @@
+
+ #: krslots.cpp:722
+ msgid "You can't combine a directory!"
+-msgstr "Vous ne pouvez pas fusionner un dossier !"
++msgstr "Vous ne pouvez pas fusionner un dossier !"
+
+ #: krslots.cpp:741
+ msgid "Not a split file %1!"
+-msgstr "%1 n'est pas un fichier fractionné !"
++msgstr "%1 n'est pas un fichier fractionné !"
+
+ #: krslots.cpp:756
+ msgid "Select only one split file!"
+-msgstr "Sélectionner un seul fichier fractionné !"
++msgstr "Sélectionner un seul fichier fractionné !"
+
+ #: krslots.cpp:804
+ msgid "Not a splitted file %1!"
+-msgstr "%1 n'est pas un fichier fractionné !"
++msgstr "%1 n'est pas un fichier fractionné !"
+
+ #: krslots.cpp:811
+ msgid "Combining %1.* to directory:"
+-msgstr "Fusion de %1.* vers le dossier :"
++msgstr "Fusion de %1.* vers le dossier :"
+
+ #: Splitter/splittergui.cpp:39
+ msgid "1.44 MB (3.5\")"
+@@ -6470,7 +6469,7 @@
+
+ #: Splitter/splittergui.cpp:60
+ msgid "Split the file %1 to directory:"
+-msgstr "Fractionner le fichier %1 vers le dossier :"
++msgstr "Fractionner le fichier %1 vers le dossier :"
+
+ #: Splitter/splittergui.cpp:74
+ msgid "User Defined"
+@@ -6478,7 +6477,7 @@
+
+ #: Splitter/splittergui.cpp:81
+ msgid "Max file size:"
+-msgstr "Taille maxi fichier :"
++msgstr "Taille maxi fichier :"
+
+ #: Splitter/splittergui.cpp:88
+ msgid "Byte"
+@@ -6506,7 +6505,7 @@
+
+ #: Splitter/splittergui.cpp:193
+ msgid "The directory path URL is malformed!"
+-msgstr "L'URL du chemin du dossier est incorrecte !"
++msgstr "L'URL du chemin du dossier est incorrecte !"
+
+ #: Splitter/combiner.cpp:61
+ msgid "Krusader::Combining..."
+@@ -6521,41 +6520,41 @@
+ "The CRC information file (%1) is missing!\n"
+ "Validity checking is impossible without it. Continue combining?"
+ msgstr ""
+-"Le fichier d'information CRC (%1) est manquant !\n"
++"Le fichier d'information CRC (%1) est manquant !\n"
+ "La vérification de validité est impossible sans celui-ci. Continuer la "
+-"fusion ?"
++"fusion ?"
+
+ #: Splitter/combiner.cpp:110
+ msgid "Error at reading the CRC file (%1)!"
+-msgstr "Erreur de lecture du fichier CRC (%1) !"
++msgstr "Erreur de lecture du fichier CRC (%1) !"
+
+ #: Splitter/combiner.cpp:144
+ msgid "Not a valid CRC file!"
+-msgstr "Fichier de CRC invalide !"
++msgstr "Fichier de CRC invalide !"
+
+ #: Splitter/combiner.cpp:152
+ msgid "Validity checking is impossible without a good CRC file. Continue combining?"
+ msgstr ""
+ "La vérification de la validité est impossible sans un fichier de CRC "
+-"correct. Continuer la fusion ?"
++"correct. Continuer la fusion ?"
+
+ #: Splitter/combiner.cpp:256
+ msgid "Can't open the first split file of %1!"
+-msgstr "Ouverture du premier fichier fractionné de %1 impossible !"
++msgstr "Ouverture du premier fichier fractionné de %1 impossible !"
+
+ #: Splitter/combiner.cpp:268
+ msgid "Incorrect filesize! The file might have been corrupted!"
+ msgstr ""
+-"Taille de fichier incorrecte ! Le fichier a sans doute été "
+-"corrompu !"
++"Taille de fichier incorrecte ! Le fichier a sans doute été "
++"corrompu !"
+
+ #: Splitter/combiner.cpp:270
+ msgid "Incorrect CRC checksum! The file might have been corrupted!"
+-msgstr "Somme de contrôle CRC incorrect ! Le fichier a sans doute été corrompu !"
++msgstr "Somme de contrôle CRC incorrect ! Le fichier a sans doute été corrompu !"
+
+ #: Splitter/combiner.cpp:296 Splitter/splitter.cpp:201
+ msgid "Error writing file %1!"
+-msgstr "Erreur d'écriture du fichier %1 !"
++msgstr "Erreur d'écriture du fichier %1 !"
+
+ #: Splitter/splitter.cpp:69
+ msgid "Krusader::Splitting..."
+@@ -6567,13 +6566,13 @@
+
+ #: Splitter/splitter.cpp:74
+ msgid "Can't split a directory!"
+-msgstr "Fractionnement d'un dossier impossible !"
++msgstr "Fractionnement d'un dossier impossible !"
+
+ #: Splitter/splitter.cpp:125
+ msgid "Error reading file %1!"
+-msgstr "Erreur de lecture du fichier %1 !"
++msgstr "Erreur de lecture du fichier %1 !"
+
+ #: Splitter/splitter.cpp:244
+ msgid "Error at writing file %1!"
+-msgstr "Erreur lors de l'écriture de %1 !"
++msgstr "Erreur lors de l'écriture de %1 !"
+
+--- a/po/uk.po
++++ b/po/uk.po
+@@ -1,24 +1,24 @@
+ # Translation of krusader.pot to Ukrainian
+ #
+ # Copyright (C) 2000-2003, Shie Erlich, Rafi Yanai
+-# Copyright (C) 2004-2007, Krusader Krew
++# Copyright (C) 2004-2008, Krusader Krew
+ # This file is distributed under the same license as the Krusader package
+-# Ivan Petrouchtchak <iip at telus.net>, 2004, 2005.
+ #
++# Ivan Petrouchtchak <iip at telus.net>, 2004, 2005.
++# Yuri Chornoivan <yurchor at ukr.net>, 2007, 2008.
+ msgid ""
+ msgstr ""
+-"Project-Id-Version: krusader-1.80.0-beta2\n"
++"Project-Id-Version: krusader-1.90.0\n"
+ "Report-Msgid-Bugs-To: Dirk Eschler <deschler at users.sourceforge.net>\n"
+ "POT-Creation-Date: 2007-03-27 15:16+0200\n"
+-"PO-Revision-Date: 2005-02-21 23:08-0800\n"
+-"Last-Translator: Ivan Petrouchtchak <iip at telus.net>\n"
+-"Language-Team: Ukrainian <translation at linux.org.ua>\n"
++"PO-Revision-Date: 2008-01-05 21:02+0200\n"
++"Last-Translator: Yuri Chornoivan <yurchor at ukr.net>\n"
++"Language-Team: krusader-i18n <krusader-i18n at googlegroups.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=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
+-"10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
++"X-Generator: KBabel 1.11.4\n"
++"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+ "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
+
+ #: GUI/dirhistorybutton.cpp:35
+@@ -35,7 +35,7 @@
+
+ #: GUI/profilemanager.cpp:82
+ msgid "Remove entry"
+-msgstr "Видалити елемент"
++msgstr "Вилучити елемент"
+
+ #: GUI/profilemanager.cpp:83
+ msgid "Overwrite entry"
+@@ -54,64 +54,57 @@
+ msgstr "Введіть назву профілю:"
+
+ #: GUI/krremoteencodingmenu.cpp:97
+-#, fuzzy
+ msgid "Reload"
+-msgstr "Червоний"
++msgstr "Перезавантажити"
+
+ #: GUI/krremoteencodingmenu.cpp:98 Konfigurator/konfiguratoritems.cpp:539
+-#, fuzzy
+ msgid "Default"
+ msgstr "Стандартні значення"
+
+ #: GUI/mediabutton.cpp:81
+-#, fuzzy
+ msgid "Open the available media list"
+-msgstr "Відкрити список історії каталогу"
++msgstr "Відкрити список доступних носіїв"
+
+ #: GUI/mediabutton.cpp:454
+ msgid "Hard Disk"
+-msgstr ""
++msgstr "Жорсткий диск"
+
+ #: GUI/mediabutton.cpp:456
+ msgid "CD-ROM"
+-msgstr ""
++msgstr "Зчитувач КД"
+
+ #: GUI/mediabutton.cpp:458
+ msgid "CD Recorder"
+-msgstr ""
++msgstr "Записувач КД"
+
+ #: GUI/mediabutton.cpp:461
+ msgid "DVD Recorder"
+-msgstr ""
++msgstr "Записувач DVD"
+
+ #: GUI/mediabutton.cpp:464
+ msgid "DVD"
+-msgstr ""
++msgstr "DVD"
+
+ #: GUI/mediabutton.cpp:466 GUI/mediabutton.cpp:468
+-#, fuzzy
+ msgid "Remote Share"
+-msgstr "Віддалений доступ"
++msgstr "Віддалений спільний ресурс"
+
+ #: GUI/mediabutton.cpp:470 GUI/mediabutton.cpp:472
+-#, fuzzy
+ msgid "Floppy"
+-msgstr "Копіювання "
++msgstr "Гнучкий диск"
+
+ #: GUI/mediabutton.cpp:474
+ msgid "Zip Disk"
+-msgstr ""
++msgstr "Диск Zip"
+
+ #: GUI/mediabutton.cpp:477
+-#, fuzzy
+ msgid "Unknown"
+-msgstr "невідомо"
++msgstr "Невідомий"
+
+ #: BookMan/krbookmarkhandler.cpp:538 GUI/mediabutton.cpp:529
+ #: Panel/krpopupmenu.cpp:61
+-#, fuzzy
+ msgid "Open"
+-msgstr "&Відкрити"
++msgstr "Відкрити"
+
+ #: BookMan/krbookmarkhandler.cpp:539 GUI/mediabutton.cpp:530
+ msgid "Open in a new tab"
+@@ -151,33 +144,30 @@
+ msgstr "Назва каталогу, в якому буде виконана команда."
+
+ #: GUI/kcmdline.cpp:94
+-#, fuzzy
+ msgid ""
+ "<qt><p>Well, it's actually quite simple: You type your command here and "
+ "Krusader obeys.</p><p><b>Tip</b>: Move within command line history with <"
+ "Up> and <Down> arrows.</p></qt>"
+ msgstr ""
+-"<qt>Це досить просто: ви вводите сюди свою команду і Krusader вам "
+-"підкоряється.<p><Tip:>Пересуватись по історії командного рядка можна за "
++"<qt><p>Це досить просто: Ви вводите сюди свою команду і Krusader вам "
++"підкоряється.</p><p><b>Підказка</b>: Пересуватись історією командного рядка можна за "
+ "допомогою стрілок <Вгору> та <Вниз>.</qt>"
+
+ #: ActionMan/actionpropertybase.cpp:418 GUI/kcmdline.cpp:102
+-#, fuzzy
+ msgid "Add <b>Placeholders</b> for the selected files in the panel."
+-msgstr "Додати шаблони для вибраних файлів у панелі"
++msgstr "Додати <b>Заповнювачі</b> для вибраних файлів у панелі."
+
+ #: GUI/kfnkeys.cpp:50
+ msgid "F2 Term "
+ msgstr "F2 Терм"
+
+ #: GUI/kfnkeys.cpp:51
+-#, fuzzy
+ msgid ""
+ "<p>Open terminal in current directory.</p><p>The terminal can be defined in "
+ "Konfigurator, default is <b>konsole</b>.</p>"
+ msgstr ""
+-"<qt>Відкрити термінал на поточному каталозі.<p>Можна вказати термінал в "
+-"Конфігураторі; стандартний - konsole.</qt>"
++"<p>Відкрити термінал на поточному каталозі.</p><p>Можна вказати термінал в "
++"Конфігураторі; стандартний - <b>konsole</b>.</p>"
+
+ #: GUI/kfnkeys.cpp:57
+ msgid "F3 View "
+@@ -192,13 +182,10 @@
+ msgstr "F4 Правка"
+
+ #: GUI/kfnkeys.cpp:63
+-#, fuzzy
+ msgid ""
+ "<p>Edit file.</p><p>The editor can be defined in Konfigurator, default is "
+ "<b>internal editor</b>.</p>"
+-msgstr ""
+-"<qt>Редагувати файл.<p>Редактор налаштовується в Конфігураторі; стандартний "
+-"- \"internal editor\".</qt>"
++msgstr "<p>Редагувати файл.</p><p>Редактор налаштовується в Конфігураторі; стандартним є <b>внутрішній редактор</b>.</p>"
+
+ #: GUI/kfnkeys.cpp:69
+ msgid "F5 Copy "
+@@ -226,11 +213,11 @@
+
+ #: GUI/kfnkeys.cpp:84
+ msgid "F8 Delete"
+-msgstr "F8 Видал"
++msgstr "F8 Вилуч"
+
+ #: GUI/kfnkeys.cpp:85
+ msgid "Delete file, directory, etc."
+-msgstr "Видалити файл, каталог, тощо."
++msgstr "Вилучити файл, каталог, тощо."
+
+ #: GUI/kfnkeys.cpp:89
+ msgid "F9 Rename"
+@@ -274,7 +261,7 @@
+
+ #: GUI/kfnkeys.cpp:127
+ msgid " Delete"
+-msgstr " Видалити"
++msgstr " Вилучити"
+
+ #: GUI/kfnkeys.cpp:128
+ msgid " Rename"
+@@ -299,6 +286,9 @@
+ "If it is not the case, please check and change the Proxy settings in "
+ "kcontrol."
+ msgstr ""
++"Krusader не підтримує доступу до FTP через HTTP.\n"
++"Якщо це не та ситуація, будь ласка перевірте та змініть налаштування проксі у "
++"kcontrol."
+
+ #: VFS/ftp_vfs.cpp:169
+ #, c-format
+@@ -310,13 +300,12 @@
+ "%1"
+
+ #: VFS/arc_vfs.cpp:217
+-#, fuzzy
+ msgid "<qt>Can't read <b>%1</b>. Archive might be corrupted!</qt>"
+-msgstr " Архів, ймовірно, пошкоджений!"
++msgstr "<qt>Неможливо прочитати <b>%1</b>. Архів, ймовірно, пошкоджений!</qt>"
+
+ #: VFS/arc_vfs.cpp:322 VFS/arc_vfs.cpp:579
+ msgid "Deleting Files..."
+-msgstr "Триває видалення файлів..."
++msgstr "Триває вилучення файлів..."
+
+ #: VFS/arc_vfs.cpp:396
+ msgid "Unpacking Files"
+@@ -339,7 +328,7 @@
+ #: VFS/normal_vfs.cpp:100 VFS/normal_vfs.cpp:106 VFS/virt_vfs.cpp:87
+ #: VFS/virt_vfs.cpp:173
+ msgid "Error"
+-msgstr ""
++msgstr "Помилка"
+
+ #: Synchronizer/synchronizerdirlist.cpp:101 VFS/normal_vfs.cpp:100
+ msgid "Can't open the %1 directory!"
+@@ -351,7 +340,7 @@
+
+ #: VFS/normal_vfs.cpp:218
+ msgid "Can't create a directory. Check your permissions."
+-msgstr "Не вдається створити теку. Перевірте ваші права доступу."
++msgstr "Не вдається створити теку. Перевірте Ваші права доступу."
+
+ #: VFS/virt_vfs.cpp:87
+ msgid ""
+@@ -392,11 +381,11 @@
+
+ #: VFS/krquery.cpp:144
+ msgid "Custom"
+-msgstr "Нетипове"
++msgstr "Нетиповий"
+
+ #: VFS/krquery.cpp:432
+ msgid "Searching content of '%1' (%2%)"
+-msgstr ""
++msgstr "Пошук серед вмісту '%1' (%2%)"
+
+ #: VFS/krarchandler.cpp:184
+ msgid "Counting files in archive"
+@@ -404,7 +393,7 @@
+
+ #: VFS/krarchandler.cpp:205
+ msgid "Failed to list the content of the archive (%1)!"
+-msgstr ""
++msgstr "Не вдалося відобразити вміст архіву (%1)!"
+
+ #: VFS/krarchandler.cpp:225
+ msgid "Failed to unpack"
+@@ -412,24 +401,23 @@
+
+ #: VFS/krarchandler.cpp:262
+ msgid "Failed to convert rpm (%1) to cpio!"
+-msgstr ""
++msgstr "Не вдалося перетворити rpm (%1) на cpio!"
+
+ #: VFS/krarchandler.cpp:279
+ msgid "Failed to convert deb (%1) to tar!"
+-msgstr ""
++msgstr "Не вдалося перетворити deb (%1) на tar!"
+
+ #: VFS/krarchandler.cpp:313
+ msgid "Unpacking File(s)"
+ msgstr "Розпаковуються файл(и)"
+
+ #: VFS/krarchandler.cpp:339
+-#, fuzzy
+ msgid "Failed to unpack %1!"
+-msgstr "Розпакування зазнало невдачі"
++msgstr "Розпакування %1 зазнало невдачі!"
+
+ #: VFS/krarchandler.cpp:340 VFS/krarchandler.cpp:509
+ msgid "User cancelled."
+-msgstr ""
++msgstr "Скасовано користувачем."
+
+ #: VFS/krarchandler.cpp:384
+ msgid "Testing Archive"
+@@ -440,9 +428,8 @@
+ msgstr "Запаковуються файл(и)"
+
+ #: VFS/krarchandler.cpp:508
+-#, fuzzy
+ msgid "Failed to pack %1!"
+-msgstr "Пакування зазнало невдачі: "
++msgstr "Пакування %1 зазнало невдачі!"
+
+ #: VFS/krarchandler.cpp:517
+ msgid "Failed to pack: "
+@@ -458,6 +445,9 @@
+ "Uncaught JavaScript exception '%2'\n"
+ "%3"
+ msgstr ""
++"У %1:\n"
++"Невідстежуване виключення JavaScript '%2'\n"
++"%3"
+
+ #: KrJS/krjs.cpp:66
+ msgid ""
+@@ -465,17 +455,21 @@
+ "Uncaught JavaScript exception '%2' at line %3\n"
+ "%4"
+ msgstr ""
++"У %1:\n"
++"Невідстежуване виключення JavaScript '%2' у рядку %3\n"
++"%4"
+
+ #: KrJS/krjs.cpp:68 KrJS/krjs.cpp:73
+-#, fuzzy
+ msgid "JavaScript error"
+-msgstr "Консоль JavaScript"
++msgstr "Помилка JavaScript"
+
+ #: KrJS/krjs.cpp:72
+ msgid ""
+ "In %1:\n"
+ "There is an error in the JavaScript"
+ msgstr ""
++"У %1:\n"
++"Помилка у JavaScript"
+
+ #: Filter/filtertabs.cpp:44
+ msgid "&General"
+@@ -487,9 +481,8 @@
+ msgstr "&Додаткові"
+
+ #: Filter/filterdialog.cpp:38
+-#, fuzzy
+ msgid "Krusader::Choose Files"
+-msgstr "Виберіть файли"
++msgstr "Krusader::Оберіть файли"
+
+ #: Filter/generalfilter.cpp:55
+ msgid "File name"
+@@ -522,6 +515,16 @@
+ "code></ul><b>Note</b>: the search term '<code>text</code>' is equivalent to "
+ "'<code>*text*</code>'.</p>"
+ msgstr ""
++"<p>Тут визначаються критерії фільтрування файлів.</p><p>Ви можете "
++"використати шаблони. Декілька зразків розділяються пробілами (означає АБО), "
++"а зразок того, що виключається з пошуку позначаються символом конвеєризації.</p><p>Якщо зразок завершується косою рискою (<code>*зразок*/</code>), це означає, що він стосується рекурсивного пошуку у каталогах.<ul><li><code>зразок</"
++"code> означає \"шукати такі файли або каталоги, назва яких <code>зразок</"
++"code>, рекурсивний пошук охоплює всі підкаталоги незалежно від значення <code>зразок</code>\"</li><li><code>зразок/</code> - означає \"шукати такі файли або каталоги, але рекурсивний пошук оминатиме або виключатиме теки, назва яких <code>зразок</code>\"</li></ul><p></p><p>Дозволяється використання лапок для назв, які містять пробіли. Фільтр <code>"
++"\"Program Files\"</code> шукає файли або теки, назва яких "
++"is <code>Program Files</code>.</p><p>Приклади:<ul><code><li>*.o</"
++"li><li>*.h *.c??</li><li>*.cpp *.h | *.moc.cpp</li><li>* | CVS/ .svn/</li></"
++"code></ul><b>Зауваження</b>: термін пошуку '<code>текст</code>' еквівалентний до "
++"'<code>*текст*</code>'.</p>"
+
+ #: Filter/generalfilter.cpp:86
+ msgid "&Of type:"
+@@ -533,26 +536,23 @@
+
+ #: Filter/generalfilter.cpp:115
+ msgid "&Profile handler"
+-msgstr ""
++msgstr "Обробник &Профілю"
+
+ #: ActionMan/actionpropertybase.cpp:417 Filter/generalfilter.cpp:127
+-#, fuzzy
+ msgid "&Add"
+-msgstr "&Додаткові"
++msgstr "&Додати"
+
+ #: Filter/generalfilter.cpp:130
+-#, fuzzy
+ msgid "&Load"
+-msgstr "&Місцезнаходження"
++msgstr "&Завантажити"
+
+ #: Filter/generalfilter.cpp:134 Panel/panelfunc.cpp:813
+ msgid "&Overwrite"
+ msgstr "&Перезаписати"
+
+ #: Filter/generalfilter.cpp:138 RemoteMan/remotemanbase.cpp:155
+-#, fuzzy
+ msgid "&Remove"
+-msgstr "вилучити"
++msgstr "&Вилучити"
+
+ #: Filter/generalfilter.cpp:155
+ msgid "&Search in"
+@@ -572,11 +572,11 @@
+
+ #: Filter/generalfilter.cpp:230
+ msgid "&Remote content search"
+-msgstr ""
++msgstr "Пошук серед вмісту на &віддаленому носії"
+
+ #: Filter/generalfilter.cpp:238
+ msgid "&Match whole word only"
+-msgstr "Тільки &співпадання цілих слів"
++msgstr "Тільки &збіг цілих слів"
+
+ #: Filter/generalfilter.cpp:244
+ msgid "Cas&e sensitive"
+@@ -731,103 +731,85 @@
+
+ #: Filter/advancedfilter.cpp:334
+ msgid "Note: a '?' is a wildcard"
+-msgstr "Примітка: \"?\" - це шаблон замін"
++msgstr "Зауваження: \"?\" - це шаблон замін"
+
+ #: Filter/advancedfilter.cpp:474
+ msgid "Invalid date entered."
+ msgstr "Введено недійсну дату."
+
+ #: Filter/advancedfilter.cpp:475
+-#, fuzzy
+ msgid ""
+ "The date %1 is not valid according to your locale. Please re-enter a valid "
+ "date (use the date button for easy access)."
+ msgstr ""
+-"\" не являється чинною для вашої локалі.\n"
+-"Будь ласка, ще раз введіть дату (вживайте кнопку дати для легкого доступу)."
++"Дата %1 не є чинною для Вашої локалі. "
++"Будь ласка, ще раз введіть коректну дату (використовуйте кнопку дати для легкого доступу)."
+
+ #: Filter/advancedfilter.cpp:508
+ msgid "Specified sizes are inconsistent!"
+ msgstr "Вказані розміри не сходяться!"
+
+ #: Filter/advancedfilter.cpp:509
+-#, fuzzy
+ msgid ""
+ "Please re-enter the values, so that the left side size will be smaller than "
+ "(or equal to) the right side size."
+-msgstr ""
+-"Будь ласка, ще раз введіть значення, щоб розмір ліворуч\n"
+-"був менший (або рівний) за розмір праворуч."
++msgstr "Будь ласка, ще раз введіть значення, щоб розмір ліворуч був менший (або рівний) за розмір праворуч."
+
+ #: Filter/advancedfilter.cpp:526 Filter/advancedfilter.cpp:584
+ msgid "Dates are inconsistent!"
+ msgstr "Дати не сходяться!"
+
+ #: Filter/advancedfilter.cpp:527
+-#, fuzzy
+ msgid ""
+ "The date on the left is later than the date on the right. Please re-enter "
+ "the dates, so that the left side date will be earlier than the right side "
+ "date."
+-msgstr ""
+-"Дата з лівого боку пізніша, ніж дата з правого боку.\n"
+-"Будь ласка, ще раз введіть дати, щоб дата з лівого\n"
+-"боку була раніше, ніж та, що з правого."
++msgstr "Дата з лівого боку пізніша, ніж дата з правого боку. Будь ласка, ще раз введіть дати, щоб дата з лівого боку була раніше, ніж та, що з правого."
+
+ #: Filter/advancedfilter.cpp:585
+-#, fuzzy
+ msgid ""
+ "The date on top is later than the date on the bottom. Please re-enter the "
+ "dates, so that the top date will be earlier than the bottom date."
+-msgstr ""
+-"Дата вгорі пізніша, ніж дата внизу.\n"
+-"Будь ласка, ще раз введіть дати, щоб дата вгорі\n"
+-"була раніше, ніж та, що внизу."
++msgstr "Дата вгорі пізніша, ніж дата внизу. Будь ласка, ще раз введіть дати, щоб дата вгорі була раніше, ніж та, що внизу."
+
+ #: UserAction/expander.cpp:55
+ #, c-format
+ msgid "Needed panel specification missing in expander %1"
+-msgstr ""
++msgstr "У розширювачі %1 відсутня необхідна специфікація панелі"
+
+ #: UserAction/expander.cpp:70
+ msgid "Expander: Bad argument to %1: %2 is not valid item specifier"
+-msgstr ""
++msgstr "Розширювач: Некоректний аргумент до %1: %2 не є коректним означенням елемента"
+
+ #: UserAction/expander.cpp:357
+-#, fuzzy
+ msgid "Panel's Path..."
+-msgstr "шлях до панелі"
++msgstr "Шлях до панелі..."
+
+ #: UserAction/expander.cpp:360 UserAction/expander.cpp:422
+ #: UserAction/expander.cpp:456 UserAction/expander.cpp:488
+ #: UserAction/expander.cpp:775
+-#, fuzzy
+ msgid "Automatically escape spaces"
+-msgstr "Автоматичні інтервали виходу"
++msgstr "Автоматичні вилучати пробіли"
+
+ #: UserAction/expander.cpp:380
+-#, fuzzy
+ msgid "Number of..."
+-msgstr "кількість ..."
++msgstr "Кількість..."
+
+ #: UserAction/expander.cpp:383
+-#, fuzzy
+ msgid "Count:"
+-msgstr "Змонтувати"
++msgstr "Лічильник:"
+
+ #: UserAction/expander.cpp:398
+ msgid "Expander: Bad argument to Count: %1 is not valid item specifier"
+-msgstr ""
++msgstr "Розширювач: Некоректний аргумент для Лічильника: %1 не є коректним визначником елемента"
+
+ #: UserAction/expander.cpp:407
+-#, fuzzy
+ msgid "Filter Mask (*.h, *.cpp, etc.)"
+-msgstr "маска фільтра: *.h, *.cpp, та ін."
++msgstr "Маска фільтра (*.h, *.cpp, та ін.)"
+
+ #: UserAction/expander.cpp:418
+-#, fuzzy
+ msgid "Current File (!= Selected File)..."
+-msgstr "поточний файл (!= вибраний файл)"
++msgstr "Поточний файл (!= обраний файл)..."
+
+ #: UserAction/expander.cpp:421 UserAction/expander.cpp:454
+ #: UserAction/expander.cpp:486 UserAction/expander.cpp:773
+@@ -835,29 +817,24 @@
+ msgstr "Обминати поточний шлях (не обов'язково)"
+
+ #: UserAction/expander.cpp:449
+-#, fuzzy
+ msgid "Item List of..."
+-msgstr "Список елементів ..."
++msgstr "Список елементів..."
+
+ #: UserAction/expander.cpp:452 UserAction/expander.cpp:484
+ #: UserAction/expander.cpp:772
+-#, fuzzy
+ msgid "Which items:"
+-msgstr "Які елементи"
++msgstr "Які елементи:"
+
+ #: UserAction/expander.cpp:453
+-#, fuzzy
+ msgid "Separator between the items (optional):"
+ msgstr "Роздільник між елементами (не обов'язковий)"
+
+ #: UserAction/expander.cpp:455 UserAction/expander.cpp:487
+ #: UserAction/expander.cpp:774
+-#, fuzzy
+ msgid "Mask (optional, all but 'Selected'):"
+ msgstr "Маска (не обов'язкова для всіх, крім \"Вибраних\")"
+
+ #: UserAction/expander.cpp:481
+-#, fuzzy
+ msgid "Filename of an Item List..."
+ msgstr "Назва файла списку елементів..."
+
+@@ -867,262 +844,234 @@
+
+ #: UserAction/expander.cpp:504
+ msgid "Expander: tempfile couldn't be opened (%1)"
+-msgstr ""
++msgstr "Розширювач: тимчасовий файл не може бути відкрито (%1)"
+
+ #: UserAction/expander.cpp:524
+-#, fuzzy
+ msgid "Manipulate the Selection..."
+-msgstr "Працювати на вибраному"
++msgstr "Працювати з обраним..."
+
+ #: UserAction/expander.cpp:527
+-#, fuzzy
+ msgid "Selection mask:"
+-msgstr "Маска вибору"
++msgstr "Маска вибору:"
+
+ #: UserAction/expander.cpp:528
+-#, fuzzy
+ msgid "Manipulate in which way:"
+-msgstr "Як маніпулювати"
++msgstr "Як маніпулювати:"
+
+ #: UserAction/expander.cpp:553
+-#, fuzzy
+ msgid "Jump to a Location..."
+-msgstr "Перескочити до адреси"
++msgstr "Перескочити до розміщення..."
+
+ #: UserAction/expander.cpp:556
+-#, fuzzy
+ msgid "Choose a path:"
+-msgstr "будь ласка, виберіть шлях"
++msgstr "Оберіть шлях:"
+
+ #: UserAction/expander.cpp:557
+-#, fuzzy
+ msgid "Open location in a new tab"
+-msgstr "відкрити адресу в новій вкладці"
++msgstr "Відкрити адресу в новій вкладці"
+
+ #: UserAction/expander.cpp:593
+ msgid "Ask Parameter from User..."
+-msgstr ""
++msgstr "Спитати параметр у користувача..."
+
+ #: UserAction/expander.cpp:596
+-#, fuzzy
+ msgid "Question:"
+-msgstr "Питання"
++msgstr "Питання:"
+
+ #: UserAction/expander.cpp:597
+-#, fuzzy
+ msgid "Preset (optional):"
+-msgstr "Preset (не обов'язково)"
++msgstr "Попередньо задане (не обов'язково)"
+
+ #: UserAction/expander.cpp:598
+-#, fuzzy
+ msgid "Caption (optional):"
+-msgstr "Надпис (не обов'язково)"
++msgstr "Підпис (не обов'язково):"
+
+ #: UserAction/expander.cpp:604
+ msgid "User Action"
+ msgstr "Дія користувача"
+
+ #: UserAction/expander.cpp:629
+-#, fuzzy
+ msgid "Copy to Clipboard..."
+-msgstr "Скопіювати до кишені"
++msgstr "Скопіювати до кишені..."
+
+ #: UserAction/expander.cpp:632 UserAction/expander.cpp:655
+ msgid "What to copy:"
+-msgstr ""
++msgstr "Що копіювати:"
+
+ #: UserAction/expander.cpp:633
+-#, fuzzy
+ msgid "Append to current clipboard content with this separator (optional):"
+-msgstr "Додати до поточного вмісту кишені з цим роздільником (не обов'язково)"
++msgstr "Дописати до поточного вмісту кишені з цим роздільником (не обов'язково)"
+
+ #: UserAction/expander.cpp:639
+ msgid "Expander: %Each% may not be in the second argument of %Clipboard%"
+-msgstr ""
++msgstr "Розширювач: %Each% не може бути другим аргументом до %Clipboard%"
+
+ #: UserAction/expander.cpp:652
+-#, fuzzy
+ msgid "Copy a File/Folder..."
+-msgstr "Скопіювати файл/теку"
++msgstr "Копіювати файл або теку..."
+
+ #: UserAction/expander.cpp:656
+-#, fuzzy
+ msgid "Where to copy:"
+-msgstr "Куди це має бути скопійовано"
++msgstr "Куди це має бути копійовано:"
+
+ #: UserAction/expander.cpp:663
+ msgid "Expander: %Each% may not be in the second argument of %Copy%"
+-msgstr ""
++msgstr "Розширювач: %Each% не може бути другим аргументом до %Copy%"
+
+ #: UserAction/expander.cpp:673
+ msgid "Expander: invalid URL's in %_Copy(\"src\", \"dest\")%"
+-msgstr ""
++msgstr "Розширювач: Некоректні адреси URL у %_Copy(\"src\", \"dest\")%"
+
+ #: UserAction/expander.cpp:684
+-#, fuzzy
+ msgid "Move/Rename a File/Folder..."
+-msgstr "Пересунути/перейменувати файл/теку"
++msgstr "Пересунути або перейменувати файл або теку..."
+
+ #: UserAction/expander.cpp:687
+-#, fuzzy
+ msgid "What to move/rename:"
+-msgstr "Що пересунуто/перейменовано"
++msgstr "Що пересунути або перейменовати:"
+
+ #: UserAction/expander.cpp:688
+-#, fuzzy
+ msgid "New target/name:"
+-msgstr "Нова ціль/назва"
++msgstr "Нова ціль або назва"
+
+ #: UserAction/expander.cpp:694
+ msgid "%Each% may not be in the second argument of %Move%"
+-msgstr ""
++msgstr "%Each% не може бути другим аргументом до %Move%"
+
+ #: UserAction/expander.cpp:704
+ msgid "Expander: invalid URL's in %_Move(\"src\", \"dest\")%"
+-msgstr ""
++msgstr "Розширювач: некоректні адреси URL у %_Move(\"src\", \"dest\")%"
+
+ #: UserAction/expander.cpp:715
+-#, fuzzy
+ msgid "Load a Synchronizer Profile..."
+-msgstr "Відкрити профіль синхронізатора"
++msgstr "Відкрити профіль синхронізатора..."
+
+ #: UserAction/expander.cpp:718 UserAction/expander.cpp:736
+ #: UserAction/expander.cpp:754
+-#, fuzzy
+ msgid "Choose a profile:"
+-msgstr "Виберіть профіль"
++msgstr "Обрати профіль:"
+
+ #: UserAction/expander.cpp:722
+ msgid "Expander: no profile specified for %_Sync(profile)%"
+-msgstr ""
++msgstr "Розширювач: не задано профілю для %_Sync(profile)%"
+
+ #: UserAction/expander.cpp:733
+-#, fuzzy
+ msgid "Load a Searchmodule Profile..."
+-msgstr "Відкрити профіль модуля пошуку"
++msgstr "Відкрити профіль модуля пошуку..."
+
+ #: UserAction/expander.cpp:740
+ msgid "Expander: no profile specified for %_NewSearch(profile)%"
+-msgstr ""
++msgstr "Розширювач: не задано профілю для %_NewSearch(profile)%"
+
+ #: UserAction/expander.cpp:751
+-#, fuzzy
+ msgid "Load a Panel Profile..."
+-msgstr "Завантажити профіль панелі"
++msgstr "Завантажити профіль панелі..."
+
+ #: UserAction/expander.cpp:758
+ msgid "Expander: no profile specified for %_Profile(profile)%; abort..."
+-msgstr ""
++msgstr "Розширювач: не задано профілю для %_Profile(profile)%; вихід..."
+
+ #: UserAction/expander.cpp:769
+-#, fuzzy
+ msgid "Separate Program Call for Each..."
+ msgstr "Виклик окремої програми для кожного..."
+
+ #: UserAction/expander.cpp:801
+-#, fuzzy
+ msgid "Set Sorting for This Panel..."
+-msgstr "Вкажіть впорядкування для цієї панелі"
++msgstr "Вкажіть впорядкування для цієї панелі..."
+
+ #: UserAction/expander.cpp:804
+-#, fuzzy
+ msgid "Choose a column:"
+-msgstr "Виберіть стовпчик"
++msgstr "Виберіть стовпчик:"
+
+ #: UserAction/expander.cpp:805
+-#, fuzzy
+ msgid "Choose a sort sequence:"
+-msgstr "Виберіть послідовність впорядкування"
++msgstr "Оберіть послідовність впорядкування:"
+
+ #: UserAction/expander.cpp:811
+ msgid "Expander: no column specified for %_ColSort(column)%"
+-msgstr ""
++msgstr "Розширювач: не задано стовпчика для %_ColSort(column)%"
+
+ #: UserAction/expander.cpp:883
+ msgid "Expander: unknown column specified for %_ColSort(%1)%"
+-msgstr ""
++msgstr "Розширювач: задано невідомий стовпчик для %_ColSort(%1)%"
+
+ #: UserAction/expander.cpp:895
+-#, fuzzy
+ msgid "Set Relation Between the Panels..."
+-msgstr "Вкажіть взаємозв'язок між двома панелями"
++msgstr "Вкажіть взаємозв'язок між двома панелями..."
+
+ #: UserAction/expander.cpp:898
+-#, fuzzy
+ msgid "Set the new size in percent:"
+-msgstr "Вкажіть новий розмір у відсотках"
++msgstr "Вкажіть новий розмір у відсотках:"
+
+ #: UserAction/expander.cpp:910
+ msgid ""
+ "Expander: Value %1 out of range for %_PanelSize(percent)%. The first "
+ "parameter has to be >0 and <100"
+ msgstr ""
++"Розширювач: Величина %1 знаходиться за межами, встановленими для %_PanelSize(percent)%. Перший "
++"параметр має бути >0 та <100"
+
+ #: UserAction/expander.cpp:934
+-#, fuzzy
+ msgid "Execute a JavaScript Extension..."
+-msgstr "Виконує розширення JavaScript"
++msgstr "Виконати розширення JavaScript..."
+
+ #: UserAction/expander.cpp:937
+ msgid "Location of the script"
+ msgstr "Адреса скрипту"
+
+ #: UserAction/expander.cpp:938
+-#, fuzzy
+ msgid ""
+ "Set some variables for the execution (optional).\n"
+ "i.e. \"return=return_var;foo=bar\", consult the handbook for more information"
+ msgstr ""
+ "Вкажіть якісь змінні для виконання (необов'язково).\n"
+-"i.e. \"return=cmd;foo=bar\", див. в Підручник для докладнішої інформації"
++"тобто \"return=return_var;foo=bar\", див. в Підручник для докладнішої інформації"
+
+ #: UserAction/expander.cpp:942
+ msgid "Expander: no script specified for %_Script(script)%"
+-msgstr ""
++msgstr "Розширювач: не задано скрипту для %_Script(script)%"
+
+ #: UserAction/expander.cpp:984
+ msgid "View File with Krusader's Internal Viewer..."
+-msgstr ""
++msgstr "Переглядати файл у внутрішньому переглядачі Krusader..."
+
+ #: UserAction/expander.cpp:987
+ msgid "Which file to view (normally '%aCurrent%'):"
+-msgstr ""
++msgstr "Який файл переглядати (зазвичай '%aCurrent%'):"
+
+ #: UserAction/expander.cpp:988
+-#, fuzzy
+ msgid "Choose a view mode:"
+-msgstr "Виберіть профіль"
++msgstr "Оберіть режим перегляду:"
+
+ #: UserAction/expander.cpp:991
+-#, fuzzy
+ msgid "Choose a window mode:"
+-msgstr "Виберіть стовпчик"
++msgstr "Оберіть режим вікна:"
+
+ #: UserAction/expander.cpp:995
+ msgid "Expander: no file to view in %_View(filename)%"
+-msgstr ""
++msgstr "Розширювач: відсутній файл для перегляду у %_View(filename)%"
+
+ #: UserAction/expander.cpp:1032
+ #, c-format
+ msgid "%Each% is not allowed in parameter to %1"
+-msgstr ""
++msgstr "%Each% заборонений у параметрі до %1"
+
+ #: UserAction/expander.cpp:1053
+ msgid "Expander: Bad panel specifier %1 in placeholder %2"
+-msgstr ""
++msgstr "Розширювач: Некоректний визначник панелі %1 у заповнювач %2"
+
+ #: UserAction/expander.cpp:1082
+ #, c-format
+ msgid "Error: unterminated % in Expander::expandCurrent"
+-msgstr ""
++msgstr "Помилка: не припинений % у Expander::expandCurrent"
+
+ #: UserAction/expander.cpp:1112
+ msgid "Error: unrecognized %%%1%2%% in Expander::expand"
+-msgstr ""
++msgstr "Помилка: невизначений %%%1%2%% у Expander::expand"
+
+ #: UserAction/expander.cpp:1148
+ msgid "Error: missing ')' in Expander::separateParameter"
+-msgstr ""
++msgstr "Помилка: відсутня ')' у Expander::separateParameter"
+
+ #: UserAction/kractionbase.cpp:51
+ msgid "Confirm execution"
+@@ -1134,9 +1083,8 @@
+
+ #: Konfigurator/konfigurator.cpp:69 Search/krsearchdialog.cpp:139
+ #: Synchronizer/synchronizergui.cpp:1471 UserAction/kraction.cpp:49
+-#, fuzzy
+ msgid "Close"
+-msgstr "Кольори"
++msgstr "Закрити"
+
+ #: UserAction/kraction.cpp:52
+ msgid "Kill"
+@@ -1148,11 +1096,11 @@
+
+ #: UserAction/kraction.cpp:54
+ msgid "Save as"
+-msgstr ""
++msgstr "Зберегти як"
+
+ #: UserAction/kraction.cpp:63
+ msgid "Standard Output (stdout)"
+-msgstr "стандартний вивід (stdout)"
++msgstr "стандартне виведення (stdout)"
+
+ #: UserAction/kraction.cpp:70
+ msgid "Standard Error (stderr)"
+@@ -1160,30 +1108,31 @@
+
+ #: UserAction/kraction.cpp:76
+ msgid "Output"
+-msgstr "Вивід"
++msgstr "Виведення"
+
+ #: UserAction/kraction.cpp:98
+ msgid "Use font with fixed width"
+-msgstr ""
++msgstr "Використовувати шрифт зі сталою шириною"
+
+ #: UserAction/kraction.cpp:132
+-#, fuzzy
+ msgid ""
+ "*.txt|Text files\n"
+ "*|all files"
+-msgstr "*.xml|xml-файли"
++msgstr ""
++"*.txt|Текстові файли\n"
++"*|всі файли"
+
+ #: UserAction/kraction.cpp:139
+-#, fuzzy
+ msgid ""
+ "This file already exists.\n"
+ "Do you want to overwrite it or append the output?"
+-msgstr " вже існує. Ви дійсно хочете перезаписати його?"
++msgstr ""
++"Цей файл вже існує.\n"
++"Бажаєте перезаписати його чи дописати до нього виведене?"
+
+ #: UserAction/kraction.cpp:140
+-#, fuzzy
+ msgid "Overwrite or append?"
+-msgstr "Перезаписати елемент"
++msgstr "Перезаписати чи дописати?"
+
+ #: ActionMan/useractionpage.cpp:248 ActionMan/useractionpage.cpp:257
+ #: Dialogs/checksumdlg.cpp:573 Dialogs/krkeydialog.cpp:135
+@@ -1192,56 +1141,56 @@
+ msgstr "Перезаписати"
+
+ #: UserAction/kraction.cpp:142
+-#, fuzzy
+ msgid "Append"
+-msgstr "&Відкрити"
++msgstr "Дописати"
+
+ #: ActionMan/useractionpage.cpp:271 UserAction/kraction.cpp:154
+ msgid ""
+ "Can't open %1 for writing!\n"
+ "Nothing exported."
+ msgstr ""
++"Неможливо відкрити %1 на запис!\n"
++"Нічого не експортовано."
+
+ #: ActionMan/useractionpage.cpp:272 UserAction/kraction.cpp:155
+-#, fuzzy
+ msgid "Export failed!"
+-msgstr "Текстові файли"
++msgstr "Експортування зазнало невдачі!"
+
+ #: UserAction/kraction.cpp:200
+ msgid ""
+ "Support for more than one command doesn't work in a terminal. Only the first "
+ "is executed in the terminal."
+-msgstr ""
++msgstr "Підтримка більш ніж одної команди не працює у терміналі. Виконуватиметься лише перша команда."
+
+ #: UserAction/kraction.cpp:204
+-msgid ""
+-"Embedded terminal emulator does not work, using output collection instead."
+-msgstr ""
++msgid "Embedded terminal emulator does not work, using output collection instead."
++msgstr "Вбудований емулятор термінала не працює, замість нього використовується колекція виведення."
+
+ #: UserAction/useraction.cpp:100
+ msgid "The file %1 does not contain valid UserActions.\n"
+-msgstr ""
++msgstr "Файл %1 не містить коректних Дій користувача.\n"
+
+ #: UserAction/useraction.cpp:101 UserAction/useraction.cpp:112
+ #: UserAction/useraction.cpp:124
+-#, fuzzy
+ msgid "UserActions - can't read from file!"
+-msgstr "Помилка: не вдається прочитати з файли"
++msgstr "Дії користувача: не вдається прочитати з файла!"
+
+ #: UserAction/useraction.cpp:123
+-#, fuzzy, c-format
++#, c-format
+ msgid "Unable to open actionfile %1"
+-msgstr "Не вдається записати в"
++msgstr "Не вдається відкрити файл дії %1"
+
+ #: UserAction/useraction.cpp:140
+ msgid ""
+ "Action without name detected. This action will not be imported!\n"
+ "This is an error in the file, you may want to correct it."
+ msgstr ""
++"Знайдено дію без назви. Цю дію не буде імпортовано!\n"
++"Це є помилкою у файлі, можливо Ви захочете її виправити."
+
+ #: UserAction/useraction.cpp:141
+ msgid "UserActions - invalid action"
+-msgstr ""
++msgstr "Дії користувача - некоректна дія"
+
+ #: Panel/krdetailedviewitem.cpp:78 Panel/krdetailedviewitem.cpp:110
+ #: Synchronizer/synchronizergui.cpp:1982 Synchronizer/synchronizergui.cpp:1989
+@@ -1275,7 +1224,7 @@
+ "The statusbar displays information about the FILESYSTEM which holds your "
+ "current directory: Total size, free space, type of filesystem, etc."
+ msgstr ""
+-"Смужка стану показує інформацію про ФАЙЛОВУ СИСТЕМУ, яка містить ваш "
++"Смужка стану показує інформацію про ФАЙЛОВУ СИСТЕМУ, яка містить Ваш "
+ "поточний каталог: загальний розмір, вільне місце, тип файлової системи, тощо."
+
+ #: Panel/listpanel.cpp:149
+@@ -1299,13 +1248,12 @@
+ msgstr "Відкрити панель-вигульк"
+
+ #: Panel/listpanel.cpp:198
+-#, fuzzy
+ msgid "Clear the location bar"
+-msgstr "Перескочити до адреси"
++msgstr "Очистити поле розміщення"
+
+ #: Panel/listpanel.cpp:206
+ msgid "Use superb KDE file dialog to choose location. "
+-msgstr "Вживайте вікно файлів KDE для вибору адреси. "
++msgstr "Використовуйте вікно файлів KDE для вибору адреси. "
+
+ #: Panel/listpanel.cpp:211
+ msgid ""
+@@ -1410,9 +1358,8 @@
+ #: Dialogs/krmaskchoice.cpp:135 Dialogs/packguibase.cpp:289
+ #: DiskUsage/diskusage.cpp:155 Panel/listpanel.cpp:836
+ #: Panel/panelpopup.cpp:379
+-#, fuzzy
+ msgid "Cancel"
+-msgstr "Панель"
++msgstr "Скасувати"
+
+ #: Panel/listpanel.cpp:1052
+ msgid ">> Reading..."
+@@ -1571,11 +1518,14 @@
+ msgstr "Всього зайнятого місця: %1"
+
+ #: Panel/krcalcspacedialog.cpp:151
+-#, fuzzy, c-format
++#, c-format
+ msgid ""
+ "_n: in %n directory\n"
+ "in %n directories"
+-msgstr "Відкрити список історії каталогу"
++msgstr ""
++"у %n каталозі\n"
++"у %n каталозі\n"
++"у %n каталогах"
+
+ #: Panel/krcalcspacedialog.cpp:153
+ #, c-format
+@@ -1583,18 +1533,19 @@
+ "_n: and %n file\n"
+ "and %n files"
+ msgstr ""
++"та %n файл\n"
++"та %n файла\n"
++"та %n файлів"
+
+ #: Panel/krpopupmenu.cpp:59
+-#, fuzzy
+ msgid "Open/Run"
+-msgstr "Кнопка відкривання"
++msgstr "Відкрити/Виконати"
+
+ #: Panel/krpopupmenu.cpp:61
+ msgid "Run"
+ msgstr "Запустити"
+
+ #: Panel/krpopupmenu.cpp:64 Panel/krpopupmenu.cpp:65
+-#, fuzzy
+ msgid "Open in New Tab"
+ msgstr "Відкрити у новій вкладці"
+
+@@ -1612,7 +1563,6 @@
+ msgstr "Інше..."
+
+ #: Panel/krpopupmenu.cpp:104
+-#, fuzzy
+ msgid "Open With"
+ msgstr "Відкрити з"
+
+@@ -1621,65 +1571,54 @@
+ msgstr "Дії користувача"
+
+ #: Panel/krpopupmenu.cpp:123
+-#, fuzzy
+ msgid "Konqueror Menu"
+ msgstr "Меню Konqueror-а"
+
+ #: Panel/krpopupmenu.cpp:131 krusader.cpp:760
+-#, fuzzy
+ msgid "Copy..."
+-msgstr "Копіювання "
++msgstr "Копіювання..."
+
+ #: Panel/krpopupmenu.cpp:134 krusader.cpp:762
+-#, fuzzy
+ msgid "Move..."
+-msgstr "Пересунути "
++msgstr "Пересунути..."
+
+ #: Panel/krpopupmenu.cpp:143
+-#, fuzzy
+ msgid "Move to Trash"
+ msgstr "Пересунути у смітник"
+
+ #: BookMan/krbookmarkhandler.cpp:541 Dialogs/krmaskchoice.cpp:110
+ #: Dialogs/kurllistrequester.cpp:149 DiskUsage/diskusage.cpp:757
+ #: Konfigurator/kgcolors.cpp:474 Panel/krpopupmenu.cpp:145 krusader.cpp:766
+-#, fuzzy
+ msgid "Delete"
+-msgstr " Видалити"
++msgstr "Вилучити"
+
+ #: Panel/krpopupmenu.cpp:149
+ msgid "Shred"
+ msgstr "Знищити"
+
+ #: Panel/krpopupmenu.cpp:156 krusader.cpp:729
+-#, fuzzy
+ msgid "New Symlink..."
+-msgstr "нове символічне посилання"
++msgstr "Нове символічне посилання..."
+
+ #: Panel/krpopupmenu.cpp:157
+-#, fuzzy
+ msgid "New Hardlink..."
+-msgstr "нове посилання"
++msgstr "Нове жорстке посилання..."
+
+ #: Panel/krpopupmenu.cpp:159
+-#, fuzzy
+ msgid "Redirect Link..."
+-msgstr "посилання перенаправлення"
++msgstr "Посилання перенаправлення..."
+
+ #: Panel/krpopupmenu.cpp:161
+-#, fuzzy
+ msgid "Link Handling"
+ msgstr "Керування посиланнями"
+
+ #: Panel/krpopupmenu.cpp:181
+-#, fuzzy
+ msgid "Send by Email"
+ msgstr "Надіслати ел. поштою"
+
+ #: Panel/krpopupmenu.cpp:186
+-#, fuzzy
+ msgid "Synchronize Selected Files..."
+-msgstr "Синхронізувати каталоги"
++msgstr "Синхронізувати обрані файли..."
+
+ #: Panel/krpopupmenu.cpp:191 krusader.cpp:544
+ msgid "Copy to Clipboard"
+@@ -1694,31 +1633,28 @@
+ msgstr "Вставити з кишені"
+
+ #: Panel/krpopupmenu.cpp:215
+-#, fuzzy
+ msgid "Folder..."
+-msgstr "Нова тека"
++msgstr "Тека..."
+
+ #: Panel/krpopupmenu.cpp:216
+-#, fuzzy
+ msgid "Text File..."
+-msgstr "Текстові файли"
++msgstr "Текстовий файл..."
+
+ #: Panel/krpopupmenu.cpp:219
+-#, fuzzy
+ msgid "Create New"
+-msgstr "Створити в:"
++msgstr "Створити нову"
+
+ #: Panel/krpopupmenu.cpp:261
+-#, fuzzy
+ msgid ""
+ "<qt>Do you really want to shred <b>%1</b>? Once shred, the file is gone "
+ "forever!</qt>"
+-msgstr " ? Після знищення файл буде відновити !!!"
++msgstr ""
++"<qt>Ви справді бажаєте розрізати на частини <b>%1</b>? Розрізаний "
++"файл буде вилучено назавжди!"
+
+ #: Panel/krpopupmenu.cpp:339
+-#, fuzzy
+ msgid "Can't open \"%1\""
+-msgstr "Неможливо відкрити "
++msgstr "Неможливо відкрити \"%1\""
+
+ #: Panel/panelfunc.cpp:270
+ msgid "You can edit links only on local file systems"
+@@ -1738,7 +1674,7 @@
+
+ #: Panel/panelfunc.cpp:296
+ msgid "Can't remove old link: "
+-msgstr "Не вдається видалити старе посилання: "
++msgstr "Не вдається вилучити старе посилання: "
+
+ #: Panel/panelfunc.cpp:301 Panel/panelfunc.cpp:341
+ msgid "Failed to create a new link: "
+@@ -1773,9 +1709,8 @@
+ msgstr "Недостатньо прав для перегляду цього файла."
+
+ #: Panel/panelfunc.cpp:380
+-#, fuzzy
+ msgid "<qt>Can't open <b>%1</b></qt>"
+-msgstr "Неможливо відкрити "
++msgstr "<qt>Неможливо відкрити <b>%1</b></qt>"
+
+ #: Panel/panelfunc.cpp:391
+ msgid "You can't edit a directory"
+@@ -1790,9 +1725,8 @@
+ msgstr "Пересування в архів вимкнене"
+
+ #: Panel/panelfunc.cpp:426
+-#, fuzzy
+ msgid "Move %1 to:"
+-msgstr "Пересунути %d файли в:"
++msgstr "Пересунути %1 до:"
+
+ #: Panel/panelfunc.cpp:428
+ #, c-format
+@@ -1800,6 +1734,9 @@
+ "_n: Move %n file to:\n"
+ "Move %n files to:"
+ msgstr ""
++"Перемістити %n файл до:\n"
++"Перемістити %n файла до:\n"
++"Перемістити %n файлів до:"
+
+ #: Panel/panelfunc.cpp:472
+ msgid "You can't move files to this file system"
+@@ -1814,9 +1751,8 @@
+ msgstr "Назва каталогу:"
+
+ #: Panel/panelfunc.cpp:581
+-#, fuzzy
+ msgid "Copy %1 to:"
+-msgstr "Скопіювати %d файли в:"
++msgstr "Скопіювати %1 до:"
+
+ #: Panel/panelfunc.cpp:583
+ #, c-format
+@@ -1824,6 +1760,9 @@
+ "_n: Copy %n file to:\n"
+ "Copy %n files to:"
+ msgstr ""
++"Копіювати %n файл до:\n"
++"Копіювати %n файла до:\n"
++"Копіювати %n файлів до:"
+
+ #: Panel/panelfunc.cpp:619
+ msgid "You can't copy files to this file system"
+@@ -1839,6 +1778,9 @@
+ "_n: Do you really want to move this item to the trash?\n"
+ "Do you really want to move these %n items to the trash?"
+ msgstr ""
++"Ви справді бажаєте викинути цей об'єкт до смітника?\n"
++"Ви справді бажаєте викинути ці %n об'єкти до смітника?\n"
++"Ви справді бажаєте викинути ці %n об'єктів до смітника?"
+
+ #: DiskUsage/diskusage.cpp:597 Panel/panelfunc.cpp:649
+ msgid "&Trash"
+@@ -1851,13 +1793,16 @@
+ "Do you really want to delete these virtual items (physical files stay "
+ "untouched)?"
+ msgstr ""
++"Ви справді бажаєте вилучити цей віртуальний елемент (справжні файли залишаться "
++"недоторканними)?\n"
++"Ви справді бажаєте вилучити ці віртуальні елементи (справжні файли залишаться "
++"недоторканними)?"
+
+ #: DiskUsage/diskusage.cpp:600 DiskUsage/radialMap/widgetEvents.cpp:172
+ #: DiskUsage/radialMap/widgetEvents.cpp:194 Panel/panelfunc.cpp:652
+ #: Panel/panelfunc.cpp:655 Panel/panelfunc.cpp:658
+-#, fuzzy
+ msgid "&Delete"
+-msgstr " Видалити"
++msgstr "&Вилучити"
+
+ #: Panel/panelfunc.cpp:654
+ #, c-format
+@@ -1867,6 +1812,12 @@
+ "<qt>Do you really want to delete these %n items <b>physically</b> (not just "
+ "removing them from the virtual items)?</qt>"
+ msgstr ""
++"<qt>Ви справді бажаєте вилучити цей елемент <b>фізично</b> (не просто "
++"вилучити його зі списку віртуальних елементів)?</qt>\n"
++"<qt>Ви справді бажаєте вилучити ці %n елемента <b>фізично</b> (не просто "
++"вилучити його зі списку віртуальних елементів)?</qt>\n"
++"<qt>Ви справді бажаєте вилучити ці %n елементів <b>фізично</b> (не просто "
++"вилучити його зі списку віртуальних елементів)?</qt>"
+
+ #: Panel/panelfunc.cpp:657
+ #, c-format
+@@ -1874,22 +1825,23 @@
+ "_n: Do you really want to delete this item?\n"
+ "Do you really want to delete these %n items?"
+ msgstr ""
++"Ви справді бажаєте вилучити цей об'єкт?\n"
++"Ви справді бажаєте вилучити ці %n об'єкти?\n"
++"Ви справді бажаєте вилучити ці %n об'єктів?"
+
+ #: Dialogs/checksumdlg.cpp:573 Dialogs/krkeydialog.cpp:135
+ #: DiskUsage/diskusage.cpp:607 Konfigurator/kgcolors.cpp:523
+ #: Panel/panelfunc.cpp:664
+-#, fuzzy
+ msgid "Warning"
+-msgstr "Працює"
++msgstr "Попередження"
+
+ #: Panel/panelfunc.cpp:682
+-#, fuzzy
+ msgid ""
+ "<qt><p>Directory <b>%1</b> is not empty!</p><p>Skip this one or Delete All?</"
+ "p></qt>"
+ msgstr ""
+-"не порожній!\n"
+-"Оминути цей чи видалити всі?"
++"<qt><p>Каталог <b>%1</b> не порожній!</p><p>Оминути його або вилучити все?</"
++"p></qt>"
+
+ #: Panel/panelfunc.cpp:683
+ msgid "&Skip"
+@@ -1897,28 +1849,29 @@
+
+ #: Panel/panelfunc.cpp:683
+ msgid "&Delete All"
+-msgstr "&Видалити всі"
++msgstr "&Вилучити всі"
+
+ #: Panel/panelfunc.cpp:797
+ msgid "Cannot pack files onto a virtual destination!"
+-msgstr ""
++msgstr "Неможливо запакувати файли до віртуального місця!"
+
+ #: Panel/panelfunc.cpp:809
+-#, fuzzy
+ msgid ""
+ "<qt><p>The archive <b>%1.%2</b> already exists. Do you want to overwrite it?"
+ "</p><p>All data in the previous archive will be lost!</p></qt>"
+-msgstr " вже існує. Ви дійсно хочете перезаписати його?"
++msgstr ""
++"<qt><p>Архів <b>%1.%2</b> вже існує. Ви дійсно хочете перезаписати його?"
++"</p><p>Всі дані з попереднього архіву буде втрачено!</p></qt>"
+
+ #: Panel/panelfunc.cpp:811
+-#, fuzzy
+ msgid ""
+ "<qt><p>The archive <b>%1.%2</b> already exists. Do you want to overwrite it?"
+ "</p><p>Zip will replace identically named entries in the zip archive or add "
+ "entries for new names.</p></qt>"
+ msgstr ""
+-"(ZIP перезапише в архіві zip елементи з однаковими назвами або додасть "
+-"елементи, у яких відмінні назви)"
++"<qt><p>Архів <b>%1.%2</b> вже існує. Бажаєте перезаписати його?"
++"</p><p>Zip перезапише в архіві zip елементи з однаковими назвами або додасть "
++"елементи, у яких назви нові.</p></qt>"
+
+ #: Panel/panelfunc.cpp:818
+ msgid "Counting files to pack"
+@@ -1942,9 +1895,8 @@
+ msgstr "%1, перевірка зазнала невдачі!"
+
+ #: Panel/panelfunc.cpp:916
+-#, fuzzy
+ msgid "Unpack %1 to:"
+-msgstr "Розпакувати"
++msgstr "Розпакувати %1 до:"
+
+ #: Panel/panelfunc.cpp:918
+ #, c-format
+@@ -1952,6 +1904,9 @@
+ "_n: Unpack %n file to:\n"
+ "Unpack %n files to:"
+ msgstr ""
++"Розпаковується %n файл до:\n"
++"Розпаковується %n файли до:\n"
++"Розпаковується %n файлів до:"
+
+ #: Panel/panelfunc.cpp:964
+ msgid "%1, unknown archive type"
+@@ -1959,17 +1914,16 @@
+
+ #: Panel/panelfunc.cpp:1147
+ msgid "Cannot cut a virtual URL collection to the clipboard!"
+-msgstr ""
++msgstr "Неможливо вирізати віртуальну колекцію URL у кишеню!"
+
+ #: Panel/panelfunc.cpp:1149
+ msgid "Cannot copy a virtual URL collection onto the clipboard!"
+-msgstr ""
++msgstr "Неможливо копіювати віртуальну колекцію URL у кишеню!"
+
+ #: Locate/locate.cpp:101 Locate/locate.cpp:241 Search/krsearchdialog.cpp:135
+ #: Synchronizer/synchronizergui.cpp:1455
+-#, fuzzy
+ msgid "Stop"
+-msgstr "до"
++msgstr "Зупинити"
+
+ #: Locate/locate.cpp:101
+ msgid "Update DB"
+@@ -2047,9 +2001,8 @@
+ msgstr "Знайти попереднє (Ctrl+P)"
+
+ #: Locate/locate.cpp:368 Search/krsearchdialog.cpp:541
+-#, fuzzy
+ msgid "Copy selected to clipboard"
+-msgstr "Скопіювати в кишеню"
++msgstr "Скопіювати обране в кишеню"
+
+ #: Locate/locate.cpp:487 Locate/locate.cpp:504
+ msgid "Search string not found!"
+@@ -2079,9 +2032,9 @@
+ "Note: Your bookmarks and keybindings will remain intact.\n"
+ " Krusader will now run Konfigurator."
+ msgstr ""
+-"Було виявлено конфігурацію з 1.51 або давнішу. Krusader мусить змінити ваші "
++"Було виявлено конфігурацію з 1.51 або давнішу. Krusader мусить змінити Ваші "
+ "параметри на типові значення.\n"
+-"Примітка: Ваші закладки та прив'язки клавіш залишаться без змін.\n"
++"Зауваження: Ваші закладки та прив'язки клавіш залишаться без змін.\n"
+ "Krusader зараз запустить Конфігуратор."
+
+ #: krusader.cpp:442
+@@ -2089,7 +2042,7 @@
+ "<qt><b>Welcome to Krusader!</b><p>As this is your first run, your machine "
+ "will now be checked for external applications. Then the Konfigurator will be "
+ "launched where you can customize Krusader to your needs.</p></qt>"
+-msgstr ""
++msgstr "<qt><b>Ласкаво просимо до Krusader!</b><p>Оскільки Ви запустили його вперше, Вашу машину буде протестовано на зовнішні програми. Потім буде запущено Конфігуратор, за допомогою якого Ви можете налаштувати Krusader для Ваших потреб.</p></qt>"
+
+ #: krusader.cpp:508
+ msgid "F3 View Dialog"
+@@ -2100,9 +2053,8 @@
+ msgstr "Tab: перемикання панелей"
+
+ #: krusader.cpp:534
+-#, fuzzy
+ msgid "&Reload"
+-msgstr "&Місцезнаходження"
++msgstr "&Перезавантажити"
+
+ #: krusader.cpp:536
+ msgid "Show Actions Toolbar"
+@@ -2121,14 +2073,12 @@
+ msgstr "Показувати &емулятор термінала"
+
+ #: krusader.cpp:558
+-#, fuzzy
+ msgid "&Detailed View"
+-msgstr "Детальний вигляд"
++msgstr "&Детальний вигляд"
+
+ #: krusader.cpp:561
+-#, fuzzy
+ msgid "&Brief View"
+-msgstr "Рядковий вигляд"
++msgstr "&Скорочений вигляд"
+
+ #: krusader.cpp:564
+ msgid "Show &Hidden Files"
+@@ -2139,31 +2089,26 @@
+ msgstr "Помін&яти панелі місцями"
+
+ #: krusader.cpp:568
+-#, fuzzy
+ msgid "Sw&ap Sides"
+-msgstr "Поміняти місцями"
++msgstr "Поміняти &місцями"
+
+ #: krusader.cpp:574
+ msgid "popup cmdline"
+ msgstr "показ командного рядка"
+
+ #: krusader.cpp:578
+-#, fuzzy
+ msgid "&New Text File..."
+-msgstr "&Редагувати новий файл"
++msgstr "&Новий текстовий файл..."
+
+ #: krusader.cpp:579
+-#, fuzzy
+ msgid "Start &Root Mode Krusader"
+ msgstr "Запустити Krusader в режимі &адміністратора"
+
+ #: krusader.cpp:581
+-#, fuzzy
+ msgid "T&est Archive"
+-msgstr "П&еревірити архів(и)"
++msgstr "П&еревірити архів"
+
+ #: krusader.cpp:585
+-#, fuzzy
+ msgid "New Net &Connection..."
+ msgstr "Нове &з'єднання мережі"
+
+@@ -2172,58 +2117,48 @@
+ msgstr "Про&філі"
+
+ #: krusader.cpp:589
+-#, fuzzy
+ msgid "Calculate &Occupied Space"
+-msgstr "Підрахувати зайняте місце"
++msgstr "Підрахувати &зайняте місце"
+
+ #: krusader.cpp:591
+-#, fuzzy
+ msgid "Create Checksum..."
+-msgstr "Створити в:"
++msgstr "Створити контрольну суму..."
+
+ #: krusader.cpp:593
+-#, fuzzy
+ msgid "Verify Checksum..."
+-msgstr "Розділення файла %1..."
++msgstr "Перевірити контрольну суму..."
+
+ #: krusader.cpp:595
+-#, fuzzy
+ msgid "&Properties..."
+-msgstr "&Властивості"
++msgstr "&Властивості..."
+
+ #: krusader.cpp:597
+-#, fuzzy
+ msgid "Pac&k..."
+-msgstr "Запа&кувати"
++msgstr "Запа&кувати..."
+
+ #: krusader.cpp:599
+-#, fuzzy
+ msgid "&Unpack..."
+-msgstr "&Розпакувати"
++msgstr "&Розпакувати..."
+
+ #: krusader.cpp:601
+-#, fuzzy
+ msgid "Sp&lit File..."
+-msgstr "Розді&лити файл"
++msgstr "Розді&лити файл..."
+
+ #: krusader.cpp:603
+-#, fuzzy
+ msgid "Com&bine Files..."
+-msgstr "О&б'єднати файли"
++msgstr "О&б'єднати файли..."
+
+ #: krusader.cpp:605
+-#, fuzzy
+ msgid "Select &Group..."
+-msgstr "Вибрати &групу"
++msgstr "Вибрати &групу..."
+
+ #: krusader.cpp:607
+ msgid "&Select All"
+ msgstr "&Вибрати все"
+
+ #: krusader.cpp:609
+-#, fuzzy
+ msgid "&Unselect Group..."
+-msgstr "&Скасувати вибір групи"
++msgstr "&Скасувати вибір групи..."
+
+ #: krusader.cpp:611
+ msgid "U&nselect All"
+@@ -2238,102 +2173,84 @@
+ msgstr "&Порівняти каталоги"
+
+ #: krusader.cpp:617
+-#, fuzzy
+ msgid "&Select Newer and Single"
+ msgstr "&Позначити новіші і одинарні"
+
+ #: krusader.cpp:619
+-#, fuzzy
+ msgid "Select &Newer"
+-msgstr "Вибрати елементи"
++msgstr "Вибрати &новіші"
+
+ #: krusader.cpp:621
+-#, fuzzy
+ msgid "Select &Single"
+-msgstr " Вибрати файли "
++msgstr "Вибрати &одинарний"
+
+ #: krusader.cpp:623
+-#, fuzzy
+ msgid "Select Different &and Single"
+ msgstr "Позначити відмінні &й одинарні"
+
+ #: krusader.cpp:625
+-#, fuzzy
+ msgid "Select &Different"
+ msgstr "Позначити &відмінні"
+
+ #: krusader.cpp:635
+ msgid "Start and &Forget"
+-msgstr ""
++msgstr "Запустити і &Забути"
+
+ #: krusader.cpp:639
+-#, fuzzy
+ msgid "Display &Separated Standard and Error Output"
+-msgstr "Відділяти стандартні помилки"
++msgstr "Показувати &окремо стандартне виведення та помилки"
+
+ #: krusader.cpp:643
+ msgid "Display &Mixed Standard and Error Output"
+-msgstr ""
++msgstr "Показувати &разом стандартне виведення та помилки"
+
+ #: krusader.cpp:647
+-#, fuzzy
+ msgid "Start in &New Terminal"
+-msgstr "Термінал"
++msgstr "Почати у &новому терміналі"
+
+ #: krusader.cpp:651
+-#, fuzzy
+ msgid "Send to &Embedded Terminal Emulator"
+-msgstr "Показувати &емулятор термінала"
++msgstr "Надіслати до &вбудованого емулятора термінала"
+
+ #: krusader.cpp:663
+-#, fuzzy
+ msgid "Start &Terminal"
+-msgstr "Термінал"
++msgstr "Відкрити &Термінал"
+
+ #: krusader.cpp:665
+-#, fuzzy
+ msgid "Disconnect &from Net"
+-msgstr "Роз'єднати &від мережі"
++msgstr "Роз'єднатися &з мережею"
+
+ #: krusader.cpp:668 krusader.cpp:673
+-#, fuzzy
+ msgid "&MountMan..."
+-msgstr "&Монтування пристроїв"
++msgstr "&Монтування пристроїв..."
+
+ #: krusader.cpp:677
+-#, fuzzy
+ msgid "&Search..."
+-msgstr "&Пошук"
++msgstr "&Пошук..."
+
+ #: krusader.cpp:679
+-#, fuzzy
+ msgid "&Locate..."
+-msgstr "&Місцезнаходження"
++msgstr "&Місцезнаходження..."
+
+ #: krusader.cpp:681
+-#, fuzzy
+ msgid "Synchronize &Directories..."
+-msgstr "Синхронізувати ката&логи"
++msgstr "Синхронізувати ката&логи..."
+
+ #: krusader.cpp:683
+-#, fuzzy
+ msgid "S&ynchron Directory Changes"
+ msgstr "Син&хронізувати зміни в каталозі"
+
+ #: krusader.cpp:685
+-#, fuzzy
+ msgid "D&isk Usage..."
+-msgstr "Використання ди&ска"
++msgstr "Використання ди&ска..."
+
+ #: krusader.cpp:687
+-#, fuzzy
+ msgid "Configure &Krusader..."
+-msgstr "Налаштувати &Krusader"
++msgstr "Налаштувати &Krusader..."
+
+ #: krusader.cpp:689
+-#, fuzzy
+ msgid "Back"
+-msgstr "Чорний"
++msgstr "Назад"
+
+ #: krusader.cpp:693
+ msgid "Save &Position"
+@@ -2348,73 +2265,61 @@
+ msgstr "&Нетипове"
+
+ #: krusader.cpp:701
+-#, fuzzy
+ msgid "Compare b&y Content..."
+-msgstr "Порівняти з&а вмістом"
++msgstr "Порівняти з&а вмістом..."
+
+ #: krusader.cpp:703
+-#, fuzzy
+ msgid "Multi &Rename..."
+-msgstr "Групове пере&йменування"
++msgstr "Групове пере&йменування..."
+
+ #: krusader.cpp:705
+-#, fuzzy
+ msgid "Right-click Menu"
+ msgstr "Контекстне меню"
+
+ #: krusader.cpp:707
+-#, fuzzy
+ msgid "Right Bookmarks"
+ msgstr "Праві закладки"
+
+ #: krusader.cpp:709
+-#, fuzzy
+ msgid "Left Bookmarks"
+ msgstr "Ліві закладки"
+
+ #: BookMan/kraddbookmarkdlg.cpp:71 BookMan/krbookmarkbutton.cpp:19
+ #: BookMan/krbookmarkhandler.cpp:30 krusader.cpp:711
+-#, fuzzy
+ msgid "Bookmarks"
+-msgstr "Додати закладку"
++msgstr "Закладки"
+
+ #: BookMan/krbookmarkhandler.cpp:399 krusader.cpp:713
+ msgid "Bookmark Current"
+ msgstr "Зробити закладку поточного"
+
+ #: krusader.cpp:715
+-#, fuzzy
+ msgid "History"
+-msgstr "Історія лівої"
++msgstr "Історія"
+
+ #: krusader.cpp:717
+ msgid "Sync Panels"
+ msgstr "Синхронізувати панелі"
+
+ #: krusader.cpp:719
+-#, fuzzy
+ msgid "Left History"
+ msgstr "Історія лівої"
+
+ #: krusader.cpp:721
+-#, fuzzy
+ msgid "Right History"
+ msgstr "Історія правої"
+
+ #: BookMan/krbookmark.cpp:12 krusader.cpp:723
+-#, fuzzy
+ msgid "Media"
+-msgstr "редагувати"
++msgstr "Носій"
+
+ #: krusader.cpp:725
+-#, fuzzy
+ msgid "Left Media"
+-msgstr "Ліва панель"
++msgstr "Лівий носій"
+
+ #: krusader.cpp:727
+-#, fuzzy
+ msgid "Right Media"
+-msgstr "Права панель"
++msgstr "Правий носій"
+
+ #: krusader.cpp:731
+ msgid "Toggle Popup Panel"
+@@ -2425,87 +2330,72 @@
+ msgstr "Вертикальний режим"
+
+ #: krusader.cpp:735
+-#, fuzzy
+ msgid "New Tab"
+ msgstr "Нова вкладка"
+
+ #: krusader.cpp:737
+-#, fuzzy
+ msgid "Duplicate Current Tab"
+-msgstr "Здублювати вкладку"
++msgstr "Здублювати поточну вкладку"
+
+ #: krusader.cpp:739
+-#, fuzzy
+ msgid "Close Current Tab"
+ msgstr "Закрити поточну вкладку"
+
+ #: krusader.cpp:741
+-#, fuzzy
+ msgid "Next Tab"
+ msgstr "Наступна вкладка"
+
+ #: krusader.cpp:743
+-#, fuzzy
+ msgid "Previous Tab"
+ msgstr "Попередня вкладка"
+
+ #: krusader.cpp:749
+-#, fuzzy
+ msgid "Manage User Actions..."
+-msgstr "Керування діями користувача"
++msgstr "Керування діями користувача..."
+
+ #: krusader.cpp:751
+-#, fuzzy
+ msgid "Select Remote Charset"
+-msgstr "Вибрати елементи"
++msgstr "Обрати зовнішнє кодування"
+
+ #: krusader.cpp:754
+ msgid "Start Terminal Here"
+-msgstr ""
++msgstr "Викликати термінал тут"
+
+ #: krusader.cpp:756
+-#, fuzzy
+ msgid "View File"
+-msgstr "Відео файли"
++msgstr "Переглянути файл"
+
+ #: krusader.cpp:758
+-#, fuzzy
+ msgid "Edit File"
+-msgstr "Правка файла (F4)"
++msgstr "Редагувати файл"
+
+ #: krusader.cpp:764
+-#, fuzzy
+ msgid "New Directory..."
+-msgstr "Новий каталог"
++msgstr "Новий каталог..."
+
+ #: krusader.cpp:770
+-#, fuzzy
+ msgid "Quit"
+-msgstr "Тихо"
++msgstr "Вийти"
+
+ #: krusader.cpp:772
+-#, fuzzy
+ msgid "Popular URLs..."
+-msgstr "Популярні URL"
++msgstr "Популярні URL..."
+
+ #: krusader.cpp:774
+-#, fuzzy
+ msgid "Go to Location Bar"
+-msgstr "Перескочити до адреси"
++msgstr "Перескочити до панелі адреси"
+
+ #: krusader.cpp:776
+-#, fuzzy
+ msgid "Jump Back"
+-msgstr "Чорний"
++msgstr "Перескочити назад"
+
+ #: krusader.cpp:778
+ msgid "Set Jump Back Point"
+-msgstr ""
++msgstr "Встановити точку повернення назад"
+
+ #: krusader.cpp:780
+-#, fuzzy
+ msgid "Toggle Fullwidget Terminal Emulator"
+-msgstr "Показувати емулятор термінала"
++msgstr "Перемкнути повновіджетовий емулятор термінала"
+
+ #: krusader.cpp:784
+ msgid "Select files using a filter"
+@@ -2516,7 +2406,6 @@
+ msgstr "Вибрати всі файли в поточному каталозі"
+
+ #: krusader.cpp:786
+-#, fuzzy
+ msgid "Unselect all selected files"
+ msgstr "Відмінити вибір всіх вибраних файлів"
+
+@@ -2537,9 +2426,8 @@
+ msgstr "Пошук файлів"
+
+ #: krusader.cpp:796
+-#, fuzzy
+ msgid "JavaScript Console..."
+-msgstr "Консоль JavaScript"
++msgstr "Консоль JavaScript..."
+
+ #: krusader.cpp:932
+ msgid "Are you sure you want to quit?"
+@@ -2570,29 +2458,24 @@
+ msgstr "Текстовий &редактор"
+
+ #: KViewer/krviewer.cpp:91
+-#, fuzzy
+ msgid "&Next tab"
+-msgstr "Наступна вкладка"
++msgstr "&Наступна вкладка"
+
+ #: KViewer/krviewer.cpp:92
+-#, fuzzy
+ msgid "&Previous tab"
+-msgstr "Попередня вкладка"
++msgstr "&Попередня вкладка"
+
+ #: KViewer/krviewer.cpp:94
+-#, fuzzy
+ msgid "&Detach tab"
+-msgstr "Наступна вкладка"
++msgstr "&Від'єднати вкладку"
+
+ #: KViewer/krviewer.cpp:101
+-#, fuzzy
+ msgid "&Close current tab"
+-msgstr "Закрити поточну вкладку"
++msgstr "&Закрити поточну вкладку"
+
+ #: KViewer/krviewer.cpp:102
+-#, fuzzy
+ msgid "&Quit"
+-msgstr " Вийти"
++msgstr "&Вийти"
+
+ #: KViewer/krviewer.cpp:159
+ msgid "&KrViewer"
+@@ -2600,9 +2483,8 @@
+
+ #: KViewer/krviewer.cpp:259 KViewer/krviewer.cpp:327 KViewer/krviewer.cpp:411
+ #: KViewer/krviewer.cpp:420 KViewer/krviewer.cpp:429 KViewer/krviewer.cpp:503
+-#, fuzzy
+ msgid "Viewing"
+-msgstr "Огляд:"
++msgstr "Перегляд"
+
+ #: KViewer/krviewer.cpp:284 krslots.cpp:500
+ msgid "Can't open "
+@@ -2610,9 +2492,8 @@
+
+ #: KViewer/krviewer.cpp:292 KViewer/krviewer.cpp:327 KViewer/krviewer.cpp:438
+ #: KViewer/krviewer.cpp:501
+-#, fuzzy
+ msgid "Editing"
+-msgstr " Правка"
++msgstr "Редагування"
+
+ #: KViewer/krviewer.cpp:579
+ msgid "Sorry, can't find internal editor"
+@@ -2628,7 +2509,7 @@
+
+ #: Search/krsearchdialog.cpp:166 Search/krsearchdialog.cpp:395
+ msgid "Found 0 matches."
+-msgstr "Знайдено співпадань: 0."
++msgstr "Не знайдено жодного збігу."
+
+ #: Search/krsearchdialog.cpp:181
+ msgid "Location"
+@@ -2639,9 +2520,8 @@
+ msgstr "Права доступу"
+
+ #: Search/krsearchdialog.cpp:222
+-#, fuzzy
+ msgid "Text found:"
+-msgstr "Текст каталогів:"
++msgstr "Знайдено текст:"
+
+ #: Search/krsearchdialog.cpp:232
+ msgid "&Results"
+@@ -2649,7 +2529,7 @@
+
+ #: Search/krsearchdialog.cpp:360
+ msgid "Found %1 matches."
+-msgstr "Знайдено співпадань: %1."
++msgstr "Знайдено збігів: %1."
+
+ #: Search/krsearchdialog.cpp:382
+ msgid ""
+@@ -2694,9 +2574,9 @@
+ msgstr "Менеджер закладок II"
+
+ #: BookMan/krbookmarkhandler.cpp:172
+-#, fuzzy, c-format
++#, c-format
+ msgid "Unable to write to %1"
+-msgstr "Не вдається записати в"
++msgstr "Не вдається записати до %1"
+
+ #: BookMan/krbookmarkhandler.cpp:180
+ msgid " instead of "
+@@ -2708,14 +2588,13 @@
+ msgstr "відсутня мітка "
+
+ #: BookMan/krbookmarkhandler.cpp:261
+-#, fuzzy
+ msgid "%1 doesn't seem to be a valid Bookmarks file"
+-msgstr " виглядає, що це не є чинний файл закладок"
++msgstr "%1 здається не є коректним файлом закладок"
+
+ #: BookMan/krbookmarkhandler.cpp:268
+-#, fuzzy, c-format
++#, c-format
+ msgid "Error reading bookmarks file: %1"
+-msgstr "Помилка читання файла закладок: "
++msgstr "Помилка читання файла закладок: %1"
+
+ #: BookMan/krbookmarkhandler.cpp:332 BookMan/krbookmarkhandler.cpp:485
+ msgid "Popular URLs"
+@@ -2726,9 +2605,8 @@
+ msgstr "Керування закладками"
+
+ #: BookMan/krbookmarkhandler.cpp:482
+-#, fuzzy
+ msgid "Enable special bookmarks"
+-msgstr "Керування закладками"
++msgstr "Дозволити особливі закладки"
+
+ #: BookMan/krbookmark.cpp:14 BookMan/krbookmarkhandler.cpp:487
+ msgid "Devices"
+@@ -2736,7 +2614,7 @@
+
+ #: BookMan/krbookmark.cpp:17 BookMan/krbookmarkhandler.cpp:489
+ msgid "Local Network"
+-msgstr ""
++msgstr "Локальна мережа"
+
+ #: BookMan/krbookmark.cpp:16 BookMan/krbookmarkhandler.cpp:491
+ msgid "Virtual Filesystem"
+@@ -2744,7 +2622,7 @@
+
+ #: BookMan/krbookmarkhandler.cpp:493
+ msgid "Jump back"
+-msgstr ""
++msgstr "Повернутися назад"
+
+ #: BookMan/kraddbookmarkdlg.cpp:13
+ msgid "Add Bookmark"
+@@ -2772,12 +2650,11 @@
+
+ #: MountMan/kmountman.cpp:197
+ msgid "Error ejecting device! You need to have 'eject' in your path."
+-msgstr ""
+-"Помилка виштовхування пристрою! Необхідно мати \"eject\" у вашому шляху."
++msgstr "Помилка виштовхування пристрою! Необхідно мати \"eject\" у Вашому шляху."
+
+ #: MountMan/kmountman.cpp:224
+ msgid "%1 ZB"
+-msgstr "%1 ZB"
++msgstr "%1 ZБ"
+
+ #: MountMan/kmountman.cpp:226
+ msgid "%1 TB"
+@@ -2801,13 +2678,12 @@
+
+ #: MountMan/kmountmangui.cpp:70 RemoteMan/remotemanbase.cpp:73
+ #: Synchronizer/synchronizedialog.cpp:117
+-#, fuzzy
+ msgid "&Close"
+-msgstr "Кольори"
++msgstr "&Закрити"
+
+ #: MountMan/kmountmangui.cpp:72
+ msgid "MountMan - Your Mount-Manager"
+-msgstr "Монтування пристроїв - ваш менеджер монтування"
++msgstr "Монтування пристроїв - Ваш менеджер монтування"
+
+ #: MountMan/kmountmangui.cpp:101
+ msgid "Filesystems"
+@@ -2851,8 +2727,7 @@
+ "Повідомте розробників"
+
+ #: MountMan/kmountmangui.cpp:326
+-msgid ""
+-"MountMan has an internal error. Please notify the developers. Thank you."
++msgid "MountMan has an internal error. Please notify the developers. Thank you."
+ msgstr ""
+ "В менеджері монтування сталася внутрішня помилка. Будь ласка, повідомте "
+ "розробників."
+@@ -2878,7 +2753,6 @@
+ msgstr "iip at telus.net"
+
+ #: main.cpp:51
+-#, fuzzy
+ msgid ""
+ "Krusader\n"
+ "Twin-Panel File Manager for KDE"
+@@ -2914,10 +2788,15 @@
+ "IRC\n"
+ "server: irc.freenode.net, channel: #krusader"
+ msgstr ""
++"Форум\n"
++"http://www.krusader.org/phpBB/\n"
++"\n"
++"IRC\n"
++"server: irc.freenode.net, channel: #krusader"
+
+ #: main.cpp:202
+ msgid "Application already running!\n"
+-msgstr ""
++msgstr "Програма вже виконується!\n"
+
+ #: krusaderview.cpp:86
+ msgid "Function keys allow performing fast operations on files."
+@@ -2925,17 +2804,15 @@
+
+ #: Dialogs/krdialogs.cpp:146
+ msgid "Preserve attributes (only for local targets)"
+-msgstr ""
++msgstr "Зберігати атрибути (тільки для локальних цілей)"
+
+ #: Dialogs/krdialogs.cpp:153
+-#, fuzzy
+ msgid "Keep virtual directory structure"
+-msgstr "Перейменувати файл, каталог, тощо."
++msgstr "Зберігати структуру віртуального каталогу"
+
+ #: Dialogs/krdialogs.cpp:158
+-#, fuzzy
+ msgid "Base URL:"
+-msgstr "URL:"
++msgstr "Базовий URL:"
+
+ #: Dialogs/krprogress.cpp:59
+ msgid "Source:"
+@@ -2950,11 +2827,14 @@
+ msgstr "Поступ Krusader"
+
+ #: Dialogs/krprogress.cpp:165
+-#, fuzzy, c-format
++#, c-format
+ msgid ""
+ "_n: %n directory\n"
+ "%n directories"
+-msgstr "Відкрити список історії каталогу"
++msgstr ""
++"%n тека\n"
++"%n теки\n"
++"%n тек"
+
+ #: Dialogs/krprogress.cpp:166
+ #, c-format
+@@ -2962,6 +2842,9 @@
+ "_n: %n file\n"
+ "%n files"
+ msgstr ""
++"%n файл\n"
++"%n файла\n"
++"%n файлів"
+
+ #: Dialogs/krprogress.cpp:172
+ msgid "%1% of %2 "
+@@ -2980,12 +2863,18 @@
+ "_n: %1 / %n directory\n"
+ "%1 / %n directories"
+ msgstr ""
++"%1 / %n тека\n"
++"%1 / %n теки\n"
++"%1 / %n тек"
+
+ #: Dialogs/krprogress.cpp:203 Dialogs/krprogress.cpp:217
+ msgid ""
+ "_n: %1 / %n file\n"
+ "%1 / %n files"
+ msgstr ""
++"%1 / %n файл\n"
++"%1 / %n файла\n"
++"%1 / %n файлів"
+
+ #: Dialogs/krprogress.cpp:225
+ msgid "Working"
+@@ -2996,9 +2885,9 @@
+ msgstr "%1/с ( лишилось %2 )"
+
+ #: Dialogs/packgui.cpp:53
+-#, fuzzy, c-format
++#, c-format
+ msgid "Pack %1"
+-msgstr "Пакувати"
++msgstr "Пакувати %1"
+
+ #: Dialogs/packgui.cpp:55
+ #, c-format
+@@ -3006,6 +2895,9 @@
+ "_n: Pack %n file\n"
+ "Pack %n files"
+ msgstr ""
++"Пакується %n файл\n"
++"Пакується %n файли\n"
++"Пакується %n файлів"
+
+ #: Dialogs/packgui.cpp:94
+ msgid "Please select a directory"
+@@ -3033,16 +2925,15 @@
+ "Notice that the line in which you edit the mask has it's own history, you "
+ "can scroll it, if needed."
+ msgstr ""
+-"Готовий вибір - це файлова маска, яку ви часто вживаєте, напр.,\n"
++"Готовий вибір — це файлова маска, яку ви часто використовуєте, напр.,\n"
+ "\"*.c, *.h\", \"*.c, *.o\", тощо. Можна додати ці маски до списку\n"
+-"ввівши їх і натиснувши кнопку \"Додати\". \"Видалити\" видаляє\n"
+-"готовий вибір, а \"Очистити\" - видаляє їх всіх. Рядок, в якому ви редагуєте "
++"ввівши їх і натиснувши кнопку \"Додати\". \"Вилучити\" вилучає\n"
++"готовий вибір, а \"Очистити\" — вилучає їх всі. Рядок, в якому ви редагуєте "
+ "маску, має власну історію, отже можна її переглядати."
+
+ #: Dialogs/krmaskchoice.cpp:105
+-#, fuzzy
+ msgid "Add"
+-msgstr "&Додаткові"
++msgstr "Додати"
+
+ #: Dialogs/krmaskchoice.cpp:106
+ msgid "Adds the selection in the line-edit to the list"
+@@ -3050,12 +2941,11 @@
+
+ #: Dialogs/krmaskchoice.cpp:111
+ msgid "Delete the marked selection from the list"
+-msgstr "Видаляє позначене вибране із списку"
++msgstr "Вилучає позначене вибране із списку"
+
+ #: Dialogs/krmaskchoice.cpp:115
+-#, fuzzy
+ msgid "Clear"
+-msgstr "років"
++msgstr "Очистити"
+
+ #: Dialogs/krmaskchoice.cpp:116
+ msgid "Clears the entire list of selections"
+@@ -3063,7 +2953,7 @@
+
+ #: Dialogs/krmaskchoice.cpp:131
+ msgid "OK"
+-msgstr ""
++msgstr "Гаразд"
+
+ #: Dialogs/newftpgui.cpp:49
+ msgid "New Network Connection"
+@@ -3115,9 +3005,8 @@
+
+ #: Dialogs/krpleasewait.cpp:60 Dialogs/newftpgui.cpp:136
+ #: Splitter/splittergui.cpp:113
+-#, fuzzy
+ msgid "&Cancel"
+-msgstr "Панель"
++msgstr "&Скасувати"
+
+ #: Dialogs/popularurls.cpp:62
+ msgid "Saved 'Popular Urls' are invalid. List will be cleared"
+@@ -3152,13 +3041,14 @@
+ "*.keymap|Krusader keymaps\n"
+ "*|all files"
+ msgstr ""
++"*.keymap|карти клавіш Krusader\n"
++"*|всі файли"
+
+ #: Dialogs/krkeydialog.cpp:41
+ msgid "Import shortcuts"
+ msgstr "Імпортувати скорочення"
+
+ #: Dialogs/krkeydialog.cpp:42
+-#, fuzzy
+ msgid "Load a keybinding profile, e.g., total_commander.keymap"
+ msgstr "Завантажити профіль прив'язки клавіш, напр., total_commander.keymap"
+
+@@ -3167,57 +3057,52 @@
+ msgstr "Експортувати скорочення"
+
+ #: Dialogs/krkeydialog.cpp:47
+-#, fuzzy
+ msgid "Save current keybindings in a keymap file."
+ msgstr "Зберегти поточні прив'язки клавіш у файл карти клавіш."
+
+ #: Dialogs/krkeydialog.cpp:64 Dialogs/krkeydialog.cpp:128
+-#, fuzzy
+ msgid "Select a keymap file"
+-msgstr "Виберіть файл схеми кольорів"
++msgstr "Виберіть файл карти клавіш"
+
+ #: Dialogs/krkeydialog.cpp:71
+ msgid ""
+ "This file does not seem to be a valid keymap.\n"
+ "It may be a keymap using a legacy format. The import can't be undone!"
+ msgstr ""
++"Цей файл здається не є коректною картою клавіш.\n"
++"Це може бути карта клавіш у застарілому форматі. Імпорт не може бути повернений!"
+
+ #: Dialogs/krkeydialog.cpp:73
+ msgid "Try to import legacy format?"
+-msgstr ""
++msgstr "Спробувати імпортувати застарілий формат?"
+
+ #: Dialogs/krkeydialog.cpp:74
+-#, fuzzy
+ msgid "Import anyway"
+-msgstr "Імпортувати дію"
++msgstr "Все одно імпортувати "
+
+ #: Dialogs/krkeydialog.cpp:95
+-#, fuzzy
+ msgid ""
+ "The following information was attached to the keymap. Do you really want to "
+ "import this keymap?"
+ msgstr ""
+-"Наступна інформація була долучена до карти клавіш.\n"
++"Нижчеподана інформація була долучена до карти клавіш."
+ "Ви дійсно хочете імпортувати цю карту клавіш?"
+
+ #: Dialogs/krkeydialog.cpp:122
+ msgid "Please restart this dialog in order to see the changes"
+-msgstr ""
++msgstr "Будь ласка перезавантажте діалог, щоб побачити зміни"
+
+ #: Dialogs/krkeydialog.cpp:123
+ msgid "Legacy import completed"
+-msgstr ""
++msgstr "Імпорт застарілого завершено"
+
+ #: Dialogs/krkeydialog.cpp:134
+-#, fuzzy
+-msgid ""
+-"<qt>File <b>%1</b> already exists. Do you really want to overwrite it?</qt>"
+-msgstr " вже існує. Ви дійсно хочете перезаписати його?"
++msgid "<qt>File <b>%1</b> already exists. Do you really want to overwrite it?</qt>"
++msgstr "<qt>Файл <b>%1</b> вже існує. Ви дійсно хочете перезаписати його?</qt>"
+
+ #: Dialogs/krkeydialog.cpp:143
+-#, fuzzy
+ msgid "<qt>Can't open <b>%1</b> for writing!</qt>"
+-msgstr "Неможливо відкрити "
++msgstr "<qt>Неможливо відкрити <b>%1</b> для запису!</qt>"
+
+ #: Dialogs/packguibase.cpp:68 Dialogs/packguibase.cpp:122
+ msgid "Pack"
+@@ -3233,7 +3118,7 @@
+
+ #: Dialogs/packguibase.cpp:147
+ msgid "Multiple volume archive"
+-msgstr ""
++msgstr "Багатотомний архів"
+
+ #: Dialogs/packguibase.cpp:156 DiskUsage/diskusage.cpp:1032
+ msgid "Size:"
+@@ -3241,76 +3126,79 @@
+
+ #: Dialogs/packguibase.cpp:174
+ msgid "Set compression level"
+-msgstr ""
++msgstr "Встановити рівень стиснення"
+
+ #: Dialogs/packguibase.cpp:189
+ msgid "MIN"
+-msgstr ""
++msgstr "МІН"
+
+ #: Dialogs/packguibase.cpp:190
+ msgid "MAX"
+-msgstr ""
++msgstr "МАКС"
+
+ #: Dialogs/packguibase.cpp:211
+-#, fuzzy
+ msgid "Password"
+-msgstr "Пароль:"
++msgstr "Пароль"
+
+ #: Dialogs/packguibase.cpp:221
+ msgid "Again"
+-msgstr ""
++msgstr "Знову"
+
+ #: Dialogs/packguibase.cpp:239
+ msgid "Encrypt headers"
+-msgstr ""
++msgstr "Шифрувати заголовки"
+
+ #: Dialogs/packguibase.cpp:251
+-#, fuzzy
+ msgid "Command line switches:"
+-msgstr "Командний рядок"
++msgstr "Перемикачі командного рядка:"
+
+ #: Dialogs/packguibase.cpp:284
+ msgid "Ok"
+ msgstr "Гаразд"
+
+ #: Dialogs/packguibase.cpp:333
+-#, fuzzy
+ msgid "No password specified"
+ msgstr "Необхідний пароль"
+
+ #: Dialogs/packguibase.cpp:338
+ msgid "The passwords are equal"
+-msgstr ""
++msgstr "Паролі еквівалентні"
+
+ #: Dialogs/packguibase.cpp:342
+ msgid "The passwords are different"
+-msgstr ""
++msgstr "Паролі відрізняються"
+
+ #: Dialogs/packguibase.cpp:379
+ msgid "Cannot pack! The passwords are different!"
+-msgstr ""
++msgstr "Пакування неможливе! Паролі відрізняються!"
+
+ #: Dialogs/packguibase.cpp:404
+ msgid "Invalid volume size!"
+-msgstr ""
++msgstr "Некоректний розмір тому!"
+
+ #: Dialogs/packguibase.cpp:434
+ msgid ""
+ "Invalid command line switch!\n"
+ "Switch must start with '-'!"
+ msgstr ""
++"Некоректний параметр командного рядка!\n"
++"Параметр має починатися на '-'!"
+
+ #: Dialogs/packguibase.cpp:446
+ msgid ""
+ "Invalid command line switch!\n"
+ "Backslash cannot be the last character"
+ msgstr ""
++"Некоректний параметр командного рядка!\n"
++"Зворотна навскісна риска не може бути останнім символом"
+
+ #: Dialogs/packguibase.cpp:454
+ msgid ""
+ "Invalid command line switch!\n"
+ "Unclosed quotation mark!"
+ msgstr ""
++"Некоректний параметр командного рядка!\n"
++"Незакриті лапки!"
+
+ #: Dialogs/krspwidgets.cpp:151
+ msgid "Enter a selection:"
+@@ -3322,31 +3210,29 @@
+
+ #: Dialogs/krspwidgets.cpp:299 Dialogs/krspwidgets.cpp:310
+ msgid "Quick Navigation"
+-msgstr ""
++msgstr "Швидка навігація"
+
+ #: Dialogs/krspwidgets.cpp:300
+ msgid "Already at <i>%1</i>"
+-msgstr ""
++msgstr "Вже у <i>%1</i>"
+
+ #: Dialogs/krspwidgets.cpp:311
+ msgid "Click to go to <i>%1</i>"
+-msgstr ""
++msgstr "Клацніть, щоб перейти до <i>%1</i>"
+
+ #: Dialogs/krpleasewait.cpp:45
+-#, fuzzy
+ msgid "Krusader::Wait"
+-msgstr "Krusader::Місцезнаходження"
++msgstr "Krusader::Очікування"
+
+ #: Dialogs/checksumdlg.cpp:211 Dialogs/checksumdlg.cpp:466
+-#, fuzzy
+ msgid "Create Checksum"
+-msgstr "Створити в:"
++msgstr "Створення контрольної суми"
+
+ #: Dialogs/checksumdlg.cpp:216
+ msgid ""
+ "<qt>Can't calculate checksum since no supported tool was found. Please check "
+ "the <b>Dependencies</b> page in Krusader's settings.</qt>"
+-msgstr ""
++msgstr "<qt>Неможливо обчислити контрольну суму, оскільки не знайдено відповідного інструменту. Будь ласка перевірте сторінку <b>Залежності</b> у налаштуваннях Krusader.</qt>"
+
+ #: Dialogs/checksumdlg.cpp:219 Dialogs/checksumdlg.cpp:320
+ msgid ""
+@@ -3354,236 +3240,222 @@
+ "checksum tool installed. Krusader currently supports <i>md5deep, sha1deep, "
+ "sha256deep, tigerdeep and cfv</i></qt>"
+ msgstr ""
++"<qt><b>Зауваження</b>: Ви обрали каталоги і по всьому не маєте встановленого рекурсивного "
++"інструменту підрахунку контрольної суми. На даний момент Krusader підтримує <i>md5deep, sha1deep, "
++"sha256deep, tigerdeep та cfv</i></qt>"
+
+ #: Dialogs/checksumdlg.cpp:235
+ msgid "About to calculate checksum for the following files"
+-msgstr ""
++msgstr "Майже обчислено контрольну суму для таких файлів"
+
+ #: Dialogs/checksumdlg.cpp:236 Dialogs/checksumdlg.cpp:337
+ msgid " and folders:"
+-msgstr ""
++msgstr " та тек:"
+
+ #: Dialogs/checksumdlg.cpp:249
+ msgid "Select the checksum method:"
+-msgstr ""
++msgstr "Оберіть вид контрольної суми"
+
+ #: Dialogs/checksumdlg.cpp:270
+ msgid "Calculating checksums ..."
+-msgstr ""
++msgstr "Обчислюється контрольна сума ..."
+
+ #: Dialogs/checksumdlg.cpp:285 Dialogs/checksumdlg.cpp:399
+ msgid "<qt>There was an error while running <b>%1</b>.</qt>"
+-msgstr ""
++msgstr "<qt>Під час виконання <b>%1</b> сталася помилка.</qt>"
+
+ #: Dialogs/checksumdlg.cpp:297 Dialogs/checksumdlg.cpp:408
+-#, fuzzy
+ msgid "Error reading stdout or stderr"
+-msgstr "Помилка читання файла закладок: "
++msgstr "Помилка читання stdout або stderr"
+
+ #: Dialogs/checksumdlg.cpp:312 Dialogs/checksumdlg.cpp:430
+ msgid "Verify Checksum"
+-msgstr ""
++msgstr "Перевірити контрольну суму"
+
+ #: Dialogs/checksumdlg.cpp:317
+ msgid ""
+ "<qt>Can't verify checksum since no supported tool was found. Please check "
+ "the <b>Dependencies</b> page in Krusader's settings.</qt>"
+ msgstr ""
++"<qt>Контрольну суму неможливо перевірити оскільки не знайдено відповідного інструменту. Будь ласка перевірте "
++"сторінку <b>Залежності</b> у налаштуваннях Krusader.</qt>"
+
+ #: Dialogs/checksumdlg.cpp:336
+-#, fuzzy
+ msgid "About to verify checksum for the following files"
+-msgstr "Виберіть наступні файли:"
++msgstr "Перевіряється контрольна сума для таких файлів"
+
+ #: Dialogs/checksumdlg.cpp:350
+ msgid "Checksum file:"
+-msgstr ""
++msgstr "Файл контрольної суми:"
+
+ #: Dialogs/checksumdlg.cpp:364
+ msgid ""
+ "<qt>Error reading checksum file <i>%1</i>.<br />Please specify a valid "
+ "checksum file.</qt>"
+ msgstr ""
++"<qt>Помилка читання файла контрольної суми <i>%1</i>.<br />Будь ласка задайте коректний файл "
++"контрольної суми.</qt>"
+
+ #: Dialogs/checksumdlg.cpp:377
+ msgid ""
+ "<qt>Krusader can't find a checksum tool that handles %1 on your system. "
+ "Please check the <b>Dependencies</b> page in Krusader's settings.</qt>"
+ msgstr ""
++"<qt>Krusader не вдалося знайти інструмент підрахунку контрольної суми для обробки %1 у Вашій системі. "
++"Будь ласка перевірте сторінку <b>Залежності</b> у налаштуваннях Krusader.</qt>"
+
+ #: Dialogs/checksumdlg.cpp:386
+-#, fuzzy
+ msgid "Verifying checksums ..."
+-msgstr "Розділення файла %1..."
++msgstr "Перевірка контрольних сум ..."
+
+ #: Dialogs/checksumdlg.cpp:443
+ msgid "Errors were detected while verifying the checksums"
+-msgstr ""
++msgstr "Під час перевірки контрольних сум виявлено помилки"
+
+ #: Dialogs/checksumdlg.cpp:444
+ msgid "Checksums were verified successfully"
+-msgstr ""
++msgstr "Контрольні суми успішно перевірено"
+
+ #: Dialogs/checksumdlg.cpp:450
+-#, fuzzy
+ msgid "The following files have failed:"
+-msgstr "Виберіть наступні файли:"
++msgstr "Помилка у таких файлах:"
+
+ #: Dialogs/checksumdlg.cpp:481
+ msgid "Errors were detected while creating the checksums"
+-msgstr ""
++msgstr "Під час створення контрольних сум помічено помилки"
+
+ #: Dialogs/checksumdlg.cpp:482
+ msgid "Checksums were created successfully"
+-msgstr ""
++msgstr "Контрольні суми успішно створено"
+
+ #: Dialogs/checksumdlg.cpp:489
+ msgid "Here are the calculated checksums:"
+-msgstr ""
++msgstr "Значення обчислених контрольних сум:"
+
+ #: Dialogs/checksumdlg.cpp:495
+-#, fuzzy
+ msgid "Hash"
+-msgstr "смітник"
++msgstr "Хеш"
+
+ #: Dialogs/checksumdlg.cpp:496 Konfigurator/kgcolors.cpp:418
+-#, fuzzy
+ msgid "File"
+-msgstr "Файл "
++msgstr "Файл"
+
+ #: Dialogs/checksumdlg.cpp:499
+-#, fuzzy
+ msgid "File and hash"
+-msgstr "Назва файла"
++msgstr "Файл та хеш"
+
+ #: Dialogs/checksumdlg.cpp:522
+ msgid "Here are the errors received:"
+-msgstr ""
++msgstr "Список виявлених помилок:"
+
+ #: Dialogs/checksumdlg.cpp:536
+ msgid "Save checksum to file:"
+-msgstr ""
++msgstr "Зберегти контрольну суму до файла:"
+
+ #: Dialogs/checksumdlg.cpp:550
+ msgid "Checksum file for each source file"
+-msgstr ""
++msgstr "Контрольна сума для кожного вхідного файла"
+
+ #: Dialogs/checksumdlg.cpp:572
+-#, fuzzy
+ msgid ""
+ "File %1 already exists.\n"
+ "Are you sure you want to overwrite it?"
+-msgstr " вже існує. Ви дійсно хочете перезаписати його?"
++msgstr ""
++"Файл %1 вже існує.\n"
++"Ви справді бажаєте його перезаписати?"
+
+ #: Dialogs/checksumdlg.cpp:575
+-#, fuzzy
+ msgid "Select a file to save to"
+-msgstr " Вибрати файли "
++msgstr "Оберіть файл для збереження"
+
+ #: Dialogs/checksumdlg.cpp:580
+-#, fuzzy, c-format
++#, c-format
+ msgid "Error saving file %1"
+-msgstr "Помилка при читанні файла %1!"
++msgstr "Помилка під час збереження файла %1"
+
+ #: Dialogs/checksumdlg.cpp:592
+-#, fuzzy
+ msgid "Saving checksum files..."
+-msgstr "Розділення файла %1..."
++msgstr "Збереження файлів контрольної суми..."
+
+ #: Dialogs/checksumdlg.cpp:597
+ msgid "Errors occured while saving multiple checksums. Stopping"
+-msgstr ""
++msgstr "Під час збереження множинних контрольних сум сталися помилки. Зупинка"
+
+ #: ActionMan/useractionlistview.cpp:34
+-#, fuzzy
+ msgid "Title"
+ msgstr "Заголовок"
+
+ #: ActionMan/useractionpage.cpp:34
+-#, fuzzy
+ msgid ""
+ "*.xml|xml-files\n"
+ "*|all files"
+-msgstr "*.xml|xml-файли"
++msgstr ""
++"*.xml|xml-файли\n"
++"*|всі файли"
+
+ #: ActionMan/useractionpage.cpp:48
+-#, fuzzy
+ msgid "Create new useraction"
+-msgstr "Керування діями користувача"
++msgstr "Створити нову дію користувача"
+
+ #: ActionMan/useractionpage.cpp:53
+-#, fuzzy
+ msgid "Import useractions"
+-msgstr "Імпортувати дію"
++msgstr "Імпортувати дії користувача"
+
+ #: ActionMan/useractionpage.cpp:58
+-#, fuzzy
+ msgid "Export useractions"
+-msgstr "Експортувати дію"
++msgstr "Експортувати дії користувача"
+
+ #: ActionMan/useractionpage.cpp:63
+-#, fuzzy
+ msgid "Copy useractions to clipboard"
+-msgstr "Скопіювати в кишеню"
++msgstr "Скопіювати дії користувача в кишеню"
+
+ #: ActionMan/useractionpage.cpp:68
+-#, fuzzy
+ msgid "Paste useractions from clipboard"
+-msgstr "Вставити з кишені"
++msgstr "Вставити дії користувача з кишені"
+
+ #: ActionMan/useractionpage.cpp:73
+-#, fuzzy
+ msgid "Delete selected useractions"
+-msgstr "Видалити цю дію?"
++msgstr "Вилучити обрані дії користувача"
+
+ #: ActionMan/useractionpage.cpp:126
+-#, fuzzy
+-msgid ""
+-"The current action has been modified. Do you want to apply these changes?"
+-msgstr "Поточна сторінка була змінена. Хочете застосувати зміни?"
++msgid "The current action has been modified. Do you want to apply these changes?"
++msgstr "Поточну дію було змінено. Хочете застосувати зміни?"
+
+ #: ActionMan/useractionpage.cpp:203
+-#, fuzzy
+ msgid "Are you sure that you want to remove all selected actions?"
+-msgstr ""
+-"Ви дійсно хочете видалити цю дію?\n"
+-"Відновлення неможливе!"
++msgstr "Ви дійсно хочете вилучити всі обрані дії?"
+
+ #: ActionMan/useractionpage.cpp:204
+-#, fuzzy
+ msgid "Remove selected actions?"
+-msgstr "Видалити цю дію?"
++msgstr "Вилучити обрані дії?"
+
+ #: ActionMan/useractionpage.cpp:205
+-#, fuzzy
+ msgid "Remove"
+-msgstr "вилучити"
++msgstr "Вилучити"
+
+ #: ActionMan/useractionpage.cpp:246
+ msgid ""
+ "This file already contains some useractions.\n"
+ "Do you want to overwrite it or should it be merged with the selected actions?"
+ msgstr ""
++"Цей файл вже містить деякі дії користувача.\n"
++"Бажаєте перезаписати його або з’єднати його з обраними діями?"
+
+ #: ActionMan/useractionpage.cpp:247
+-#, fuzzy
+ msgid "Overwrite or merge?"
+-msgstr "Перезаписати елемент"
++msgstr "Перезаписати або з’єднати?"
+
+ #: ActionMan/useractionpage.cpp:249
+-#, fuzzy
+ msgid "Merge"
+-msgstr "&Ще"
++msgstr "Сполучити"
+
+ #: ActionMan/useractionpage.cpp:255
+-#, fuzzy
+ msgid "This file already exists. Do you want to overwrite it?"
+-msgstr " вже існує. Ви дійсно хочете перезаписати його?"
++msgstr "Цей файл вже існує. Ви дійсно хочете перезаписати його?"
+
+ #: ActionMan/useractionpage.cpp:256
+-#, fuzzy
+ msgid "Overwrite existing file?"
+-msgstr "Показувати тільки існуючі файли"
++msgstr "Перезаписати існуючий файл?"
+
+ #: ActionMan/actionproperty.cpp:294
+ msgid "New protocol"
+@@ -3659,11 +3531,13 @@
+ "If you don't have such an useraction the name is used by Krusader for an "
+ "internal action"
+ msgstr ""
++"Дія з цією назвою вже існує\n"
++"Якщо у Вас немає дії користувача з цією назвою: вона використовується Krusader для "
++"внутрішньої дії"
+
+ #: ActionMan/actionman.cpp:26
+-#, fuzzy
+ msgid "ActionMan - Manage Your Useractions"
+-msgstr "Керування діями користувача"
++msgstr "Керівник - Керуйте Вашими діями"
+
+ #: ActionMan/actionpropertybase.cpp:386
+ msgid "Action Property"
+@@ -3678,45 +3552,40 @@
+ msgstr "Опис:"
+
+ #: ActionMan/actionpropertybase.cpp:389 ActionMan/actionpropertybase.cpp:419
+-#, fuzzy
+ msgid ""
+ "A detailed description of the <b>Useraction</b>. It is only displayed in the "
+ "<i>Konfigurator</i> and via <code>Shift-F1</code>."
+-msgstr "Опис показується тільки в Конфігураторі і через Shift-F1"
++msgstr ""
++"Детальний опис <b>Дії користувача</b>. Він показується тільки у "
++"<i>Конфігураторі</i> та через <code>Shift-F1</code>."
+
+ #: ActionMan/actionpropertybase.cpp:390
+ msgid "Command accepts"
+ msgstr "Команда приймає"
+
+ #: ActionMan/actionpropertybase.cpp:391
+-#, fuzzy
+ msgid "Local files only (no URL's)"
+ msgstr "Тільки локальні файли (не URL)"
+
+ #: ActionMan/actionpropertybase.cpp:392
+-#, fuzzy
+ msgid "Substitute the <b>Placeholders</b> with local filenames."
+-msgstr "Замініть шаблони назвами локальних файлів"
++msgstr "Замініть <b>Заповнювачі</b> на назви локальних файлів."
+
+ #: ActionMan/actionpropertybase.cpp:393
+-#, fuzzy
+ msgid "URL's (remote and local)"
+ msgstr "Адреси URL (віддалені і локальні)"
+
+ #: ActionMan/actionpropertybase.cpp:394
+-#, fuzzy
+ msgid "Substitute the <b>Placeholders</b> with valid URL's."
+-msgstr "Замініть шаблони чинними адресами URL"
++msgstr "Замініть <b>Заповнювачі</b> чинними адресами URL."
+
+ #: ActionMan/actionpropertybase.cpp:395 ActionMan/actionpropertybase.cpp:397
+-#, fuzzy
+ msgid "The title displayed in the <b>Usermenu</b>."
+-msgstr "Заголовок, який показується в меню"
++msgstr "Заголовок, який показується у <b>Меню користувача</b>."
+
+ #: ActionMan/actionpropertybase.cpp:396
+-#, fuzzy
+ msgid "Title:"
+-msgstr "Заголовок"
++msgstr "Заголовок:"
+
+ #: ActionMan/actionpropertybase.cpp:398
+ msgid ""
+@@ -3724,27 +3593,30 @@
+ "<i>Konfigurator</i> and doesn't appear in any other menu.<p><b>Note</b>: The "
+ "<i>Title</i> shown in the <b>Usermenu</b> can be set below."
+ msgstr ""
++"Особлива назва <b>Дії користувача</b>. Її буде використано лише у "
++"<i>Конфігураторі</i>, вона не з'явиться у жодному іншому меню.<p><b>Зауваження</b>: <i>Заголовок</i>, що показується у <b>Меню користувача</b> може бути заданий нижче."
+
+ #: ActionMan/actionpropertybase.cpp:399 ActionMan/actionpropertybase.cpp:416
+ msgid ""
+ "<b>Useractions</b> can be grouped in categories for better distinction. "
+ "Choose a existing <i>Category</i> or create a new one by entering a name."
+ msgstr ""
++"<b>Дії користувача</b> можна згрупувати у категорії для кращої організації. "
++"Оберіть існуючу <i>Категорію</i> або створіть нову ввівши назву."
+
+ #: ActionMan/actionpropertybase.cpp:400
+-#, fuzzy
+ msgid "Icon"
+-msgstr "піктограма"
++msgstr "Піктограма"
+
+ #: ActionMan/actionpropertybase.cpp:401
+ msgid ""
+ "Each <b>Useraction</b> can have its own icon. It will appear in front of the "
+ "title in the <b>Usermenu</b>."
+-msgstr ""
++msgstr "Кожна <b>Дія користувача</b> може мати власну піктограму. Вона з'явиться навпроти заголовка у <b>Меню користувача</b>."
+
+ #: ActionMan/actionpropertybase.cpp:402
+ msgid "Identifier:"
+-msgstr ""
++msgstr "Ідентифікатор:"
+
+ #: ActionMan/actionpropertybase.cpp:403
+ msgid ""
+@@ -3752,11 +3624,13 @@
+ "<i>Konfigurator</i> and doesn't appear in any other menu.</p><p><b>Note</b>: "
+ "The <i>Title</i> shown in the <b>Usermenu</b> can be set below.</p>"
+ msgstr ""
++"<p>Унікальна назва <b>Дії користувача</b>. Вона використовується у "
++"<i>Конфігураторі</i> та не з’явиться у жодному з інших меню.</p><p><b>Зауваження</b>: "
++"<i>Заголовок</i> буде показано у <b>Меню користувача</b> може бути встановлено нижче.</p>"
+
+ #: ActionMan/actionpropertybase.cpp:404
+-#, fuzzy
+ msgid "Command:"
+-msgstr "&Команди"
++msgstr "Команда:"
+
+ #: ActionMan/actionpropertybase.cpp:405
+ msgid ""
+@@ -3767,23 +3641,28 @@
+ "</li></code></ul>\n"
+ "Please consult the handbook to learn more about the syntax.</p>"
+ msgstr ""
++"<p><i>Команда</i> визначає команду: яку буде виконано після використання "
++"<b>Дії користувача</b>. Це може бути проста команда оболонки або складна "
++"послідовність декількох команд з <b>Заповнювачами</b>.</p><p>Приклади:"
++"<ul><code><li>eject /mnt/cdrom</li><li>amarok --append %aList(\"Selected\")%"
++"</li></code></ul>\n"
++"Будь ласка прочитайте довідку, щоб дізнатися більше про синтаксис.</p>"
+
+ #: ActionMan/actionpropertybase.cpp:407 ActionMan/actionpropertybase.cpp:410
+ msgid ""
+ "The <i>Tooltip</i> is shown when the mouse cursor is hold over an entry of "
+ "the <b>Useraction Toolbar</b>."
+-msgstr ""
++msgstr "<i>Підказка</i> показується, коли курсор миші знаходиться над <b>Панелю Дій користувача</b>."
+
+ #: ActionMan/actionpropertybase.cpp:408 ActionMan/actionpropertybase.cpp:421
+ msgid ""
+ "The <i>Workdir</i> defines in which directory the <i>Command</i> will be "
+ "executed."
+-msgstr ""
++msgstr "<i>Робоча тека</i> визначає, у якій теці буде виконано <i>Команду</i>."
+
+ #: ActionMan/actionpropertybase.cpp:409
+-#, fuzzy
+ msgid "Tooltip:"
+-msgstr "Підказка"
++msgstr "Підказка:"
+
+ #: ActionMan/actionpropertybase.cpp:412
+ msgid ""
+@@ -3794,16 +3673,19 @@
+ "(\"Selected\")%</li></code></ul>\n"
+ "Please consult the handbook to learn more about the syntax."
+ msgstr ""
++"<i>Команда</i> визначає команду, яку буде виконано, коли використовується "
++"<b>Дія користувача</b>. Це може бути проста команда оболонки чи складна послідовність декількома командами з <b>Заповнювачами</b>.<p>\n"
++"Зразки:<ul><code><li>eject /mnt/cdrom</li><li>amarok --append %aList"
++"(\"Selected\")%</li></code></ul>\n"
++"Будь ласка почитайте підручник користувача, щоб прочитати більше про синтаксис."
+
+ #: ActionMan/actionpropertybase.cpp:415
+-#, fuzzy
+ msgid "Category:"
+-msgstr "Категорія"
++msgstr "Категорія:"
+
+ #: ActionMan/actionpropertybase.cpp:420
+-#, fuzzy
+ msgid "Workdir:"
+-msgstr "Працює"
++msgstr "Робоча тека:"
+
+ #: ActionMan/actionpropertybase.cpp:422
+ msgid "Default shortcut:"
+@@ -3814,27 +3696,24 @@
+ msgstr "Немає"
+
+ #: ActionMan/actionpropertybase.cpp:424
+-#, fuzzy
+ msgid "Set a default keyboard shortcut."
+-msgstr "встановіть стандартне скорочення клавіатури"
++msgstr "Встановіть стандартне скорочення клавіатури."
+
+ #: ActionMan/actionpropertybase.cpp:426
+ msgid "Collect output"
+-msgstr "Збирати вивід"
++msgstr "Збирати виведення"
+
+ #: ActionMan/actionpropertybase.cpp:427
+-#, fuzzy
+ msgid "Collect the output of the executed program."
+-msgstr "Збирати вивід програми, яка виконується"
++msgstr "Збирати виведення програми, яка виконується."
+
+ #: ActionMan/actionpropertybase.cpp:428
+ msgid "Separate standard error"
+ msgstr "Відділяти стандартні помилки"
+
+ #: ActionMan/actionpropertybase.cpp:429
+-#, fuzzy
+ msgid "Separate standard out and standard error in the output collection."
+-msgstr "Відділяти стандартний вивід і стандартні помилки"
++msgstr "Відділяти стандартний виведення і стандартні помилки під час збирання."
+
+ #: ActionMan/actionpropertybase.cpp:430
+ msgid "Normal"
+@@ -3845,41 +3724,36 @@
+ msgstr "Виконувати в терміналі"
+
+ #: ActionMan/actionpropertybase.cpp:432
+-#, fuzzy
+ msgid "Run the command in a terminal."
+-msgstr "Виконувати команду в терміналі"
++msgstr "Виконати команду в терміналі."
+
+ #: ActionMan/actionpropertybase.cpp:433
+ msgid "Basic Properties"
+ msgstr "Основні властивості"
+
+ #: ActionMan/actionpropertybase.cpp:434
+-#, fuzzy
+ msgid "The Useraction is only available for"
+-msgstr "Ця дія можлива тільки для "
++msgstr "Ця дія користувача можлива тільки для"
+
+ #: ActionMan/actionpropertybase.cpp:435 ActionMan/actionpropertybase.cpp:441
+ #: ActionMan/actionpropertybase.cpp:446 ActionMan/actionpropertybase.cpp:451
+-#, fuzzy
+ msgid "&New..."
+-msgstr "..."
++msgstr "&Створити..."
+
+ #: ActionMan/actionpropertybase.cpp:436 ActionMan/actionpropertybase.cpp:442
+ #: ActionMan/actionpropertybase.cpp:447 ActionMan/actionpropertybase.cpp:452
+ msgid "Chan&ge..."
+-msgstr ""
++msgstr "Зміни&ти..."
+
+ #: ActionMan/actionpropertybase.cpp:437 ActionMan/actionpropertybase.cpp:443
+ #: ActionMan/actionpropertybase.cpp:448 ActionMan/actionpropertybase.cpp:453
+-#, fuzzy
+ msgid "De&lete"
+-msgstr " Видалити"
++msgstr "Вилучити"
+
+ #: ActionMan/actionpropertybase.cpp:438 ActionMan/actionpropertybase.cpp:440
+ #: ActionMan/actionpropertybase.cpp:445
+-#, fuzzy
+ msgid "Show the <b>Useraction</b> only for the values defined here."
+-msgstr "Показувати цю дію тільки для цих типів файлів"
++msgstr "Показувати <b>Дію користувача</b> тільки для значень зазначених тут"
+
+ #: ActionMan/actionpropertybase.cpp:439
+ msgid "Protocol"
+@@ -3897,7 +3771,7 @@
+ msgid ""
+ "Show the <b>Useraction</b> only for the filenames defined here. The "
+ "wildcards '<code>?</code>' and '<code>*</code>' can be used."
+-msgstr ""
++msgstr "Показувати <b>Дію користувача</b> тільки для назв файлів визначених тут. Можна використовувати шаблони '<code>?</code>' та '<code>*</code>'."
+
+ #: ActionMan/actionpropertybase.cpp:454
+ msgid "Filename"
+@@ -3908,19 +3782,16 @@
+ msgstr "Окремо підтверджувати кожний виклик програми"
+
+ #: ActionMan/actionpropertybase.cpp:456
+-#, fuzzy
+ msgid "Allows to tweak the <i>Command</i> before it is executed."
+-msgstr "Це дозволяє підправити командний рядок перед виконанням команди"
++msgstr "Це дозволяє підправити <i>команду</i> перед її виконанням."
+
+ #: ActionMan/actionpropertybase.cpp:457
+-#, fuzzy
+ msgid "Run as different user:"
+-msgstr "Запускати як інший користувач"
++msgstr "Запускати як інший користувач:"
+
+ #: ActionMan/actionpropertybase.cpp:458 ActionMan/actionpropertybase.cpp:459
+-#, fuzzy
+ msgid "Execute the <i>Command</i> under a different user-id."
+-msgstr "запустити команду під ІД іншого користувача"
++msgstr "Запустити <i>команду</i> під записом іншого користувача."
+
+ #: ActionMan/actionpropertybase.cpp:460
+ msgid "Advanced Properties"
+@@ -3947,9 +3818,8 @@
+ msgstr "Незалежне від панелі"
+
+ #: ActionMan/addplaceholderpopup.cpp:60
+-#, fuzzy
+ msgid "Choose executable..."
+-msgstr "Файл програми"
++msgstr "Обрати виконуваний файл..."
+
+ #: ActionMan/addplaceholderpopup.cpp:135
+ msgid "User Action Parameter Dialog"
+@@ -3981,7 +3851,7 @@
+
+ #: RemoteMan/remoteman.cpp:360
+ msgid "Are you sure you want to delete this item ???"
+-msgstr "Ви впевнені, що хочете видалити цей елемент???"
++msgstr "Ви впевнені, що хочете вилучити цей елемент???"
+
+ #: RemoteMan/remotemanbase.cpp:41
+ msgid "RemoteMan: Connection Manager"
+@@ -4029,7 +3899,7 @@
+
+ #: UserMenu/usermenu.cpp:51
+ msgid "User Menu"
+-msgstr "Меню користувачів"
++msgstr "Меню користувача"
+
+ #: UserMenu/usermenu.cpp:58
+ msgid "Manage user actions"
+@@ -4044,44 +3914,40 @@
+ msgstr "Порівняння каталогів"
+
+ #: Synchronizer/synchronizergui.cpp:1126
+-#, fuzzy
+ msgid "File &Filter:"
+ msgstr "Файловий фільтр:"
+
+ #: Synchronizer/synchronizergui.cpp:1148
+ msgid "The left base directory used during the synchronisation process."
+-msgstr ""
++msgstr "Ліва тека використовуватиметься як базова під час процесу синхронізації."
+
+ #: Synchronizer/synchronizergui.cpp:1181
+ msgid "The right base directory used during the synchronisation process."
+-msgstr ""
++msgstr "Права тека використовуватиметься як базова під час процесу синхронізації."
+
+ #: Synchronizer/synchronizergui.cpp:1188
+ msgid "Recurse subdirectories"
+ msgstr "Підкаталоги рекурсивно"
+
+ #: Synchronizer/synchronizergui.cpp:1190
+-#, fuzzy
+ msgid "Compare not only the base directories but their subdirectories as well."
+-msgstr "Порівнює не тільки базові каталоги, але й також їхні підкаталоги"
++msgstr "Порівнювати не тільки базові теки, але й також їхні підтеки."
+
+ #: Synchronizer/synchronizergui.cpp:1191
+ msgid "Follow symlinks"
+ msgstr "Йти по символічних посиланнях"
+
+ #: Synchronizer/synchronizergui.cpp:1194
+-#, fuzzy
+ msgid "Follow symbolic links during the compare process."
+-msgstr "Дозволяти навігацію по символічних посиланнях також при порівнянні"
++msgstr "Перехід за символічними посиланнями під час порівняння."
+
+ #: Synchronizer/synchronizergui.cpp:1195
+ msgid "Compare by content"
+ msgstr "Порівняти за вмістом"
+
+ #: Synchronizer/synchronizergui.cpp:1197
+-#, fuzzy
+ msgid "Compare duplicated files with same size by content."
+-msgstr "Порівнює за вмістом файли-дублікати з однаковим розміром"
++msgstr "Порівнювати за вмістом файли-дублікати з однаковим розміром."
+
+ #: Synchronizer/synchronizergui.cpp:1198
+ msgid "Ignore Date"
+@@ -4092,90 +3958,78 @@
+ "<p>Ignore date information during the compare process.</p><p><b>Note</b>: "
+ "useful if the files are located on network filesystems or in archives.</p>"
+ msgstr ""
++"<p>Ігнорувати інформацію про дату під час процесу порівняння.</p><p><b>Зауваження</b>: "
++"корисно, якщо розташовано у мережних файлових системах або у архівах.</p>"
+
+ #: Synchronizer/synchronizergui.cpp:1201
+ msgid "Asymmetric"
+ msgstr "Асиметрично"
+
+ #: Synchronizer/synchronizergui.cpp:1203
+-#, fuzzy
+ msgid ""
+ "<p><b>Asymmetric mode</b></p><p>The left side is the destination, the right "
+ "is the source directory. Files existing only in the left directory will be "
+ "deleted, the other differing ones will be copied from right to left.</"
+ "p><p><b>Note</b>: useful when updating a directory from a file server.</p>"
+ msgstr ""
+-"Асиметричний режим. Лівий бік - це місце призначення, а правий - каталог "
+-"джерела.\n"
+-"Файли, які існують тільки в лівому каталозі, будуть видалені, інші, які "
+-"мають розходження\n"
+-"будуть скопійовані з правого боку на лівий (придатне при поновленні каталогу "
+-"з сервера файлів)."
++"<p><b>Асиметричний режим</b></p> <p> Лівий бік - це місце призначення, а правий - каталог джерела. Файли, які існують тільки в лівому каталозі, буде вилучено, інші, які мають розходження будуть скопійовані з правого боку на лівий.</p><p><b>Зауваження</b>: придатне при поновленні каталогу "
++"з сервера файлів.</p>"
+
+ #: Synchronizer/synchronizergui.cpp:1204
+ msgid "Ignore Case"
+ msgstr "Без урахування регістру"
+
+ #: Synchronizer/synchronizergui.cpp:1206
+-#, fuzzy
+ msgid ""
+ "<p>Case insensitive filename compare.</p><p><b>Note</b>: useful when "
+ "synchronizing Windows filesystems.</p>"
+ msgstr ""
+-"Порівняння без урахування регістру. Вживайте для синхронізації на файлових "
+-"системах Windows."
++"Порівняння без урахування регістру.</p><p><b>Зауваження</b>: корисно для "
++"синхронізації на файлових системах Windows."
+
+ #: Synchronizer/synchronizergui.cpp:1211
+-#, fuzzy
+ msgid "S&how options"
+-msgstr "Показувати параметри"
++msgstr "Пока&зувати параметри"
+
+ #: Synchronizer/synchronizergui.cpp:1232
+-#, fuzzy
+ msgid "Show files marked to <i>Copy from left to right</i> (CTRL+L)."
+-msgstr "Видає список файлів позначених для копіювання з лівого боку на правий"
++msgstr "Показати файли, позначені <i>для копіювання з лівого боку на правий</i> (CTRL+L)."
+
+ #: Synchronizer/synchronizergui.cpp:1241
+-#, fuzzy
+ msgid "Show files considered to be identical (CTRL+E)."
+-msgstr "Видає список файлів, які вважаються ідентичними"
++msgstr "Показати список файлів, які вважаються ідентичними (CTRL+E)."
+
+ #: Synchronizer/synchronizergui.cpp:1250
+-#, fuzzy
+ msgid "Show excluded files (CTRL+D)."
+-msgstr "Видає список невключених файлів"
++msgstr "Видає список невключених файлів (CTRL+D)."
+
+ #: Synchronizer/synchronizergui.cpp:1259
+-#, fuzzy
+ msgid "Show files marked to <i>Copy from right to left</i> (CTRL+R)."
+-msgstr "Видає список файлів позначених для копіювання з правого боку на лівий"
++msgstr "Показати файли, позначені <i>для копіювання з правого боку на лівий</i> (CTRL+R)."
+
+ #: Synchronizer/synchronizergui.cpp:1268
+-#, fuzzy
+ msgid "Show files marked to delete. (CTRL+T)"
+-msgstr "Видає список файлів позначених для видалення"
++msgstr "Показати список файлів, позначених для вилучення. (CTRL+T)"
+
+ #: Synchronizer/synchronizergui.cpp:1272
+ msgid "Duplicates"
+ msgstr "Дублікати"
+
+ #: Synchronizer/synchronizergui.cpp:1276
+-#, fuzzy
+ msgid "Show files that exist on both sides."
+-msgstr "Видає список файлів які існують на обох боках"
++msgstr "Показати список файлів, які існують на обох панелях."
+
+ #: Synchronizer/synchronizergui.cpp:1280
+ msgid "Singles"
+ msgstr "Одинарні"
+
+ #: Synchronizer/synchronizergui.cpp:1284
+-#, fuzzy
+ msgid "Show files that exist on one side only."
+-msgstr "Видає список файлів які існують на обох боках"
++msgstr "Показати список файлів, які існують тільки на одній панелі."
+
+ #: Synchronizer/synchronizergui.cpp:1293
+ msgid "The compare results of the synchronizer (CTRL+M)."
+-msgstr ""
++msgstr "Результати порівняння за допомогою синхронізатора (CTRL+M)."
+
+ #: Synchronizer/synchronizergui.cpp:1325
+ msgid "<=>"
+@@ -4186,52 +4040,48 @@
+ msgstr "&Синхронізатор"
+
+ #: Synchronizer/synchronizergui.cpp:1355
+-#, fuzzy
+ msgid "&Options"
+-msgstr "Дія"
++msgstr "&Параметри"
+
+ #: Synchronizer/synchronizergui.cpp:1364
+ msgid "Parallel threads:"
+-msgstr ""
++msgstr "Паралельних ниток:"
+
+ #: Synchronizer/synchronizergui.cpp:1375
+ msgid "Equality threshold:"
+-msgstr ""
++msgstr "Поріг еквівалентності:"
+
+ #: Synchronizer/synchronizergui.cpp:1383 Synchronizer/synchronizergui.cpp:1398
+ msgid "sec"
+-msgstr ""
++msgstr "сек."
+
+ #: Synchronizer/synchronizergui.cpp:1384 Synchronizer/synchronizergui.cpp:1399
+ msgid "min"
+-msgstr ""
++msgstr "хв."
+
+ #: Synchronizer/synchronizergui.cpp:1385 Synchronizer/synchronizergui.cpp:1400
+ msgid "hour"
+-msgstr ""
++msgstr "годин"
+
+ #: Synchronizer/synchronizergui.cpp:1386 Synchronizer/synchronizergui.cpp:1401
+-#, fuzzy
+ msgid "day"
+ msgstr "днів"
+
+ #: Synchronizer/synchronizergui.cpp:1389
+ msgid "Time shift (right-left):"
+-msgstr ""
++msgstr "Часовий зсув (права-ліва):"
+
+ #: Synchronizer/synchronizergui.cpp:1408
+-#, fuzzy
+ msgid "Ignore hidden files"
+-msgstr "Показувати приховані файли"
++msgstr "Ігнорувати приховані файли"
+
+ #: Synchronizer/synchronizergui.cpp:1422
+ msgid "Profile manager (Ctrl+P)."
+-msgstr ""
++msgstr "Керування профілями (Ctrl+P)."
+
+ #: Synchronizer/synchronizergui.cpp:1429
+-#, fuzzy
+ msgid "Swap sides (Ctrl+S)."
+-msgstr "Поміняти місцями"
++msgstr "Поміняти місцями (Ctrl+S)"
+
+ #: Synchronizer/synchronizergui.cpp:1439
+ msgid "Compare"
+@@ -4250,44 +4100,36 @@
+ msgstr "Синхронізувати"
+
+ #: Synchronizer/synchronizergui.cpp:1578
+-#, fuzzy
+ msgid "Selected files from targ&et directory:"
+-msgstr "Вибрати всі файли в поточному каталозі"
++msgstr "Обрані файли з каталогу &цілі:"
+
+ #: Synchronizer/synchronizergui.cpp:1579
+-#, fuzzy
+ msgid "Selected files from sou&rce directory:"
+-msgstr "Вибрати всі файли в поточному каталозі"
++msgstr "Вибрані файли в каталозі д&жерела:"
+
+ #: Synchronizer/synchronizergui.cpp:1583
+-#, fuzzy
+ msgid "Selected files from &left directory:"
+-msgstr "Розділити файл %1 в каталог:"
++msgstr "Вибрані файли в &лівому каталозі:"
+
+ #: Synchronizer/synchronizergui.cpp:1584
+-#, fuzzy
+ msgid "Selected files from &right directory:"
+-msgstr "Розділити файл %1 в каталог:"
++msgstr "Вибрані файли в &правому каталозі:"
+
+ #: Synchronizer/synchronizergui.cpp:1588
+-#, fuzzy
+ msgid "Targ&et directory:"
+-msgstr "Каталог цілі:"
++msgstr "Каталог &цілі:"
+
+ #: Synchronizer/synchronizergui.cpp:1589
+-#, fuzzy
+ msgid "Sou&rce directory:"
+-msgstr "Каталог джерела:"
++msgstr "Каталог д&жерела:"
+
+ #: Synchronizer/synchronizergui.cpp:1593
+-#, fuzzy
+ msgid "&Left directory:"
+-msgstr "Лівий каталог:"
++msgstr "&Лівий каталог:"
+
+ #: Synchronizer/synchronizergui.cpp:1594
+-#, fuzzy
+ msgid "&Right directory:"
+-msgstr "Правий каталог:"
++msgstr "&Правий каталог:"
+
+ #: Synchronizer/synchronizergui.cpp:1629
+ msgid "URL must be the descendant of either the left or the right base URL!"
+@@ -4298,79 +4140,64 @@
+ msgstr "Синхронізувати каталоги"
+
+ #: Synchronizer/synchronizergui.cpp:1690
+-#, fuzzy
+ msgid "E&xclude"
+-msgstr "Виключити"
++msgstr "Вик&лючити"
+
+ #: Synchronizer/synchronizergui.cpp:1692
+-#, fuzzy
+ msgid "Restore ori&ginal operation"
+-msgstr "Відновити первісну дію"
++msgstr "Відновити перві&сну операція"
+
+ #: Synchronizer/synchronizergui.cpp:1694
+-#, fuzzy
+ msgid "Re&verse direction"
+-msgstr "Зміна напрямку"
++msgstr "&Зміна напрямку"
+
+ #: Synchronizer/synchronizergui.cpp:1696
+-#, fuzzy
+ msgid "Copy from &right to left"
+-msgstr "Скопіювати з правого боку на лівий"
++msgstr "Копіювати з &правого боку на лівий"
+
+ #: Synchronizer/synchronizergui.cpp:1698
+-#, fuzzy
+ msgid "Copy from &left to right"
+-msgstr "Скопіювати з лівого боку на правий"
++msgstr "Копіювати з &лівого боку на правий"
+
+ #: Synchronizer/synchronizergui.cpp:1700
+-#, fuzzy
+ msgid "&Delete (left single)"
+-msgstr "Видалити (залишити одинарним)"
++msgstr "&Вилучити (залишити одинарним)"
+
+ #: Synchronizer/synchronizergui.cpp:1705
+-#, fuzzy
+ msgid "V&iew left file"
+-msgstr "Переглянути лівий файл"
++msgstr "Пе&реглянути лівий файл"
+
+ #: Synchronizer/synchronizergui.cpp:1707
+-#, fuzzy
+ msgid "Vi&ew right file"
+-msgstr "Переглянути правий файл"
++msgstr "Пере&глянути правий файл"
+
+ #: Synchronizer/synchronizergui.cpp:1709
+-#, fuzzy
+ msgid "&Compare Files"
+-msgstr "Порівняти файли"
++msgstr "&Порівняти файли"
+
+ #: Synchronizer/synchronizergui.cpp:1714
+-#, fuzzy
+ msgid "C&opy selected to clipboard (left)"
+-msgstr "Скопіювати в кишеню"
++msgstr "К&опіювати обране в кишеню (ліва)"
+
+ #: Synchronizer/synchronizergui.cpp:1715
+-#, fuzzy
+ msgid "Co&py selected to clipboard (right)"
+-msgstr "Скопіювати в кишеню"
++msgstr "Ко&піювати обране в кишеню (права)"
+
+ #: Synchronizer/synchronizergui.cpp:1719
+-#, fuzzy
+ msgid "&Select items"
+-msgstr "Вибрати елементи"
++msgstr "&Вибрати елементи"
+
+ #: Synchronizer/synchronizergui.cpp:1721
+-#, fuzzy
+ msgid "Deselec&t items"
+-msgstr "Скасувати вибір елементів"
++msgstr "Скасува&ти вибір елементів"
+
+ #: Synchronizer/synchronizergui.cpp:1723
+-#, fuzzy
+ msgid "I&nvert selection"
+-msgstr "Інвертувати вибір"
++msgstr "Ін&вертувати вибір"
+
+ #: Synchronizer/synchronizergui.cpp:1734
+-#, fuzzy
+ msgid "Synchronize with &KGet"
+-msgstr "Синхронізувати за допомогою KGet"
++msgstr "Синхронізувати за допомогою &KGet"
+
+ #: Synchronizer/synchronizergui.cpp:1798
+ msgid "Select items"
+@@ -4389,31 +4216,34 @@
+ "The synchronizer window contains data from a previous compare. If you exit, "
+ "this data will be lost. Do you really want to exit?"
+ msgstr ""
++"Вікно синхронізатора містить дані від попереднього порівняння. Якщо Ви вийдете, "
++"ці дані буде втрачено. Ви справді бажаєте вийти?"
+
+ #: Synchronizer/synchronizertask.cpp:134 Synchronizer/synchronizertask.cpp:141
+-#, fuzzy
+ msgid "Error at opening %1!"
+-msgstr "Помилка при відкритті адреси URL:%1!"
++msgstr "Помилка під час відкриття %1!"
+
+ #: Synchronizer/synchronizertask.cpp:302
+ msgid "IO error at comparing file %1 with %2!"
+ msgstr "Помилка В/В при порівнянні файла %1 з %2!"
+
+ #: Synchronizer/synchronizertask.cpp:339
+-#, fuzzy
+ msgid "Comparing file %1 (%2)..."
+-msgstr "Порівнюється файл %1..."
++msgstr "Порівнюється файл %1 (%2)..."
+
+ #: Synchronizer/synchronizedialog.cpp:49
+ msgid "Krusader::Synchronize"
+ msgstr "Krusader::Синхронізувати"
+
+ #: Synchronizer/synchronizedialog.cpp:53
+-#, fuzzy, c-format
++#, c-format
+ msgid ""
+ "_n: Right to left: Copy 1 file\n"
+ "Right to left: Copy %n files"
+-msgstr "З правого боку до лівого: скопіювати файлів - %1 (байтів - %2)"
++msgstr ""
++"Копіювати один файл ліворуч\n"
++"Копіювати %n файла ліворуч\n"
++"Копіювати %n файлів ліворуч"
+
+ #: Synchronizer/synchronizedialog.cpp:54 Synchronizer/synchronizedialog.cpp:67
+ #: Synchronizer/synchronizedialog.cpp:80
+@@ -4422,42 +4252,51 @@
+ "_n: (1 byte)\n"
+ "(%n bytes)"
+ msgstr ""
++"(1 байт)\n"
++"(%n байта)\n"
++"(%n байтів)"
+
+ #: Synchronizer/synchronizedialog.cpp:60 Synchronizer/synchronizedialog.cpp:73
+ #: Synchronizer/synchronizedialog.cpp:86
+-#, fuzzy
+ msgid ""
+ "_n: Ready: %1/1 file, %3/%4\n"
+ "Ready: %1/%n files, %3/%4"
+-msgstr "\tГотово: файлів - %1/%2, %3/%4"
++msgstr ""
++"Виконано: %1/1 файл, %3/%4\n"
++"Виконано: %1/%n файла, %3/%4\n"
++"Виконано: %1/%n файлів, %3/%4"
+
+ #: Synchronizer/synchronizedialog.cpp:66
+-#, fuzzy, c-format
++#, c-format
+ msgid ""
+ "_n: Left to right: Copy 1 file\n"
+ "Left to right: Copy %n files"
+-msgstr "З лівого боку до правого: скопіювати файлів - %1 (байтів - %2)"
++msgstr ""
++"Копіювати один файл праворуч\n"
++"Копіювати %n файла праворуч\n"
++"Копіювати %n файлів праворуч"
+
+ #: Synchronizer/synchronizedialog.cpp:79
+-#, fuzzy, c-format
++#, c-format
+ msgid ""
+ "_n: Left: Delete 1 file\n"
+ "Left: Delete %n files"
+-msgstr "Ліва: видалити файлів - %1 (байтів - %2)"
++msgstr ""
++"Ліва: Вилучено 1 файл\n"
++"Ліва: Вилучено %n файла\n"
++"Ліва: Вилучено %n файлів"
+
+ #: Synchronizer/synchronizedialog.cpp:101
+ msgid "Confirm overwrites"
+ msgstr "Підтверджувати перезаписування"
+
+ #: Synchronizer/synchronizedialog.cpp:110
+-#, fuzzy
+ msgid "&Start"
+-msgstr "Старт"
++msgstr "&Старт"
+
+ #: Synchronizer/synchronizedialog.cpp:114
+-#, fuzzy
+ msgid "&Pause"
+-msgstr "Пауза"
++msgstr "&Пауза"
+
+ #: Synchronizer/synchronizedialog.cpp:158
+ #: Synchronizer/synchronizedialog.cpp:161
+@@ -4477,12 +4316,12 @@
+ #: Synchronizer/synchronizer.cpp:157 Synchronizer/synchronizer.cpp:648
+ #, c-format
+ msgid "Number of files: %1"
+-msgstr ""
++msgstr "Кількість файлів: %1"
+
+ #: Synchronizer/synchronizer.cpp:188
+-#, fuzzy, c-format
++#, c-format
+ msgid "Number of compared directories: %1"
+-msgstr "Скановано каталоги:%1"
++msgstr "Кількість порівняний каталогів: %1"
+
+ #: Synchronizer/synchronizer.cpp:1151 Synchronizer/synchronizer.cpp:1164
+ msgid "File Already Exists"
+@@ -4494,7 +4333,7 @@
+
+ #: Synchronizer/synchronizer.cpp:1219
+ msgid "Error at deleting file %1!"
+-msgstr "Помилка при видаленні файла %1!"
++msgstr "Помилка під час вилучення файла %1!"
+
+ #: Synchronizer/synchronizer.cpp:1398
+ msgid "Krusader::Synchronizer"
+@@ -4509,46 +4348,40 @@
+ msgstr "Помилка виконання "
+
+ #: Synchronizer/feedtolistboxdialog.cpp:54
+-#, fuzzy
+ msgid "Krusader::Feed to listbox"
+-msgstr "Подача у список"
++msgstr "Krusader::Подача у список"
+
+ #: Synchronizer/feedtolistboxdialog.cpp:87
+ msgid "No elements to feed!"
+-msgstr ""
++msgstr "Відсутні елементи для обробки!"
+
+ #: Synchronizer/feedtolistboxdialog.cpp:101
+-#, fuzzy
+ msgid "Synchronize results"
+-msgstr "&Синхронізатор"
++msgstr "Результати синхронізації"
+
+ #: Synchronizer/feedtolistboxdialog.cpp:120
+ msgid "Side to feed:"
+-msgstr ""
++msgstr "Сторона для обробки:"
+
+ #: Synchronizer/feedtolistboxdialog.cpp:125
+ msgid "Left"
+-msgstr ""
++msgstr "Ліва"
+
+ #: Synchronizer/feedtolistboxdialog.cpp:126
+-#, fuzzy
+ msgid "Right"
+-msgstr "Права панель"
++msgstr "Права"
+
+ #: Synchronizer/feedtolistboxdialog.cpp:127
+-#, fuzzy
+ msgid "Both"
+-msgstr "місяців"
++msgstr "Обидві"
+
+ #: Synchronizer/feedtolistboxdialog.cpp:141
+-#, fuzzy
+ msgid "Selected files only"
+-msgstr " Вибрати файли "
++msgstr "Тільки обрані файли"
+
+ #: Synchronizer/feedtolistboxdialog.cpp:191
+-#, fuzzy
+ msgid "Cannot open %1!"
+-msgstr "Неможливо відкрити "
++msgstr "Неможливо відкрити %1!"
+
+ #: Konfigurator/kglookfeel.cpp:121 paneltabbar.cpp:35
+ msgid "Panel"
+@@ -4571,18 +4404,16 @@
+ msgstr "&Відкрити"
+
+ #: DiskUsage/radialMap/widgetEvents.cpp:192
+-#, fuzzy
+ msgid ""
+ "<qt>The directory at <i>'%1'</i> will be <b>recursively</b> and "
+ "<b>permanently</b> deleted!</qt>"
+ msgstr ""
+ "<qt>Каталог на <i>\"%1\"</i> буде <b>рекурсивно</b> і <b>назавжди</b> "
+-"видалено!"
++"вилучено!</qt>"
+
+ #: DiskUsage/radialMap/widgetEvents.cpp:193
+-#, fuzzy
+ msgid "<qt><i>'%1'</i> will be <b>permanently</b> deleted!</qt>"
+-msgstr "<qt><i>\"%1\"</i> буди <b>назавжди</b> видалено!"
++msgstr "<qt><i>\"%1\"</i> буди <b>назавжди</b> вилучено!</qt>"
+
+ #: DiskUsage/radialMap/builder.cpp:134
+ msgid "%1 files: ~ %2"
+@@ -4595,7 +4426,7 @@
+
+ #: DiskUsage/dulines.cpp:234
+ msgid "Line View"
+-msgstr "Рядковий вигляд"
++msgstr "Візуальне представлення"
+
+ #: DiskUsage/dulines.cpp:237 DiskUsage/dulistview.cpp:59
+ msgid "Percent"
+@@ -4683,7 +4514,7 @@
+
+ #: DiskUsage/diskusagegui.cpp:76
+ msgid "Line view"
+-msgstr "Рядковий вигляд"
++msgstr "Візуальне представлення"
+
+ #: DiskUsage/diskusagegui.cpp:81
+ msgid "Detailed view"
+@@ -4738,19 +4569,16 @@
+ msgstr "Krusader::Використання диска"
+
+ #: DiskUsage/diskusage.cpp:596
+-#, fuzzy
+ msgid "Do you really want to move this item to the trash?"
+-msgstr "Ви впевнені, що хочете видалити цей елемент???"
++msgstr "Ви впевнені, що хочете перемістити цей елемент у смітник?"
+
+ #: DiskUsage/diskusage.cpp:599
+-#, fuzzy
+ msgid "Do you really want to delete this item?"
+-msgstr "Ви впевнені, що хочете видалити цей елемент???"
++msgstr "Ви впевнені, що хочете вилучити цей елемент?"
+
+ #: DiskUsage/diskusage.cpp:611
+-#, fuzzy
+ msgid "Deleting %1..."
+-msgstr "Триває видалення файлів..."
++msgstr "Вилучення %1..."
+
+ #: DiskUsage/diskusage.cpp:727
+ msgid "Current directory:%1, Total size:%2, Own size:%3"
+@@ -4793,9 +4621,8 @@
+ msgstr "Попередн."
+
+ #: DiskUsage/diskusage.cpp:797
+-#, fuzzy
+ msgid "View"
+-msgstr "Огляд:"
++msgstr "Перегляд"
+
+ #: DiskUsage/diskusage.cpp:1031
+ msgid "Type:"
+@@ -4819,69 +4646,69 @@
+
+ #. i18n: file krusaderui.rc line 4
+ #: rc.cpp:3
+-#, fuzzy, no-c-format
++#, no-c-format
+ msgid "&File"
+-msgstr "Файл "
++msgstr "&Файл"
+
+ #. i18n: file krusaderui.rc line 36
+ #: rc.cpp:6
+-#, fuzzy, no-c-format
++#, no-c-format
+ msgid "&Edit"
+-msgstr " Правка"
++msgstr "&Редагування"
+
+ #. i18n: file krusaderui.rc line 51
+ #: rc.cpp:9
+ #, no-c-format
+ msgid "Compare Se&tup"
+-msgstr "Порівняння налаш&тування"
++msgstr "Налаш&тування порівняння"
+
+ #. i18n: file krusaderui.rc line 63
+ #: rc.cpp:12
+-#, fuzzy, no-c-format
++#, no-c-format
+ msgid "&View"
+-msgstr " Огляд"
++msgstr "&Вигляд"
+
+ #. i18n: file krusaderui.rc line 77
+ #: rc.cpp:15
+ #, no-c-format
+ msgid "&Go"
+-msgstr ""
++msgstr "&Перейти"
+
+ #. i18n: file krusaderui.rc line 88
+ #: rc.cpp:18
+-#, fuzzy, no-c-format
++#, no-c-format
+ msgid "User&actions"
+ msgstr "Дії &користувача"
+
+ #. i18n: file krusaderui.rc line 93
+ #: rc.cpp:21
+-#, fuzzy, no-c-format
++#, no-c-format
+ msgid "&Tools"
+-msgstr "Підказка"
++msgstr "&Інструменти"
+
+ #. i18n: file krusaderui.rc line 117
+ #: rc.cpp:24
+-#, fuzzy, no-c-format
++#, no-c-format
+ msgid "&Settings"
+-msgstr "Одинарні"
++msgstr "&Налаштування"
+
+ #. i18n: file krusaderui.rc line 127
+ #: rc.cpp:27
+-#, fuzzy, no-c-format
++#, no-c-format
+ msgid "Command Execution Mode Se&tup"
+-msgstr "Режим виконання"
++msgstr "Нала&штування режиму виконання команд"
+
+ #. i18n: file krusaderui.rc line 141
+ #: rc.cpp:30
+ #, no-c-format
+ msgid "&Window"
+-msgstr ""
++msgstr "&Вікно"
+
+ #. i18n: file krusaderui.rc line 158
+ #: rc.cpp:33
+ #, no-c-format
+ msgid "&Help"
+-msgstr ""
++msgstr "&Довідка"
+
+ #: Konfigurator/kgadvanced.cpp:48 Konfigurator/kgarchives.cpp:51
+ #: Konfigurator/kgcolors.cpp:51 Konfigurator/kgdependencies.cpp:53
+@@ -4896,7 +4723,7 @@
+
+ #: Konfigurator/kgdependencies.cpp:99
+ msgid "Checksum Utilities"
+-msgstr ""
++msgstr "Інструменти контрольної суми"
+
+ #: Konfigurator/kgdependencies.cpp:156
+ msgid "The %1 path is incorrect, no valid path found."
+@@ -4904,33 +4731,31 @@
+
+ #: Konfigurator/kgdependencies.cpp:159
+ msgid "The %1 path is incorrect, %2 used instead."
+-msgstr "Шлях %1 не є чинним, замість нього буде вживатись %2."
++msgstr "Шлях %1 не є чинним, замість нього буде використано %2."
+
+ #: Konfigurator/kggeneral.cpp:60
+ msgid "Delete files"
+-msgstr "Видалити файли"
++msgstr "Вилучити файли"
+
+ #: Konfigurator/kggeneral.cpp:60
+ msgid "Files will be permanently deleted."
+-msgstr "Файли буде видалено назавжди."
++msgstr "Файли буде вилучено назавжди."
+
+ #: Konfigurator/kggeneral.cpp:61
+ msgid "Move to trash"
+ msgstr "Пересунути у смітник"
+
+ #: Konfigurator/kggeneral.cpp:61
+-#, fuzzy
+ msgid "Files will be moved to trash when deleted."
+-msgstr "При видаленні файли буде пересунуто в смітник."
++msgstr "Файли буде переміщено у смітник, а потім вилучено."
+
+ #: Konfigurator/kggeneral.cpp:68
+ msgid "Use mimetype magic"
+-msgstr "Вживати mimetype magic"
++msgstr "Використовувати mimetype magic"
+
+ #: Konfigurator/kggeneral.cpp:69
+-#, fuzzy
+ msgid "Mimetype magic allows better distinction of file types, but is slower."
+-msgstr "Тип MIME magic краще розрізняє файли, але повільніше"
++msgstr "Mimetype magic дозволяє краще розрізняти типи файлів, але є повільнішим."
+
+ #: Konfigurator/kggeneral.cpp:76
+ msgid "Editor:"
+@@ -4941,53 +4766,50 @@
+ "Hint: use 'internal editor' if you want to use Krusader's fast built-in "
+ "editor"
+ msgstr ""
+-"Підказка: вживайте \"internal editor\", якщо ви хочете щоб Krusader "
++"Підказка: використовуйте \"internal editor\", якщо ви хочете щоб Krusader "
+ "використовував швидкий вбудований редактор"
+
+ #: Konfigurator/kggeneral.cpp:93
+ msgid "Default viewer mode:"
+-msgstr ""
++msgstr "Стандартний режим переглядача:"
+
+ #: Konfigurator/kggeneral.cpp:97
+-#, fuzzy
+ msgid "Generic mode"
+-msgstr "&Загальний переглядач"
++msgstr "Звичайний режим"
+
+ #: Konfigurator/kggeneral.cpp:97
+ msgid "Use the system's default viewer"
+-msgstr ""
++msgstr "Використовувати системний стандартний переглядач"
+
+ #: Konfigurator/kggeneral.cpp:98
+-#, fuzzy
+ msgid "Text mode"
+-msgstr "Текст каталогів:"
++msgstr "Текстовий режим"
+
+ #: Konfigurator/kggeneral.cpp:98
+ msgid "View the file in text-only mode"
+-msgstr ""
++msgstr "Переглянути файл у текстовому режимі"
+
+ #: Konfigurator/kggeneral.cpp:99
+-#, fuzzy
+ msgid "Hex mode"
+-msgstr "режим порівняння"
++msgstr "Шістнадцятковий режим"
+
+ #: Konfigurator/kggeneral.cpp:99
+ msgid "View the file in hex-mode (better for binary files)"
+-msgstr ""
++msgstr "Переглядати файл у шістнадцятковому режимі (краще для виконуваних файлів)"
+
+ #: Konfigurator/kggeneral.cpp:104
+ msgid "Internal editor and viewer opens each file in a separate window"
+-msgstr ""
++msgstr "Внутрішній редактор та переглядач відкривають файл у окремому вікні"
+
+ #: Konfigurator/kggeneral.cpp:105
+ msgid ""
+ "If checked, each file will open in a separate window, otherwise, the viewer "
+ "will work in a single, tabbed mode"
+-msgstr ""
++msgstr "Якщо відмічено, кожен файл буде відкрито у окремому вікні, інакше переглядача працюватиме у одному вікні з вкладками"
+
+ #: Konfigurator/kggeneral.cpp:115
+ msgid "Atomic extensions:"
+-msgstr ""
++msgstr "Елементарні розширення:"
+
+ #: Konfigurator/kggeneral.cpp:143
+ msgid "Terminal:"
+@@ -4995,116 +4817,105 @@
+
+ #: Konfigurator/kggeneral.cpp:150
+ msgid "Terminal Emulator sends Chdir on panel change"
+-msgstr ""
++msgstr "Емулятор термінал надішле Chdir після зміни панелей"
+
+ #: Konfigurator/kggeneral.cpp:151
+ msgid ""
+ "When checked, whenever the panel is changed (for example, by pressing TAB), "
+ "krusader changes the current directory in the terminal emulator."
+ msgstr ""
++"Якщо відмічено, під час зміни панелі (наприклад, коли натиснуто TAB), "
++"krusader змінить поточну теку у емуляторі терміналу."
+
+ #: Konfigurator/kggeneral.cpp:159
+ msgid "Temp Directory:"
+ msgstr "Тимчасовий каталог:"
+
+ #: Konfigurator/kggeneral.cpp:167
+-#, fuzzy
+ msgid "Note: you must have full permissions for the temporary directory!"
+-msgstr "Примітка: ви мусите мати повні права доступу до тимчасового каталогу!"
++msgstr "Зауваження: Ви мусите мати повні права доступу до тимчасового каталогу!"
+
+ #: Konfigurator/kggeneral.cpp:186
+-#, fuzzy
+ msgid "Searching for tools..."
+-msgstr ""
+-"Пошук за засобами...\n"
+-"Результати пошуку:\n"
+-"\n"
++msgstr "Пошук інструментів..."
+
+ #: Konfigurator/kggeneral.cpp:187
+-msgid ""
+-"Make sure to install new tools in your <code>$PATH</code> (e.g. /usr/bin)"
+-msgstr ""
++msgid "Make sure to install new tools in your <code>$PATH</code> (e.g. /usr/bin)"
++msgstr "Переконайтеся, що встановили нові інструменти до Вашої теки <code>$PATH</code> (наприклад /usr/bin)"
+
+ #: Konfigurator/kggeneral.cpp:195
+ msgid "Add new atomic extension"
+-msgstr ""
++msgstr "Додати нове елементарне розширення"
+
+ #: Konfigurator/kggeneral.cpp:195
+-#, fuzzy
+ msgid "Extension: "
+-msgstr "Розширення"
++msgstr "Розширення: "
+
+ #: Konfigurator/kggeneral.cpp:200
+ msgid ""
+ "Atomic extensions must start with '.'\n"
+ " and must contain at least one more '.' character"
+ msgstr ""
++"Елементарні розширення мають починатися з '.'\n"
++" та мають містити хоча б один додатковий символ '.'"
+
+ #: Konfigurator/krresulttable.cpp:121
+ msgid "unarj not found, but arj found, which will be used for unpacking"
+-msgstr ""
++msgstr "unarj не знайдено, але знайдено arj, який буде використано для розпакування"
+
+ #: Konfigurator/krresulttable.cpp:127
+ msgid "rpm found, but cpio not found which is required for unpacking"
+-msgstr ""
++msgstr "знайдено rpm, але не знайдено cpio, яка потрібна для розпакування"
+
+ #: Konfigurator/krresulttable.cpp:130 Konfigurator/krresulttable.cpp:283
+-#, fuzzy
+ msgid "Found"
+-msgstr "Текст:"
++msgstr "Знайдено"
+
+ #: Konfigurator/krresulttable.cpp:131
+-#, fuzzy
+ msgid "Packing"
+-msgstr "Пакувати"
++msgstr "Пакування"
+
+ #: Konfigurator/krresulttable.cpp:132
+-#, fuzzy
+ msgid "Unpacking"
+-msgstr "Розпаковуються файли"
++msgstr "Розпакування"
+
+ #: Konfigurator/krresulttable.cpp:133
+-#, fuzzy
+ msgid "Note"
+-msgstr "Немає"
++msgstr "Зауваження"
+
+ #: Konfigurator/krresulttable.cpp:196 Konfigurator/krresulttable.cpp:210
+ #: Konfigurator/krresulttable.cpp:356
+-#, fuzzy
+ msgid "enabled"
+-msgstr "Детально"
++msgstr "можливе"
+
+ #: Konfigurator/krresulttable.cpp:199 Konfigurator/krresulttable.cpp:213
+ #: Konfigurator/krresulttable.cpp:359
+ msgid "disabled"
+-msgstr ""
++msgstr "неможливе"
+
+ #: Konfigurator/krresulttable.cpp:276
+ msgid "diff utility"
+-msgstr ""
++msgstr "інструмент diff"
+
+ #: Konfigurator/krresulttable.cpp:277
+ msgid "email client"
+-msgstr ""
++msgstr "поштовий клієнт"
+
+ #: Konfigurator/krresulttable.cpp:278
+-#, fuzzy
+ msgid "batch renamer"
+-msgstr " Перейменувати"
++msgstr "пакетний перейменовувач"
+
+ #: Konfigurator/krresulttable.cpp:279
+ msgid "checksum utility"
+-msgstr ""
++msgstr "інструмент контрольної суми"
+
+ #: Konfigurator/krresulttable.cpp:282
+-#, fuzzy
+ msgid "Tool"
+-msgstr "Підказка"
++msgstr "Інструмент"
+
+ #: Konfigurator/krresulttable.cpp:284
+-#, fuzzy
+ msgid "Status"
+-msgstr "Запуск"
++msgstr "Статус"
+
+ #: Konfigurator/konfigurator.cpp:62
+ msgid "Defaults"
+@@ -5112,7 +4923,7 @@
+
+ #: Konfigurator/konfigurator.cpp:65
+ msgid "Konfigurator - Creating Your Own Krusader"
+-msgstr "Конфігуратор - створення вашого власного Krusader-а"
++msgstr "Конфігуратор - створення Вашого власного Krusader-а"
+
+ #: Konfigurator/konfigurator.cpp:90
+ msgid "Startup"
+@@ -5145,7 +4956,7 @@
+
+ #: Konfigurator/konfigurator.cpp:107
+ msgid "Customize the way Krusader deals with archives"
+-msgstr "Налаштуєте як Krusader поводиться з архівами"
++msgstr "Налаштуйте як Krusader поводитиметься з архівами"
+
+ #: Konfigurator/konfigurator.cpp:110
+ msgid "Dependencies"
+@@ -5157,7 +4968,7 @@
+
+ #: Konfigurator/konfigurator.cpp:113
+ msgid "Configure your personal actions"
+-msgstr "Налаштування ваших власних дій"
++msgstr "Налаштування Ваших власних дій"
+
+ #: Konfigurator/kgprotocols.cpp:108 Konfigurator/konfigurator.cpp:116
+ msgid "Protocols"
+@@ -5181,42 +4992,37 @@
+
+ #: Konfigurator/kglookfeel.cpp:85
+ msgid "Warn on exit"
+-msgstr "Попереджувати при виході"
++msgstr "Попереджати при виході"
+
+ #: Konfigurator/kglookfeel.cpp:85
+-#, fuzzy
+ msgid "Display a warning when trying to close the main window."
+-msgstr "Показувати попередження при спробі виходу з Krusader."
++msgstr "Показувати попередження за спроби закрити головне вікно."
+
+ #: Konfigurator/kglookfeel.cpp:86
+ msgid "Minimize to tray"
+ msgstr "Мінімізувати в лоток"
+
+ #: Konfigurator/kglookfeel.cpp:86
+-#, fuzzy
+ msgid ""
+ "The icon will appear in the system tray instead of the taskbar, when "
+ "Krusader is minimized."
+ msgstr ""
+-"При мінімізації Krusader його піктограма з'явиться в системному лотку, а не "
++"Після мінімізації Krusader його піктограма з'явиться в системному лотку, а не "
+ "в панелі задач."
+
+ #: Konfigurator/kglookfeel.cpp:87
+-#, fuzzy
+ msgid "Autoselect directories"
+ msgstr "Автоматичне позначення каталогів"
+
+ #: Konfigurator/kglookfeel.cpp:87
+-#, fuzzy
+ msgid ""
+ "When matching the select criteria, not only files will be selected, but also "
+ "directories."
+-msgstr "Коли критерії вибору співпадають, каталоги також будуть позначені"
++msgstr "Коли критерії вибору збігаються, каталоги також буде позначено."
+
+ #: Konfigurator/kglookfeel.cpp:88
+-#, fuzzy
+ msgid "Rename selects extension"
+-msgstr "Видалити цю дію?"
++msgstr "Перейменування обирає розширення"
+
+ #: Konfigurator/kglookfeel.cpp:88
+ msgid ""
+@@ -5224,32 +5030,32 @@
+ "Commander like renaming of just the name, without extension, uncheck this "
+ "option."
+ msgstr ""
++"Під час перейменування файла, буде обрано весь текст назви. Якщо Ви бажаєте перейменування "
++"у стилі Total Commander, тільки назви без розширення, не обирайте цього параметра."
+
+ #: Konfigurator/kglookfeel.cpp:89
+ msgid "Use full path tab names"
+ msgstr "Використовувати у вкладках назви з повним шляхом"
+
+ #: Konfigurator/kglookfeel.cpp:89
+-#, fuzzy
+ msgid ""
+ "Display the full path in the folder tabs. By default only the last part of "
+ "the path is displayed."
+ msgstr ""
+-"Показувати повний шлях вкладок тек; інакше, буде показано тільки останню "
++"Показувати повний шлях вкладок тек. Типово буде показано тільки кінцеву "
+ "частину шляху."
+
+ #: Konfigurator/kglookfeel.cpp:90
+ msgid "Fullscreen terminal (mc-style)"
+-msgstr ""
++msgstr "Повноекранний термінал (у стилі mc)"
+
+ #: Konfigurator/kglookfeel.cpp:90
+ msgid "Terminal is shown instead of the Krusader window (full screen)."
+-msgstr ""
++msgstr "Замість вікна Krusader буде видно термінал (на весь екран)."
+
+ #: Konfigurator/kglookfeel.cpp:99
+-#, fuzzy
+ msgid "Quicksearch"
+-msgstr "Швидкий пошук у новому стилі"
++msgstr "Швидкий пошук"
+
+ #: Konfigurator/kglookfeel.cpp:104
+ msgid "New style quicksearch"
+@@ -5301,7 +5107,7 @@
+
+ #: Konfigurator/kglookfeel.cpp:153
+ msgid "Use icons in the filenames"
+-msgstr "Вживати піктограми в назвах файлів"
++msgstr "Використовувати піктограми в назвах файлів"
+
+ #: Konfigurator/kglookfeel.cpp:153
+ msgid "Show the icons for filenames and folders."
+@@ -5309,7 +5115,7 @@
+
+ #: Konfigurator/kglookfeel.cpp:154
+ msgid "Use human-readable file size"
+-msgstr "Вживати розмір шрифту, легкий для читання"
++msgstr "Використовувати розмір шрифту, легкий для читання"
+
+ #: Konfigurator/kglookfeel.cpp:154
+ msgid "File sizes are displayed in B, KB, MB and GB, not just in bytes."
+@@ -5321,7 +5127,7 @@
+
+ #: Konfigurator/kglookfeel.cpp:155
+ msgid "Display files beginning with a dot."
+-msgstr ""
++msgstr "Показувати файли, що починаються з крапки."
+
+ #: Konfigurator/kglookfeel.cpp:156
+ msgid "Case sensitive sorting"
+@@ -5329,31 +5135,31 @@
+
+ #: Konfigurator/kglookfeel.cpp:157
+ msgid "Always sort dirs by name"
+-msgstr ""
++msgstr "Завжди сортувати каталоги за назвою"
+
+ #: Konfigurator/kglookfeel.cpp:157
+ msgid "Directories are sorted by name, regardless of the sort column."
+-msgstr ""
++msgstr "Каталоги сортуватимуться за назвою, незалежно від стовпчика сортування."
+
+ #: Konfigurator/kglookfeel.cpp:158
+-#, fuzzy
+ msgid "Numeric Permissions"
+-msgstr "Права Krusader"
++msgstr "Числова форма дозволів"
+
+ #: Konfigurator/kglookfeel.cpp:158
+ msgid ""
+ "Show octal numbers (0755) instead of the standard permissions (rwxr-xr-x) in "
+ "the permission column."
+ msgstr ""
++"Показувати вісімкові цифри (0755) замість стандартної форми запису (rwxr-xr-x) у "
++"стовпці дозволів."
+
+ #: Konfigurator/kglookfeel.cpp:172
+-#, fuzzy
+ msgid "Default panel type:"
+-msgstr "Ліва панель"
++msgstr "Типовий тип панелі:"
+
+ #: Konfigurator/kglookfeel.cpp:175
+ msgid "Brief"
+-msgstr ""
++msgstr "Коротко"
+
+ #: Konfigurator/kglookfeel.cpp:188
+ msgid "Panel Toolbar"
+@@ -5364,23 +5170,20 @@
+ msgstr "Показати пенал панелі"
+
+ #: Konfigurator/kglookfeel.cpp:196
+-#, fuzzy
+ msgid "The panel toolbar will be visible."
+-msgstr "Пенал буде видимий після запуску."
++msgstr "Панель інструментів буде видимою."
+
+ #: Konfigurator/kglookfeel.cpp:202
+ msgid "Visible Panel Toolbar buttons"
+ msgstr "Видимі кнопки пенала панелі"
+
+ #: Konfigurator/kglookfeel.cpp:208
+-#, fuzzy
+ msgid "Clear location bar button"
+-msgstr "Перескочити до адреси"
++msgstr "Кнопка очищення поля адреси"
+
+ #: Konfigurator/kglookfeel.cpp:208
+-#, fuzzy
+ msgid "Clears the location bar"
+-msgstr "Перескочити до адреси"
++msgstr "Очищує поле адреси"
+
+ #: Konfigurator/kglookfeel.cpp:209
+ msgid "Open button"
+@@ -5427,53 +5230,44 @@
+ msgstr "Кнопка перемикання синхронізованої навігації"
+
+ #: Konfigurator/kglookfeel.cpp:214
+-#, fuzzy
+-msgid ""
+-"Each directory change in the panel is also performed in the other panel."
+-msgstr "Кожна зміна каталогу в панелі також виконується в іншій панелі."
++msgid "Each directory change in the panel is also performed in the other panel."
++msgstr "Кожна зміна каталогу в цій панелі також виконується в іншій панелі."
+
+ #: Konfigurator/kglookfeel.cpp:234
+-#, fuzzy
+ msgid "Selection Mode"
+-msgstr "Нетиповий режим вибору"
++msgstr "Режим вибору"
+
+ #: Konfigurator/kglookfeel.cpp:248
+ msgid "Krusader Mode"
+ msgstr "Режим Krusader"
+
+ #: Konfigurator/kglookfeel.cpp:248
+-#, fuzzy
+ msgid ""
+ "Both keys allow selecting files. To select more than one file, hold the Ctrl "
+ "key and click the left mouse button. Right-click menu is invoked using a "
+ "short click on the right mouse button."
+ msgstr ""
+-"Обидві клавіші дають змогу вибирати файли. Щоб вибрати більше ніж один файл, "
+-"натисніть на клавішу Ctrl й клацніть\n"
+-"на ліву кнопку мишки. Контекстне меню викликається при швидкому клацанні на "
+-"праву кнопку мишки."
++"Обидві клавіші дають змогу обирати файли. Щоб вибрати більше ніж один файл, "
++"натисніть на клавішу Ctrl й клацніть лівою кнопкою мишки. Контекстне меню викликається швидким клацанням правою кнопкою мишки."
+
+ #: Konfigurator/kglookfeel.cpp:249
+ msgid "Konqueror Mode"
+ msgstr "Режим Konqueror"
+
+ #: Konfigurator/kglookfeel.cpp:249
+-#, fuzzy
+ msgid ""
+ "Pressing the left mouse button selects files - you can click and select "
+ "multiple files. Right-click menu is invoked using a short click on the right "
+ "mouse button."
+ msgstr ""
+ "Натискання на ліву кнопку мишки вибирає файли - можна клацнути і вибрати "
+-"декілька файлів.\n"
+-"Контекстне меню викликається при швидкому клацанні на праву кнопку мишки."
++"декілька файлів. Контекстне меню викликається швидким клацанням правою кнопкою мишки."
+
+ #: Konfigurator/kglookfeel.cpp:250
+ msgid "Total-Commander Mode"
+ msgstr "Режим Total-Commander"
+
+ #: Konfigurator/kglookfeel.cpp:250
+-#, fuzzy
+ msgid ""
+ "The left mouse button does not select, but sets the current file without "
+ "affecting the current selection. The right mouse button selects multiple "
+@@ -5481,9 +5275,7 @@
+ "mouse button."
+ msgstr ""
+ "Ліва кнопка мишки не вибирає, але вказує поточний файл не впливаючи на "
+-"вибір.\n"
+-"Права кнопка мишки вибирає декілька файлів, а контекстне меню викликається,\n"
+-"коли натиснути і тримати праву кнопку мишки."
++"поточний вибір. Права кнопка мишки вибирає декілька файлів, а контекстне меню викликається, коли натиснути і тримати праву кнопку мишки."
+
+ #: Konfigurator/kglookfeel.cpp:251 Konfigurator/kglookfeel.cpp:354
+ msgid "Custom Selection Mode"
+@@ -5494,7 +5286,6 @@
+ msgstr "Створіть свій власний режим вибору!"
+
+ #: Konfigurator/kglookfeel.cpp:261
+-#, fuzzy
+ msgid "Details"
+ msgstr "Детально"
+
+@@ -5515,22 +5306,20 @@
+ msgstr "Підкорятись глобальним правилам вибору KDE"
+
+ #: Konfigurator/kglookfeel.cpp:270
+-#, fuzzy
+ msgid ""
+ "<p>Use KDE's global setting:</p><p><i>KDE Control Center -> Peripherals -> "
+ "Mouse</i></p>"
+ msgstr ""
+-"Використовувати параметри KDE Kcontrol: Центр керування KDE ->Периферійні "
+-"пристрої->Мишка"
++"<p>Використовувати глобальні параметри KDE:</p><p>Центр керування KDE -> Периферійні "
++"пристрої -> Мишка</i></p>"
+
+ #: Konfigurator/kglookfeel.cpp:282
+ msgid "Based on KDE's selection mode"
+ msgstr "Оснований на режимі вибору KDE"
+
+ #: Konfigurator/kglookfeel.cpp:283
+-#, fuzzy
+ msgid "If checked, use a mode based on KDE's style."
+-msgstr "Увімкнення цього параметра створить режим оснований на стилі KDE."
++msgstr "Увімкнення цього параметра увімкне режим заснований на стилі KDE."
+
+ #: Konfigurator/kglookfeel.cpp:285
+ msgid "Left mouse button selects"
+@@ -5538,8 +5327,7 @@
+
+ #: Konfigurator/kglookfeel.cpp:286
+ msgid "If checked, left clicking an item will select it."
+-msgstr ""
+-"Якщо увімкнено, клацання лівою кнопкою мишки на елемент - вибирає його."
++msgstr "Якщо увімкнено, клацання лівою кнопкою мишки на елемент - вибирає його."
+
+ #: Konfigurator/kglookfeel.cpp:288
+ msgid "Left mouse button preserves selection"
+@@ -5558,14 +5346,13 @@
+ msgstr "Shift/Ctrl-ліва кнопка мишки вибирає"
+
+ #: Konfigurator/kglookfeel.cpp:292
+-#, fuzzy
+ msgid ""
+ "If checked, shift/ctrl left clicking will select items. \n"
+ "Note: This is meaningless if 'Left Button Selects' is checked."
+ msgstr ""
+-"Якщо увімкнено, клацання shift/ctrl та лівою кнопкою мишки на елемент - "
+-"вибирає його. Примітка: не має сенсу, якщо увімкнено \"Ліва кнопка мишки "
+-"вибирає\"."
++"Якщо увімкнено, клацання shift/ctrl та лівою кнопкою мишки на елементі - "
++"вибирає його.\n"
++"Зауваження: не має сенсу, якщо увімкнено \"Ліва кнопка мишки вибирає\"."
+
+ #: Konfigurator/kglookfeel.cpp:294
+ msgid "Right mouse button selects"
+@@ -5573,8 +5360,7 @@
+
+ #: Konfigurator/kglookfeel.cpp:295
+ msgid "If checked, right clicking an item will select it."
+-msgstr ""
+-"Якщо увімкнено, клацання правою кнопкою мишки на елемент - вибирає його."
++msgstr "Якщо увімкнено, клацання правою кнопкою мишки на елемент - вибирає його."
+
+ #: Konfigurator/kglookfeel.cpp:297
+ msgid "Right mouse button preserves selection"
+@@ -5593,77 +5379,73 @@
+ msgstr "Shift/Ctrl-права кнопка мишки вибирає"
+
+ #: Konfigurator/kglookfeel.cpp:301
+-#, fuzzy
+ msgid ""
+ "If checked, shift/ctrl right clicking will select items. \n"
+ "Note: This is meaningless if 'Right Button Selects' is checked."
+ msgstr ""
+-"Якщо увімкнено, клацання shift/ctrl та правою кнопкою мишки на елемент - "
+-"вибирає його. Примітка: не має сенсу, якщо увімкнено \"Права кнопка мишки "
+-"вибирає\"."
++"Якщо увімкнено, клацання shift/ctrl та правою кнопкою мишки на елемент "
++"вибирає його.\n"
++"Зауваження: не має сенсу, якщо увімкнено \"Права кнопка мишки вибирає\"."
+
+ #: Konfigurator/kglookfeel.cpp:303
+ msgid "Spacebar moves down"
+ msgstr "Кнопка пробілу пересуває вниз"
+
+ #: Konfigurator/kglookfeel.cpp:304
+-#, fuzzy
+ msgid ""
+ "If checked, pressing the spacebar will select the current item and move "
+ "down. \n"
+ "Otherwise, current item is selected, but remains the current item."
+ msgstr ""
+ "Якщо увімкнено, натискання на клавішу пробілу буде вибирати поточний елемент "
+-"й пересуватись вниз. Інакше, буде вибрано поточний елемент, але залишиться "
+-"поточний елемент."
++"й пересуватись вниз.\n"
++"Інакше, буде вибрано поточний елемент, але просування за списком не буде."
+
+ #: Konfigurator/kglookfeel.cpp:306
+ msgid "Spacebar calculates disk space"
+ msgstr "Кнопка пробілу підраховує місце на диску"
+
+ #: Konfigurator/kglookfeel.cpp:307
+-#, fuzzy
+ msgid ""
+ "If checked, pressing the spacebar while the current item is a folder, will "
+ "(except from selecting the folder) \n"
+ "calculate space occupied by the folder (recursively)."
+ msgstr ""
+-"Якщо увімкнено, натискання на клавішу пробілу, коли поточний елемент - це "
+-"тека, буде підраховувати місце зайняти текою (рекурсивно)."
++"Якщо увімкнено, натискання на клавішу пробілу, коли поточний елемент це "
++"тека, буде (за виключенням випадку вибору теки)\n"
++"підраховувати місце зайняте текою (рекурсивно)."
+
+ #: Konfigurator/kglookfeel.cpp:309
+ msgid "Insert moves down"
+ msgstr "Insert пересуває вниз"
+
+ #: Konfigurator/kglookfeel.cpp:310
+-#, fuzzy
+ msgid ""
+ "If checked, pressing INSERT will select the current item, and move down to "
+ "the next item. \n"
+ "Otherwise, current item is not changed."
+ msgstr ""
+ "Якщо увімкнено, натискання INSERT буде вибирати поточний елемент й "
+-"пересуватись вниз до іншого елемента. Інакше, поточний елемент залишиться "
+-"без зміни."
++"пересуватись вниз до іншого елемента.\n"
++"Інакше, поточний елемент залишиться незмінним."
+
+ #: Konfigurator/kglookfeel.cpp:312
+ msgid "Right clicking pops context menu immediately"
+ msgstr "Клацання на праву кнопку мишки негайно викликає контекстне меню"
+
+ #: Konfigurator/kglookfeel.cpp:313
+-#, fuzzy
+ msgid ""
+ "If checked, right clicking will result in an immediate showing of the "
+ "context menu. \n"
+ "Otherwise, user needs to click and hold the right mouse button for 500ms."
+ msgstr ""
+ "Якщо увімкнено, натискання правою кнопкою мишки призведе до негайного показу "
+-"контекстного меню. Інакше, користувач мусить натиснути і потримати праву "
+-"кнопку мишки 500 мс."
++"контекстного меню.\n"
++"Інакше, користувач мусить натиснути і потримати праву кнопку мишки 500 мс."
+
+ #: Konfigurator/kgadvanced.cpp:63
+ msgid "Preserve attributes for local copy/move (slower)"
+-msgstr ""
++msgstr "Зберігати атрибути під час локального переміщення або копіювання (сповільнення)"
+
+ #: Konfigurator/kgadvanced.cpp:63
+ msgid ""
+@@ -5673,6 +5455,10 @@
+ "root or member of the group</li><li>Preserving the timestamp</li></"
+ "ul><b>Note</b>: This can slow down the copy process."
+ msgstr ""
++"Krusader спробує зберегти всі атрибути (час, власника, групу) для "
++"локальних файлів у відповідності до джерела та Ваших дозволів:"
++"<ul><li>Збереження користувача, якщо Ви привілейований користувач</li><li>Збереження групи, якщо Ви привілейований користувач або член групи</li><li>Збереження часової мітки</li></"
++"ul><b>Зауваження</b>: Це може сповільнити процес копіювання."
+
+ #: Konfigurator/kgadvanced.cpp:64
+ msgid "Automount filesystems"
+@@ -5683,17 +5469,20 @@
+ "When stepping into a directory which is defined as a mount point in the "
+ "<b>fstab</b>, try mounting it with the defined parameters."
+ msgstr ""
++"Під час відкриття теки, яка визначена як точка монтування у "
++"<b>fstab</b>, намагатися примонтувати її з типовими параметрами."
+
+ #: Konfigurator/kgadvanced.cpp:65
+-msgid ""
+-"Don't use KDE's media protocol for media button (if it's buggy or missing)"
+-msgstr ""
++msgid "Don't use KDE's media protocol for media button (if it's buggy or missing)"
++msgstr "Не використовувати протокол носія від KDE для кнопки носія (якщо він нестабільний або відсутній)"
+
+ #: Konfigurator/kgadvanced.cpp:65
+ msgid ""
+ "Select if your media protocol is buggy (in some older KDE versions), or not "
+ "present (no kdebase package installed)."
+ msgstr ""
++"Оберіть це якщо протокол носія нестабільний (у деяких старих версіях KDE), або "
++"відсутній (не встановлено пакунку kdebase)."
+
+ #: Konfigurator/kgadvanced.cpp:74
+ msgid "MountMan won't (un)mount the following mount-points:"
+@@ -5704,18 +5493,16 @@
+ msgstr "Підтвердження"
+
+ #: Konfigurator/kgadvanced.cpp:91
+-#, fuzzy
+ msgid "Request user confirmation for the following operations:"
+-msgstr ""
+-"Для наступних дій Krusader буде запитувати у користувача про підтвердження:"
++msgstr "Krusader буде запитувати користувача про підтвердження:"
+
+ #: Konfigurator/kgadvanced.cpp:96
+ msgid "Deleting non-empty directories"
+-msgstr "Видалення непорожніх каталогів"
++msgstr "Вилучення непорожніх каталогів"
+
+ #: Konfigurator/kgadvanced.cpp:97
+ msgid "Deleting files"
+-msgstr "Видалення файлів"
++msgstr "Вилучення файлів"
+
+ #: Konfigurator/kgadvanced.cpp:98
+ msgid "Copying files"
+@@ -5733,11 +5520,11 @@
+ msgid ""
+ "Ask for a result name when feeding items to the listbox. By default the "
+ "standard value is used."
+-msgstr ""
++msgstr "Запитати про назву під час подачі пунктів до списку. Типово буде використано стандартну назву."
+
+ #: Konfigurator/kgadvanced.cpp:101
+ msgid "Removing Useractions"
+-msgstr "Видалення дій користувача"
++msgstr "Вилучення дій користувача"
+
+ #: Konfigurator/kgadvanced.cpp:112 Konfigurator/kgarchives.cpp:89
+ msgid "Fine-Tuning"
+@@ -5748,13 +5535,12 @@
+ msgstr "Розмір кешу для піктограм (КБ):"
+
+ #: Konfigurator/kgadvanced.cpp:117 Konfigurator/kgadvanced.cpp:121
+-#, fuzzy
+ msgid ""
+ "The icon cache size influences how fast the contents of a panel can be "
+ "displayed. However, too large a cache might consume your memory."
+ msgstr ""
+-"Розмір кешу визначає швидкість, з якою Krusader зможе показувати вміст "
+-"панелі. Однак, занадто великий розмір може споживати забагато пам'яті."
++"Розмір кешу піктограм визначає швидкість, з якою Krusader зможе показувати вміст "
++"панелі. Однак, занадто великий розмір може використовувати забагато пам'яті."
+
+ #: Konfigurator/kgadvanced.cpp:125
+ msgid "Arguments of updatedb:"
+@@ -5769,24 +5555,20 @@
+ msgstr "Визначені посилання"
+
+ #: Konfigurator/kgprotocols.cpp:85
+-#, fuzzy
+ msgid "Add protocol to the link list."
+-msgstr "Додати протокол до списку посилань"
++msgstr "Додати протокол до списку посилань."
+
+ #: Konfigurator/kgprotocols.cpp:88
+-#, fuzzy
+ msgid "Remove protocol from the link list."
+-msgstr "Видалити протокол із списку посилань"
++msgstr "Вилучити протокол із списку посилань."
+
+ #: Konfigurator/kgprotocols.cpp:98
+-#, fuzzy
+ msgid "Add mime to the selected protocol on the link list."
+-msgstr "Додати тип mime до вибраного протоколу в списку посилань"
++msgstr "Додати тип mime до вибраного протоколу в списку посилань."
+
+ #: Konfigurator/kgprotocols.cpp:101
+-#, fuzzy
+ msgid "Remove mime from the link list."
+-msgstr "Видалити тип mime із списку посилань"
++msgstr "Вилучити тип mime із списку посилань."
+
+ #: Konfigurator/kgprotocols.cpp:119
+ msgid "Mimes"
+@@ -5866,55 +5648,54 @@
+
+ #: Konfigurator/kgcolors.cpp:59
+ msgid "Use the default KDE colors"
+-msgstr "Вживати типові кольори KDE"
++msgstr "Використовувати типові кольори KDE"
+
+ #: Konfigurator/kgcolors.cpp:59
+-#, fuzzy
+ msgid ""
+ "<p>Use KDE's global color configuration.</p><p><i>KDE Control Center -> "
+ "Appearance & Themes -> Colors</i></p>"
+ msgstr ""
+-"Використовувати параметри KDE Kcontrol: Центр керування KDE ->Периферійні "
+-"пристрої->Мишка"
++"<p>Використовувати загальне налаштування кольорів KDE.</p><p><i>Центр керування KDE ->Вигляд та теми "
++"-> Кольори</i></p>"
+
+ #: Konfigurator/kgcolors.cpp:60
+ msgid "Use alternate background color"
+-msgstr "Вживати альтернативний колір тла"
++msgstr "Використовувати альтернативний колір тла"
+
+ #: Konfigurator/kgcolors.cpp:60
+-#, fuzzy
+ msgid ""
+ "<p>The <b>background color</b> and the <b>alternate background</b> color "
+ "alternates line by line.</p><p>When you don't use the <i>KDE default colors</"
+ "i>, you can configure the alternate colors in the <i>colors</i> box.</p>"
+ msgstr ""
+-"Колір тла та альтернативний колір тла чергуються рядок за рядком.\n"
+-"Якщо ви не використовуєте типові кольори KDE, ви можете налаштувати "
+-"альтернативні кольори в рамці кольорів."
++"<p><b>Колір тла</b> та <b>альтернативний колір тла</b> чергуються рядок за рядком.</p><p>"
++"Якщо ви не використовуєте <i>типові кольори KDE</i>, Ви можете налаштувати "
++"альтернативні кольори в рамці <i>кольорів</i>."
+
+ #: Konfigurator/kgcolors.cpp:61
+ msgid "Show current item even if not focused"
+ msgstr "Показувати поточний елемент, навіть, якщо не в фокусі"
+
+ #: Konfigurator/kgcolors.cpp:61
+-#, fuzzy
+ msgid ""
+ "<p>Shows the last cursor position in the non active list panel.</p><p>This "
+ "option is only available when you don't use the <i>KDE default colors</i>.</"
+ "p>"
+ msgstr ""
+-"Показує останню позицію курсора в неактивній панелі списку. Цей\n"
+-"параметр доступний тільки, якщо ви не використовуєте типові кольори KDE."
++"<p>Показує останню позицію курсора в неактивній панелі списку.</p><p>Цей\n"
++"параметр доступний тільки, якщо ви не використовуєте <i>типові кольори KDE</i>.</p>"
+
+ #: Konfigurator/kgcolors.cpp:62
+ msgid "Dim the colors of the inactive panel"
+-msgstr ""
++msgstr "Притлумлювати кольори неактивної панелі"
+
+ #: Konfigurator/kgcolors.cpp:62
+ msgid ""
+ "<p>The colors of the inactive panel are calculated by a dim color and a dim "
+ "factor.</p>"
+ msgstr ""
++"<p>Кольори неактивної панелі обчислюються з кольором притлумлення та "
++"його множником.</p>"
+
+ #: Konfigurator/kgcolors.cpp:89
+ msgid "Active"
+@@ -5963,28 +5744,24 @@
+ msgstr "Альтернативне тло:"
+
+ #: Konfigurator/kgcolors.cpp:105 Konfigurator/kgcolors.cpp:141
+-#, fuzzy
+ msgid "Selected foreground:"
+-msgstr "Текст каталогів:"
++msgstr "Обраний передній план:"
+
+ #: Konfigurator/kgcolors.cpp:106 Konfigurator/kgcolors.cpp:142
+-#, fuzzy
+ msgid "Selected background:"
+-msgstr "Альтернативне тло:"
++msgstr "Обране тло:"
+
+ #: Konfigurator/kgcolors.cpp:107 Konfigurator/kgcolors.cpp:143
+ msgid "Same as alt. background"
+ msgstr "Такий як альтернативного тла"
+
+ #: Konfigurator/kgcolors.cpp:108 Konfigurator/kgcolors.cpp:145
+-#, fuzzy
+ msgid "Alternate selected background:"
+ msgstr "Альтернативне позначене тло:"
+
+ #: Konfigurator/kgcolors.cpp:108 Konfigurator/kgcolors.cpp:144
+-#, fuzzy
+ msgid "Same as selected background"
+-msgstr "Такий як альтернативного тла"
++msgstr "Такий як обране тло"
+
+ #: Konfigurator/kgcolors.cpp:109 Konfigurator/kgcolors.cpp:146
+ msgid "Current foreground:"
+@@ -5993,17 +5770,15 @@
+ #: Konfigurator/kgcolors.cpp:109 Konfigurator/kgcolors.cpp:111
+ #: Konfigurator/kgcolors.cpp:112
+ msgid "Not used"
+-msgstr "Не вживається"
++msgstr "Не використовується"
+
+ #: Konfigurator/kgcolors.cpp:110 Konfigurator/kgcolors.cpp:147
+-#, fuzzy
+ msgid "Same as selected foreground"
+-msgstr "Таке ж як і позначений текст"
++msgstr "Таке ж як і обраний передній план"
+
+ #: Konfigurator/kgcolors.cpp:111 Konfigurator/kgcolors.cpp:148
+-#, fuzzy
+ msgid "Selected current foreground:"
+-msgstr "Позначений поточний текст:"
++msgstr "Позначений поточний передній план:"
+
+ #: Konfigurator/kgcolors.cpp:112 Konfigurator/kgcolors.cpp:149
+ msgid "Current background:"
+@@ -6025,72 +5800,59 @@
+
+ #: Konfigurator/kgcolors.cpp:168
+ msgid "Dim target color:"
+-msgstr ""
++msgstr "Цільовий колір притлумлення:"
+
+ #: Konfigurator/kgcolors.cpp:171
+-#, fuzzy
+ msgid "Dim factor:"
+-msgstr "Каталоги:"
++msgstr "Множник притлумлення:"
+
+ #: Konfigurator/kgcolors.cpp:184
+-#, fuzzy
+ msgid "Synchronizer"
+-msgstr "&Синхронізатор"
++msgstr "Синхронізатор"
+
+ #: Konfigurator/kgcolors.cpp:190 Konfigurator/kgcolors.cpp:191
+-#, fuzzy
+ msgid "KDE default"
+-msgstr "Стандартні значення"
++msgstr "Стандартні значення KDE"
+
+ #: Konfigurator/kgcolors.cpp:195
+-#, fuzzy
+ msgid "Equals foreground:"
+-msgstr "Текст програми:"
++msgstr "Передній план спільне:"
+
+ #: Konfigurator/kgcolors.cpp:196
+-#, fuzzy
+ msgid "Equals background:"
+-msgstr "Позначене тло:"
++msgstr "Тло спільне:"
+
+ #: Konfigurator/kgcolors.cpp:197
+-#, fuzzy
+ msgid "Differing foreground:"
+-msgstr "Текст каталогів:"
++msgstr "Передній план різне:"
+
+ #: Konfigurator/kgcolors.cpp:198
+-#, fuzzy
+ msgid "Differing background:"
+-msgstr "Альтернативне тло:"
++msgstr "Тло різне:"
+
+ #: Konfigurator/kgcolors.cpp:199
+-#, fuzzy
+ msgid "Copy to left foreground:"
+-msgstr "Поточний текст:"
++msgstr "Передній план копіювання ліворуч:"
+
+ #: Konfigurator/kgcolors.cpp:200
+-#, fuzzy
+ msgid "Copy to left background:"
+-msgstr "Поточне тло:"
++msgstr "Тло копіювання ліворуч:"
+
+ #: Konfigurator/kgcolors.cpp:201
+-#, fuzzy
+ msgid "Copy to right foreground:"
+-msgstr "Поточний текст:"
++msgstr "Передній план копіювання праворуч:"
+
+ #: Konfigurator/kgcolors.cpp:202
+-#, fuzzy
+ msgid "Copy to right background:"
+-msgstr "Поточне тло:"
++msgstr "Тло копіювання праворуч:"
+
+ #: Konfigurator/kgcolors.cpp:203
+-#, fuzzy
+ msgid "Delete foreground:"
+-msgstr "Текст каталогів:"
++msgstr "Передній план вилучення:"
+
+ #: Konfigurator/kgcolors.cpp:204
+-#, fuzzy
+ msgid "Delete background:"
+-msgstr "Альтернативне тло:"
++msgstr "Тло вилучення:"
+
+ #: Konfigurator/kgcolors.cpp:228
+ msgid "Import color-scheme"
+@@ -6101,19 +5863,16 @@
+ msgstr "Експортувати схему кольорів"
+
+ #: Konfigurator/kgcolors.cpp:411
+-#, fuzzy
+ msgid "Selected + Current"
+-msgstr "Здублювати вкладку"
++msgstr "Обране + Поточний"
+
+ #: Konfigurator/kgcolors.cpp:412
+-#, fuzzy
+ msgid "Selected 2"
+-msgstr " Вибрати файли "
++msgstr "Обране 2"
+
+ #: Konfigurator/kgcolors.cpp:413
+-#, fuzzy
+ msgid "Selected 1"
+-msgstr " Вибрати файли "
++msgstr "Обране 1"
+
+ #: Konfigurator/kgcolors.cpp:414
+ msgid "Current"
+@@ -6132,23 +5891,20 @@
+ msgstr "Прикладна програма"
+
+ #: Konfigurator/kgcolors.cpp:475
+-#, fuzzy
+ msgid "Copy to right"
+-msgstr "Скопіювати з лівого боку на правий"
++msgstr "Копіювати з лівого боку на правий"
+
+ #: Konfigurator/kgcolors.cpp:476
+-#, fuzzy
+ msgid "Copy to left"
+-msgstr "Скопіювати з правого боку на лівий"
++msgstr "Копіювати з правого боку на лівий"
+
+ #: Konfigurator/kgcolors.cpp:477
+ msgid "Differing"
+-msgstr ""
++msgstr "Пошук відмінностей"
+
+ #: Konfigurator/kgcolors.cpp:478
+-#, fuzzy
+ msgid "Equals"
+-msgstr "Дорівнює"
++msgstr "Вирівнювання"
+
+ #: Konfigurator/kgcolors.cpp:504
+ msgid "Select a color-scheme file"
+@@ -6181,32 +5937,33 @@
+ "li></ul><b><Last session></b> is a special panel profile which is "
+ "saved automatically when Krusader is closed."
+ msgstr ""
++"Визначає профіль панелі, використовуваний під час запуску. Профіль панелі містить:"
++"<ul><li>всі шляхи вкладок</li><li>поточна вкладка</li><li>активна панель</"
++"li></ul><b><Останній сеанс></b> є особливим профілем панелі, що збережено автоматично під час закриття Krusader."
+
+ #: Konfigurator/kgstartup.cpp:51
+-#, fuzzy
+ msgid "Startup profile:"
+-msgstr "Пошук файлів"
++msgstr "Стартовий профіль:"
+
+ #: Konfigurator/kgstartup.cpp:56
+-#, fuzzy
+ msgid "Last session"
+-msgstr "Новий сеанс"
++msgstr "Останній сеанс"
+
+ #: Konfigurator/kgstartup.cpp:72
+ msgid "Show splashscreen"
+-msgstr ""
++msgstr "Показувати вікно анонсу"
+
+ #: Konfigurator/kgstartup.cpp:72
+ msgid "Display a splashscreen when starting krusader."
+-msgstr ""
++msgstr "Показувати віконце анонсу під час запуску krusader."
+
+ #: Konfigurator/kgstartup.cpp:73
+ msgid "Single instance mode"
+-msgstr ""
++msgstr "Режим запуску однієї копії"
+
+ #: Konfigurator/kgstartup.cpp:73
+ msgid "Only one Krusader instance is allowed to run."
+-msgstr ""
++msgstr "Буде дозволено запуск тільки однієї копії Krusader."
+
+ #: Konfigurator/kgstartup.cpp:83
+ msgid "User Interface"
+@@ -6217,13 +5974,12 @@
+ msgstr "Зберегти параметри при виході"
+
+ #: Konfigurator/kgstartup.cpp:88
+-#, fuzzy
+ msgid ""
+ "Check the state of the user interface components and restore them to their "
+ "condition when last shutdown."
+ msgstr ""
+-"Krusader перевіряє стан компонентів інтерфейсу користувача\n"
+-"й відновлює їх до стану, у якому вони були перед закриттям."
++"Krusader перевіряє стан компонентів інтерфейсу користувача "
++"і відновлює їх до стану, у якому вони були перед останнім закриттям."
+
+ #: Konfigurator/kgstartup.cpp:89
+ msgid "Show toolbar"
+@@ -6270,7 +6026,6 @@
+ msgstr "Зберегти останню позицію і розмір та параметри панелі"
+
+ #: Konfigurator/kgstartup.cpp:94
+-#, fuzzy
+ msgid ""
+ "<p>At startup, the main window will resize itself to the size it was when "
+ "last shutdown. It will also appear in the same location of the screen, "
+@@ -6278,23 +6033,22 @@
+ "is disabled, you can use the menu <i>Window -> Save Position</i> option to "
+ "manually set the main window's size and position at startup.</p>"
+ msgstr ""
+-"При запуску Krusader змінить свої розміри до тих, які були перед закриттям.\n"
++"<p>Під час запуску Krusader змінить свої розміри до тих, які були перед закриттям. "
+ "Також, Krusader з'явиться на екрані в тому самому місці, а його панелі "
+-"впорядковані та вирівняні як і були.\n"
+-"Якщо цей параметр вимкнено, можете скористатись меню \"Параметри - Зберегти "
+-"позицію,\n"
+-"щоб вручну вказати розмір та позицію програми Krusader при запуску"
++"впорядковані та вирівняні як і були.</p><p>"
++"Якщо цей параметр вимкнено, можете скористатись меню <i>Вікно -> Зберегти "
++"позицію</i>,"
++"щоб вручну вказати розмір та позицію програми Krusader під час запуску."
+
+ #: Konfigurator/kgstartup.cpp:95
+-#, fuzzy
+ msgid "Start to tray"
+-msgstr "Шлях початку"
++msgstr "Запуск у лоток"
+
+ #: Konfigurator/kgstartup.cpp:95
+ msgid ""
+ "Krusader starts to tray (if minimize to tray is set), without showing the "
+ "main window"
+-msgstr ""
++msgstr "Krusader буде запущено у лотку (якщо увімкнено мінімізувати до лотка), не показуючи головного вікна"
+
+ #: Konfigurator/kgarchives.cpp:54
+ msgid "Krusader transparently handles the following types of archives:"
+@@ -6338,11 +6092,11 @@
+
+ #: Konfigurator/kgarchives.cpp:68
+ msgid "Deb"
+-msgstr ""
++msgstr "Deb"
+
+ #: Konfigurator/kgarchives.cpp:69
+ msgid "7zip"
+-msgstr ""
++msgstr "7zip"
+
+ #: Konfigurator/kgarchives.cpp:75
+ msgid ""
+@@ -6350,8 +6104,8 @@
+ "system last time Krusader checked. If you wish Krusader to\n"
+ "search again, click the 'Auto Configure' button."
+ msgstr ""
+-"Архіви, які \"затінені\" не були доступні у вашій системі,\n"
+-"коли Krusader востаннє зондував її. Якщо хочете, щоб Krusader\n"
++"Архіви, які \"затінені\" не були доступні у Вашій системі,\n"
++"коли Krusader востаннє сканував її. Якщо хочете, щоб Krusader\n"
+ "знову пошукав, натисніть кнопку \"Автоматичне налаштування\"."
+
+ #: Konfigurator/kgarchives.cpp:80
+@@ -6359,12 +6113,10 @@
+ msgstr "Автоматичне налаштування"
+
+ #: Konfigurator/kgarchives.cpp:95
+-#, fuzzy
+ msgid "Test archive after packing"
+-msgstr "Перевіряти архів перед розпакуванням"
++msgstr "Перевіряти архів після пакування"
+
+ #: Konfigurator/kgarchives.cpp:95
+-#, fuzzy
+ msgid "Check the archive's integrity after packing it."
+ msgstr "Якщо ввімкнено, Krusader буде перевіряти архів після пакування."
+
+@@ -6373,64 +6125,58 @@
+ msgstr "Перевіряти архів перед розпакуванням"
+
+ #: Konfigurator/kgarchives.cpp:96
+-msgid ""
+-"Some corrupted archives might cause a crash; therefore, testing is suggested."
++msgid "Some corrupted archives might cause a crash; therefore, testing is suggested."
+ msgstr ""
+ "Деякі пошкоджені архіви можуть спричиняти крах, отже, рекомендується робити "
+ "перевірку."
+
+ #: Konfigurator/kgarchives.cpp:113
+-#, fuzzy
+ msgid "Searching for packers..."
+-msgstr "Пошук файлів"
++msgstr "Пошук пакувальників..."
+
+ #: Konfigurator/kgarchives.cpp:114
+-msgid ""
+-"Make sure to install new packers in your <code>$PATH</code> (e.g. /usr/bin)"
+-msgstr ""
++msgid "Make sure to install new packers in your <code>$PATH</code> (e.g. /usr/bin)"
++msgstr "Переконайтесь, що нові пакувальники встановлено до теки <code>$PATH</code> (наприклад /usr/bin)"
+
+ #: Konfigurator/kguseractions.cpp:48
+-#, fuzzy
+ msgid "Information"
+-msgstr "Підтвердження"
++msgstr "Інформація"
+
+ #: Konfigurator/kguseractions.cpp:53
+ msgid ""
+ "Here you can configure settings about useractions.\n"
+ "To set up, configure and manage your useractions please use ActionMan."
+ msgstr ""
++"Тут Ви зможете налаштувати параметри дій користувача.\n"
++"Для встановлення, налаштування та керування Вашим діями користувача будь ласка використовуйте Керівник."
+
+ #: Konfigurator/kguseractions.cpp:57
+-#, fuzzy
+ msgid "Start ActionMan"
+-msgstr "Шлях початку"
++msgstr "Запуск Керівника"
+
+ #: Konfigurator/kguseractions.cpp:64
+-#, fuzzy
+ msgid "Terminal execution"
+-msgstr "Видалення дій користувача"
++msgstr "Виконання у терміналі"
+
+ #: Konfigurator/kguseractions.cpp:68
+-#, fuzzy
+ msgid "Terminal for UserActions:"
+-msgstr "Видалення дій користувача"
++msgstr "Термінал для дій користувача:"
+
+ #: Konfigurator/kguseractions.cpp:78
+ msgid "Output collection"
+-msgstr ""
++msgstr "Збірник виведення"
+
+ #: Konfigurator/kguseractions.cpp:83
+-#, fuzzy
+ msgid "Normal font:"
+-msgstr "Шрифт панелі:"
++msgstr "Звичайний шрифт:"
+
+ #: Konfigurator/kguseractions.cpp:89
+ msgid "Font with fixed width:"
+-msgstr ""
++msgstr "Шрифт зі сталою шириною:"
+
+ #: Konfigurator/kguseractions.cpp:95
+ msgid "Use fixed width font as default"
+-msgstr ""
++msgstr "Типово використовувати шрифт зі сталою шириною"
+
+ #: krslots.cpp:106
+ msgid ""
+@@ -6438,7 +6184,7 @@
+ "path. Hint: Krusader supports Kmail."
+ msgstr ""
+ "Krusader не може знайти ніякого поштового клієнта, що підтримується. Будь "
+-"ласка, встановіть якийсь у ваш шлях. Підказка: Krusader підтримує Kmail."
++"ласка, встановіть якийсь у Ваш шлях. Підказка: Krusader підтримує Kmail."
+
+ #: krslots.cpp:113
+ msgid "Sending file: "
+@@ -6449,18 +6195,16 @@
+ msgstr "Невідомо які файли порівняти."
+
+ #: krslots.cpp:149
+-#, fuzzy
+ msgid ""
+ "To compare two files by content, you can either:<ul><li>Select one file in "
+ "the left panel, and one in the right panel.</li><li>Select exactly two files "
+ "in the active panel.</li><li>Make sure there is a file in the other panel, "
+ "with the same name as the current file in the active panel.</li></ul>"
+ msgstr ""
+-"Порівняти 2 файли за вмістом можна наступними способами:\n"
+-"- вибрати (позначити) один файл в лівій панелі, а один в правій\n"
+-"- вибрати точно два файли в активній панелі\n"
+-"- переконайтесь, що є файл в іншій панелі з такою самою назвою, як поточний "
+-"в активній панелі"
++"Порівняти 2 файли за вмістом можна такими способами:<ul><li>"
++"Обрати (позначити) один файл в лівій панелі, а один в правій.</li><li>Обрати точно два файли в активній панелі.</li><li> "
++"Переконайтесь, що є файл в іншій панелі з такою самою назвою, що і поточний "
++"в активній панелі.</li></ul>"
+
+ #: krslots.cpp:186
+ msgid ""
+@@ -6468,7 +6212,7 @@
+ "to your path. Hint: Krusader supports Kompare, Kdiff3 and Xxdiff."
+ msgstr ""
+ "Krusader не може знайти ніяких інтерфейсів до diff. Будь ласка, встановіть "
+-"якийсь інтерфейс у ваш шлях. Підказка: Krusader підтримує Kompare, Kdiff3 та "
++"якийсь інтерфейс у Ваш шлях. Підказка: Krusader підтримує Kompare, Kdiff3 та "
+ "Xxdiff."
+
+ #: krslots.cpp:441
+@@ -6490,8 +6234,8 @@
+ msgstr ""
+ "Увага: Віддалений доступ був замінений новим менеджером закладок. Новий "
+ "менеджер працює однаково з локальними і віддаленими адресами URL. Віддалений "
+-"доступ ще залишиться на деякий час, щоб ви змогли перенести ваші закладки. "
+-"НЕЗАБАРОМ ЙОГО БУДЕ ВИДАЛЕНО!\n"
++"доступ ще залишиться на деякий час, щоб ви змогли перенести Ваші закладки. "
++"НЕЗАБАРОМ ЙОГО БУДЕ ВИЛУЧЕНО!\n"
+ "Скористайтесь новим менеджером закладок: відкрийте нове віддалене з'єднання, "
+ "потім натисніть на кнопку закладок, виберіть \"додати закладку\" і це все!"
+
+@@ -6503,8 +6247,7 @@
+
+ #: krslots.cpp:509
+ msgid "Can't find \"KsysCtrl\". Please install KDE admin package"
+-msgstr ""
+-"Не вдається знайти \"KsysCtrl\". Будь ласка, встановіть пакет admin для KDE"
++msgstr "Не вдається знайти \"KsysCtrl\". Будь ласка, встановіть пакет admin для KDE"
+
+ #: krslots.cpp:517
+ msgid ""
+@@ -6659,8 +6402,7 @@
+ msgstr "Недійсний файл CRC!"
+
+ #: Splitter/combiner.cpp:152
+-msgid ""
+-"Validity checking is impossible without a good CRC file. Continue combining?"
++msgid "Validity checking is impossible without a good CRC file. Continue combining?"
+ msgstr "Без чинного файла CRC перевірка неможлива. Продовжити об'єднання?"
+
+ #: Splitter/combiner.cpp:256
+@@ -6699,643 +6441,3 @@
+ msgid "Error at writing file %1!"
+ msgstr "Помилка при записі файла %1!"
+
+-#~ msgid "If pressed, Krusader executes command line in a terminal."
+-#~ msgstr "При натисканні, Krusader виконає команду в терміналі."
+-
+-#~ msgid ""
+-#~ "The 'run in terminal' button allows Krusader to run console (or otherwise "
+-#~ "non-graphical) programs in a terminal of your choice. If it's pressed, "
+-#~ "terminal mode is active."
+-#~ msgstr ""
+-#~ "Кнопка \"виконання в терміналі\" дозволяє Krusader-у виконувати консольні "
+-#~ "(або не-графічні) програми в терміналі на вибір. Коли натиснута, режим "
+-#~ "терміналу активований."
+-
+-#~ msgid "This terminal will close in 1 hour.."
+-#~ msgstr "Цей термінал закриється через 1 годину..."
+-
+-#~ msgid "count all:"
+-#~ msgstr "підрахувати всі:"
+-
+-#~ msgid "Ask the user for a parameter"
+-#~ msgstr "Запитати користувача про параметр"
+-
+-#~ msgid "Copy to clipboard"
+-#~ msgstr "Скопіювати в кишеню"
+-
+-#~ msgid "What should be copied"
+-#~ msgstr "Що має бути скопійоване"
+-
+-#~ msgid "Can't Read "
+-#~ msgstr "Неможливо прочитати "
+-
+-#~ msgid "Directory "
+-#~ msgstr "Каталог "
+-
+-#~ msgid "The Archive "
+-#~ msgstr "Архів "
+-
+-#~ msgid " already exists. Do you want to overwrite the archive ?\n"
+-#~ msgstr " вже існує. Хочете перезаписати архів?\n"
+-
+-#~ msgid "Mark &Newer"
+-#~ msgstr "Позначити &новіші"
+-
+-#~ msgid "Mark &Single"
+-#~ msgstr "Позначити &одинарні"
+-
+-#~ msgid "trash"
+-#~ msgstr "смітник"
+-
+-#~ msgid "delete"
+-#~ msgstr "видалити"
+-
+-#~ msgid "Are you sure you want to "
+-#~ msgstr "Ви впевнені, що хочете "
+-
+-#~ msgid "Marked foreground:"
+-#~ msgstr "Позначений текст:"
+-
+-#~ msgid "Marked background:"
+-#~ msgstr "Позначене тло:"
+-
+-#~ msgid "Same as marked background"
+-#~ msgstr "Таке ж як і позначене тло"
+-
+-#~ msgid "Marked 2"
+-#~ msgstr "Позначений 2"
+-
+-#~ msgid "Marked 1"
+-#~ msgstr "Позначений 1"
+-
+-#~ msgid "new symlink"
+-#~ msgstr "нове символічне посилання"
+-
+-#, fuzzy
+-#~ msgid "Text file"
+-#~ msgstr "Текстові файли"
+-
+-#~ msgid "Are you sure you want to shred "
+-#~ msgstr "Ви впевнені, що хочете знищити "
+-
+-#, fuzzy
+-#~ msgid "Calculate &Occupied Space..."
+-#~ msgstr "Підрахувати &зайняте місце"
+-
+-#, fuzzy
+-#~ msgid "&Terminal..."
+-#~ msgstr "&Термінал"
+-
+-#~ msgid "Close tab"
+-#~ msgstr "Закрити вкладку"
+-
+-#~ msgid "F2 - Open a terminal"
+-#~ msgstr "F2 - Відкрити термінал"
+-
+-#~ msgid "F3 - View a file"
+-#~ msgstr "F3 Огляд файла"
+-
+-#~ msgid "F4 - Edit a file"
+-#~ msgstr "F4 - Редагувати файл"
+-
+-#~ msgid "F5 - Copy"
+-#~ msgstr "F5 - Копіювати"
+-
+-#~ msgid "F6 - Move"
+-#~ msgstr "F6 - Пересунути"
+-
+-#~ msgid "F7 - Mkdir"
+-#~ msgstr "F7 - СтвКатал"
+-
+-#~ msgid "F8 - Delete"
+-#~ msgstr "F8 - Видалити"
+-
+-#~ msgid "F9 - Rename"
+-#~ msgstr "F9 - Перейменувати"
+-
+-#~ msgid "F10 - Quit"
+-#~ msgstr "F10 - Вийти"
+-
+-#~ msgid "&Mark"
+-#~ msgstr "&Вибір"
+-
+-#~ msgid "&Commands"
+-#~ msgstr "&Команди"
+-
+-#~ msgid "Toolbar"
+-#~ msgstr "Пенал"
+-
+-#, fuzzy
+-#~ msgid "Keybindings"
+-#~ msgstr "Прив'язки клавіш"
+-
+-#, fuzzy
+-#~ msgid "Mouse mode"
+-#~ msgstr "режим порівняння"
+-
+-#~ msgid "Select a shortcuts file"
+-#~ msgstr "Виберіть файл скорочень"
+-
+-#~ msgid "Panels"
+-#~ msgstr "Панелі"
+-
+-#~ msgid "Single click / Double click Selection:"
+-#~ msgstr "Вибір одинарним / подвійним клацанням:"
+-
+-#~ msgid "Mouse Selection Mode:"
+-#~ msgstr "Режим мишки для вибору:"
+-
+-#~ msgid "Reset"
+-#~ msgstr "Скинути"
+-
+-#~ msgid "New Action"
+-#~ msgstr "Нова дія"
+-
+-#~ msgid "Remove Action"
+-#~ msgstr "Видалити дію"
+-
+-#~ msgid "Export Action"
+-#~ msgstr "Експортувати дію"
+-
+-#, fuzzy
+-#~ msgid "Action to Clipboard"
+-#~ msgstr "Вирізати до кишені"
+-
+-#, fuzzy
+-#~ msgid "Action from Clipboard"
+-#~ msgstr "Вставити з кишені"
+-
+-#, fuzzy
+-#~ msgid "&Time options"
+-#~ msgstr "Показувати параметри"
+-
+-#, fuzzy
+-#~ msgid "Left to right: Copy %1 files (%2 bytes)"
+-#~ msgstr "З правого боку до лівого: скопіювати файлів - %1 (байтів - %2)"
+-
+-#~ msgid "File number:%1"
+-#~ msgstr "Номер файла:%1"
+-
+-#~ msgid "Error at opening URL:%1!"
+-#~ msgstr "Помилка при відкритті адреси URL:%1!"
+-
+-#~ msgid "There already is an action with this name"
+-#~ msgstr "Вже існує дія з цією назвою"
+-
+-#, fuzzy
+-#~ msgid "Use tooltip"
+-#~ msgstr "вживати підказки"
+-
+-#~ msgid "tar.bz2"
+-#~ msgstr "tar.bz2"
+-
+-#~ msgid "The file you've chosen doesn't seem to be a valid action-file."
+-#~ msgstr "Файл, який ви вибрали, ймовірно, не являється чинним файлом дій."
+-
+-#~ msgid "No actions found in this file."
+-#~ msgstr "В цьому файлі не знайдено жодних дій."
+-
+-#~ msgid ""
+-#~ "Couldn't import all actions because of name conflicts. Check the action-"
+-#~ "list on the left to fix them.\n"
+-#~ "Please note that these actions won't be imported if you close the "
+-#~ "Konfigurator now!"
+-#~ msgstr ""
+-#~ "Не вдалося імпортувати всі дії через конфлікт назв. Перегляньте список "
+-#~ "дій зліва і виправте їх.\n"
+-#~ "Примітка: ці дії не буде імпортовано, якщо ви зараз закриєте Конфігуратор!"
+-
+-#~ msgid ""
+-#~ "\n"
+-#~ "in %1 directories and %2 files"
+-#~ msgstr ""
+-#~ "\n"
+-#~ "в %1 каталогах і %2 фалах"
+-
+-#, fuzzy
+-#~ msgid "Move %1 files to:"
+-#~ msgstr "Пересунути %d файли в:"
+-
+-#, fuzzy
+-#~ msgid "Copy %1 files to:"
+-#~ msgstr "Скопіювати %d файли в:"
+-
+-#~ msgid "to"
+-#~ msgstr "до"
+-
+-#~ msgid "%1 files"
+-#~ msgstr "%1 файлів"
+-
+-#~ msgid "Show Columns:"
+-#~ msgstr "Показати стовпчики:"
+-
+-#, fuzzy
+-#~ msgid ""
+-#~ "Show the last part of the filename (part after the last dot) in the "
+-#~ "extension column and not as a complete filename in the name column, like "
+-#~ "for instance Konqueror does."
+-#~ msgstr ""
+-#~ "Показувати останню частину назви файла (частина після останньої крапки) в "
+-#~ "стовпчику розширення,\n"
+-#~ "а не як повну назву файла в стовпчику назви як у Konqueror."
+-
+-#~ msgid "Mimetype"
+-#~ msgstr "Тип MIME"
+-
+-#, fuzzy
+-#~ msgid "Show the mimetype column."
+-#~ msgstr "Показати стовпчик типів MIME"
+-
+-#, fuzzy
+-#~ msgid "Show the size column."
+-#~ msgstr "Показати стовпчик розміру"
+-
+-#~ msgid "Date and Time"
+-#~ msgstr "Дата та час"
+-
+-#, fuzzy
+-#~ msgid "Show the date and time column."
+-#~ msgstr "Показати стовпчик дати та часу"
+-
+-#~ msgid "Permission"
+-#~ msgstr "Право доступу"
+-
+-#~ msgid "Krusader Permission"
+-#~ msgstr "Права Krusader"
+-
+-#, fuzzy
+-#~ msgid "Show the permissions of the current user only (-rw)."
+-#~ msgstr "Показати права доступу тільки поточного користувача, напр., \"-rw\""
+-
+-#, fuzzy
+-#~ msgid "Show the owner column."
+-#~ msgstr "Показати стовпчик власника"
+-
+-#, fuzzy
+-#~ msgid "Show the group column."
+-#~ msgstr "Показати стовпчик групи"
+-
+-#~ msgid "Description"
+-#~ msgstr "Опис"
+-
+-#~ msgid "A unique name for the action"
+-#~ msgstr "Унікальна назва для цієї дії"
+-
+-#~ msgid "Choose a category for a better overview"
+-#~ msgstr "Виберіть категорію для кращого огляду"
+-
+-#~ msgid "Choose an icon for the action"
+-#~ msgstr "Виберіть піктограму для цієї дії"
+-
+-#~ msgid "You may use the tooltip as description"
+-#~ msgstr "Можна вживати підказку для опису"
+-
+-#~ msgid "Distinct name"
+-#~ msgstr "Назва"
+-
+-#~ msgid "A tooltip for the action"
+-#~ msgstr "Підказка для цієї дії"
+-
+-#~ msgid "You may want to set a working directory"
+-#~ msgstr "Тут можна вказати робочий каталог"
+-
+-#~ msgid "This command line is executed"
+-#~ msgstr "Цей командний рядок виконано"
+-
+-#~ msgid "new"
+-#~ msgstr "новий"
+-
+-#~ msgid "edit"
+-#~ msgstr "редагувати"
+-
+-#~ msgid "Show the action only for these protocols"
+-#~ msgstr "Показувати цю дію тільки для цих протоколів"
+-
+-#~ msgid "Show the action only in these paths"
+-#~ msgstr "Показувати цю дію тільки в цих шляхах"
+-
+-#~ msgid "Show the action only for these filenames (you may use '?' and '*')"
+-#~ msgstr ""
+-#~ "Показувати цю дію тільки для цих назв файлів (можна вживати \"?\" і \"*\")"
+-
+-#~ msgid ""
+-#~ "Here you enter the filename filtering criteria. You can use wildcards\n"
+-#~ "(*.o .* *.c?? etc.), and give more items separated by space.\n"
+-#~ "If you type 'text' that results the same as '*text*'. You can exclude\n"
+-#~ "patterns from the search with '|' (e.g. '*.cpp *.h | *.moc.cpp' )."
+-#~ msgstr ""
+-#~ "Тут вводяться критерії фільтрування назв файлів. Можна використовувати\n"
+-#~ "шаблони (*.o .* *.c?? тощо.) й додавати елементи розділені пропусками.\n"
+-#~ "Якщо ввести \"text\", то це те саме що й \"*text*\". Можна виключати\n"
+-#~ "шаблони з пошуку за допомогою \"|\" (напр., \"*.cpp *.h | *.moc.cpp\")."
+-
+-#~ msgid "The date '"
+-#~ msgstr "Дата \""
+-
+-#~ msgid ""
+-#~ "Welcome to Krusader! As this is your first run, Krusader will now run "
+-#~ "Konfigurator."
+-#~ msgstr ""
+-#~ "Ласкаво просимо до Krusader! Оскільки це ваш перший раз, Krusader зараз "
+-#~ "запустить Конфігуратор."
+-
+-#~ msgid "The left base directory"
+-#~ msgstr "Лівий базовий каталог"
+-
+-#~ msgid "The right base directory"
+-#~ msgstr "Правий базовий каталог"
+-
+-#~ msgid ""
+-#~ "Ignores the date information at comparing (good if the files\n"
+-#~ "were fetched from ftp, smb, archive, ... file systems)"
+-#~ msgstr ""
+-#~ "При порівнянні ігнорує інформацію про дату (придатне, якщо\n"
+-#~ "файли були отримані з ftp, smb, архіву й ін. файлових систем)"
+-
+-#~ msgid "Lists those files that exist only in either side"
+-#~ msgstr "Видає список файлів які існують тільки на одному боці"
+-
+-#~ msgid "diff: found "
+-#~ msgstr "diff: знайдено "
+-
+-#~ msgid ", compare by content available.\n"
+-#~ msgstr ", порівняти за наявним вмістом.\n"
+-
+-#~ msgid ""
+-#~ "diff: no diff frontends found. Compare by content disabled.\n"
+-#~ "hint: Krusader supports Kompare, Kdiff3 and Xxdiff\n"
+-#~ "\n"
+-#~ msgstr ""
+-#~ "diff: не знайдено інтерфейсу для diff. Порівняння за вмістом вимкнене.\n"
+-#~ "Підказка: Krusader підтримує Kdiff3 та Xxdiff\n"
+-#~ "\n"
+-
+-#~ msgid "mail: found "
+-#~ msgstr "mail: знайдено "
+-
+-#~ msgid ", sending files by email enabled.\n"
+-#~ msgstr ", надсилання файлів по ел. пошті ввімкнено.\n"
+-
+-#~ msgid ""
+-#~ "mail: no compatible mail-programs found. Sending files by email is "
+-#~ "disabled.\n"
+-#~ "hint: Krusader supports Kmail\n"
+-#~ "\n"
+-#~ msgstr ""
+-#~ "mail: не знайдено сумісної програми пошти. Надсилання файлів по ел. пошті "
+-#~ "вимкнено.\n"
+-#~ "Підказка: Krusader підтримує Kmail\n"
+-#~ "\n"
+-
+-#~ msgid "rename: found "
+-#~ msgstr "rename: знайдено "
+-
+-#~ msgid ", multiple rename enabled.\n"
+-#~ msgstr ", групове перейменування ввімкнене.\n"
+-
+-#~ msgid ""
+-#~ "rename: no compatible rename-programs found. Multiple rename is "
+-#~ "disabled.\n"
+-#~ "hint: Krusader supports Krename\n"
+-#~ "\n"
+-#~ msgstr ""
+-#~ "rename: не знайдено сумісної програми перейменування. Групове "
+-#~ "перейменування вимкнене.\n"
+-#~ "Підказка: Krusader підтримує Krename\n"
+-#~ "\n"
+-
+-#~ msgid ""
+-#~ "\n"
+-#~ "If you install new tools, please install them"
+-#~ msgstr ""
+-#~ "\n"
+-#~ "Якщо ви робите інсталяцію нових засобів, будь ласка, встановіть їх"
+-
+-#~ msgid ""
+-#~ "\n"
+-#~ "to your path, e.g. /usr/bin, /usr/local/bin, etc."
+-#~ msgstr ""
+-#~ "\n"
+-#~ "у ваш шлях, тобто, /usr/bin, /usr/local/bin, тощо"
+-
+-#~ msgid ""
+-#~ "\n"
+-#~ "and-or (re)configure the Tools path in"
+-#~ msgstr ""
+-#~ "\n"
+-#~ "і/або вкажіть (знов) шлях засобів у"
+-
+-#~ msgid ""
+-#~ "\n"
+-#~ "Konfigurator->Dependencies if needed."
+-#~ msgstr ""
+-#~ "\n"
+-#~ "Konfigurator->Залежності, якщо треба."
+-
+-#~ msgid "Display the dot files"
+-#~ msgstr "Показувати файли з крапками"
+-
+-#~ msgid "Krusader will display the Panel Toolbar."
+-#~ msgstr "Krusader покаже пенал панелі."
+-
+-#~ msgid "If checked, Krusader will mount FSTAB mount-points when needed."
+-#~ msgstr ""
+-#~ "Якщо ввімкнено, Krusader змонтує точки монтування з FSTAB при потребі."
+-
+-#~ msgid ""
+-#~ "if checked, Krusader will ask for a result-name; else the default value "
+-#~ "will be used"
+-#~ msgstr ""
+-#~ "Якщо увімкнено, Krusader буде запитувати про назву результату; інакше "
+-#~ "буде використовуватись типове значення"
+-
+-#~ msgid "Krusader default color configuration."
+-#~ msgstr "Налаштування типового кольору програми Krusader."
+-
+-#~ msgid "Test archive when finished packing"
+-#~ msgstr "Після пакування перевіряти архів"
+-
+-#~ msgid ""
+-#~ "Search results:\n"
+-#~ "\n"
+-#~ msgstr ""
+-#~ "Результати пошуку:\n"
+-#~ "\n"
+-
+-#~ msgid "tar: found, packing and unpacking enabled.\n"
+-#~ msgstr "tar: знайдено, пакування і розпакування ввімкнене.\n"
+-
+-#~ msgid ""
+-#~ "tar: NOT found, packing and unpacking DISABLED.\n"
+-#~ "==> tar can be obtained at www.gnu.org\n"
+-#~ msgstr ""
+-#~ "tar: НЕ знайдено, пакування і розпакування ВИМКНЕНЕ.\n"
+-#~ "==> tar можна взяти з www.gnu.org\n"
+-
+-#~ msgid "gzip: found, packing and unpacking enabled.\n"
+-#~ msgstr "gzip: знайдено, пакування і розпакування ввімкнене.\n"
+-
+-#~ msgid ""
+-#~ "gzip: NOT found, packing and unpacking DISABLED.\n"
+-#~ "==> gzip can be obtained at www.gnu.org\n"
+-#~ msgstr ""
+-#~ "gzip: NOT found, packing and unpacking DISABLED.\n"
+-#~ "==> gzip can be obtained at www.gnu.org\n"
+-
+-#~ msgid "bzip2: found, packing and unpacking enabled.\n"
+-#~ msgstr "bzip2: знайдено, пакування і розпакування ввімкнене.\n"
+-
+-#~ msgid ""
+-#~ "bzip2: NOT found, packing and unpacking DISABLED.\n"
+-#~ "==> bzip2 can be obtained at www.gnu.org\n"
+-#~ msgstr ""
+-#~ "bzip2: НЕ знайдено, пакування і розпакування ВИМКНЕНЕ.\n"
+-#~ "==> bzip2 можна взяти з www.gnu.org\n"
+-
+-#~ msgid "unzip: found, unpacking enabled.\n"
+-#~ msgstr "unzip: знайдено, розпакування ввімкнене.\n"
+-
+-#~ msgid ""
+-#~ "unzip: NOT found, unpacking DISABLED.\n"
+-#~ "==> unzip can be obtained at www.info-zip.org\n"
+-#~ msgstr ""
+-#~ "unzip: НЕ знайдено, розпакування ВИМКНЕНЕ.\n"
+-#~ "==> unzip можна взяти з www.info-zip.org\n"
+-
+-#~ msgid "zip: found, packing enabled.\n"
+-#~ msgstr "zip: знайдено, пакування ввімкнене.\n"
+-
+-#~ msgid ""
+-#~ "zip: NOT found, packing DISABLED.\n"
+-#~ "==> zip can be obtained at www.info-zip.org\n"
+-#~ msgstr ""
+-#~ "zip: НЕ знайдено, пакування ВИМКНЕНЕ.\n"
+-#~ "==> zip можна взяти з www.info-zip.org\n"
+-
+-#~ msgid "lha: found, packing and unpacking enabled.\n"
+-#~ msgstr "lha: знайдено, пакування і розпакування ввімкнене.\n"
+-
+-#~ msgid ""
+-#~ "lha: NOT found, packing and unpacking DISABLED.\n"
+-#~ "==> lha can be obtained at www.gnu.org\n"
+-#~ msgstr ""
+-#~ "lha: НЕ знайдено, пакування і розпакування ВИМКНЕНЕ.\n"
+-#~ "==> lha можна взяти з www.gnu.org\n"
+-
+-#~ msgid "rpm: found, unpacking enabled.\n"
+-#~ msgstr "rpm: знайдено, розпакування ввімкнене.\n"
+-
+-#~ msgid ""
+-#~ "rpm found but cpio NOT found: unpacking DISABLED.\n"
+-#~ "==>cpio can be obtained at www.gnu.org\n"
+-#~ msgstr ""
+-#~ "rpm знайдено, але cpio НЕ знайдено: розпакування ВИМКНЕНЕ.\n"
+-#~ "==> cpio можна взяти з www.gnu.org\n"
+-
+-#~ msgid ""
+-#~ "rpm: NOT found, unpacking is DISABLED.\n"
+-#~ "==> rpm can be obtained at www.gnu.org\n"
+-#~ msgstr ""
+-#~ "rpm: НЕ знайдено, розпакування ВИМКНЕНЕ.\n"
+-#~ "==> rpm можна взяти з www.gnu.org\n"
+-
+-#~ msgid "unrar: found, unpacking is enabled.\n"
+-#~ msgstr "unrar: знайдено, розпакування ввімкнене.\n"
+-
+-#~ msgid "unrar: NOT found.\n"
+-#~ msgstr "unrar: НЕ знайдено.\n"
+-
+-#~ msgid ""
+-#~ "unrar: NOT found, unpacking is DISABLED.\n"
+-#~ "==> unrar can be obtained at www.rarsoft.com\n"
+-#~ msgstr ""
+-#~ "unrar: НЕ знайдено, розпакування ВИМКНЕНЕ.\n"
+-#~ "==> unrar можна взяти з www.rarsoft.com\n"
+-
+-#~ msgid "rar: found, packing and unpacking is enabled.\n"
+-#~ msgstr "rar: знайдено, пакування і розпакування ввімкнене.\n"
+-
+-#~ msgid ""
+-#~ "rar: NOT found, packing is DISABLED.\n"
+-#~ "==> rar can be obtained at www.rarsoft.com\n"
+-#~ msgstr ""
+-#~ "rar: НЕ знайдено, пакування ВИМКНЕНЕ.\n"
+-#~ "==> rar можна взяти з www.rarsoft.com\n"
+-
+-#~ msgid "unarj: found, unpacking is enabled.\n"
+-#~ msgstr "unarj: знайдено, розпакування ввімкнене.\n"
+-
+-#~ msgid "unarj: NOT found.\n"
+-#~ msgstr "unarj: НЕ знайдено.\n"
+-
+-#~ msgid ""
+-#~ "unarj: NOT found, unpacking is DISABLED.\n"
+-#~ "==> unarj can be obtained at www.arjsoft.com\n"
+-#~ msgstr ""
+-#~ "unarj: НЕ знайдено, розпакування ВИМКНЕНЕ.\n"
+-#~ "==> unarj можна взяти з www.arjsoft.com\n"
+-
+-#~ msgid "arj: found, packing and unpacking is enabled.\n"
+-#~ msgstr "arj: знайдено, пакування і розпакування ввімкнене.\n"
+-
+-#~ msgid ""
+-#~ "arj: NOT found, packing is DISABLED.\n"
+-#~ "==> arj can be obtained at www.arjsoft.com\n"
+-#~ msgstr ""
+-#~ "arj: НЕ знайдено, пакування ВИМКНЕНЕ.\n"
+-#~ "==> arj можна взяти з www.arjsoft.com\n"
+-
+-#~ msgid "unace: found, unpacking is enabled.\n"
+-#~ msgstr "unace: знайдено, розпакування ввімкнене.\n"
+-
+-#~ msgid ""
+-#~ "unace: NOT found, unpacking is DISABLED.\n"
+-#~ "==> unace can be obtained at www.winace.com\n"
+-#~ msgstr ""
+-#~ "unace: НЕ знайдено, розпакування ВИМКНЕНЕ.\n"
+-#~ "==> unace можна взяти з www.winace.com\n"
+-
+-#~ msgid ""
+-#~ "\n"
+-#~ "If you install new packers, please install them"
+-#~ msgstr ""
+-#~ "\n"
+-#~ "Якщо ви робите інсталяцію нових архіваторів, будь ласка, встановіть їх"
+-
+-#~ msgid ""
+-#~ "\n"
+-#~ "to your path, e.g., /usr/bin, /usr/local/bin, etc."
+-#~ msgstr ""
+-#~ "\n"
+-#~ "у ваш шлях, напр., /usr/bin, /usr/local/bin, тощо"
+-
+-#~ msgid ""
+-#~ "\n"
+-#~ "Thanks for flying Krusader :-)"
+-#~ msgstr ""
+-#~ "\n"
+-#~ "Дякуємо за користування Krusader-ом :-)"
+-
+-#~ msgid " this item?"
+-#~ msgstr " цей елемент ?"
+-
+-#~ msgid " these %d items?"
+-#~ msgstr " ці %d елементи?"
+-
+-#~ msgid "%n directory"
+-#~ msgstr "%n каталог"
+-
+-#~ msgid "%n file"
+-#~ msgstr "%n файл"
+-
+-#~ msgid "%1 / %n directory"
+-#~ msgstr "%1 / %n каталогів"
+-
+-#~ msgid "%1 / %n file"
+-#~ msgstr "%1 / %n файлів"
+-
+-#~ msgid "*|all files"
+-#~ msgstr "*|всі файли"
+-
+-#~ msgid "Show the Full Permissions Column, e.g. '-rw-r--r--'"
+-#~ msgstr "Показати стовпчик повних прав доступу, тобто, \"-rw-r--r--\""
+--- a/krusader/UserAction/kraction.cpp
++++ b/krusader/UserAction/kraction.cpp
+@@ -555,7 +555,7 @@
+ } //KrAction::readAvailability
+
+ QDomElement KrAction::dumpAvailability( QDomDocument& doc ) const {
+- QDomElement availabilityElement = doc.createElement("command");
++ QDomElement availabilityElement = doc.createElement("availability");
+
+ # define LIST_ELEMENT( TAGNAME, LIST ) \
+ { \
Deleted: kde-extras/krusader/tags/1.90.0-2/debian/patches/02_autotools_update.diff
Copied: kde-extras/krusader/tags/1.90.0-2/debian/patches/02_autotools_update.diff (from rev 11903, kde-extras/krusader/trunk/debian/patches/02_autotools_update.diff)
===================================================================
--- kde-extras/krusader/tags/1.90.0-2/debian/patches/02_autotools_update.diff (rev 0)
+++ kde-extras/krusader/tags/1.90.0-2/debian/patches/02_autotools_update.diff 2008-08-10 17:01:44 UTC (rev 11904)
@@ -0,0 +1,731 @@
+--- a/admin/depcomp
++++ b/admin/depcomp
+@@ -1,9 +1,10 @@
+ #! /bin/sh
+ # depcomp - compile a program generating dependencies as side-effects
+
+-scriptversion=2005-07-09.11
++scriptversion=2006-10-15.18
+
+-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
++# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006 Free Software
++# Foundation, Inc.
+
+ # This program is free software; you can redistribute it and/or modify
+ # it under the terms of the GNU General Public License as published by
+@@ -91,7 +92,20 @@
+ ## gcc 3 implements dependency tracking that does exactly what
+ ## we want. Yay! Note: for some reason libtool 1.4 doesn't like
+ ## it if -MD -MP comes after the -MF stuff. Hmm.
+- "$@" -MT "$object" -MD -MP -MF "$tmpdepfile"
++## Unfortunately, FreeBSD c89 acceptance of flags depends upon
++## the command line argument order; so add the flags where they
++## appear in depend2.am. Note that the slowdown incurred here
++## affects only configure: in makefiles, %FASTDEP% shortcuts this.
++ for arg
++ do
++ case $arg in
++ -c) set fnord "$@" -MT "$object" -MD -MP -MF "$tmpdepfile" "$arg" ;;
++ *) set fnord "$@" "$arg" ;;
++ esac
++ shift # fnord
++ shift # $arg
++ done
++ "$@"
+ stat=$?
+ if test $stat -eq 0; then :
+ else
+@@ -276,6 +290,46 @@
+ rm -f "$tmpdepfile"
+ ;;
+
++hp2)
++ # The "hp" stanza above does not work with aCC (C++) and HP's ia64
++ # compilers, which have integrated preprocessors. The correct option
++ # to use with these is +Maked; it writes dependencies to a file named
++ # 'foo.d', which lands next to the object file, wherever that
++ # happens to be.
++ # Much of this is similar to the tru64 case; see comments there.
++ dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
++ test "x$dir" = "x$object" && dir=
++ base=`echo "$object" | sed -e 's|^.*/||' -e 's/\.o$//' -e 's/\.lo$//'`
++ if test "$libtool" = yes; then
++ tmpdepfile1=$dir$base.d
++ tmpdepfile2=$dir.libs/$base.d
++ "$@" -Wc,+Maked
++ else
++ tmpdepfile1=$dir$base.d
++ tmpdepfile2=$dir$base.d
++ "$@" +Maked
++ fi
++ stat=$?
++ if test $stat -eq 0; then :
++ else
++ rm -f "$tmpdepfile1" "$tmpdepfile2"
++ exit $stat
++ fi
++
++ for tmpdepfile in "$tmpdepfile1" "$tmpdepfile2"
++ do
++ test -f "$tmpdepfile" && break
++ done
++ if test -f "$tmpdepfile"; then
++ sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
++ # Add `dependent.h:' lines.
++ sed -ne '2,${; s/^ *//; s/ \\*$//; s/$/:/; p;}' "$tmpdepfile" >> "$depfile"
++ else
++ echo "#dummy" > "$depfile"
++ fi
++ rm -f "$tmpdepfile" "$tmpdepfile2"
++ ;;
++
+ tru64)
+ # The Tru64 compiler uses -MD to generate dependencies as a side
+ # effect. `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+@@ -288,13 +342,13 @@
+
+ if test "$libtool" = yes; then
+ # With Tru64 cc, shared objects can also be used to make a
+- # static library. This mecanism is used in libtool 1.4 series to
++ # static library. This mechanism is used in libtool 1.4 series to
+ # handle both shared and static libraries in a single compilation.
+ # With libtool 1.4, dependencies were output in $dir.libs/$base.lo.d.
+ #
+ # With libtool 1.5 this exception was removed, and libtool now
+ # generates 2 separate objects for the 2 libraries. These two
+- # compilations output dependencies in in $dir.libs/$base.o.d and
++ # compilations output dependencies in $dir.libs/$base.o.d and
+ # in $dir$base.o.d. We have to check for both files, because
+ # one of the two compilations can be disabled. We should prefer
+ # $dir$base.o.d over $dir.libs/$base.o.d because the latter is
+--- a/admin/install-sh
++++ b/admin/install-sh
+@@ -1,7 +1,7 @@
+ #!/bin/sh
+ # install - install a program, script, or datafile
+
+-scriptversion=2005-11-07.23
++scriptversion=2006-10-14.15
+
+ # This originates from X11R5 (mit/util/scripts/install.sh), which was
+ # later released in X11R6 (xc/config/util/install.sh) with the
+@@ -39,15 +39,24 @@
+ # when there is no Makefile.
+ #
+ # This script is compatible with the BSD install script, but was written
+-# from scratch. It can only install one file at a time, a restriction
+-# shared with many OS's install programs.
++# from scratch.
++
++nl='
++'
++IFS=" "" $nl"
+
+ # set DOITPROG to echo to test this script
+
+ # Don't use :- since 4.3BSD and earlier shells don't like it.
+ doit="${DOITPROG-}"
++if test -z "$doit"; then
++ doit_exec=exec
++else
++ doit_exec=$doit
++fi
+
+-# put in absolute paths if you don't have them in your path; or use env. vars.
++# Put in absolute file names if you don't have them in your path;
++# or use environment vars.
+
+ mvprog="${MVPROG-mv}"
+ cpprog="${CPPROG-cp}"
+@@ -61,17 +70,9 @@
+ posix_glob=
+ posix_mkdir=
+
+-# Symbolic mode for testing mkdir with directories.
+-# It is the same as 755, but also tests that "u+" works.
+-test_mode=u=rwx,g=rx,o=rx,u+wx
+-
+ # Desired mode of installed file.
+ mode=0755
+
+-# Desired mode of newly created intermediate directories.
+-# It is empty if not known yet.
+-intermediate_mode=
+-
+ chmodcmd=$chmodprog
+ chowncmd=
+ chgrpcmd=
+@@ -109,7 +110,7 @@
+ CHGRPPROG CHMODPROG CHOWNPROG CPPROG MKDIRPROG MVPROG RMPROG STRIPPROG
+ "
+
+-while test -n "$1"; do
++while test $# -ne 0; do
+ case $1 in
+ -c) shift
+ continue;;
+@@ -128,6 +129,12 @@
+ -m) mode=$2
+ shift
+ shift
++ case $mode in
++ *' '* | *' '* | *'
++'* | *'*'* | *'?'* | *'['*)
++ echo "$0: invalid mode: $mode" >&2
++ exit 1;;
++ esac
+ continue;;
+
+ -o) chowncmd="$chownprog $2"
+@@ -150,25 +157,33 @@
+
+ --version) echo "$0 $scriptversion"; exit $?;;
+
+- *) # When -d is used, all remaining arguments are directories to create.
+- # When -t is used, the destination is already specified.
+- test -n "$dir_arg$dstarg" && break
+- # Otherwise, the last argument is the destination. Remove it from $@.
+- for arg
+- do
+- if test -n "$dstarg"; then
+- # $@ is not empty: it contains at least $arg.
+- set fnord "$@" "$dstarg"
+- shift # fnord
+- fi
+- shift # arg
+- dstarg=$arg
+- done
++ --) shift
+ break;;
++
++ -*) echo "$0: invalid option: $1" >&2
++ exit 1;;
++
++ *) break;;
+ esac
+ done
+
+-if test -z "$1"; then
++if test $# -ne 0 && test -z "$dir_arg$dstarg"; then
++ # When -d is used, all remaining arguments are directories to create.
++ # When -t is used, the destination is already specified.
++ # Otherwise, the last argument is the destination. Remove it from $@.
++ for arg
++ do
++ if test -n "$dstarg"; then
++ # $@ is not empty: it contains at least $arg.
++ set fnord "$@" "$dstarg"
++ shift # fnord
++ fi
++ shift # arg
++ dstarg=$arg
++ done
++fi
++
++if test $# -eq 0; then
+ if test -z "$dir_arg"; then
+ echo "$0: no input file specified." >&2
+ exit 1
+@@ -178,7 +193,32 @@
+ exit 0
+ fi
+
+-test -n "$dir_arg" || trap '(exit $?); exit' 1 2 13 15
++if test -z "$dir_arg"; then
++ trap '(exit $?); exit' 1 2 13 15
++
++ # Set umask so as not to create temps with too-generous modes.
++ # However, 'strip' requires both read and write access to temps.
++ case $mode in
++ # Optimize common cases.
++ *644) cp_umask=133;;
++ *755) cp_umask=22;;
++
++ *[0-7])
++ if test -z "$stripcmd"; then
++ u_plus_rw=
++ else
++ u_plus_rw='% 200'
++ fi
++ cp_umask=`expr '(' 777 - $mode % 1000 ')' $u_plus_rw`;;
++ *)
++ if test -z "$stripcmd"; then
++ u_plus_rw=
++ else
++ u_plus_rw=,u+rw
++ fi
++ cp_umask=$mode$u_plus_rw;;
++ esac
++fi
+
+ for src
+ do
+@@ -230,14 +270,25 @@
+ expr X"$dst" : 'X\(.*[^/]\)//*[^/][^/]*/*$' \| \
+ X"$dst" : 'X\(//\)[^/]' \| \
+ X"$dst" : 'X\(//\)$' \| \
+- X"$dst" : 'X\(/\)' \| \
+- . : '\(.\)' 2>/dev/null ||
++ X"$dst" : 'X\(/\)' \| . 2>/dev/null ||
+ echo X"$dst" |
+- sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{ s//\1/; q; }
+- /^X\(\/\/\)[^/].*/{ s//\1/; q; }
+- /^X\(\/\/\)$/{ s//\1/; q; }
+- /^X\(\/\).*/{ s//\1/; q; }
+- s/.*/./; q'
++ sed '/^X\(.*[^/]\)\/\/*[^/][^/]*\/*$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)[^/].*/{
++ s//\1/
++ q
++ }
++ /^X\(\/\/\)$/{
++ s//\1/
++ q
++ }
++ /^X\(\/\).*/{
++ s//\1/
++ q
++ }
++ s/.*/./; q'
+ `
+
+ test -d "$dstdir"
+@@ -250,51 +301,86 @@
+ if test $dstdir_status != 0; then
+ case $posix_mkdir in
+ '')
+- posix_mkdir=false
+- if $mkdirprog -m $test_mode -p -- / >/dev/null 2>&1; then
+- posix_mkdir=true
+- else
+- # Remove any dirs left behind by ancient mkdir implementations.
+- rmdir ./-m "$test_mode" ./-p ./-- 2>/dev/null
+- fi ;;
+- esac
+-
+- if
+- $posix_mkdir && {
++ # Create intermediate dirs using mode 755 as modified by the umask.
++ # This is like FreeBSD 'install' as of 1997-10-28.
++ umask=`umask`
++ case $stripcmd.$umask in
++ # Optimize common cases.
++ *[2367][2367]) mkdir_umask=$umask;;
++ .*0[02][02] | .[02][02] | .[02]) mkdir_umask=22;;
++
++ *[0-7])
++ mkdir_umask=`expr $umask + 22 \
++ - $umask % 100 % 40 + $umask % 20 \
++ - $umask % 10 % 4 + $umask % 2
++ `;;
++ *) mkdir_umask=$umask,go-w;;
++ esac
+
+ # With -d, create the new directory with the user-specified mode.
+- # Otherwise, create it using the same intermediate mode that
+- # mkdir -p would use when creating intermediate directories.
+- # POSIX says that this mode is "$(umask -S),u+wx", so use that
+- # if umask -S works.
+-
++ # Otherwise, rely on $mkdir_umask.
+ if test -n "$dir_arg"; then
+- mkdir_mode=$mode
++ mkdir_mode=-m$mode
+ else
+- case $intermediate_mode in
+- '')
+- if umask_S=`(umask -S) 2>/dev/null`; then
+- intermediate_mode=$umask_S,u+wx
+- else
+- intermediate_mode=$test_mode
+- fi ;;
+- esac
+- mkdir_mode=$intermediate_mode
++ mkdir_mode=
+ fi
+
+- $mkdirprog -m "$mkdir_mode" -p -- "$dstdir"
+- }
++ posix_mkdir=false
++ case $umask in
++ *[123567][0-7][0-7])
++ # POSIX mkdir -p sets u+wx bits regardless of umask, which
++ # is incompatible with FreeBSD 'install' when (umask & 300) != 0.
++ ;;
++ *)
++ tmpdir=${TMPDIR-/tmp}/ins$RANDOM-$$
++ trap 'ret=$?; rmdir "$tmpdir/d" "$tmpdir" 2>/dev/null; exit $ret' 0
++
++ if (umask $mkdir_umask &&
++ exec $mkdirprog $mkdir_mode -p -- "$tmpdir/d") >/dev/null 2>&1
++ then
++ if test -z "$dir_arg" || {
++ # Check for POSIX incompatibilities with -m.
++ # HP-UX 11.23 and IRIX 6.5 mkdir -m -p sets group- or
++ # other-writeable bit of parent directory when it shouldn't.
++ # FreeBSD 6.1 mkdir -m -p sets mode of existing directory.
++ ls_ld_tmpdir=`ls -ld "$tmpdir"`
++ case $ls_ld_tmpdir in
++ d????-?r-*) different_mode=700;;
++ d????-?--*) different_mode=755;;
++ *) false;;
++ esac &&
++ $mkdirprog -m$different_mode -p -- "$tmpdir" && {
++ ls_ld_tmpdir_1=`ls -ld "$tmpdir"`
++ test "$ls_ld_tmpdir" = "$ls_ld_tmpdir_1"
++ }
++ }
++ then posix_mkdir=:
++ fi
++ rmdir "$tmpdir/d" "$tmpdir"
++ else
++ # Remove any dirs left behind by ancient mkdir implementations.
++ rmdir ./$mkdir_mode ./-p ./-- 2>/dev/null
++ fi
++ trap '' 0;;
++ esac;;
++ esac
++
++ if
++ $posix_mkdir && (
++ umask $mkdir_umask &&
++ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir"
++ )
+ then :
+ else
+
+- # mkdir does not conform to POSIX, or it failed possibly due to
+- # a race condition. Create the directory the slow way, step by
+- # step, checking for races as we go.
++ # The umask is ridiculous, or mkdir does not conform to POSIX,
++ # or it failed possibly due to a race condition. Create the
++ # directory the slow way, step by step, checking for races as we go.
+
+ case $dstdir in
+- /*) pathcomp=/ ;;
+- -*) pathcomp=./ ;;
+- *) pathcomp= ;;
++ /*) prefix=/ ;;
++ -*) prefix=./ ;;
++ *) prefix= ;;
+ esac
+
+ case $posix_glob in
+@@ -314,19 +400,39 @@
+ $posix_glob && set +f
+ IFS=$oIFS
+
++ prefixes=
++
+ for d
+ do
+- test "x$d" = x && continue
++ test -z "$d" && continue
+
+- pathcomp=$pathcomp$d
+- if test ! -d "$pathcomp"; then
+- $mkdirprog "$pathcomp"
+- # Don't fail if two instances are running concurrently.
+- test -d "$pathcomp" || exit 1
++ prefix=$prefix$d
++ if test -d "$prefix"; then
++ prefixes=
++ else
++ if $posix_mkdir; then
++ (umask=$mkdir_umask &&
++ $doit_exec $mkdirprog $mkdir_mode -p -- "$dstdir") && break
++ # Don't fail if two instances are running concurrently.
++ test -d "$prefix" || exit 1
++ else
++ case $prefix in
++ *\'*) qprefix=`echo "$prefix" | sed "s/'/'\\\\\\\\''/g"`;;
++ *) qprefix=$prefix;;
++ esac
++ prefixes="$prefixes '$qprefix'"
++ fi
+ fi
+- pathcomp=$pathcomp/
++ prefix=$prefix/
+ done
+- obsolete_mkdir_used=true
++
++ if test -n "$prefixes"; then
++ # Don't fail if two instances are running concurrently.
++ (umask $mkdir_umask &&
++ eval "\$doit_exec \$mkdirprog $prefixes") ||
++ test -d "$dstdir" || exit 1
++ obsolete_mkdir_used=true
++ fi
+ fi
+ fi
+
+@@ -334,7 +440,7 @@
+ { test -z "$chowncmd" || $doit $chowncmd "$dst"; } &&
+ { test -z "$chgrpcmd" || $doit $chgrpcmd "$dst"; } &&
+ { test "$obsolete_mkdir_used$chowncmd$chgrpcmd" = false ||
+- test -z "$chmodcmd" || $doit $chmodcmd "$mode" "$dst"; } || exit 1
++ test -z "$chmodcmd" || $doit $chmodcmd $mode "$dst"; } || exit 1
+ else
+
+ # Make a couple of temp file names in the proper directory.
+@@ -345,7 +451,7 @@
+ trap 'ret=$?; rm -f "$dsttmp" "$rmtmp" && exit $ret' 0
+
+ # Copy the file name to the temp name.
+- $doit $cpprog "$src" "$dsttmp" &&
++ (umask $cp_umask && $doit_exec $cpprog "$src" "$dsttmp") &&
+
+ # and set any options; do chmod last to preserve setuid bits.
+ #
+@@ -356,7 +462,7 @@
+ { test -z "$chowncmd" || $doit $chowncmd "$dsttmp"; } \
+ && { test -z "$chgrpcmd" || $doit $chgrpcmd "$dsttmp"; } \
+ && { test -z "$stripcmd" || $doit $stripcmd "$dsttmp"; } \
+- && { test -z "$chmodcmd" || $doit $chmodcmd "$mode" "$dsttmp"; } &&
++ && { test -z "$chmodcmd" || $doit $chmodcmd $mode "$dsttmp"; } &&
+
+ # Now rename the file to the real destination.
+ { $doit $mvcmd -f "$dsttmp" "$dst" 2>/dev/null \
+--- a/admin/missing
++++ b/admin/missing
+@@ -1,9 +1,9 @@
+ #! /bin/sh
+ # Common stub for a few missing GNU programs while installing.
+
+-scriptversion=2004-09-07.08
++scriptversion=2006-05-10.23
+
+-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004
++# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
+ # Free Software Foundation, Inc.
+ # Originally by Fran,cois Pinard <pinard at iro.umontreal.ca>, 1996.
+
+@@ -19,8 +19,8 @@
+
+ # You should have received a copy of the GNU General Public License
+ # along with this program; if not, write to the Free Software
+-# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+-# 02111-1307, USA.
++# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA
++# 02110-1301, USA.
+
+ # As a special exception to the GNU General Public License, if you
+ # distribute this file as part of a program that contains a
+@@ -33,6 +33,8 @@
+ fi
+
+ run=:
++sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
++sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
+
+ # In the cases where this matters, `missing' is being run in the
+ # srcdir already.
+@@ -44,7 +46,7 @@
+
+ msg="missing on your system"
+
+-case "$1" in
++case $1 in
+ --run)
+ # Try to run requested program, and just exit if it succeeds.
+ run=
+@@ -77,6 +79,7 @@
+ aclocal touch file \`aclocal.m4'
+ autoconf touch file \`configure'
+ autoheader touch file \`config.h.in'
++ autom4te touch the output file, or create a stub one
+ automake touch all \`Makefile.in' files
+ bison create \`y.tab.[ch]', if possible, from existing .[ch]
+ flex create \`lex.yy.c', if possible, from existing .c
+@@ -87,12 +90,12 @@
+ yacc create \`y.tab.[ch]', if possible, from existing .[ch]
+
+ Send bug reports to <bug-automake at gnu.org>."
+- exit 0
++ exit $?
+ ;;
+
+ -v|--v|--ve|--ver|--vers|--versi|--versio|--version)
+ echo "missing $scriptversion (GNU Automake)"
+- exit 0
++ exit $?
+ ;;
+
+ -*)
+@@ -106,7 +109,7 @@
+ # Now exit if we have it, but it failed. Also exit now if we
+ # don't have it and --version was passed (most likely to detect
+ # the program).
+-case "$1" in
++case $1 in
+ lex|yacc)
+ # Not GNU programs, they don't have --version.
+ ;;
+@@ -135,7 +138,7 @@
+
+ # If it does not exist, or fails to run (possibly an outdated version),
+ # try to emulate it.
+-case "$1" in
++case $1 in
+ aclocal*)
+ echo 1>&2 "\
+ WARNING: \`$1' is $msg. You should only need it if
+@@ -164,7 +167,7 @@
+ test -z "$files" && files="config.h"
+ touch_files=
+ for f in $files; do
+- case "$f" in
++ case $f in
+ *:*) touch_files="$touch_files "`echo "$f" |
+ sed -e 's/^[^:]*://' -e 's/:.*//'`;;
+ *) touch_files="$touch_files $f.in";;
+@@ -192,8 +195,8 @@
+ You can get \`$1' as part of \`Autoconf' from any GNU
+ archive site."
+
+- file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+- test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
++ file=`echo "$*" | sed -n "$sed_output"`
++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -f "$file"; then
+ touch $file
+ else
+@@ -214,25 +217,25 @@
+ in order for those modifications to take effect. You can get
+ \`Bison' from any GNU archive site."
+ rm -f y.tab.c y.tab.h
+- if [ $# -ne 1 ]; then
++ if test $# -ne 1; then
+ eval LASTARG="\${$#}"
+- case "$LASTARG" in
++ case $LASTARG in
+ *.y)
+ SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
+- if [ -f "$SRCFILE" ]; then
++ if test -f "$SRCFILE"; then
+ cp "$SRCFILE" y.tab.c
+ fi
+ SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
+- if [ -f "$SRCFILE" ]; then
++ if test -f "$SRCFILE"; then
+ cp "$SRCFILE" y.tab.h
+ fi
+ ;;
+ esac
+ fi
+- if [ ! -f y.tab.h ]; then
++ if test ! -f y.tab.h; then
+ echo >y.tab.h
+ fi
+- if [ ! -f y.tab.c ]; then
++ if test ! -f y.tab.c; then
+ echo 'main() { return 0; }' >y.tab.c
+ fi
+ ;;
+@@ -244,18 +247,18 @@
+ in order for those modifications to take effect. You can get
+ \`Flex' from any GNU archive site."
+ rm -f lex.yy.c
+- if [ $# -ne 1 ]; then
++ if test $# -ne 1; then
+ eval LASTARG="\${$#}"
+- case "$LASTARG" in
++ case $LASTARG in
+ *.l)
+ SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
+- if [ -f "$SRCFILE" ]; then
++ if test -f "$SRCFILE"; then
+ cp "$SRCFILE" lex.yy.c
+ fi
+ ;;
+ esac
+ fi
+- if [ ! -f lex.yy.c ]; then
++ if test ! -f lex.yy.c; then
+ echo 'main() { return 0; }' >lex.yy.c
+ fi
+ ;;
+@@ -267,11 +270,9 @@
+ \`Help2man' package in order for those modifications to take
+ effect. You can get \`Help2man' from any GNU archive site."
+
+- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+- if test -z "$file"; then
+- file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+- fi
+- if [ -f "$file" ]; then
++ file=`echo "$*" | sed -n "$sed_output"`
++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
++ if test -f "$file"; then
+ touch $file
+ else
+ test -z "$file" || exec >$file
+@@ -288,11 +289,24 @@
+ call might also be the consequence of using a buggy \`make' (AIX,
+ DU, IRIX). You might want to install the \`Texinfo' package or
+ the \`GNU make' package. Grab either from any GNU archive site."
+- file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
++ # The file to touch is that specified with -o ...
++ file=`echo "$*" | sed -n "$sed_output"`
++ test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ if test -z "$file"; then
+- file=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
+- file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $file`
+- fi
++ # ... or it is the one specified with @setfilename ...
++ infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
++ file=`sed -n '
++ /^@setfilename/{
++ s/.* \([^ ]*\) *$/\1/
++ p
++ q
++ }' $infile`
++ # ... or it is derived from the source name (dir/f.texi becomes f.info)
++ test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
++ fi
++ # If the file does not exist, the user really needs makeinfo;
++ # let's fail without touching anything.
++ test -f $file || exit 1
+ touch $file
+ ;;
+
+@@ -310,13 +324,13 @@
+ fi
+ firstarg="$1"
+ if shift; then
+- case "$firstarg" in
++ case $firstarg in
+ *o*)
+ firstarg=`echo "$firstarg" | sed s/o//`
+ tar "$firstarg" "$@" && exit 0
+ ;;
+ esac
+- case "$firstarg" in
++ case $firstarg in
+ *h*)
+ firstarg=`echo "$firstarg" | sed s/h//`
+ tar "$firstarg" "$@" && exit 0
+--- a/admin/mkinstalldirs
++++ b/admin/mkinstalldirs
+@@ -1,7 +1,7 @@
+ #! /bin/sh
+ # mkinstalldirs --- make directory hierarchy
+
+-scriptversion=2005-06-29.22
++scriptversion=2006-05-11.19
+
+ # Original author: Noah Friedman <friedman at prep.ai.mit.edu>
+ # Created: 1993-05-16
+@@ -11,6 +11,9 @@
+ # bugs to <bug-automake at gnu.org> or send patches to
+ # <automake-patches at gnu.org>.
+
++nl='
++'
++IFS=" "" $nl"
+ errstatus=0
+ dirmode=
+
Deleted: kde-extras/krusader/tags/1.90.0-2/debian/patches/03_libtool_update.diff
Copied: kde-extras/krusader/tags/1.90.0-2/debian/patches/03_libtool_update.diff (from rev 11903, kde-extras/krusader/trunk/debian/patches/03_libtool_update.diff)
===================================================================
--- kde-extras/krusader/tags/1.90.0-2/debian/patches/03_libtool_update.diff (rev 0)
+++ kde-extras/krusader/tags/1.90.0-2/debian/patches/03_libtool_update.diff 2008-08-10 17:01:44 UTC (rev 11904)
@@ -0,0 +1,8774 @@
+--- a/admin/libtool.m4.in
++++ b/admin/libtool.m4.in
+@@ -1,28 +1,13 @@
+ # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
+-## Copyright 1996, 1997, 1998, 1999, 2000, 2001
++## Copyright 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007
+ ## Free Software Foundation, Inc.
+ ## Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+ ##
+-## This program is free software; you can redistribute it and/or modify
+-## it under the terms of the GNU General Public License as published by
+-## the Free Software Foundation; either version 2 of the License, or
+-## (at your option) any later version.
+-##
+-## This program is distributed in the hope that it will be useful, but
+-## WITHOUT ANY WARRANTY; without even the implied warranty of
+-## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+-## General Public License for more details.
+-##
+-## You should have received a copy of the GNU General Public License
+-## along with this program; if not, write to the Free Software
+-## Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+-##
+-## As a special exception to the GNU General Public License, if you
+-## distribute this file as part of a program that contains a
+-## configuration script generated by Autoconf, you may include it under
+-## the same distribution terms that you use for the rest of that program.
++## This file 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.
+
+-# serial 47 AC_PROG_LIBTOOL
++# serial 51 Debian 1.5.24-1 AC_PROG_LIBTOOL
+
+
+ # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
+@@ -82,7 +67,7 @@
+ LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
+
+ # Always use our own libtool.
+-LIBTOOL='$(SHELL) $(top_builddir)/libtool --silent'
++LIBTOOL='$(SHELL) $(top_builddir)/libtool'
+ AC_SUBST(LIBTOOL)dnl
+
+ # Prevent multiple expansion
+@@ -132,7 +117,7 @@
+
+ # Sed substitution that helps us do robust quoting. It backslashifies
+ # metacharacters that are still active within double-quoted strings.
+-Xsed='sed -e s/^X//'
++Xsed='sed -e 1s/^X//'
+ [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
+
+ # Same as above, but do not quote variable references.
+@@ -152,7 +137,7 @@
+ default_ofile=libtool
+ can_build_shared=yes
+
+-# All known linkers require a `.a' archive for static linking (except M$VC,
++# All known linkers require a `.a' archive for static linking (except MSVC,
+ # which needs '.lib').
+ libext=a
+ ltmain="$ac_aux_dir/ltmain.sh"
+@@ -172,6 +157,7 @@
+ test -z "$AS" && AS=as
+ test -z "$CC" && CC=cc
+ test -z "$LTCC" && LTCC=$CC
++test -z "$LTCFLAGS" && LTCFLAGS=$CFLAGS
+ test -z "$DLLTOOL" && DLLTOOL=dlltool
+ test -z "$LD" && LD=ld
+ test -z "$LN_S" && LN_S="ln -s"
+@@ -184,22 +170,24 @@
+ test -z "$ac_objext" && ac_objext=o
+
+ # Determine commands to create old-style static archives.
+-old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs'
++old_archive_cmds='$AR $AR_FLAGS $oldlib$oldobjs'
+ old_postinstall_cmds='chmod 644 $oldlib'
+ old_postuninstall_cmds=
+
+ if test -n "$RANLIB"; then
+ case $host_os in
+ openbsd*)
+- old_postinstall_cmds="\$RANLIB -t \$oldlib~$old_postinstall_cmds"
++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+ ;;
+ *)
+- old_postinstall_cmds="\$RANLIB \$oldlib~$old_postinstall_cmds"
++ old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+ ;;
+ esac
+ old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+ fi
+
++_LT_CC_BASENAME([$compiler])
++
+ # Only perform the check for file, if the check method requires it
+ case $deplibs_check_method in
+ file_magic*)
+@@ -240,11 +228,58 @@
+ # If no C compiler was specified, use CC.
+ LTCC=${LTCC-"$CC"}
+
++# If no C compiler flags were specified, use CFLAGS.
++LTCFLAGS=${LTCFLAGS-"$CFLAGS"}
++
+ # Allow CC to be a program name with arguments.
+ compiler=$CC
+ ])# _LT_AC_SYS_COMPILER
+
+
++# _LT_CC_BASENAME(CC)
++# -------------------
++# Calculate cc_basename. Skip known compiler wrappers and cross-prefix.
++AC_DEFUN([_LT_CC_BASENAME],
++[for cc_temp in $1""; do
++ case $cc_temp in
++ compile | *[[\\/]]compile | ccache | *[[\\/]]ccache ) ;;
++ distcc | *[[\\/]]distcc | purify | *[[\\/]]purify ) ;;
++ \-*) ;;
++ *) break;;
++ esac
++done
++cc_basename=`$echo "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
++])
++
++
++# _LT_COMPILER_BOILERPLATE
++# ------------------------
++# Check for compiler boilerplate output or warnings with
++# the simple compiler test code.
++AC_DEFUN([_LT_COMPILER_BOILERPLATE],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++ac_outfile=conftest.$ac_objext
++echo "$lt_simple_compile_test_code" >conftest.$ac_ext
++eval "$ac_compile" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
++_lt_compiler_boilerplate=`cat conftest.err`
++$rm conftest*
++])# _LT_COMPILER_BOILERPLATE
++
++
++# _LT_LINKER_BOILERPLATE
++# ----------------------
++# Check for linker boilerplate output or warnings with
++# the simple link test code.
++AC_DEFUN([_LT_LINKER_BOILERPLATE],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++ac_outfile=conftest.$ac_objext
++echo "$lt_simple_link_test_code" >conftest.$ac_ext
++eval "$ac_link" 2>&1 >/dev/null | $SED '/^$/d; /^ *+/d' >conftest.err
++_lt_linker_boilerplate=`cat conftest.err`
++$rm conftest*
++])# _LT_LINKER_BOILERPLATE
++
++
+ # _LT_AC_SYS_LIBPATH_AIX
+ # ----------------------
+ # Links a minimal program and checks the executable
+@@ -254,12 +289,20 @@
+ # If we don't find anything, use the default library path according
+ # to the aix ld manual.
+ AC_DEFUN([_LT_AC_SYS_LIBPATH_AIX],
+-[AC_LINK_IFELSE(AC_LANG_PROGRAM,[
+-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_LINK_IFELSE(AC_LANG_PROGRAM,[
++lt_aix_libpath_sed='
++ /Import File Strings/,/^$/ {
++ /^0/ {
++ s/^0 *\(.*\)$/\1/
++ p
++ }
++ }'
++aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+ # Check for a 64-bit object if we didn't find anything.
+-if test -z "$aix_libpath"; then aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e '/Import File Strings/,/^$/ { /^0/ { s/^0 *\(.*\)$/\1/; p; }
+-}'`; fi],[])
++if test -z "$aix_libpath"; then
++ aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
++fi],[])
+ if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+ ])# _LT_AC_SYS_LIBPATH_AIX
+
+@@ -317,15 +360,15 @@
+
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+ if test -z "$ECHO"; then
+ if test "X${echo_test_string+set}" != Xset; then
+ # find a string as large as possible, as long as the shell can cope with it
+ for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
+ # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
+- if (echo_test_string="`eval $cmd`") 2>/dev/null &&
+- echo_test_string="`eval $cmd`" &&
++ if (echo_test_string=`eval $cmd`) 2>/dev/null &&
++ echo_test_string=`eval $cmd` &&
+ (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
+ then
+ break
+@@ -490,18 +533,21 @@
+ rm -rf conftest*
+ ;;
+
+-x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*|s390*-*linux*|sparc*-*linux*)
++x86_64-*kfreebsd*-gnu|x86_64-*linux*|ppc*-*linux*|powerpc*-*linux*| \
++s390*-*linux*|sparc*-*linux*)
+ # Find out which ABI we are using.
+ echo 'int i;' > conftest.$ac_ext
+ if AC_TRY_EVAL(ac_compile); then
+- case "`/usr/bin/file conftest.o`" in
++ case `/usr/bin/file conftest.o` in
+ *32-bit*)
+- LINUX_64_MODE="32"
+ case $host in
++ x86_64-*kfreebsd*-gnu)
++ LD="${LD-ld} -m elf_i386_fbsd"
++ ;;
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_i386"
+ ;;
+- ppc64-*linux*)
++ ppc64-*linux*|powerpc64-*linux*)
+ LD="${LD-ld} -m elf32ppclinux"
+ ;;
+ s390x-*linux*)
+@@ -513,8 +559,10 @@
+ esac
+ ;;
+ *64-bit*)
+- LINUX_64_MODE="64"
+ case $host in
++ x86_64-*kfreebsd*-gnu)
++ LD="${LD-ld} -m elf_x86_64_fbsd"
++ ;;
+ x86_64-*linux*)
+ LD="${LD-ld} -m elf_x86_64"
+ ;;
+@@ -547,6 +595,22 @@
+ CFLAGS="$SAVE_CFLAGS"
+ fi
+ ;;
++sparc*-*solaris*)
++ # Find out which ABI we are using.
++ echo 'int i;' > conftest.$ac_ext
++ if AC_TRY_EVAL(ac_compile); then
++ case `/usr/bin/file conftest.o` in
++ *64-bit*)
++ case $lt_cv_prog_gnu_ld in
++ yes*) LD="${LD-ld} -m elf64_sparc" ;;
++ *) LD="${LD-ld} -64" ;;
++ esac
++ ;;
++ esac
++ fi
++ rm -rf conftest*
++ ;;
++
+ AC_PROVIDE_IFELSE([AC_LIBTOOL_WIN32_DLL],
+ [*-*-cygwin* | *-*-mingw* | *-*-pw32*)
+ AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+@@ -570,7 +634,7 @@
+ AC_CACHE_CHECK([$1], [$2],
+ [$2=no
+ ifelse([$4], , [ac_outfile=conftest.$ac_objext], [ac_outfile=$4])
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+ lt_compiler_flag="$3"
+ # Insert the option either (1) after the last *FLAGS variable, or
+ # (2) before a word containing "conftest.", or (3) at the end.
+@@ -578,7 +642,7 @@
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ # The option is referenced via a variable to avoid confusing sed.
+ lt_compile=`echo "$ac_compile" | $SED \
+- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++ -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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+@@ -588,8 +652,10 @@
+ echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+ 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
+- if test ! -s conftest.err; then
++ # So say no if there are warnings other than the usual output.
++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++ if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
+ $2=yes
+ fi
+ fi
+@@ -609,17 +675,23 @@
+ # ------------------------------------------------------------
+ # Check whether the given compiler option works
+ AC_DEFUN([AC_LIBTOOL_LINKER_OPTION],
+-[AC_CACHE_CHECK([$1], [$2],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_CACHE_CHECK([$1], [$2],
+ [$2=no
+ save_LDFLAGS="$LDFLAGS"
+ LDFLAGS="$LDFLAGS $3"
+- printf "$lt_simple_link_test_code" > conftest.$ac_ext
++ echo "$lt_simple_link_test_code" > conftest.$ac_ext
+ if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+- # The compiler can only warn and ignore the option if not recognized
++ # The linker can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+ if test -s conftest.err; then
+ # Append any errors to the config.log.
+ cat conftest.err 1>&AS_MESSAGE_LOG_FD
++ $echo "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
++ $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
++ if diff conftest.exp conftest.er2 >/dev/null; then
++ $2=yes
++ fi
+ else
+ $2=yes
+ fi
+@@ -643,7 +715,7 @@
+ AC_MSG_CHECKING([the maximum length of command line arguments])
+ AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
+ i=0
+- testring="ABCD"
++ teststring="ABCD"
+
+ case $build_os in
+ msdosdjgpp*)
+@@ -672,24 +744,77 @@
+ lt_cv_sys_max_cmd_len=8192;
+ ;;
+
+- *)
+- # If test is not a shell built-in, we'll probably end up computing a
+- # maximum length that is only half of the actual maximum length, but
+- # we can't tell.
+- while (test "X"`$CONFIG_SHELL [$]0 --fallback-echo "X$testring" 2>/dev/null` \
+- = "XX$testring") >/dev/null 2>&1 &&
+- new_result=`expr "X$testring" : ".*" 2>&1` &&
+- lt_cv_sys_max_cmd_len=$new_result &&
+- test $i != 17 # 1/2 MB should be enough
+- do
+- i=`expr $i + 1`
+- testring=$testring$testring
+- done
+- testring=
+- # Add a significant safety factor because C++ compilers can tack on massive
+- # amounts of additional arguments before passing them to the linker.
+- # It appears as though 1/2 is a usable value.
+- lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++ amigaos*)
++ # On AmigaOS with pdksh, this test takes hours, literally.
++ # So we just punt and use a minimum line length of 8192.
++ lt_cv_sys_max_cmd_len=8192;
++ ;;
++
++ netbsd* | freebsd* | openbsd* | darwin* | dragonfly*)
++ # This has been around since 386BSD, at least. Likely further.
++ if test -x /sbin/sysctl; then
++ lt_cv_sys_max_cmd_len=`/sbin/sysctl -n kern.argmax`
++ elif test -x /usr/sbin/sysctl; then
++ lt_cv_sys_max_cmd_len=`/usr/sbin/sysctl -n kern.argmax`
++ else
++ lt_cv_sys_max_cmd_len=65536 # usable default for all BSDs
++ fi
++ # And add a safety zone
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++ ;;
++
++ interix*)
++ # We know the value 262144 and hardcode it with a safety zone (like BSD)
++ lt_cv_sys_max_cmd_len=196608
++ ;;
++
++ osf*)
++ # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
++ # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
++ # nice to cause kernel panics so lets avoid the loop below.
++ # First set a reasonable default.
++ lt_cv_sys_max_cmd_len=16384
++ #
++ if test -x /sbin/sysconfig; then
++ case `/sbin/sysconfig -q proc exec_disable_arg_limit` in
++ *1*) lt_cv_sys_max_cmd_len=-1 ;;
++ esac
++ fi
++ ;;
++ sco3.2v5*)
++ lt_cv_sys_max_cmd_len=102400
++ ;;
++ sysv5* | sco5v6* | sysv4.2uw2*)
++ kargmax=`grep ARG_MAX /etc/conf/cf.d/stune 2>/dev/null`
++ if test -n "$kargmax"; then
++ lt_cv_sys_max_cmd_len=`echo $kargmax | sed 's/.*[[ ]]//'`
++ else
++ lt_cv_sys_max_cmd_len=32768
++ fi
++ ;;
++ *)
++ lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
++ if test -n "$lt_cv_sys_max_cmd_len"; then
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
++ else
++ SHELL=${SHELL-${CONFIG_SHELL-/bin/sh}}
++ while (test "X"`$SHELL [$]0 --fallback-echo "X$teststring" 2>/dev/null` \
++ = "XX$teststring") >/dev/null 2>&1 &&
++ new_result=`expr "X$teststring" : ".*" 2>&1` &&
++ lt_cv_sys_max_cmd_len=$new_result &&
++ test $i != 17 # 1/2 MB should be enough
++ do
++ i=`expr $i + 1`
++ teststring=$teststring$teststring
++ done
++ teststring=
++ # Add a significant safety factor because C++ compilers can tack on massive
++ # amounts of additional arguments before passing them to the linker.
++ # It appears as though 1/2 is a usable value.
++ lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 2`
++ fi
+ ;;
+ esac
+ ])
+@@ -702,7 +827,7 @@
+
+
+ # _LT_AC_CHECK_DLFCN
+-# --------------------
++# ------------------
+ AC_DEFUN([_LT_AC_CHECK_DLFCN],
+ [AC_CHECK_HEADERS(dlfcn.h)dnl
+ ])# _LT_AC_CHECK_DLFCN
+@@ -710,7 +835,7 @@
+
+ # _LT_AC_TRY_DLOPEN_SELF (ACTION-IF-TRUE, ACTION-IF-TRUE-W-USCORE,
+ # ACTION-IF-FALSE, ACTION-IF-CROSS-COMPILING)
+-# ------------------------------------------------------------------
++# ---------------------------------------------------------------------
+ AC_DEFUN([_LT_AC_TRY_DLOPEN_SELF],
+ [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+ if test "$cross_compiling" = yes; then :
+@@ -776,17 +901,19 @@
+ else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+ /* dlclose (self); */
+ }
++ else
++ puts (dlerror ());
+
+ exit (status);
+ }]
+ EOF
+ if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
+- (./conftest; exit; ) 2>/dev/null
++ (./conftest; exit; ) >&AS_MESSAGE_LOG_FD 2>/dev/null
+ lt_status=$?
+ case x$lt_status in
+ x$lt_dlno_uscore) $1 ;;
+ x$lt_dlneed_uscore) $2 ;;
+- x$lt_unknown|x*) $3 ;;
++ x$lt_dlunknown|x*) $3 ;;
+ esac
+ else :
+ # compilation failed
+@@ -798,7 +925,7 @@
+
+
+ # AC_LIBTOOL_DLOPEN_SELF
+-# -------------------
++# ----------------------
+ AC_DEFUN([AC_LIBTOOL_DLOPEN_SELF],
+ [AC_REQUIRE([_LT_AC_CHECK_DLFCN])dnl
+ if test "x$enable_dlopen" != xyes; then
+@@ -835,7 +962,7 @@
+ lt_cv_dlopen_self=yes
+ ])
+ ;;
+-
++
+ *)
+ AC_CHECK_FUNC([shl_load],
+ [lt_cv_dlopen="shl_load"],
+@@ -869,7 +996,7 @@
+ test "x$ac_cv_header_dlfcn_h" = xyes && CPPFLAGS="$CPPFLAGS -DHAVE_DLFCN_H"
+
+ save_LDFLAGS="$LDFLAGS"
+- eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $export_dynamic_flag_spec\"
+
+ save_LIBS="$LIBS"
+ LIBS="$lt_cv_dlopen_libs $LIBS"
+@@ -882,7 +1009,7 @@
+ ])
+
+ if test "x$lt_cv_dlopen_self" = xyes; then
+- LDFLAGS="$LDFLAGS $link_static_flag"
++ wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
+ AC_CACHE_CHECK([whether a statically linked program can dlopen itself],
+ lt_cv_dlopen_self_static, [dnl
+ _LT_AC_TRY_DLOPEN_SELF(
+@@ -914,7 +1041,8 @@
+ # ---------------------------------
+ # Check to see if options -c and -o are simultaneously supported by compiler
+ AC_DEFUN([AC_LIBTOOL_PROG_CC_C_O],
+-[AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_REQUIRE([_LT_AC_SYS_COMPILER])dnl
+ AC_CACHE_CHECK([if $compiler supports -c -o file.$ac_objext],
+ [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)],
+ [_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=no
+@@ -922,14 +1050,7 @@
+ mkdir conftest
+ cd conftest
+ mkdir out
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-
+- # According to Tom Tromey, Ian Lance Taylor reported there are C compilers
+- # that will create temporary files in the current directory regardless of
+- # the output directory. Thus, making CWD read-only will cause this test
+- # to fail, enabling locking or at least warning the user not to do parallel
+- # builds.
+- chmod -w .
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+ lt_compiler_flag="-o out/conftest2.$ac_objext"
+ # Insert the option either (1) after the last *FLAGS variable, or
+@@ -937,7 +1058,7 @@
+ # Note that $ac_compile itself does not contain backslashes and begins
+ # with a dollar sign (not a hyphen), so the echo should work correctly.
+ lt_compile=`echo "$ac_compile" | $SED \
+- -e 's:.*FLAGS}? :&$lt_compiler_flag :; t' \
++ -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:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+@@ -949,13 +1070,18 @@
+ then
+ # The compiler can only warn and ignore the option if not recognized
+ # So say no if there are warnings
+- if test ! -s out/conftest.err; then
++ $echo "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
++ $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
++ if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+ fi
+ fi
+- chmod u+w .
+- $rm conftest* out/*
+- rmdir out
++ chmod u+w . 2>&AS_MESSAGE_LOG_FD
++ $rm conftest*
++ # SGI C++ compiler will create directory out/ii_files/ for
++ # template instantiation
++ test -d out/ii_files && $rm out/ii_files/* && rmdir out/ii_files
++ $rm out/* && rmdir out
+ cd ..
+ rmdir conftest
+ $rm conftest*
+@@ -1014,8 +1140,8 @@
+ [AC_MSG_CHECKING([how to hardcode library paths into programs])
+ _LT_AC_TAGVAR(hardcode_action, $1)=
+ if test -n "$_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)" || \
+- test -n "$_LT_AC_TAGVAR(runpath_var $1)" || \
+- test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)"="Xyes" ; then
++ test -n "$_LT_AC_TAGVAR(runpath_var, $1)" || \
++ test "X$_LT_AC_TAGVAR(hardcode_automatic, $1)" = "Xyes" ; then
+
+ # We can hardcode non-existant directories.
+ if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
+@@ -1064,6 +1190,7 @@
+ darwin*)
+ if test -n "$STRIP" ; then
+ striplib="$STRIP -x"
++ old_striplib="$STRIP -S"
+ AC_MSG_RESULT([yes])
+ else
+ AC_MSG_RESULT([no])
+@@ -1072,7 +1199,7 @@
+ *)
+ AC_MSG_RESULT([no])
+ ;;
+- esac
++ esac
+ fi
+ ])# AC_LIBTOOL_SYS_LIB_STRIP
+
+@@ -1081,11 +1208,12 @@
+ # -----------------------------
+ # PORTME Fill in your ld.so characteristics
+ AC_DEFUN([AC_LIBTOOL_SYS_DYNAMIC_LINKER],
+-[AC_MSG_CHECKING([dynamic linker characteristics])
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_MSG_CHECKING([dynamic linker characteristics])
+ library_names_spec=
+ libname_spec='lib$name'
+ soname_spec=
+-shrext=".so"
++shrext_cmds=".so"
+ postinstall_cmds=
+ postuninstall_cmds=
+ finish_cmds=
+@@ -1095,7 +1223,58 @@
+ version_type=none
+ dynamic_linker="$host_os ld.so"
+ sys_lib_dlsearch_path_spec="/lib /usr/lib"
+-sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++m4_if($1,[],[
++if test "$GCC" = yes; then
++ case $host_os in
++ darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
++ *) lt_awk_arg="/^libraries:/" ;;
++ esac
++ lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
++ if echo "$lt_search_path_spec" | grep ';' >/dev/null ; then
++ # if the path contains ";" then we assume it to be the separator
++ # otherwise default to the standard path separator (i.e. ":") - it is
++ # assumed that no part of a normal pathname contains ";" but that should
++ # okay in the real world where ";" in dirpaths is itself problematic.
++ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e 's/;/ /g'`
++ else
++ lt_search_path_spec=`echo "$lt_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
++ fi
++ # Ok, now we have the path, separated by spaces, we can step through it
++ # and add multilib dir if necessary.
++ lt_tmp_lt_search_path_spec=
++ lt_multi_os_dir=`$CC $CPPFLAGS $CFLAGS $LDFLAGS -print-multi-os-directory 2>/dev/null`
++ for lt_sys_path in $lt_search_path_spec; do
++ if test -d "$lt_sys_path/$lt_multi_os_dir"; then
++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path/$lt_multi_os_dir"
++ else
++ test -d "$lt_sys_path" && \
++ lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
++ fi
++ done
++ lt_search_path_spec=`echo $lt_tmp_lt_search_path_spec | awk '
++BEGIN {RS=" "; FS="/|\n";} {
++ lt_foo="";
++ lt_count=0;
++ for (lt_i = NF; lt_i > 0; lt_i--) {
++ if ($lt_i != "" && $lt_i != ".") {
++ if ($lt_i == "..") {
++ lt_count++;
++ } else {
++ if (lt_count == 0) {
++ lt_foo="/" $lt_i lt_foo;
++ } else {
++ lt_count--;
++ }
++ }
++ }
++ }
++ if (lt_foo != "") { lt_freq[[lt_foo]]++; }
++ if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
++}'`
++ sys_lib_search_path_spec=`echo $lt_search_path_spec`
++else
++ sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
++fi])
+ need_lib_prefix=unknown
+ hardcode_into_libs=no
+
+@@ -1160,7 +1339,7 @@
+ amigaos*)
+ library_names_spec='$libname.ixlibrary $libname.a'
+ # Create ${libname}_ixlibrary.a entries in /sys/libs.
+- finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "(cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a)"; (cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a) || exit 1; done'
++ finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$echo "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $rm /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+ ;;
+
+ beos*)
+@@ -1169,7 +1348,7 @@
+ shlibpath_var=LIBRARY_PATH
+ ;;
+
+-bsdi4*)
++bsdi[[45]]*)
+ version_type=linux
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -1185,7 +1364,7 @@
+
+ cygwin* | mingw* | pw32*)
+ version_type=windows
+- shrext=".dll"
++ shrext_cmds=".dll"
+ need_version=no
+ need_lib_prefix=no
+
+@@ -1197,7 +1376,8 @@
+ dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
+ dldir=$destdir/`dirname \$dlpath`~
+ test -d \$dldir || mkdir -p \$dldir~
+- $install_prog $dir/$dlname \$dldir/$dlname'
++ $install_prog $dir/$dlname \$dldir/$dlname~
++ chmod a+x \$dldir/$dlname'
+ postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+ dlpath=$dir/\$dldll~
+ $rm \$dlpath'
+@@ -1227,7 +1407,7 @@
+ ;;
+ pw32*)
+ # pw32 DLLs use 'pw' prefix rather than 'lib'
+- library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
++ library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+ ;;
+ esac
+ ;;
+@@ -1250,13 +1430,9 @@
+ soname_spec='${libname}${release}${major}$shared_ext'
+ shlibpath_overrides_runpath=yes
+ shlibpath_var=DYLD_LIBRARY_PATH
+- shrext='$(test .$module = .yes && echo .so || echo .dylib)'
+- # Apple's gcc prints 'gcc -print-search-dirs' doesn't operate the same.
+- if test "$GCC" = yes; then
+- sys_lib_search_path_spec=`$CC -print-search-dirs | tr "\n" "$PATH_SEPARATOR" | sed -e 's/libraries:/@libraries:/' | tr "@" "\n" | grep "^libraries:" | sed -e "s/^libraries://" -e "s,=/,/,g" -e "s,$PATH_SEPARATOR, ,g" -e "s,.*,& /lib /usr/lib /usr/local/lib,g"`
+- else
+- sys_lib_search_path_spec='/lib /usr/lib /usr/local/lib'
+- fi
++ shrext_cmds='`test .$module = .yes && echo .so || echo .dylib`'
++ m4_if([$1], [],[
++ sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/local/lib"])
+ sys_lib_dlsearch_path_spec='/usr/local/lib /lib /usr/lib'
+ ;;
+
+@@ -1273,20 +1449,17 @@
+ dynamic_linker=no
+ ;;
+
+-kfreebsd*-gnu*)
+- version_type=linux
+- need_lib_prefix=no
+- need_version=no
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+- soname_spec='${libname}${release}${shared_ext}$major'
+- shlibpath_var=LD_LIBRARY_PATH
+- shlibpath_overrides_runpath=no
+- hardcode_into_libs=yes
+- dynamic_linker='GNU ld.so'
+- ;;
+-
+-freebsd*)
+- objformat=`test -x /usr/bin/objformat && /usr/bin/objformat || echo aout`
++freebsd* | dragonfly*)
++ # DragonFly does not have aout. When/if they implement a new
++ # versioning mechanism, adjust this.
++ if test -x /usr/bin/objformat; then
++ objformat=`/usr/bin/objformat`
++ else
++ case $host_os in
++ freebsd[[123]]*) objformat=aout ;;
++ *) objformat=elf ;;
++ esac
++ fi
+ version_type=freebsd-$objformat
+ case $version_type in
+ freebsd-elf*)
+@@ -1304,14 +1477,19 @@
+ freebsd2*)
+ shlibpath_overrides_runpath=yes
+ ;;
+- freebsd3.[01]* | freebsdelf3.[01]*)
++ freebsd3.[[01]]* | freebsdelf3.[[01]]*)
+ shlibpath_overrides_runpath=yes
+ hardcode_into_libs=yes
+ ;;
+- *) # from 3.2 on
++ freebsd3.[[2-9]]* | freebsdelf3.[[2-9]]* | \
++ freebsd4.[[0-5]] | freebsdelf4.[[0-5]] | freebsd4.1.1 | freebsdelf4.1.1)
+ shlibpath_overrides_runpath=no
+ hardcode_into_libs=yes
+ ;;
++ *) # from 4.6 on, and DragonFly
++ shlibpath_overrides_runpath=yes
++ hardcode_into_libs=yes
++ ;;
+ esac
+ ;;
+
+@@ -1331,9 +1509,9 @@
+ version_type=sunos
+ need_lib_prefix=no
+ need_version=no
+- case "$host_cpu" in
++ case $host_cpu in
+ ia64*)
+- shrext='.so'
++ shrext_cmds='.so'
+ hardcode_into_libs=yes
+ dynamic_linker="$host_os dld.so"
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -1348,7 +1526,7 @@
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+ hppa*64*)
+- shrext='.sl'
++ shrext_cmds='.sl'
+ hardcode_into_libs=yes
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
+@@ -1359,7 +1537,7 @@
+ sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
+ ;;
+ *)
+- shrext='.sl'
++ shrext_cmds='.sl'
+ dynamic_linker="$host_os dld.sl"
+ shlibpath_var=SHLIB_PATH
+ shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
+@@ -1371,6 +1549,18 @@
+ postinstall_cmds='chmod 555 $lib'
+ ;;
+
++interix[[3-9]]*)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ dynamic_linker='Interix 3.x ld.so.1 (PE, like ELF)'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ ;;
++
+ irix5* | irix6* | nonstopux*)
+ case $host_os in
+ nonstopux*) version_type=nonstopux ;;
+@@ -1414,29 +1604,26 @@
+ ;;
+
+ # This must be Linux ELF.
+-linux*)
++linux* | k*bsd*-gnu)
+ version_type=linux
+ need_lib_prefix=no
+ need_version=no
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
+- libsuff=
+- if test "x$LINUX_64_MODE" = x64; then
+- # Some platforms are per default 64-bit, so there's no /lib64
+- if test -d /lib64; then
+- libsuff=64
+- fi
+- fi
+ shlibpath_var=LD_LIBRARY_PATH
+ shlibpath_overrides_runpath=no
+- sys_lib_dlsearch_path_spec="/lib${libsuff} /usr/lib${libsuff}"
+- sys_lib_search_path_spec="/lib${libsuff} /usr/lib${libsuff} /usr/local/lib${libsuff}"
+ # This implies no fast_install, which is unacceptable.
+ # Some rework will be needed to allow for fast_install
+ # before this can be enabled.
+ hardcode_into_libs=yes
+
++ # Append ld.so.conf contents to the search path
++ if test -f /etc/ld.so.conf; then
++ lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[ ]*hwcap[ ]/d;s/[:, ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
++ sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
++ fi
++
+ # We used to test for /lib/ld.so.1 and disable shared libraries on
+ # powerpc, because MkLinux only supported shared libraries with the
+ # GNU dynamic linker. Since this was broken with cross compilers,
+@@ -1446,6 +1633,18 @@
+ dynamic_linker='GNU/Linux ld.so'
+ ;;
+
++netbsdelf*-gnu)
++ version_type=linux
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ shlibpath_overrides_runpath=no
++ hardcode_into_libs=yes
++ dynamic_linker='NetBSD ld.elf_so'
++ ;;
++
+ netbsd*)
+ version_type=sunos
+ need_lib_prefix=no
+@@ -1455,7 +1654,7 @@
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ dynamic_linker='NetBSD (a.out) ld.so'
+ else
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${release}${shared_ext} ${libname}${shared_ext}'
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+ dynamic_linker='NetBSD ld.elf_so'
+ fi
+@@ -1483,8 +1682,13 @@
+
+ openbsd*)
+ version_type=sunos
++ sys_lib_dlsearch_path_spec="/usr/lib"
+ need_lib_prefix=no
+- need_version=no
++ # Some older versions of OpenBSD (3.3 at least) *do* need versioned libs.
++ case $host_os in
++ openbsd3.3 | openbsd3.3.*) need_version=yes ;;
++ *) need_version=no ;;
++ esac
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${shared_ext}$versuffix'
+ finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
+ shlibpath_var=LD_LIBRARY_PATH
+@@ -1504,7 +1708,7 @@
+
+ os2*)
+ libname_spec='$name'
+- shrext=".dll"
++ shrext_cmds=".dll"
+ need_lib_prefix=no
+ library_names_spec='$libname${shared_ext} $libname.a'
+ dynamic_linker='OS/2 ld.exe'
+@@ -1522,11 +1726,8 @@
+ sys_lib_dlsearch_path_spec="$sys_lib_search_path_spec"
+ ;;
+
+-sco3.2v5*)
+- version_type=osf
+- soname_spec='${libname}${release}${shared_ext}$major'
+- library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+- shlibpath_var=LD_LIBRARY_PATH
++rdos*)
++ dynamic_linker=no
+ ;;
+
+ solaris*)
+@@ -1554,7 +1755,7 @@
+ need_version=yes
+ ;;
+
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++sysv4 | sysv4.3*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+ soname_spec='${libname}${release}${shared_ext}$major'
+@@ -1587,6 +1788,29 @@
+ fi
+ ;;
+
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
++ version_type=freebsd-elf
++ need_lib_prefix=no
++ need_version=no
++ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext} $libname${shared_ext}'
++ soname_spec='${libname}${release}${shared_ext}$major'
++ shlibpath_var=LD_LIBRARY_PATH
++ hardcode_into_libs=yes
++ if test "$with_gnu_ld" = yes; then
++ sys_lib_search_path_spec='/usr/local/lib /usr/gnu/lib /usr/ccs/lib /usr/lib /lib'
++ shlibpath_overrides_runpath=no
++ else
++ sys_lib_search_path_spec='/usr/ccs/lib /usr/lib'
++ shlibpath_overrides_runpath=yes
++ case $host_os in
++ sco3.2v5*)
++ sys_lib_search_path_spec="$sys_lib_search_path_spec /lib"
++ ;;
++ esac
++ fi
++ sys_lib_dlsearch_path_spec='/usr/lib'
++ ;;
++
+ uts4*)
+ version_type=linux
+ library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
+@@ -1600,13 +1824,19 @@
+ esac
+ AC_MSG_RESULT([$dynamic_linker])
+ test "$dynamic_linker" = no && can_build_shared=no
++
++variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
++if test "$GCC" = yes; then
++ variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
++fi
+ ])# AC_LIBTOOL_SYS_DYNAMIC_LINKER
+
+
+ # _LT_AC_TAGCONFIG
+ # ----------------
+ AC_DEFUN([_LT_AC_TAGCONFIG],
+-[AC_ARG_WITH([tags],
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_ARG_WITH([tags],
+ [AC_HELP_STRING([--with-tags@<:@=TAGS@:>@],
+ [include additional configurations @<:@automatic@:>@])],
+ [tagnames="$withval"])
+@@ -1624,6 +1854,9 @@
+ AC_MSG_WARN([using `LTCC=$LTCC', extracted from `$ofile'])
+ fi
+ fi
++ if test -z "$LTCFLAGS"; then
++ eval "`$SHELL ${ofile} --config | grep '^LTCFLAGS='`"
++ fi
+
+ # Extract list of available tagged configurations in $ofile.
+ # Note that this assumes the entire list is on one line.
+@@ -1650,7 +1883,9 @@
+
+ case $tagname in
+ CXX)
+- if test -n "$CXX" && test "X$CXX" != "Xno"; then
++ if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++ (test "X$CXX" != "Xg++"))) ; then
+ AC_LIBTOOL_LANG_CXX_CONFIG
+ else
+ tagname=""
+@@ -1712,7 +1947,7 @@
+
+ # AC_LIBTOOL_WIN32_DLL
+ # --------------------
+-# declare package support for building win32 dll's
++# declare package support for building win32 DLLs
+ AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
+ [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
+ ])# AC_LIBTOOL_WIN32_DLL
+@@ -1750,7 +1985,7 @@
+
+ # AC_DISABLE_SHARED
+ # -----------------
+-#- set the default shared flag to --disable-shared
++# set the default shared flag to --disable-shared
+ AC_DEFUN([AC_DISABLE_SHARED],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+ AC_ENABLE_SHARED(no)
+@@ -1862,7 +2097,7 @@
+
+ # AC_PATH_TOOL_PREFIX
+ # -------------------
+-# find a file program which can recognise shared library
++# find a file program which can recognize shared library
+ AC_DEFUN([AC_PATH_TOOL_PREFIX],
+ [AC_REQUIRE([AC_PROG_EGREP])dnl
+ AC_MSG_CHECKING([for $1])
+@@ -1886,7 +2121,7 @@
+ if test -n "$file_magic_test_file"; then
+ case $deplibs_check_method in
+ "file_magic "*)
+- file_magic_regex="`expr \"$deplibs_check_method\" : \"file_magic \(.*\)\"`"
++ file_magic_regex=`expr "$deplibs_check_method" : "file_magic \(.*\)"`
+ MAGIC_CMD="$lt_cv_path_MAGIC_CMD"
+ if eval $file_magic_cmd \$file_magic_test_file 2> /dev/null |
+ $EGREP "$file_magic_regex" > /dev/null; then
+@@ -1925,7 +2160,7 @@
+
+ # AC_PATH_MAGIC
+ # -------------
+-# find a file program which can recognise a shared library
++# find a file program which can recognize a shared library
+ AC_DEFUN([AC_PATH_MAGIC],
+ [AC_PATH_TOOL_PREFIX(${ac_tool_prefix}file, /usr/bin$PATH_SEPARATOR$PATH)
+ if test -z "$lt_cv_path_MAGIC_CMD"; then
+@@ -1996,7 +2231,7 @@
+ if test -f "$ac_dir/$ac_prog" || test -f "$ac_dir/$ac_prog$ac_exeext"; then
+ lt_cv_path_LD="$ac_dir/$ac_prog"
+ # Check to see if the program is GNU ld. I'd rather use --version,
+- # but apparently some GNU ld's only accept -v.
++ # but apparently some variants of GNU ld only accept -v.
+ # Break only if it was the GNU/non-GNU ld that we prefer.
+ case `"$lt_cv_path_LD" -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+@@ -2028,7 +2263,7 @@
+ AC_DEFUN([AC_PROG_LD_GNU],
+ [AC_REQUIRE([AC_PROG_EGREP])dnl
+ AC_CACHE_CHECK([if the linker ($LD) is GNU ld], lt_cv_prog_gnu_ld,
+-[# I'd rather use --version here, but apparently some GNU ld's only accept -v.
++[# I'd rather use --version here, but apparently some GNU lds only accept -v.
+ case `$LD -v 2>&1 </dev/null` in
+ *GNU* | *'with BFD'*)
+ lt_cv_prog_gnu_ld=yes
+@@ -2055,6 +2290,15 @@
+ *) reload_flag=" $reload_flag" ;;
+ esac
+ reload_cmds='$LD$reload_flag -o $output$reload_objs'
++case $host_os in
++ darwin*)
++ if test "$GCC" = yes; then
++ reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
++ else
++ reload_cmds='$LD$reload_flag -o $output$reload_objs'
++ fi
++ ;;
++esac
+ ])# AC_PROG_LD_RELOAD_FLAG
+
+
+@@ -2063,7 +2307,7 @@
+ # how to check for library dependencies
+ # -- PORTME fill in with the dynamic library characteristics
+ AC_DEFUN([AC_DEPLIBS_CHECK_METHOD],
+-[AC_CACHE_CHECK([how to recognise dependent libraries],
++[AC_CACHE_CHECK([how to recognize dependent libraries],
+ lt_cv_deplibs_check_method,
+ [lt_cv_file_magic_cmd='$MAGIC_CMD'
+ lt_cv_file_magic_test_file=
+@@ -2088,44 +2332,42 @@
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-bsdi4*)
++bsdi[[45]]*)
+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib)'
+ lt_cv_file_magic_cmd='/usr/bin/file -L'
+ lt_cv_file_magic_test_file=/shlib/libc.so
+ ;;
+
+ cygwin*)
+- lt_cv_deplibs_check_method=pass_all
++ # func_win32_libid is a shell function defined in ltmain.sh
++ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++ lt_cv_file_magic_cmd='func_win32_libid'
+ ;;
+-
++
+ mingw* | pw32*)
+- # win32_libid is a shell function defined in ltmain.sh
+- lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
+- lt_cv_file_magic_cmd='win32_libid'
++ # Base MSYS/MinGW do not provide the 'file' command needed by
++ # func_win32_libid shell function, so use a weaker test based on 'objdump',
++ # unless we find 'file', for example because we are cross-compiling.
++ if ( file / ) >/dev/null 2>&1; then
++ lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
++ lt_cv_file_magic_cmd='func_win32_libid'
++ else
++ lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
++ lt_cv_file_magic_cmd='$OBJDUMP -f'
++ fi
+ ;;
+
+ darwin* | rhapsody*)
+- # this will be overwritten by pass_all, but leave it in just in case
+- lt_cv_deplibs_check_method='file_magic Mach-O dynamically linked shared library'
+- lt_cv_file_magic_cmd='/usr/bin/file -L'
+- case "$host_os" in
+- rhapsody* | darwin1.[[012]])
+- lt_cv_file_magic_test_file=`/System/Library/Frameworks/System.framework/System`
+- ;;
+- *) # Darwin 1.3 on
+- lt_cv_file_magic_test_file='/usr/lib/libSystem.dylib'
+- ;;
+- esac
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-freebsd* | kfreebsd*-gnu)
++freebsd* | dragonfly*)
+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+ case $host_cpu in
+ i*86 )
+ # Not sure whether the presence of OpenBSD here was a mistake.
+ # Let's accept both of them until this is cleared up.
+- lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD)/i[[3-9]]86 (compact )?demand paged shared library'
++ lt_cv_deplibs_check_method='file_magic (FreeBSD|OpenBSD|DragonFly)/i[[3-9]]86 (compact )?demand paged shared library'
+ lt_cv_file_magic_cmd=/usr/bin/file
+ lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+ ;;
+@@ -2141,7 +2383,7 @@
+
+ hpux10.20* | hpux11*)
+ lt_cv_file_magic_cmd=/usr/bin/file
+- case "$host_cpu" in
++ case $host_cpu in
+ ia64*)
+ lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|ELF-[[0-9]][[0-9]]) shared object file - IA64'
+ lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
+@@ -2157,43 +2399,27 @@
+ esac
+ ;;
+
++interix[[3-9]]*)
++ # PIC code is broken on Interix 3.x, that's why |\.a not |_pic\.a here
++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so|\.a)$'
++ ;;
++
+ irix5* | irix6* | nonstopux*)
+- case $host_os in
+- irix5* | nonstopux*)
+- # this will be overridden with pass_all, but let us keep it just in case
+- lt_cv_deplibs_check_method="file_magic ELF 32-bit MSB dynamic lib MIPS - version 1"
+- ;;
+- *)
+- case $LD in
+- *-32|*"-32 ") libmagic=32-bit;;
+- *-n32|*"-n32 ") libmagic=N32;;
+- *-64|*"-64 ") libmagic=64-bit;;
+- *) libmagic=never-match;;
+- esac
+- # this will be overridden with pass_all, but let us keep it just in case
+- lt_cv_deplibs_check_method="file_magic ELF ${libmagic} MSB mips-[[1234]] dynamic lib MIPS - version 1"
+- ;;
++ case $LD in
++ *-32|*"-32 ") libmagic=32-bit;;
++ *-n32|*"-n32 ") libmagic=N32;;
++ *-64|*"-64 ") libmagic=64-bit;;
++ *) libmagic=never-match;;
+ esac
+- lt_cv_file_magic_test_file=`echo /lib${libsuff}/libc.so*`
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+ # This must be Linux ELF.
+-linux*)
+- case $host_cpu in
+- alpha* | hppa* | i*86 | ia64* | m68* | mips* | powerpc* | sparc* | s390* | sh* | x86_64* )
+- lt_cv_deplibs_check_method=pass_all ;;
+- # the debian people say, arm and glibc 2.3.1 works for them with pass_all
+- arm* )
+- lt_cv_deplibs_check_method=pass_all ;;
+- *)
+- # glibc up to 2.1.1 does not perform some relocations on ARM
+- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB (shared object|dynamic lib )' ;;
+- esac
+- lt_cv_file_magic_test_file=`echo /lib/libc.so* /lib/libc-*.so`
++linux* | k*bsd*-gnu)
++ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-netbsd*)
++netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
+ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+ else
+@@ -2212,32 +2438,26 @@
+ ;;
+
+ openbsd*)
+- lt_cv_file_magic_cmd=/usr/bin/file
+- lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
+ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[LM]]SB shared object'
++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|\.so|_pic\.a)$'
+ else
+- lt_cv_deplibs_check_method='file_magic OpenBSD.* shared library'
++ lt_cv_deplibs_check_method='match_pattern /lib[[^/]]+(\.so\.[[0-9]]+\.[[0-9]]+|_pic\.a)$'
+ fi
+ ;;
+
+ osf3* | osf4* | osf5*)
+- # this will be overridden with pass_all, but let us keep it just in case
+- lt_cv_deplibs_check_method='file_magic COFF format alpha shared library'
+- lt_cv_file_magic_test_file=/shlib/libc.so
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+-sco3.2v5*)
++rdos*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+
+ solaris*)
+ lt_cv_deplibs_check_method=pass_all
+- lt_cv_file_magic_test_file=/lib/libc.so
+ ;;
+
+-sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++sysv4 | sysv4.3*)
+ case $host_vendor in
+ motorola)
+ lt_cv_deplibs_check_method='file_magic ELF [[0-9]][[0-9]]*-bit [[ML]]SB (shared object|dynamic lib) M[[0-9]][[0-9]]* Version [[0-9]]'
+@@ -2258,10 +2478,13 @@
+ siemens)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
++ pc)
++ lt_cv_deplibs_check_method=pass_all
++ ;;
+ esac
+ ;;
+
+-sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7* | sysv4*uw2*)
++sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX* | sysv4*uw2*)
+ lt_cv_deplibs_check_method=pass_all
+ ;;
+ esac
+@@ -2281,36 +2504,43 @@
+ # Let the user override the test.
+ lt_cv_path_NM="$NM"
+ else
+- lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
+- for ac_dir in $PATH /usr/ccs/bin /usr/ucb /bin; do
+- IFS="$lt_save_ifs"
+- test -z "$ac_dir" && ac_dir=.
+- tmp_nm="$ac_dir/${ac_tool_prefix}nm"
+- if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
+- # Check to see if the nm accepts a BSD-compat flag.
+- # Adding the `sed 1q' prevents false positives on HP-UX, which says:
+- # nm: unknown option "B" ignored
+- # Tru64's nm complains that /dev/null is an invalid object file
+- case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
+- */dev/null* | *'Invalid file or object type'*)
+- lt_cv_path_NM="$tmp_nm -B"
+- break
+- ;;
+- *)
+- case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
+- */dev/null*)
+- lt_cv_path_NM="$tmp_nm -p"
++ lt_nm_to_check="${ac_tool_prefix}nm"
++ if test -n "$ac_tool_prefix" && test "$build" = "$host"; then
++ lt_nm_to_check="$lt_nm_to_check nm"
++ fi
++ for lt_tmp_nm in $lt_nm_to_check; do
++ lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
++ for ac_dir in $PATH /usr/ccs/bin/elf /usr/ccs/bin /usr/ucb /bin; do
++ IFS="$lt_save_ifs"
++ test -z "$ac_dir" && ac_dir=.
++ tmp_nm="$ac_dir/$lt_tmp_nm"
++ if test -f "$tmp_nm" || test -f "$tmp_nm$ac_exeext" ; then
++ # Check to see if the nm accepts a BSD-compat flag.
++ # Adding the `sed 1q' prevents false positives on HP-UX, which says:
++ # nm: unknown option "B" ignored
++ # Tru64's nm complains that /dev/null is an invalid object file
++ case `"$tmp_nm" -B /dev/null 2>&1 | sed '1q'` in
++ */dev/null* | *'Invalid file or object type'*)
++ lt_cv_path_NM="$tmp_nm -B"
+ break
+ ;;
+ *)
+- lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
+- continue # so that we can try to find one that supports BSD flags
++ case `"$tmp_nm" -p /dev/null 2>&1 | sed '1q'` in
++ */dev/null*)
++ lt_cv_path_NM="$tmp_nm -p"
++ break
++ ;;
++ *)
++ lt_cv_path_NM=${lt_cv_path_NM="$tmp_nm"} # keep the first match, but
++ continue # so that we can try to find one that supports BSD flags
++ ;;
++ esac
+ ;;
+ esac
+- esac
+- fi
++ fi
++ done
++ IFS="$lt_save_ifs"
+ done
+- IFS="$lt_save_ifs"
+ test -z "$lt_cv_path_NM" && lt_cv_path_NM=nm
+ fi])
+ NM="$lt_cv_path_NM"
+@@ -2342,13 +2572,13 @@
+ # -----------------------------------
+ # sets LIBLTDL to the link flags for the libltdl convenience library and
+ # LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-convenience to the configure arguments. Note that LIBLTDL
+-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If
+-# DIRECTORY is not provided, it is assumed to be `libltdl'. LIBLTDL will
+-# be prefixed with '${top_builddir}/' and LTDLINCL will be prefixed with
+-# '${top_srcdir}/' (note the single quotes!). If your package is not
+-# flat and you're not using automake, define top_builddir and
+-# top_srcdir appropriately in the Makefiles.
++# --enable-ltdl-convenience to the configure arguments. Note that
++# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
++# it is assumed to be `libltdl'. LIBLTDL will be prefixed with
++# '${top_builddir}/' and LTDLINCL will be prefixed with '${top_srcdir}/'
++# (note the single quotes!). If your package is not flat and you're not
++# using automake, define top_builddir and top_srcdir appropriately in
++# the Makefiles.
+ AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+ case $enable_ltdl_convenience in
+@@ -2367,13 +2597,13 @@
+ # -----------------------------------
+ # sets LIBLTDL to the link flags for the libltdl installable library and
+ # LTDLINCL to the include flags for the libltdl header and adds
+-# --enable-ltdl-install to the configure arguments. Note that LIBLTDL
+-# and LTDLINCL are not AC_SUBSTed, nor is AC_CONFIG_SUBDIRS called. If
+-# DIRECTORY is not provided and an installed libltdl is not found, it is
+-# assumed to be `libltdl'. LIBLTDL will be prefixed with '${top_builddir}/'
+-# and LTDLINCL will be prefixed with '${top_srcdir}/' (note the single
+-# quotes!). If your package is not flat and you're not using automake,
+-# define top_builddir and top_srcdir appropriately in the Makefiles.
++# --enable-ltdl-install to the configure arguments. Note that
++# AC_CONFIG_SUBDIRS is not called here. If DIRECTORY is not provided,
++# and an installed libltdl is not found, it is assumed to be `libltdl'.
++# LIBLTDL will be prefixed with '${top_builddir}/'# and LTDLINCL with
++# '${top_srcdir}/' (note the single quotes!). If your package is not
++# flat and you're not using automake, define top_builddir and top_srcdir
++# appropriately in the Makefiles.
+ # In the future, this macro may have to be called after AC_PROG_LIBTOOL.
+ AC_DEFUN([AC_LIBLTDL_INSTALLABLE],
+ [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
+@@ -2411,10 +2641,21 @@
+ # ---------------
+ AC_DEFUN([_LT_AC_LANG_CXX],
+ [AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([AC_PROG_CXXCPP])
++AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+ _LT_AC_SHELL_INIT([tagnames=${tagnames+${tagnames},}CXX])
+ ])# _LT_AC_LANG_CXX
+
++# _LT_AC_PROG_CXXCPP
++# ------------------
++AC_DEFUN([_LT_AC_PROG_CXXCPP],
++[
++AC_REQUIRE([AC_PROG_CXX])
++if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
++ ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
++ (test "X$CXX" != "Xg++"))) ; then
++ AC_PROG_CXXCPP
++fi
++])# _LT_AC_PROG_CXXCPP
+
+ # AC_LIBTOOL_F77
+ # --------------
+@@ -2454,7 +2695,7 @@
+
+
+ # AC_LIBTOOL_RC
+-# --------------
++# -------------
+ # enable support for Windows resource files
+ AC_DEFUN([AC_LIBTOOL_RC],
+ [AC_REQUIRE([LT_AC_PROG_RC])
+@@ -2480,43 +2721,16 @@
+ _LT_AC_TAGVAR(objext, $1)=$objext
+
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++lt_simple_compile_test_code="int some_variable = 0;"
+
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='int main(){return(0);}\n'
++lt_simple_link_test_code='int main(){return(0);}'
+
+ _LT_AC_SYS_COMPILER
+
+-#
+-# Check for any special shared library compilation flags.
+-#
+-_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)=
+-if test "$GCC" = no; then
+- case $host_os in
+- sco3.2v5*)
+- _LT_AC_TAGVAR(lt_prog_cc_shlib, $1)='-belf'
+- ;;
+- esac
+-fi
+-if test -n "$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)"; then
+- AC_MSG_WARN([`$CC' requires `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to build shared libraries])
+- if echo "$old_CC $old_CFLAGS " | grep "[[ ]]$]_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)[[[ ]]" >/dev/null; then :
+- else
+- AC_MSG_WARN([add `$_LT_AC_TAGVAR(lt_prog_cc_shlib, $1)' to the CC or CFLAGS env variable and reconfigure])
+- _LT_AC_TAGVAR(lt_cv_prog_cc_can_build_shared, $1)=no
+- fi
+-fi
+-
+-
+-#
+-# Check to make sure the static flag actually works.
+-#
+-AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $_LT_AC_TAGVAR(lt_prog_compiler_static, $1) works],
+- _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
+- $_LT_AC_TAGVAR(lt_prog_compiler_static, $1),
+- [],
+- [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+-
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
+
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+@@ -2530,9 +2744,9 @@
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+ AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_DLOPEN_SELF($1)
++AC_LIBTOOL_DLOPEN_SELF
+
+-# Report which librarie types wil actually be built
++# Report which library types will actually be built
+ AC_MSG_CHECKING([if libtool supports shared libraries])
+ AC_MSG_RESULT([$can_build_shared])
+
+@@ -2541,7 +2755,7 @@
+
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+-case "$host_os" in
++case $host_os in
+ aix3*)
+ test "$enable_shared" = yes && enable_static=no
+ if test -n "$RANLIB"; then
+@@ -2550,48 +2764,11 @@
+ fi
+ ;;
+
+-aix4*)
++aix4* | aix5*)
+ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
+ test "$enable_shared" = yes && enable_static=no
+ fi
+- ;;
+- darwin* | rhapsody*)
+- if test "$GCC" = yes; then
+- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+- case "$host_os" in
+- rhapsody* | darwin1.[[012]])
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
+- ;;
+- *) # Darwin 1.3 on
+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- else
+- case ${MACOSX_DEPLOYMENT_TARGET} in
+- 10.[012])
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- ;;
+- 10.*)
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
+- ;;
+- esac
+- fi
+- ;;
+- esac
+- output_verbose_link_cmd='echo'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
+- _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- _LT_AC_TAGVAR(hardcode_direct, $1)=no
+- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+- else
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- fi
+- ;;
++ ;;
+ esac
+ AC_MSG_RESULT([$enable_shared])
+
+@@ -2616,7 +2793,7 @@
+ AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
+ [AC_LANG_PUSH(C++)
+ AC_REQUIRE([AC_PROG_CXX])
+-AC_REQUIRE([AC_PROG_CXXCPP])
++AC_REQUIRE([_LT_AC_PROG_CXXCPP])
+
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=
+@@ -2628,6 +2805,7 @@
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
++_LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+ _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+ _LT_AC_TAGVAR(module_cmds, $1)=
+ _LT_AC_TAGVAR(module_expsym_cmds, $1)=
+@@ -2645,21 +2823,25 @@
+ _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
+
+ # Source file extension for C++ test sources.
+-ac_ext=cc
++ac_ext=cpp
+
+ # Object file extension for compiled C++ test sources.
+ objext=o
+ _LT_AC_TAGVAR(objext, $1)=$objext
+
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="int some_variable = 0;\n"
++lt_simple_compile_test_code="int some_variable = 0;"
+
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='int main(int, char *[]) { return(0); }\n'
++lt_simple_link_test_code='int main(int, char *[[]]) { return(0); }'
+
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC=$CC
+ lt_save_LD=$LD
+@@ -2670,18 +2852,18 @@
+ if test -n "${lt_cv_prog_gnu_ldcxx+set}"; then
+ lt_cv_prog_gnu_ld=$lt_cv_prog_gnu_ldcxx
+ else
+- unset lt_cv_prog_gnu_ld
++ $as_unset lt_cv_prog_gnu_ld
+ fi
+ if test -n "${lt_cv_path_LDCXX+set}"; then
+ lt_cv_path_LD=$lt_cv_path_LDCXX
+ else
+- unset lt_cv_path_LD
++ $as_unset lt_cv_path_LD
+ fi
+ test -z "${LDCXX+set}" || LD=$LDCXX
+ CC=${CXX-"c++"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++_LT_CC_BASENAME([$compiler])
+
+ # We don't want -fno-exception wen compiling C++ code, so set the
+ # no_builtin_flag separately
+@@ -2699,8 +2881,8 @@
+ # Check if GNU C++ uses GNU ld as the underlying linker, since the
+ # archiving commands below assume that GNU ld is being used.
+ if test "$with_gnu_ld" = yes; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+@@ -2726,7 +2908,7 @@
+ # linker, instead of GNU ld. If possible, this setting should
+ # overridden to take advantage of the native linker features on
+ # the platform it is being used on.
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
+ fi
+
+ # Commands to make compiler produce verbose output that lists
+@@ -2756,13 +2938,28 @@
+ exp_sym_flag='-Bexport'
+ no_entry_flag=""
+ else
+- # KDE requires run time linking. Make it the default.
+- aix_use_runtimelinking=yes
+- exp_sym_flag='-bexport'
+- no_entry_flag='-bnoentry'
+- fi
++ aix_use_runtimelinking=no
+
+- # When large executables or shared objects are built, AIX ld can
++ # Test if we are trying to use run time linking or normal
++ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
++ # need to do runtime linking.
++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
++ for ld_flag in $LDFLAGS; do
++ case $ld_flag in
++ *-brtl*)
++ aix_use_runtimelinking=yes
++ break
++ ;;
++ esac
++ done
++ ;;
++ esac
++
++ exp_sym_flag='-bexport'
++ no_entry_flag='-bnoentry'
++ fi
++
++ # When large executables or shared objects are built, AIX ld can
+ # have problems creating the table of contents. If linking a library
+ # or program results in "error TOC overflow" add -mminimal-toc to
+ # CXXFLAGS/CFLAGS for g++/gcc. In the cases where that is not
+@@ -2774,7 +2971,7 @@
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+ if test "$GXX" = yes; then
+- case $host_os in aix4.[012]|aix4.[012].*)
++ case $host_os in aix4.[[012]]|aix4.[[012]].*)
+ # We only want to do this on AIX 4.2 and lower, the check
+ # below for broken collect2 doesn't work under 4.3+
+ collect2name=`${CC} -print-prog-name=collect2`
+@@ -2782,7 +2979,7 @@
+ strings "$collect2name" | grep resolve_lib_name >/dev/null
+ then
+ # We have reworked collect2
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ :
+ else
+ # We have old collect2
+ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+@@ -2793,8 +2990,12 @@
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+ fi
++ ;;
+ esac
+ shared_flag='-shared'
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag="$shared_flag "'${wl}-G'
++ fi
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+@@ -2803,15 +3004,16 @@
+ shared_flag='-G'
+ else
+ if test "$aix_use_runtimelinking" = yes; then
+- shared_flag='-qmkshrobj ${wl}-G'
++ shared_flag='${wl}-G'
+ else
+- shared_flag='-qmkshrobj'
++ shared_flag='${wl}-bM:SRE'
+ fi
+ fi
+ fi
+
+- # Let the compiler handle the export list.
+- _LT_AC_TAGVAR(always_export_symbols, $1)=no
++ # It seems that -bexpall does not export symbols beginning with
++ # underscore (_), so it is better to generate a list of symbols to export.
++ _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+ if test "$aix_use_runtimelinking" = yes; then
+ # Warning - without using the other runtime loading flags (-brtl),
+ # -berok will link without error, but may produce a broken library.
+@@ -2820,13 +3022,12 @@
+ _LT_AC_SYS_LIBPATH_AIX
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+
+- _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ else
+ if test "$host_cpu" = ia64; then
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ else
+ # Determine the default libpath from the value encoded in an empty executable.
+ _LT_AC_SYS_LIBPATH_AIX
+@@ -2835,16 +3036,26 @@
+ # -berok will link without error, but may produce a broken library.
+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+- # -bexpall does not export symbols beginning with underscore (_)
+- _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+ # Exported symbols can be pulled into shared objects from archives
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+- # This is similar to how AIX traditionally builds it's shared libraries.
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++ # This is similar to how AIX traditionally builds its shared libraries.
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ fi
+ fi
+ ;;
++
++ beos*)
++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
++ # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
++ # support --undefined. This deserves some investigation. FIXME
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ else
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ fi
++ ;;
++
+ chorus*)
+ case $cc_basename in
+ *)
+@@ -2858,12 +3069,12 @@
+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+ # as there is no search path for DLLs.
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ _LT_AC_TAGVAR(always_export_symbols, $1)=no
+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ # If the export-symbols file already is a .def file (1st line
+ # is EXPORTS), use it as is; otherwise, prepend...
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+@@ -2872,70 +3083,81 @@
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+- $CC -shared -nostdlib $output_objdir/$soname.def $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
++ darwin* | rhapsody*)
++ case $host_os in
++ rhapsody* | darwin1.[[012]])
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
++ ;;
++ *) # Darwin 1.3 on
++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ else
++ case ${MACOSX_DEPLOYMENT_TARGET} in
++ 10.[[012]])
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ ;;
++ 10.*)
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
++ ;;
++ esac
++ fi
++ ;;
++ esac
++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++ _LT_AC_TAGVAR(hardcode_direct, $1)=no
++ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+- darwin* | rhapsody*)
+- if test "$GXX" = yes; then
+- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+- case "$host_os" in
+- rhapsody* | darwin1.[[012]])
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
+- ;;
+- *) # Darwin 1.3 on
+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
++ if test "$GXX" = yes ; then
++ lt_int_apple_cc_single_mod=no
++ output_verbose_link_cmd='echo'
++ if $CC -dumpspecs 2>&1 | $EGREP 'single_module' >/dev/null ; then
++ lt_int_apple_cc_single_mod=yes
++ fi
++ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
+ else
+- case ${MACOSX_DEPLOYMENT_TARGET} in
+- 10.[012])
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- ;;
+- 10.*)
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
+- ;;
+- esac
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++ fi
++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ else
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ fi
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ else
++ case $cc_basename in
++ xlc*)
++ output_verbose_link_cmd='echo'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj ${wl}-single_module $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ ;;
++ *)
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ ;;
++ esac
+ fi
+- ;;
+- esac
+- lt_int_apple_cc_single_mod=no
+- output_verbose_link_cmd='echo'
+- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+- lt_int_apple_cc_single_mod=yes
+- fi
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
+- else
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
+- fi
+- _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
+-
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- else
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- fi
+- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- _LT_AC_TAGVAR(hardcode_direct, $1)=no
+- _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
+- _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+- else
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- fi
+- ;;
++ ;;
+
+ dgux*)
+ case $cc_basename in
+- ec++)
++ ec++*)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- ghcx)
++ ghcx*)
+ # Green Hills C++ Compiler
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -2946,14 +3168,14 @@
+ ;;
+ esac
+ ;;
+- freebsd[12]*)
++ freebsd[[12]]*)
+ # C++ shared libraries reported to be fairly broken before switch to ELF
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+ freebsd-elf*)
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ ;;
+- freebsd* | kfreebsd*-gnu)
++ freebsd* | dragonfly*)
+ # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
+ # conventions
+ _LT_AC_TAGVAR(ld_shlibs, $1)=yes
+@@ -2970,12 +3192,12 @@
+ # location of the library.
+
+ case $cc_basename in
+- CC)
++ CC*)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- aCC)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++ aCC*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -b ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+@@ -2984,11 +3206,11 @@
+ # explicitly linking system object files so we need to strip them
+ # from the output so that they don't get included in the library
+ # dependencies.
+- output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | egrep "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++ output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | grep "[[-]]L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ ;;
+ *)
+ if test "$GXX" = yes; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ else
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -2998,33 +3220,20 @@
+ ;;
+ hpux10*|hpux11*)
+ if test $with_gnu_ld = no; then
+- case "$host_cpu" in
+- hppa*64*)
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+- ;;
+- ia64*)
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+- ;;
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++ case $host_cpu in
++ hppa*64*|ia64*) ;;
+ *)
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ ;;
+ esac
+ fi
+- case "$host_cpu" in
+- hppa*64*)
+- _LT_AC_TAGVAR(hardcode_direct, $1)=no
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- ;;
+- ia64*)
++ case $host_cpu in
++ hppa*64*|ia64*)
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes # Not in the search PATH,
+- # but as the default
+- # location of the library.
+ ;;
+ *)
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+@@ -3035,17 +3244,20 @@
+ esac
+
+ case $cc_basename in
+- CC)
++ CC*)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- aCC)
+- case "$host_cpu" in
+- hppa*64*|ia64*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++ aCC*)
++ case $host_cpu in
++ hppa*64*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ ;;
++ ia64*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ *)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ esac
+ # Commands to make compiler produce verbose output that lists
+@@ -3061,12 +3273,15 @@
+ *)
+ if test "$GXX" = yes; then
+ if test $with_gnu_ld = no; then
+- case "$host_cpu" in
+- ia64*|hppa*64*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $linker_flags $libobjs $deplibs'
++ case $host_cpu in
++ hppa*64*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ ;;
++ ia64*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ *)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ ;;
+ esac
+ fi
+@@ -3077,11 +3292,25 @@
+ ;;
+ esac
+ ;;
++ interix[[3-9]]*)
++ _LT_AC_TAGVAR(hardcode_direct, $1)=no
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++ # Instead, shared libraries are loaded at an image base (0x10000000 by
++ # default) and relocated if they conflict, which is a slow very memory
++ # consuming and fragmenting process. To avoid this, we pick a random,
++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ ;;
+ irix5* | irix6*)
+ case $cc_basename in
+- CC)
++ CC*)
+ # SGI C++
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+
+ # Archives containing C++ object files must be created using
+ # "CC -ar", where "CC" is the IRIX C++ compiler. This is
+@@ -3092,9 +3321,9 @@
+ *)
+ if test "$GXX" = yes; then
+ if test "$with_gnu_ld" = no; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ else
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` -o $lib'
+ fi
+ fi
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+@@ -3103,16 +3332,16 @@
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ ;;
+- linux*)
++ linux* | k*bsd*-gnu)
+ case $cc_basename in
+- KCC)
++ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+ # KCC will only create a shared library if the output file
+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
+ # to its proper name (with version) after linking.
+- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib ${wl}-retain-symbols-file,$export_symbols; mv \$templib $lib'
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+ # linking a shared library.
+@@ -3130,20 +3359,44 @@
+ # "CC -Bstatic", where "CC" is the KAI C++ compiler.
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+ ;;
+- icpc)
++ icpc*)
+ # Intel C++
+ with_gnu_ld=yes
++ # version 8.0 and above of icpc choke on multiply defined symbols
++ # if we add $predep_objects and $postdep_objects, however 7.1 and
++ # earlier do not add the objects themselves.
++ case `$CC -V 2>&1` in
++ *"Version 7."*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ ;;
++ *) # Version 8.0 or newer
++ tmp_idyn=
++ case $host_cpu in
++ ia64*) tmp_idyn=' -i_dynamic';;
++ esac
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared'"$tmp_idyn"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ ;;
++ esac
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+ ;;
+- cxx)
++ pgCC*)
++ # Portland Group C++ compiler
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
++
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ ;;
++ cxx*)
+ # Compaq C++
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib ${wl}-retain-symbols-file $wl$export_symbols'
+
+ runpath_var=LD_RUN_PATH
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+@@ -3159,6 +3412,29 @@
+ # dependencies.
+ output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep "ld"`; templist=`echo $templist | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
+ ;;
++ *)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C++ 5.9
++ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++
++ # Not sure whether something based on
++ # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
++ # would be better.
++ output_verbose_link_cmd='echo'
++
++ # Archives containing C++ object files must be created using
++ # "CC -xar", where "CC" is the Sun C++ compiler. This is
++ # necessary to make sure instantiated templates are included
++ # in the archive.
++ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
++ ;;
++ esac
++ ;;
+ esac
+ ;;
+ lynxos*)
+@@ -3171,7 +3447,7 @@
+ ;;
+ mvs*)
+ case $cc_basename in
+- cxx)
++ cxx*)
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+@@ -3181,7 +3457,7 @@
+ ;;
+ esac
+ ;;
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
+ wlarc=
+@@ -3192,15 +3468,35 @@
+ # Workaround some broken pre-1.5 toolchains
+ output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | grep conftest.$objext | $SED -e "s:-lgcc -lc -lgcc::"'
+ ;;
++ openbsd2*)
++ # C++ shared libraries are fairly broken
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ ;;
++ openbsd*)
++ if test -f /usr/libexec/ld.so; then
++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $lib'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file,$export_symbols -o $lib'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++ fi
++ output_verbose_link_cmd='echo'
++ else
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ fi
++ ;;
+ osf3*)
+ case $cc_basename in
+- KCC)
++ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+ # KCC will only create a shared library if the output file
+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
+ # to its proper name (with version) after linking.
+- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -3210,14 +3506,14 @@
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
+
+ ;;
+- RCC)
++ RCC*)
+ # Rational C++ 2.4.1
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- cxx)
++ cxx*)
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && echo ${wl}-set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -3235,7 +3531,7 @@
+ *)
+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -3254,13 +3550,13 @@
+ ;;
+ osf4* | osf5*)
+ case $cc_basename in
+- KCC)
++ KCC*)
+ # Kuck and Associates, Inc. (KAI) C++ Compiler
+
+ # KCC will only create a shared library if the output file
+ # ends with ".so" (or ".sl" for HP-UX), so rename the library
+ # to its proper name (with version) after linking.
+- _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects --soname $soname -o \$templib; mv \$templib $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='tempext=`echo $shared_ext | $SED -e '\''s/\([[^()0-9A-Za-z{}]]\)/\\\\\1/g'\''`; templib=`echo $lib | $SED -e "s/\${tempext}\..*/.so/"`; $CC $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags --soname $soname -o \$templib; mv \$templib $lib'
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -3269,17 +3565,17 @@
+ # the KAI C++ compiler.
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
+ ;;
+- RCC)
++ RCC*)
+ # Rational C++ 2.4.1
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- cxx)
++ cxx*)
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
+ echo "-hidden">> $lib.exp~
+- $CC -shared$allow_undefined_flag $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry $objdir/so_locations -o $lib~
++ $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname -Wl,-input -Wl,$lib.exp `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~
+ $rm $lib.exp'
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+@@ -3298,7 +3594,7 @@
+ *)
+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+@@ -3319,27 +3615,14 @@
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- sco*)
+- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+- case $cc_basename in
+- CC)
+- # FIXME: insert proper C++ library support
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- ;;
+- *)
+- # FIXME: insert proper C++ library support
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- ;;
+- esac
+- ;;
+ sunos4*)
+ case $cc_basename in
+- CC)
++ CC*)
+ # Sun C++ 4.x
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+- lcc)
++ lcc*)
+ # Lucid
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -3352,36 +3635,28 @@
+ ;;
+ solaris*)
+ case $cc_basename in
+- CC)
++ CC*)
+ # Sun C++ 4.2, 5.x and Centerline C++
++ _LT_AC_TAGVAR(archive_cmds_need_lc,$1)=yes
+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -zdefs'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -nolib -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+- $CC -G${allow_undefined_flag} -nolib ${wl}-M ${wl}$lib.exp -h$soname -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
++ $CC -G${allow_undefined_flag} ${wl}-M ${wl}$lib.exp -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ case $host_os in
+- solaris2.[0-5] | solaris2.[0-5].*) ;;
++ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+ *)
+- # The C++ compiler is used as linker so we must use $wl
+- # flag to pass the commands to the underlying system
+- # linker.
++ # The compiler driver will combine and reorder linker options,
++ # but understands `-z linker_flag'.
+ # Supported since Solaris 2.6 (maybe 2.5.1?)
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
+ ;;
+ esac
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+- # Commands to make compiler produce verbose output that lists
+- # what "hidden" libraries, object files and flags are used when
+- # linking a shared library.
+- #
+- # There doesn't appear to be a way to prevent this compiler from
+- # explicitly linking system object files so we need to strip them
+- # from the output so that they don't get included in the library
+- # dependencies.
+- output_verbose_link_cmd='templist=`$CC -G $CFLAGS -v conftest.$objext 2>&1 | grep "\-[[LR]]"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; echo $list'
++ output_verbose_link_cmd='echo'
+
+ # Archives containing C++ object files must be created using
+ # "CC -xar", where "CC" is the Sun C++ compiler. This is
+@@ -3389,9 +3664,9 @@
+ # in the archive.
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
+ ;;
+- gcx)
++ gcx*)
+ # Green Hills C++ Compiler
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+
+ # The C++ compiler must be used to create the archive.
+ _LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
+@@ -3401,9 +3676,9 @@
+ if test "$GXX" = yes && test "$with_gnu_ld" = no; then
+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
+ if $CC --version | grep -v '^2\.7' > /dev/null; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+- $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
++ $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+@@ -3412,9 +3687,9 @@
+ else
+ # g++ 2.7 appears to require `-G' NOT `-shared' on this
+ # platform.
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects ${wl}-h $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+- $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $compiler_flags $predep_objects $libobjs $deplibs $postdep_objects~$rm $lib.exp'
++ $CC -G -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$rm $lib.exp'
+
+ # Commands to make compiler produce verbose output that lists
+ # what "hidden" libraries, object files and flags are used when
+@@ -3423,16 +3698,73 @@
+ fi
+
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
++ case $host_os in
++ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
++ *)
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++ ;;
++ esac
+ fi
+ ;;
+ esac
+ ;;
+- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ runpath_var='LD_RUN_PATH'
++
++ case $cc_basename in
++ CC*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ *)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ esac
++ ;;
++ sysv5* | sco3.2v5* | sco5v6*)
++ # Note: We can NOT use -z defs as we might desire, because we do not
++ # link with -lc, and that would cause any symbols used from libc to
++ # always be unresolved, which means just about no library would
++ # ever link correctly. If we're not using GNU ld we use -z text
++ # though, which does catch some bad symbols but isn't as heavy-handed
++ # as -z defs.
++ # For security reasons, it is highly recommended that you always
++ # use absolute paths for naming shared libraries, and exclude the
++ # DT_RUNPATH tag from executables and libraries. But doing so
++ # requires that you compile everything twice, which is a pain.
++ # So that behaviour is only enabled if SCOABSPATH is set to a
++ # non-empty value in the environment. Most likely only useful for
++ # creating official distributions of packages.
++ # This is a hack until libtool officially supports absolute path
++ # names for shared libraries.
++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
++ runpath_var='LD_RUN_PATH'
++
++ case $cc_basename in
++ CC*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ *)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ esac
+ ;;
+ tandem*)
+ case $cc_basename in
+- NCC)
++ NCC*)
+ # NonStop-UX NCC 3.20
+ # FIXME: insert proper C++ library support
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+@@ -3469,8 +3801,6 @@
+ AC_LIBTOOL_PROG_LD_SHLIBS($1)
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_DLOPEN_SELF($1)
+
+ AC_LIBTOOL_CONFIG($1)
+
+@@ -3488,7 +3818,7 @@
+ ])# AC_LIBTOOL_LANG_CXX_CONFIG
+
+ # AC_LIBTOOL_POSTDEP_PREDEP([TAGNAME])
+-# ------------------------
++# ------------------------------------
+ # Figure out "hidden" library dependencies from verbose
+ # compiler output when linking a shared library.
+ # Parse the compiler output and extract the necessary
+@@ -3542,7 +3872,7 @@
+ # The `*' in the case matches for architectures that use `case' in
+ # $output_verbose_cmd can trigger glob expansion during the loop
+ # eval without this substitution.
+- output_verbose_link_cmd="`$echo \"X$output_verbose_link_cmd\" | $Xsed -e \"$no_glob_subst\"`"
++ output_verbose_link_cmd=`$echo "X$output_verbose_link_cmd" | $Xsed -e "$no_glob_subst"`
+
+ for p in `eval $output_verbose_link_cmd`; do
+ case $p in
+@@ -3582,7 +3912,7 @@
+ fi
+ ;;
+
+- *.$objext|*.$libext)
++ *.$objext)
+ # This assumes that the test object file only shows up
+ # once in the compiler output.
+ if test "$p" = "conftest.$objext"; then
+@@ -3618,13 +3948,70 @@
+
+ $rm -f confest.$objext
+
++# PORTME: override above test on systems where it is broken
++ifelse([$1],[CXX],
++[case $host_os in
++interix[[3-9]]*)
++ # Interix 3.5 installs completely hosed .la files for C++, so rather than
++ # hack all around it, let's just trust "g++" to DTRT.
++ _LT_AC_TAGVAR(predep_objects,$1)=
++ _LT_AC_TAGVAR(postdep_objects,$1)=
++ _LT_AC_TAGVAR(postdeps,$1)=
++ ;;
++
++linux*)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C++ 5.9
++ #
++ # The more standards-conforming stlport4 library is
++ # incompatible with the Cstd library. Avoid specifying
++ # it if it's in CXXFLAGS. Ignore libCrun as
++ # -library=stlport4 depends on it.
++ case " $CXX $CXXFLAGS " in
++ *" -library=stlport4 "*)
++ solaris_use_stlport4=yes
++ ;;
++ esac
++ if test "$solaris_use_stlport4" != yes; then
++ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
++ fi
++ ;;
++ esac
++ ;;
++
++solaris*)
++ case $cc_basename in
++ CC*)
++ # The more standards-conforming stlport4 library is
++ # incompatible with the Cstd library. Avoid specifying
++ # it if it's in CXXFLAGS. Ignore libCrun as
++ # -library=stlport4 depends on it.
++ case " $CXX $CXXFLAGS " in
++ *" -library=stlport4 "*)
++ solaris_use_stlport4=yes
++ ;;
++ esac
++
++ # Adding this requires a known-good setup of shared libraries for
++ # Sun compiler versions before 5.6, else PIC objects from an old
++ # archive will be linked into the output, leading to subtle bugs.
++ if test "$solaris_use_stlport4" != yes; then
++ _LT_AC_TAGVAR(postdeps,$1)='-library=Cstd -library=Crun'
++ fi
++ ;;
++ esac
++ ;;
++esac
++])
++
+ case " $_LT_AC_TAGVAR(postdeps, $1) " in
+ *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
+ esac
+ ])# AC_LIBTOOL_POSTDEP_PREDEP
+
+ # AC_LIBTOOL_LANG_F77_CONFIG
+-# ------------------------
++# --------------------------
+ # Ensure that the configuration vars for the C compiler are
+ # suitably defined. Those variables are subsequently used by
+ # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+@@ -3660,20 +4047,31 @@
+ _LT_AC_TAGVAR(objext, $1)=$objext
+
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code=" subroutine t\n return\n end\n"
++lt_simple_compile_test_code="\
++ subroutine t
++ return
++ end
++"
+
+ # Code to be used in simple link tests
+-lt_simple_link_test_code=" program t\n end\n"
++lt_simple_link_test_code="\
++ program t
++ end
++"
+
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${F77-"f77"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
+-cc_basename=`$echo X"$compiler" | $Xsed -e 's%^.*/%%'`
++_LT_CC_BASENAME([$compiler])
+
+ AC_MSG_CHECKING([if libtool supports shared libraries])
+ AC_MSG_RESULT([$can_build_shared])
+@@ -3683,7 +4081,7 @@
+
+ # On AIX, shared libraries and static libraries use the same namespace, and
+ # are all built from PIC.
+-case "$host_os" in
++case $host_os in
+ aix3*)
+ test "$enable_shared" = yes && enable_static=no
+ if test -n "$RANLIB"; then
+@@ -3691,8 +4089,10 @@
+ postinstall_cmds='$RANLIB $lib'
+ fi
+ ;;
+-aix4*)
+- test "$enable_shared" = yes && enable_static=no
++aix4* | aix5*)
++ if test "$host_cpu" != ia64 && test "$aix_use_runtimelinking" = no ; then
++ test "$enable_shared" = yes && enable_static=no
++ fi
+ ;;
+ esac
+ AC_MSG_RESULT([$enable_shared])
+@@ -3702,8 +4102,6 @@
+ test "$enable_shared" = yes || enable_static=yes
+ AC_MSG_RESULT([$enable_static])
+
+-test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+-
+ _LT_AC_TAGVAR(GCC, $1)="$G77"
+ _LT_AC_TAGVAR(LD, $1)="$LD"
+
+@@ -3713,8 +4111,6 @@
+ AC_LIBTOOL_PROG_LD_SHLIBS($1)
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-
+
+ AC_LIBTOOL_CONFIG($1)
+
+@@ -3740,23 +4136,30 @@
+ _LT_AC_TAGVAR(objext, $1)=$objext
+
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code="class foo {}\n"
++lt_simple_compile_test_code="class foo {}"
+
+ # Code to be used in simple link tests
+-lt_simple_link_test_code='public class conftest { public static void main(String[] argv) {}; }\n'
++lt_simple_link_test_code='public class conftest { public static void main(String[[]] argv) {}; }'
+
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${GCJ-"gcj"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
+
+ # GCJ did not exist at the time GCC didn't implicitly link libc in.
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+
++_LT_AC_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
++
+ ## CAVEAT EMPTOR:
+ ## There is no encapsulation within the following macros, do not change
+ ## the running order or otherwise move them around unless you know exactly
+@@ -3768,8 +4171,6 @@
+ AC_LIBTOOL_PROG_LD_SHLIBS($1)
+ AC_LIBTOOL_SYS_DYNAMIC_LINKER($1)
+ AC_LIBTOOL_PROG_LD_HARDCODE_LIBPATH($1)
+-AC_LIBTOOL_SYS_LIB_STRIP
+-AC_LIBTOOL_DLOPEN_SELF($1)
+
+ AC_LIBTOOL_CONFIG($1)
+
+@@ -3779,7 +4180,7 @@
+
+
+ # AC_LIBTOOL_LANG_RC_CONFIG
+-# --------------------------
++# -------------------------
+ # Ensure that the configuration vars for the Windows resource compiler are
+ # suitably defined. Those variables are subsequently used by
+ # AC_LIBTOOL_CONFIG to write the compiler configuration to `libtool'.
+@@ -3795,7 +4196,7 @@
+ _LT_AC_TAGVAR(objext, $1)=$objext
+
+ # Code to be used in simple compile tests
+-lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }\n'
++lt_simple_compile_test_code='sample MENU { MENUITEM "&Soup", 100, CHECKED }'
+
+ # Code to be used in simple link tests
+ lt_simple_link_test_code="$lt_simple_compile_test_code"
+@@ -3803,11 +4204,16 @@
+ # ltmain only uses $CC for tagged configurations so make sure $CC is set.
+ _LT_AC_SYS_COMPILER
+
++# save warnings/boilerplate of simple test code
++_LT_COMPILER_BOILERPLATE
++_LT_LINKER_BOILERPLATE
++
+ # Allow CC to be a program name with arguments.
+ lt_save_CC="$CC"
+ CC=${RC-"windres"}
+ compiler=$CC
+ _LT_AC_TAGVAR(compiler, $1)=$CC
++_LT_CC_BASENAME([$compiler])
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
+
+ AC_LIBTOOL_CONFIG($1)
+@@ -3833,11 +4239,12 @@
+ # without removal of \ escapes.
+ if test -n "${ZSH_VERSION+set}" ; then
+ setopt NO_GLOB_SUBST
+- fi
++ fi
+ # Now quote all the things that may contain metacharacters while being
+ # careful not to overquote the AC_SUBSTed values. We take copies of the
+ # variables and quote the copies for generation of the libtool script.
+- for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC NM SED SHELL \
++ for var in echo old_CC old_CFLAGS AR AR_FLAGS EGREP RANLIB LN_S LTCC LTCFLAGS NM \
++ SED SHELL STRIP \
+ libname_spec library_names_spec soname_spec extract_expsyms_cmds \
+ old_striplib striplib file_magic_cmd finish_cmds finish_eval \
+ deplibs_check_method reload_flag reload_cmds need_locks \
+@@ -3878,6 +4285,7 @@
+ _LT_AC_TAGVAR(module_cmds, $1) \
+ _LT_AC_TAGVAR(module_expsym_cmds, $1) \
+ _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1) \
++ _LT_AC_TAGVAR(fix_srcfile_path, $1) \
+ _LT_AC_TAGVAR(exclude_expsyms, $1) \
+ _LT_AC_TAGVAR(include_expsyms, $1); do
+
+@@ -3887,7 +4295,7 @@
+ _LT_AC_TAGVAR(archive_cmds, $1) | \
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
+ _LT_AC_TAGVAR(module_cmds, $1) | \
+- _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
++ _LT_AC_TAGVAR(module_expsym_cmds, $1) | \
+ _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
+ _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
+ extract_expsyms_cmds | reload_cmds | finish_cmds | \
+@@ -3924,7 +4332,7 @@
+ # Generated automatically by $PROGRAM (GNU $PACKAGE $VERSION$TIMESTAMP)
+ # NOTE: Changes made to this file will be lost: look at ltmain.sh.
+ #
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007
+ # Free Software Foundation, Inc.
+ #
+ # This file is part of GNU Libtool:
+@@ -3953,11 +4361,11 @@
+ SED=$lt_SED
+
+ # Sed that helps us avoid accidentally triggering echo(1) options like -n.
+-Xsed="$SED -e s/^X//"
++Xsed="$SED -e 1s/^X//"
+
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test "X\${CDPATH+set}" = Xset; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+ # The names of the tagged configurations supported by this script.
+ available_tags=
+@@ -3988,6 +4396,12 @@
+ # The host system.
+ host_alias=$host_alias
+ host=$host
++host_os=$host_os
++
++# The build system.
++build_alias=$build_alias
++build=$build
++build_os=$build_os
+
+ # An echo program that does not interpret backslashes.
+ echo=$lt_echo
+@@ -3999,6 +4413,9 @@
+ # A C compiler.
+ LTCC=$lt_LTCC
+
++# LTCC compiler flags.
++LTCFLAGS=$lt_LTCFLAGS
++
+ # A language-specific compiler.
+ CC=$lt_[]_LT_AC_TAGVAR(compiler, $1)
+
+@@ -4018,7 +4435,7 @@
+ NM=$lt_NM
+
+ # A symbol stripping program
+-STRIP=$STRIP
++STRIP=$lt_STRIP
+
+ # Used to examine libraries when file_magic_cmd begins "file"
+ MAGIC_CMD=$MAGIC_CMD
+@@ -4049,7 +4466,7 @@
+ libext="$libext"
+
+ # Shared library suffix (normally ".so").
+-shrext='$shrext'
++shrext_cmds='$shrext_cmds'
+
+ # Executable file suffix (normally "").
+ exeext="$exeext"
+@@ -4064,7 +4481,7 @@
+ # Does compiler simultaneously support -c and -o options?
+ compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
+
+-# Must we lock files when doing compilation ?
++# Must we lock files when doing compilation?
+ need_locks=$lt_need_locks
+
+ # Do we need the lib prefix for modules?
+@@ -4240,7 +4657,7 @@
+ sys_lib_dlsearch_path_spec=$lt_sys_lib_dlsearch_path_spec
+
+ # Fix the shell variable \$srcfile for the compiler.
+-fix_srcfile_path="$_LT_AC_TAGVAR(fix_srcfile_path, $1)"
++fix_srcfile_path=$lt_fix_srcfile_path
+
+ # Set to yes if exported symbols are required.
+ always_export_symbols=$_LT_AC_TAGVAR(always_export_symbols, $1)
+@@ -4293,7 +4710,10 @@
+ # If there is no Makefile yet, we rely on a make rule to execute
+ # `config.status --recheck' to rerun these tests and create the
+ # libtool script then.
+- test -f Makefile && make "$ltmain"
++ ltmain_in=`echo $ltmain | sed -e 's/\.sh$/.in/'`
++ if test -f "$ltmain_in"; then
++ test -f Makefile && make "$ltmain"
++ fi
+ fi
+ ])# AC_LIBTOOL_CONFIG
+
+@@ -4320,6 +4740,7 @@
+ # ---------------------------------
+ AC_DEFUN([AC_LIBTOOL_SYS_GLOBAL_SYMBOL_PIPE],
+ [AC_REQUIRE([AC_CANONICAL_HOST])
++AC_REQUIRE([LT_AC_PROG_SED])
+ AC_REQUIRE([AC_PROG_NM])
+ AC_REQUIRE([AC_OBJEXT])
+ # Check for command to grab the raw symbol name followed by C symbol from nm.
+@@ -4335,9 +4756,6 @@
+ # Regexp to match symbols that can be accessed directly from C.
+ sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
+
+-# Transform the above into a raw symbol and a C symbol.
+-symxfrm='\1 \2\3 \3'
+-
+ # Transform an extracted symbol line into a proper C declaration
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^. .* \(.*\)$/extern int \1;/p'"
+
+@@ -4359,14 +4777,30 @@
+ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
+ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
+ ;;
++linux* | k*bsd*-gnu)
++ if test "$host_cpu" = ia64; then
++ symcode='[[ABCDGIRSTW]]'
++ lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
++ lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/ {\\\"\1\\\", (lt_ptr) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/ {\"\2\", (lt_ptr) \&\2},/p'"
++ fi
++ ;;
+ irix* | nonstopux*)
+ symcode='[[BCDEGRST]]'
+ ;;
+ osf*)
+ symcode='[[BCDEGQRST]]'
+ ;;
+-solaris* | sysv5*)
+- symcode='[[BDT]]'
++solaris*)
++ symcode='[[BDRT]]'
++ ;;
++sco3.2v5*)
++ symcode='[[DT]]'
++ ;;
++sysv4.2uw2*)
++ symcode='[[DT]]'
++ ;;
++sysv5* | sco5v6* | unixware* | OpenUNIX*)
++ symcode='[[ABDT]]'
+ ;;
+ sysv4)
+ symcode='[[DFNSTU]]'
+@@ -4384,14 +4818,17 @@
+ # If we're using GNU nm, then use its standard symbol codes.
+ case `$NM -V 2>&1` in
+ *GNU* | *'with BFD'*)
+- symcode='[[ABCDGISTW]]' ;;
++ symcode='[[ABCDGIRSTW]]' ;;
+ esac
+
+ # Try without a prefix undercore, then with it.
+ for ac_symprfx in "" "_"; do
+
++ # Transform symcode, sympat, and symprfx into a raw symbol and a C symbol.
++ symxfrm="\\1 $ac_symprfx\\2 \\2"
++
+ # Write the raw and C identifiers.
+- lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*\($ac_symprfx\)$sympat$opt_cr$/$symxfrm/p'"
++ lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[ ]]\($symcode$symcode*\)[[ ]][[ ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
+
+ # Check to see that the pipe works correctly.
+ pipe_works=no
+@@ -4530,12 +4967,14 @@
+ # like `-m68040'.
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+ ;;
+- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ # PIC is the default for these OSes.
+ ;;
+- mingw* | os2* | pw32*)
++ mingw* | cygwin* | os2* | pw32*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
++ # Although the cygwin gcc ignores -fPIC, still need this for old-style
++ # (--disable-auto-import) libraries
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+ ;;
+ darwin* | rhapsody*)
+@@ -4547,6 +4986,10 @@
+ # DJGPP does not support shared libraries at all
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+ ;;
++ interix[[3-9]]*)
++ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++ # Instead, we relocate shared libraries at runtime.
++ ;;
+ sysv4*MP*)
+ if test -d /usr/nec; then
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=-Kconform_pic
+@@ -4555,7 +4998,7 @@
+ hpux*)
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ ;;
+ *)
+@@ -4580,18 +5023,28 @@
+ ;;
+ chorus*)
+ case $cc_basename in
+- cxch68)
++ cxch68*)
+ # Green Hills C++ Compiler
+ # _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="--no_auto_instantiation -u __main -u __premain -u _abort -r $COOL_DIR/lib/libOrb.a $MVME_DIR/lib/CC/libC.a $MVME_DIR/lib/classix/libcx.s.a"
+ ;;
+ esac
+ ;;
++ darwin*)
++ # PIC is the default on this platform
++ # Common symbols not allowed in MH_DYLIB files
++ case $cc_basename in
++ xlc*)
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ ;;
++ esac
++ ;;
+ dgux*)
+ case $cc_basename in
+- ec++)
++ ec++*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ ;;
+- ghcx)
++ ghcx*)
+ # Green Hills C++ Compiler
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ ;;
+@@ -4599,22 +5052,22 @@
+ ;;
+ esac
+ ;;
+- freebsd* | kfreebsd*-gnu)
++ freebsd* | dragonfly*)
+ # FreeBSD uses GNU C++
+ ;;
+ hpux9* | hpux10* | hpux11*)
+ case $cc_basename in
+- CC)
++ CC*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
+ if test "$host_cpu" != ia64; then
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='+Z'
+ fi
+ ;;
+- aCC)
++ aCC*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)="${ac_cv_prog_cc_wl}-a ${ac_cv_prog_cc_wl}archive"
+- case "$host_cpu" in
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='${wl}-a ${wl}archive'
++ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+@@ -4627,9 +5080,13 @@
+ ;;
+ esac
+ ;;
++ interix*)
++ # This is c89, which is MS Visual C++ (no shared libs)
++ # Anyone wants to do a port?
++ ;;
+ irix5* | irix6* | nonstopux*)
+ case $cc_basename in
+- CC)
++ CC*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ # CC pic flag -KPIC is the default.
+@@ -4638,20 +5095,26 @@
+ ;;
+ esac
+ ;;
+- linux*)
++ linux* | k*bsd*-gnu)
+ case $cc_basename in
+- KCC)
++ KCC*)
+ # KAI C++ Compiler
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+ ;;
+- icpc)
++ icpc* | ecpc*)
+ # Intel C++
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+- ;;
+- cxx)
++ ;;
++ pgCC*)
++ # Portland Group C++ compiler.
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ ;;
++ cxx*)
+ # Compaq C++
+ # Make sure the PIC flag is empty. It appears that all Alpha
+ # Linux and Compaq Tru64 Unix objects are PIC.
+@@ -4659,6 +5122,14 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+ *)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C++ 5.9
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
++ ;;
++ esac
+ ;;
+ esac
+ ;;
+@@ -4668,25 +5139,25 @@
+ ;;
+ mvs*)
+ case $cc_basename in
+- cxx)
++ cxx*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-W c,exportall'
+ ;;
+ *)
+ ;;
+ esac
+ ;;
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ ;;
+ osf3* | osf4* | osf5*)
+ case $cc_basename in
+- KCC)
++ KCC*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='--backend -Wl,'
+ ;;
+- RCC)
++ RCC*)
+ # Rational C++ 2.4.1
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ ;;
+- cxx)
++ cxx*)
+ # Digital/Compaq C++
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ # Make sure the PIC flag is empty. It appears that all Alpha
+@@ -4700,24 +5171,15 @@
+ ;;
+ psos*)
+ ;;
+- sco*)
+- case $cc_basename in
+- CC)
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+- ;;
+- *)
+- ;;
+- esac
+- ;;
+ solaris*)
+ case $cc_basename in
+- CC)
++ CC*)
+ # Sun C++ 4.2, 5.x and Centerline C++
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+ ;;
+- gcx)
++ gcx*)
+ # Green Hills C++ Compiler
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+ ;;
+@@ -4727,12 +5189,12 @@
+ ;;
+ sunos4*)
+ case $cc_basename in
+- CC)
++ CC*)
+ # Sun C++ 4.x
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+- lcc)
++ lcc*)
+ # Lucid
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ ;;
+@@ -4742,7 +5204,7 @@
+ ;;
+ tandem*)
+ case $cc_basename in
+- NCC)
++ NCC*)
+ # NonStop-UX NCC 3.20
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ ;;
+@@ -4750,7 +5212,14 @@
+ ;;
+ esac
+ ;;
+- unixware*)
++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++ case $cc_basename in
++ CC*)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ ;;
++ esac
+ ;;
+ vxworks*)
+ ;;
+@@ -4781,13 +5250,15 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-m68020 -resident32 -malways-restore-a4'
+ ;;
+
+- beos* | cygwin* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
++ beos* | irix5* | irix6* | nonstopux* | osf3* | osf4* | osf5*)
+ # PIC is the default for these OSes.
+ ;;
+
+- mingw* | pw32* | os2*)
++ mingw* | cygwin* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
++ # Although the cygwin gcc ignores -fPIC, still need this for old-style
++ # (--disable-auto-import) libraries
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+ ;;
+
+@@ -4797,6 +5268,11 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
+ ;;
+
++ interix[[3-9]]*)
++ # Interix 3.x gcc -fpic/-fPIC options generate broken code.
++ # Instead, we relocate shared libraries at runtime.
++ ;;
++
+ msdosdjgpp*)
+ # Just because we use GCC doesn't mean we suddenly get shared libraries
+ # on systems that don't support them.
+@@ -4813,7 +5289,7 @@
+ hpux*)
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+@@ -4839,8 +5315,18 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
+ fi
+ ;;
++ darwin*)
++ # PIC is the default on this platform
++ # Common symbols not allowed in MH_DYLIB files
++ case $cc_basename in
++ xlc*)
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-qnocommon'
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ ;;
++ esac
++ ;;
+
+- mingw* | pw32* | os2*)
++ mingw* | cygwin* | pw32* | os2*)
+ # This hack is so that the source file can tell whether it is being
+ # built for inclusion in a dll (and should export symbols for example).
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'
+@@ -4850,7 +5336,7 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
+ # not for PA HP-UX.
+- case "$host_cpu" in
++ case $host_cpu in
+ hppa*64*|ia64*)
+ # +Z the default
+ ;;
+@@ -4873,18 +5359,41 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+
+- linux*)
+- case $CC in
++ linux* | k*bsd*-gnu)
++ case $cc_basename in
+ icc* | ecc*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-static'
+ ;;
++ pgcc* | pgf77* | pgf90* | pgf95*)
++ # Portland Group compilers (*not* the Pentium gcc compiler,
++ # which looks to be a dead project)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ ;;
+ ccc*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ # All Alpha code is PIC.
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
++ *)
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*)
++ # Sun C 5.9
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ ;;
++ *Sun\ F*)
++ # Sun Fortran 8.3 passes all unrecognized flags to the linker
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)=''
++ ;;
++ esac
++ ;;
+ esac
+ ;;
+
+@@ -4894,15 +5403,19 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+
+- sco3.2v5*)
+- _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-Kpic'
+- _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-dn'
++ rdos*)
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
+ ;;
+
+ solaris*)
+- _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ case $cc_basename in
++ f77* | f90* | f95*)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
++ *)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
++ esac
+ ;;
+
+ sunos4*)
+@@ -4911,7 +5424,7 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+ ;;
+
+- sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
++ sysv4 | sysv4.2uw2* | sysv4.3*)
+ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+@@ -4924,6 +5437,17 @@
+ fi
+ ;;
+
++ sysv5* | unixware* | sco3.2v5* | sco5v6* | OpenUNIX*)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
++ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
++ ;;
++
++ unicos*)
++ _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
++ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no
++ ;;
++
+ uts4*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
+ _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+@@ -4951,7 +5475,7 @@
+ [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+ _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
+ fi
+-case "$host_os" in
++case $host_os in
+ # For platforms which do not support PIC, -DPIC is meaningless:
+ *djgpp*)
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
+@@ -4960,6 +5484,16 @@
+ _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)ifelse([$1],[],[ -DPIC],[ifelse([$1],[CXX],[ -DPIC],[])])"
+ ;;
+ esac
++
++#
++# Check to make sure the static flag actually works.
++#
++wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1) eval lt_tmp_static_flag=\"$_LT_AC_TAGVAR(lt_prog_compiler_static, $1)\"
++AC_LIBTOOL_LINKER_OPTION([if $compiler static flag $lt_tmp_static_flag works],
++ _LT_AC_TAGVAR(lt_prog_compiler_static_works, $1),
++ $lt_tmp_static_flag,
++ [],
++ [_LT_AC_TAGVAR(lt_prog_compiler_static, $1)=])
+ ])
+
+
+@@ -4967,7 +5501,8 @@
+ # ------------------------------------
+ # See if the linker supports building shared libraries.
+ AC_DEFUN([AC_LIBTOOL_PROG_LD_SHLIBS],
+-[AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
++[AC_REQUIRE([LT_AC_PROG_SED])dnl
++AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
+ ifelse([$1],[CXX],[
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ case $host_os in
+@@ -4984,7 +5519,10 @@
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
+ ;;
+ cygwin* | mingw*)
+- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
++ ;;
++ linux* | k*bsd*-gnu)
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
+ ;;
+ *)
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+@@ -5010,7 +5548,7 @@
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
+ _LT_AC_TAGVAR(hardcode_automatic, $1)=no
+ _LT_AC_TAGVAR(module_cmds, $1)=
+- _LT_AC_TAGVAR(module_expsym_cmds, $1)=
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)=
+ _LT_AC_TAGVAR(always_export_symbols, $1)=no
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+ # include_expsyms should be a list of space-separated symbols to be *always*
+@@ -5027,7 +5565,8 @@
+ # rely on this symbol name, it's probably fine to never include it in
+ # preloaded symbol tables.
+ extract_expsyms_cmds=
+-
++ # Just being paranoid about ensuring that cc_basename is set.
++ _LT_CC_BASENAME([$compiler])
+ case $host_os in
+ cygwin* | mingw* | pw32*)
+ # FIXME: the MSVC++ port hasn't been tested in a loooong time
+@@ -5037,6 +5576,10 @@
+ with_gnu_ld=no
+ fi
+ ;;
++ interix*)
++ # we just hope/assume this is gcc and not c89 (= MSVC++)
++ with_gnu_ld=yes
++ ;;
+ openbsd*)
+ with_gnu_ld=no
+ ;;
+@@ -5047,6 +5590,27 @@
+ # If archive_cmds runs LD, not CC, wlarc should be empty
+ wlarc='${wl}'
+
++ # Set some defaults for GNU ld with shared library support. These
++ # are reset later if shared libraries are not supported. Putting them
++ # here allows them to be overridden if necessary.
++ runpath_var=LD_RUN_PATH
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
++ # ancient GNU ld didn't support --whole-archive et. al.
++ if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
++ else
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
++ fi
++ supports_anon_versioning=no
++ case `$LD -v 2>/dev/null` in
++ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.10.*) ;; # catch versions < 2.11
++ *\ 2.11.93.0.2\ *) supports_anon_versioning=yes ;; # RH7.3 ...
++ *\ 2.11.92.0.12\ *) supports_anon_versioning=yes ;; # Mandrake 8.2 ...
++ *\ 2.11.*) ;; # other 2.11 versions
++ *) supports_anon_versioning=yes ;;
++ esac
++
+ # See if GNU ld supports shared libraries.
+ case $host_os in
+ aix3* | aix4* | aix5*)
+@@ -5084,7 +5648,7 @@
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ # Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
+ # support --undefined. This deserves some investigation. FIXME
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -nostart $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+@@ -5094,13 +5658,13 @@
+ # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+ # as there is no search path for DLLs.
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ _LT_AC_TAGVAR(always_export_symbols, $1)=no
+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+- _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGS]] /s/.* \([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]] /s/.* //'\'' | sort | uniq > $export_symbols'
++ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+
+ if $LD --help 2>&1 | grep 'auto-import' > /dev/null; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ # If the export-symbols file already is a .def file (1st line
+ # is EXPORTS), use it as is; otherwise, prepend...
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+@@ -5109,23 +5673,79 @@
+ echo EXPORTS > $output_objdir/$soname.def;
+ cat $export_symbols >> $output_objdir/$soname.def;
+ fi~
+- $CC -shared $output_objdir/$soname.def $compiler_flags $libobjs $deplibs -o $output_objdir/$soname ${wl}--image-base=0x10000000 ${wl}--out-implib,$lib'
++ $CC -shared $output_objdir/$soname.def $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+ else
+- ld_shlibs=no
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+
+- netbsd*)
++ interix[[3-9]]*)
++ _LT_AC_TAGVAR(hardcode_direct, $1)=no
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++ # Hack: On Interix 3.x, we cannot compile PIC because of a broken gcc.
++ # Instead, shared libraries are loaded at an image base (0x10000000 by
++ # default) and relocated if they conflict, which is a slow very memory
++ # consuming and fragmenting process. To avoid this, we pick a random,
++ # 256 KiB-aligned image base between 0x50000000 and 0x6FFC0000 at link
++ # time. Moving up from 0x10000000 also allows more sbrk(2) space.
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed "s,^,_," $export_symbols >$output_objdir/$soname.expsym~$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-h,$soname ${wl}--retain-symbols-file,$output_objdir/$soname.expsym ${wl}--image-base,`expr ${RANDOM-$$} % 4096 / 2 \* 262144 + 1342177280` -o $lib'
++ ;;
++
++ gnu* | linux* | k*bsd*-gnu)
++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++ tmp_addflag=
++ case $cc_basename,$host_cpu in
++ pgcc*) # Portland Group C compiler
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ tmp_addflag=' $pic_flag'
++ ;;
++ pgf77* | pgf90* | pgf95*) # Portland Group f77 and f90 compilers
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ tmp_addflag=' $pic_flag -Mnomain' ;;
++ ecc*,ia64* | icc*,ia64*) # Intel C compiler on ia64
++ tmp_addflag=' -i_dynamic' ;;
++ efc*,ia64* | ifort*,ia64*) # Intel Fortran compiler on ia64
++ tmp_addflag=' -i_dynamic -nofor_main' ;;
++ ifc* | ifort*) # Intel Fortran compiler
++ tmp_addflag=' -nofor_main' ;;
++ esac
++ case `$CC -V 2>&1 | sed 5q` in
++ *Sun\ C*) # Sun C 5.9
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $echo \"$new_convenience\"` ${wl}--no-whole-archive'
++ tmp_sharedflag='-G' ;;
++ *Sun\ F*) # Sun Fortran 8.3
++ tmp_sharedflag='-G' ;;
++ *)
++ tmp_sharedflag='-shared' ;;
++ esac
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++
++ if test $supports_anon_versioning = yes; then
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $output_objdir/$libname.ver~
++ cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
++ $echo "local: *; };" >> $output_objdir/$libname.ver~
++ $CC '"$tmp_sharedflag""$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
++ fi
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=no
++ else
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ fi
++ ;;
++
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
+ wlarc=
+ else
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ fi
+ ;;
+
+- solaris* | sysv5*)
++ solaris*)
+ if $LD -v 2>&1 | grep 'BFD 2\.8' > /dev/null; then
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ cat <<EOF 1>&2
+@@ -5139,13 +5759,40 @@
+
+ EOF
+ elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+
++ sysv5* | sco3.2v5* | sco5v6* | unixware* | OpenUNIX*)
++ case `$LD -v 2>&1` in
++ *\ [[01]].* | *\ 2.[[0-9]].* | *\ 2.1[[0-5]].*)
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ cat <<_LT_EOF 1>&2
++
++*** Warning: Releases of the GNU linker prior to 2.16.91.0.3 can not
++*** reliably create shared libraries on SCO systems. Therefore, libtool
++*** is disabling shared libraries support. We urge you to upgrade GNU
++*** binutils to release 2.16.91.0.3 or newer. Another option is to modify
++*** your PATH or compiler configuration so that the native linker is
++*** used, and then restart.
++
++_LT_EOF
++ ;;
++ *)
++ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-rpath,$libdir`'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname,\${SCOABSPATH:+${install_libdir}/}$soname,-retain-symbols-file,$export_symbols -o $lib'
++ else
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ fi
++ ;;
++ esac
++ ;;
++
+ sunos4*)
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+ wlarc=
+@@ -5155,24 +5802,19 @@
+
+ *)
+ if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname -o $lib'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+ else
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+ esac
+
+- if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = yes; then
+- runpath_var=LD_RUN_PATH
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
+- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
+- # ancient GNU ld didn't support --whole-archive et. al.
+- if $LD --help 2>&1 | grep 'no-whole-archive' > /dev/null; then
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
+- else
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+- fi
++ if test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no; then
++ runpath_var=
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=
+ fi
+ else
+ # PORTME fill in a description of your system's linker (not GNU ld)
+@@ -5184,7 +5826,7 @@
+ # Note: this linker hardcodes the directories in LIBPATH if there
+ # are no directories specified by -L.
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+- if test "$GCC" = yes && test -z "$link_static_flag"; then
++ if test "$GCC" = yes && test -z "$lt_prog_compiler_static"; then
+ # Neither direct hardcoding nor static linking is supported with a
+ # broken collect2.
+ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+@@ -5206,9 +5848,21 @@
+ else
+ _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\[$]2 == "T") || (\[$]2 == "D") || (\[$]2 == "B")) && ([substr](\[$]3,1,1) != ".")) { print \[$]3 } }'\'' | sort -u > $export_symbols'
+ fi
++ aix_use_runtimelinking=no
++
++ # Test if we are trying to use run time linking or normal
++ # AIX style linking. If -brtl is somewhere in LDFLAGS, we
++ # need to do runtime linking.
++ case $host_os in aix4.[[23]]|aix4.[[23]].*|aix5*)
++ for ld_flag in $LDFLAGS; do
++ if (test $ld_flag = "-brtl" || test $ld_flag = "-Wl,-brtl"); then
++ aix_use_runtimelinking=yes
++ break
++ fi
++ done
++ ;;
++ esac
+
+- # KDE requires run time linking. Make it the default.
+- aix_use_runtimelinking=yes
+ exp_sym_flag='-bexport'
+ no_entry_flag='-bnoentry'
+ fi
+@@ -5225,7 +5879,7 @@
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+
+ if test "$GCC" = yes; then
+- case $host_os in aix4.[012]|aix4.[012].*)
++ case $host_os in aix4.[[012]]|aix4.[[012]].*)
+ # We only want to do this on AIX 4.2 and lower, the check
+ # below for broken collect2 doesn't work under 4.3+
+ collect2name=`${CC} -print-prog-name=collect2`
+@@ -5233,7 +5887,7 @@
+ strings "$collect2name" | grep resolve_lib_name >/dev/null
+ then
+ # We have reworked collect2
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ :
+ else
+ # We have old collect2
+ _LT_AC_TAGVAR(hardcode_direct, $1)=unsupported
+@@ -5244,8 +5898,12 @@
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=
+ fi
++ ;;
+ esac
+ shared_flag='-shared'
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag="$shared_flag "'${wl}-G'
++ fi
+ else
+ # not using gcc
+ if test "$host_cpu" = ia64; then
+@@ -5253,30 +5911,30 @@
+ # chokes on -Wl,-G. The following line is correct:
+ shared_flag='-G'
+ else
+- if test "$aix_use_runtimelinking" = yes; then
+- shared_flag='-qmkshrobj ${wl}-G'
++ if test "$aix_use_runtimelinking" = yes; then
++ shared_flag='${wl}-G'
+ else
+- shared_flag='-qmkshrobj'
+- fi
++ shared_flag='${wl}-bM:SRE'
++ fi
+ fi
+ fi
+
+- # Let the compiler handle the export list.
+- _LT_AC_TAGVAR(always_export_symbols, $1)=no
++ # It seems that -bexpall does not export symbols beginning with
++ # underscore (_), so it is better to generate a list of symbols to export.
++ _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+ if test "$aix_use_runtimelinking" = yes; then
+ # Warning - without using the other runtime loading flags (-brtl),
+ # -berok will link without error, but may produce a broken library.
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)='-berok'
+ # Determine the default libpath from the value encoded in an empty executable.
+- _LT_AC_SYS_LIBPATH_AIX
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
+- _LT_AC_TAGVAR(archive_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '" $shared_flag"
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
++ _LT_AC_SYS_LIBPATH_AIX
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then echo "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+ else
+ if test "$host_cpu" = ia64; then
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)="-z nodefs"
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}${allow_undefined_flag} '"\${wl}$no_entry_flag \${wl}$exp_sym_flag:\$export_symbols"
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags ${wl}${allow_undefined_flag} '"\${wl}$exp_sym_flag:\$export_symbols"
+ else
+ # Determine the default libpath from the value encoded in an empty executable.
+ _LT_AC_SYS_LIBPATH_AIX
+@@ -5285,13 +5943,11 @@
+ # -berok will link without error, but may produce a broken library.
+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
+- # -bexpall does not export symbols beginning with underscore (_)
+- _LT_AC_TAGVAR(always_export_symbols, $1)=yes
+ # Exported symbols can be pulled into shared objects from archives
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
+- # This is similar to how AIX traditionally builds it's shared libraries.
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $compiler_flags $libobjs $deplibs ${wl}-bE:$export_symbols ${wl}-bnoentry${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
++ # This is similar to how AIX traditionally builds its shared libraries.
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
+ fi
+ fi
+ ;;
+@@ -5304,7 +5960,7 @@
+ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ ;;
+
+- bsdi4*)
++ bsdi[[45]]*)
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
+ ;;
+
+@@ -5314,69 +5970,69 @@
+ # hardcode_libdir_flag_spec is actually meaningless, as there is
+ # no search path for DLLs.
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)=no
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+ # Tell ltmain to make .lib files, not .a files.
+ libext=lib
+ # Tell ltmain to make .dll files, not .so files.
+- shrext=".dll"
++ shrext_cmds=".dll"
+ # FIXME: Setting linknames here is a bad hack.
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $compiler_flags $libobjs `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `echo "$deplibs" | $SED -e '\''s/ -lc$//'\''` -link -dll~linknames='
+ # The linker will automatically build a .lib file if we build a DLL.
+ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='true'
+ # FIXME: Should let the user specify the lib program.
+- _LT_AC_TAGVAR(old_archive_cmds, $1)='lib /OUT:$oldlib$oldobjs$old_deplibs'
+- fix_srcfile_path='`cygpath -w "$srcfile"`'
++ _LT_AC_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
++ _LT_AC_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
+ _LT_AC_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+ ;;
+
+ darwin* | rhapsody*)
+- if test "$GXX" = yes ; then
+- _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+- case "$host_os" in
+- rhapsody* | darwin1.[[012]])
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,suppress'
+- ;;
+- *) # Darwin 1.3 on
+- if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- else
+- case ${MACOSX_DEPLOYMENT_TARGET} in
+- 10.[012])
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-flat_namespace -Wl,-undefined -Wl,suppress'
+- ;;
+- 10.*)
+- _LT_AC_TAGVAR(allow_undefined_flag, $1)='-Wl,-undefined -Wl,dynamic_lookup'
+- ;;
+- esac
+- fi
+- ;;
++ case $host_os in
++ rhapsody* | darwin1.[[012]])
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}suppress'
++ ;;
++ *) # Darwin 1.3 on
++ if test -z ${MACOSX_DEPLOYMENT_TARGET} ; then
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ else
++ case ${MACOSX_DEPLOYMENT_TARGET} in
++ 10.[[012]])
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-flat_namespace ${wl}-undefined ${wl}suppress'
++ ;;
++ 10.*)
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-undefined ${wl}dynamic_lookup'
++ ;;
++ esac
++ fi
++ ;;
+ esac
+- lt_int_apple_cc_single_mod=no
+- output_verbose_link_cmd='echo'
+- if $CC -dumpspecs 2>&1 | grep 'single_module' >/dev/null ; then
+- lt_int_apple_cc_single_mod=yes
+- fi
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring'
+- else
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring'
+- fi
+- _LT_AC_TAGVAR(module_cmds, $1)='$CC ${wl}-bind_at_load $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs'
+- # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin ld's
+- if test "X$lt_int_apple_cc_single_mod" = Xyes ; then
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib -single_module $allow_undefined_flag -o $lib $compiler_flags $libobjs $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- else
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -r ${wl}-bind_at_load -keep_private_externs -nostdlib -o ${lib}-master.o $libobjs~$CC -dynamiclib $allow_undefined_flag -o $lib ${lib}-master.o $compiler_flags $deplibs -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
+- fi
+- _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $compiler_flags $libobjs $deplibs~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_automatic, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-all_load $convenience'
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=''
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+- else
+- _LT_AC_TAGVAR(ld_shlibs, $1)=no
+- fi
++ if test "$GCC" = yes ; then
++ output_verbose_link_cmd='echo'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring'
++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -dynamiclib $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags -install_name $rpath/$soname $verstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ else
++ case $cc_basename in
++ xlc*)
++ output_verbose_link_cmd='echo'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}`echo $rpath/$soname` $xlcverstring'
++ _LT_AC_TAGVAR(module_cmds, $1)='$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags'
++ # Don't fix this by using the ld -exported_symbols_list flag, it doesn't exist in older darwin lds
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC -qmkshrobj $allow_undefined_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-install_name ${wl}$rpath/$soname $xlcverstring~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ _LT_AC_TAGVAR(module_expsym_cmds, $1)='sed -e "s,#.*,," -e "s,^[ ]*,," -e "s,^\(..*\),_&," < $export_symbols > $output_objdir/${libname}-symbols.expsym~$CC $allow_undefined_flag -o $lib -bundle $libobjs $deplibs$compiler_flags~nmedit -s $output_objdir/${libname}-symbols.expsym ${lib}'
++ ;;
++ *)
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
++ ;;
++ esac
++ fi
+ ;;
+
+ dgux*)
+@@ -5409,8 +6065,8 @@
+ ;;
+
+ # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
+- freebsd* | kfreebsd*-gnu)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
++ freebsd* | dragonfly*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+@@ -5418,7 +6074,7 @@
+
+ hpux9*)
+ if test "$GCC" = yes; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $compiler_flags $libobjs $deplibs~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ else
+ _LT_AC_TAGVAR(archive_cmds, $1)='$rm $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+ fi
+@@ -5432,47 +6088,62 @@
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+ ;;
+
+- hpux10* | hpux11*)
++ hpux10*)
+ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+- case "$host_cpu" in
+- hppa*64*|ia64*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
++ else
++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++ fi
++ if test "$with_gnu_ld" = no; then
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++
++ # hardcode_minus_L: Not really in the search PATH,
++ # but as the default location of the library.
++ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
++ fi
++ ;;
++
++ hpux11*)
++ if test "$GCC" = yes -a "$with_gnu_ld" = no; then
++ case $host_cpu in
++ hppa*64*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ ia64*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $compiler_flags $libobjs $deplibs'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ else
+- case "$host_cpu" in
+- hppa*64*|ia64*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
++ case $host_cpu in
++ hppa*64*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ ;;
++ ia64*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ *)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+ ;;
+ esac
+ fi
+ if test "$with_gnu_ld" = no; then
+- case "$host_cpu" in
+- hppa*64*)
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
++
++ case $host_cpu in
++ hppa*64*|ia64*)
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_AC_TAGVAR(hardcode_direct, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+- ia64*)
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+- _LT_AC_TAGVAR(hardcode_direct, $1)=no
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+-
+- # hardcode_minus_L: Not really in the search PATH,
+- # but as the default location of the library.
+- _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+- ;;
+ *)
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
+- _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
+
+@@ -5486,7 +6157,7 @@
+
+ irix5* | irix6* | nonstopux*)
+ if test "$GCC" = yes; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ else
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
+@@ -5496,7 +6167,7 @@
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+
+- netbsd*)
++ netbsd* | netbsdelf*-gnu)
+ if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags' # a.out
+ else
+@@ -5516,23 +6187,28 @@
+ ;;
+
+ openbsd*)
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++ if test -f /usr/libexec/ld.so; then
++ _LT_AC_TAGVAR(hardcode_direct, $1)=yes
++ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags ${wl}-retain-symbols-file,$export_symbols'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
++ else
++ case $host_os in
++ openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
++ ;;
++ *)
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
++ ;;
++ esac
++ fi
+ else
+- case $host_os in
+- openbsd[[01]].* | openbsd2.[[0-7]] | openbsd2.[[0-7]].*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
+- ;;
+- *)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $compiler_flags $libobjs $deplibs'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
+- ;;
+- esac
++ _LT_AC_TAGVAR(ld_shlibs, $1)=no
+ fi
+ ;;
+
+@@ -5540,14 +6216,14 @@
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+ _LT_AC_TAGVAR(hardcode_minus_L, $1)=yes
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=unsupported
+- _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $compiler_flags $libobjs $deplibs$output_objdir/$libname.def'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$echo "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$echo "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$echo DATA >> $output_objdir/$libname.def~$echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~$echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+ _LT_AC_TAGVAR(old_archive_From_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
+ ;;
+
+ osf3*)
+ if test "$GCC" = yes; then
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ else
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+@@ -5559,13 +6235,13 @@
+ osf4* | osf5*) # as osf3* with the addition of -msym flag
+ if test "$GCC" = yes; then
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $compiler_flags $libobjs $deplibs ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && echo ${wl}-set_version ${wl}$verstring` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+ else
+ _LT_AC_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -shared${allow_undefined_flag} $libobjs $deplibs $linker_flags -msym -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; echo "-hidden">> $lib.exp~
+- $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${objdir}/so_locations -o $lib~$rm $lib.exp'
++ $LD -shared${allow_undefined_flag} -input $lib.exp $linker_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib~$rm $lib.exp'
+
+ # Both c and cxx compiler support -rpath directly
+ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
+@@ -5573,21 +6249,15 @@
+ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
+ ;;
+
+- sco3.2v5*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+- runpath_var=LD_RUN_PATH
+- hardcode_runpath_var=yes
+- ;;
+-
+ solaris*)
+ _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+ if test "$GCC" = yes; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++ wlarc='${wl}'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+- $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs~$rm $lib.exp'
++ $CC -shared ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$rm $lib.exp'
+ else
++ wlarc=''
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+ $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+@@ -5596,8 +6266,17 @@
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ case $host_os in
+ solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
+- *) # Supported since Solaris 2.6 (maybe 2.5.1?)
+- _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract' ;;
++ *)
++ # The compiler driver will combine and reorder linker options,
++ # but understands `-z linker_flag'. GCC discards it without `$wl',
++ # but is careful enough not to reorder.
++ # Supported since Solaris 2.6 (maybe 2.5.1?)
++ if test "$GCC" = yes; then
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='${wl}-z ${wl}allextract$convenience ${wl}-z ${wl}defaultextract'
++ else
++ _LT_AC_TAGVAR(whole_archive_flag_spec, $1)='-z allextract$convenience -z defaultextract'
++ fi
++ ;;
+ esac
+ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
+ ;;
+@@ -5606,7 +6285,7 @@
+ if test "x$host_vendor" = xsequent; then
+ # Use $CC to link under sequent, because it throws in some extra .o
+ # files that make .init and .fini sections work.
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $compiler_flags $libobjs $deplibs'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h $soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+ _LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
+ fi
+@@ -5654,36 +6333,45 @@
+ fi
+ ;;
+
+- sysv4.2uw2*)
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G -o $lib $libobjs $deplibs $linker_flags'
+- _LT_AC_TAGVAR(hardcode_direct, $1)=yes
+- _LT_AC_TAGVAR(hardcode_minus_L, $1)=no
++ sysv4*uw2* | sysv5OpenUNIX* | sysv5UnixWare7.[[01]].[[10]]* | unixware7* | sco3.2v5.0.[[024]]*)
++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+- hardcode_runpath_var=yes
+- runpath_var=LD_RUN_PATH
+- ;;
++ runpath_var='LD_RUN_PATH'
+
+- sysv5OpenUNIX8* | sysv5UnixWare7* | sysv5uw[[78]]* | unixware7*)
+- _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
+ if test "$GCC" = yes; then
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ else
+- _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h ${wl}$soname -o $lib $compiler_flags $libobjs $deplibs'
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+ fi
+- runpath_var='LD_RUN_PATH'
+- _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
+ ;;
+
+- sysv5*)
+- _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
+- # $CC -shared without GNU ld will not create a library from C++
+- # object files and a static libstdc++, better avoid it by now
+- _LT_AC_TAGVAR(archive_cmds, $1)='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
+- _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~$echo "local: *; };" >> $lib.exp~
+- $LD -G${allow_undefined_flag} -M $lib.exp -h $soname -o $lib $libobjs $deplibs $linker_flags~$rm $lib.exp'
+- _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=
++ sysv5* | sco3.2v5* | sco5v6*)
++ # Note: We can NOT use -z defs as we might desire, because we do not
++ # link with -lc, and that would cause any symbols used from libc to
++ # always be unresolved, which means just about no library would
++ # ever link correctly. If we're not using GNU ld we use -z text
++ # though, which does catch some bad symbols but isn't as heavy-handed
++ # as -z defs.
++ _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z,text'
++ _LT_AC_TAGVAR(allow_undefined_flag, $1)='${wl}-z,nodefs'
++ _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
+ _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
++ _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='`test -z "$SCOABSPATH" && echo ${wl}-R,$libdir`'
++ _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=':'
++ _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
++ _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-Bexport'
+ runpath_var='LD_RUN_PATH'
++
++ if test "$GCC" = yes; then
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -shared ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ else
++ _LT_AC_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ _LT_AC_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,\${SCOABSPATH:+${install_libdir}/}$soname -o $lib $libobjs $deplibs $compiler_flags'
++ fi
+ ;;
+
+ uts4*)
+@@ -5701,11 +6389,6 @@
+ AC_MSG_RESULT([$_LT_AC_TAGVAR(ld_shlibs, $1)])
+ test "$_LT_AC_TAGVAR(ld_shlibs, $1)" = no && can_build_shared=no
+
+-variables_saved_for_relink="PATH $shlibpath_var $runpath_var"
+-if test "$GCC" = yes; then
+- variables_saved_for_relink="$variables_saved_for_relink GCC_EXEC_PREFIX COMPILER_PATH LIBRARY_PATH"
+-fi
+-
+ #
+ # Do we need to explicitly link libc?
+ #
+@@ -5725,14 +6408,15 @@
+ # to ld, don't add -lc before -lgcc.
+ AC_MSG_CHECKING([whether -lc should be explicitly linked in])
+ $rm conftest*
+- printf "$lt_simple_compile_test_code" > conftest.$ac_ext
+-
++ echo "$lt_simple_compile_test_code" > conftest.$ac_ext
++
+ if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+ soname=conftest
+ lib=conftest
+ libobjs=conftest.$ac_objext
+ deplibs=
+ wl=$_LT_AC_TAGVAR(lt_prog_compiler_wl, $1)
++ pic_flag=$_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)
+ compiler_flags=-v
+ linker_flags=-v
+ verstring=
+@@ -5827,6 +6511,30 @@
+ [AC_CHECK_TOOL(RC, windres, no)
+ ])
+
++
++# Cheap backport of AS_EXECUTABLE_P and required macros
++# from Autoconf 2.59; we should not use $as_executable_p directly.
++
++# _AS_TEST_PREPARE
++# ----------------
++m4_ifndef([_AS_TEST_PREPARE],
++[m4_defun([_AS_TEST_PREPARE],
++[if test -x / >/dev/null 2>&1; then
++ as_executable_p='test -x'
++else
++ as_executable_p='test -f'
++fi
++])])# _AS_TEST_PREPARE
++
++# AS_EXECUTABLE_P
++# ---------------
++# Check whether a file is executable.
++m4_ifndef([AS_EXECUTABLE_P],
++[m4_defun([AS_EXECUTABLE_P],
++[AS_REQUIRE([_AS_TEST_PREPARE])dnl
++$as_executable_p $1[]dnl
++])])# AS_EXECUTABLE_P
++
+ ############################################################
+ # NOTE: This macro has been submitted for inclusion into #
+ # GNU Autoconf as AC_PROG_SED. When it is available in #
+@@ -5849,18 +6557,19 @@
+ test -z "$as_dir" && as_dir=.
+ for lt_ac_prog in sed gsed; do
+ for ac_exec_ext in '' $ac_executable_extensions; do
+- if $as_executable_p "$as_dir/$lt_ac_prog$ac_exec_ext"; then
++ if AS_EXECUTABLE_P(["$as_dir/$lt_ac_prog$ac_exec_ext"]); then
+ lt_ac_sed_list="$lt_ac_sed_list $as_dir/$lt_ac_prog$ac_exec_ext"
+ fi
+ done
+ done
+ done
++IFS=$as_save_IFS
+ lt_ac_max=0
+ lt_ac_count=0
+ # Add /usr/xpg4/bin/sed as it is typically found on Solaris
+ # along with /bin/sed that truncates output.
+ for lt_ac_sed in $lt_ac_sed_list /usr/xpg4/bin/sed; do
+- test ! -f $lt_ac_sed && break
++ test ! -f $lt_ac_sed && continue
+ cat /dev/null > conftest.in
+ lt_ac_count=0
+ echo $ECHO_N "0123456789$ECHO_C" >conftest.in
+@@ -5887,5 +6596,6 @@
+ done
+ ])
+ SED=$lt_cv_path_SED
++AC_SUBST([SED])
+ AC_MSG_RESULT([$SED])
+ ])
+--- a/admin/ltmain.sh
++++ b/admin/ltmain.sh
+@@ -1,8 +1,8 @@
+ # ltmain.sh - Provide generalized library-building support services.
+ # NOTE: Changing this file will not affect anything until you rerun configure.
+ #
+-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003
+-# Free Software Foundation, Inc.
++# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
++# 2007 Free Software Foundation, Inc.
+ # Originally by Gordon Matzigkeit <gord at gnu.ai.mit.edu>, 1996
+ #
+ # This program is free software; you can redistribute it and/or modify
+@@ -24,6 +24,42 @@
+ # configuration script generated by Autoconf, you may include it under
+ # the same distribution terms that you use for the rest of that program.
+
++basename="s,^.*/,,g"
++
++# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
++# is ksh but when the shell is invoked as "sh" and the current value of
++# the _XPG environment variable is not equal to 1 (one), the special
++# positional parameter $0, within a function call, is the name of the
++# function.
++progpath="$0"
++
++# The name of this program:
++progname=`echo "$progpath" | $SED $basename`
++modename="$progname"
++
++# Global variables:
++EXIT_SUCCESS=0
++EXIT_FAILURE=1
++
++PROGRAM=ltmain.sh
++PACKAGE=libtool
++VERSION="1.5.24 Debian 1.5.24-1"
++TIMESTAMP=" (1.1220.2.456 2007/06/24 02:25:32)"
++
++# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
++if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
++ emulate sh
++ NULLCMD=:
++ # Zsh 3.x and 4.x performs word splitting on ${1+"$@"}, which
++ # is contrary to our usage. Disable this feature.
++ alias -g '${1+"$@"}'='"$@"'
++ setopt NO_GLOB_SUBST
++else
++ 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
++
+ # Check that we have a working $echo.
+ if test "X$1" = X--no-reexec; then
+ # Discard the --no-reexec flag, and continue.
+@@ -36,14 +72,7 @@
+ :
+ else
+ # Restart under the correct shell, and then maybe $echo will work.
+- exec $SHELL "$0" --no-reexec ${1+"$@"}
+-fi
+-# Same for EGREP, and just to be sure, do LTCC as well
+-if test "x$EGREP" = x ; then
+- EGREP=egrep
+-fi
+-if test "x$LTCC" = x ; then
+- LTCC=${CC-gcc}
++ exec $SHELL "$progpath" --no-reexec ${1+"$@"}
+ fi
+
+ if test "X$1" = X--fallback-echo; then
+@@ -52,19 +81,9 @@
+ cat <<EOF
+ $*
+ EOF
+- exit 0
++ exit $EXIT_SUCCESS
+ fi
+
+-# The name of this program.
+-progname=`$echo "$0" | ${SED} 's%^.*/%%'`
+-modename="$progname"
+-
+-# Constants.
+-PROGRAM=ltmain.sh
+-PACKAGE=libtool
+-VERSION=1.5a
+-TIMESTAMP=" (1.1240 2003/06/26 06:55:19)"
+-
+ default_mode=
+ help="Try \`$progname --help' for more information."
+ magic="%%%MAGIC variable%%%"
+@@ -77,14 +96,15 @@
+ Xsed="${SED}"' -e 1s/^X//'
+ sed_quote_subst='s/\([\\`\\"$\\\\]\)/\\\1/g'
+ # test EBCDIC or ASCII
+-case `echo A|tr A '\301'` in
+- A) # EBCDIC based system
+- SP2NL="tr '\100' '\n'"
+- NL2SP="tr '\r\n' '\100\100'"
++case `echo X|tr X '\101'` in
++ A) # ASCII based system
++ # \n is not interpreted correctly by Solaris 8 /usr/ucb/tr
++ SP2NL='tr \040 \012'
++ NL2SP='tr \015\012 \040\040'
+ ;;
+- *) # Assume ASCII based system
+- SP2NL="tr '\040' '\012'"
+- NL2SP="tr '\015\012' '\040\040'"
++ *) # EBCDIC based system
++ SP2NL='tr \100 \n'
++ NL2SP='tr \r\n \100\100'
+ ;;
+ esac
+
+@@ -93,20 +113,24 @@
+ # These must not be set unconditionally because not all systems understand
+ # e.g. LANG=C (notably SCO).
+ # We save the old values to restore during execute mode.
+-if test "${LC_ALL+set}" = set; then
+- save_LC_ALL="$LC_ALL"; LC_ALL=C; export LC_ALL
+-fi
+-if test "${LANG+set}" = set; then
+- save_LANG="$LANG"; LANG=C; export LANG
+-fi
++for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
++do
++ eval "if test \"\${$lt_var+set}\" = set; then
++ save_$lt_var=\$$lt_var
++ $lt_var=C
++ export $lt_var
++ fi"
++done
+
+ # Make sure IFS has a sensible default
+-: ${IFS=" "}
++lt_nl='
++'
++IFS=" $lt_nl"
+
+ if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+ $echo "$modename: not configured to build any kind of library" 1>&2
+ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Global variables.
+@@ -118,41 +142,62 @@
+ show="$echo"
+ show_help=
+ execute_dlfiles=
++duplicate_deps=no
++preserve_args=
+ lo2o="s/\\.lo\$/.${objext}/"
+ o2lo="s/\\.${objext}\$/.lo/"
+-
+-if test -z "$max_cmd_len"; then
+- i=0
+- testring="ABCD"
+- new_result=
+-
+- # If test is not a shell built-in, we'll probably end up computing a
+- # maximum length that is only half of the actual maximum length, but
+- # we can't tell.
+- while (test "X"`$SHELL $0 --fallback-echo "X$testring" 2>/dev/null` \
+- = "XX$testring") >/dev/null 2>&1 &&
+- new_result=`expr "X$testring" : ".*" 2>&1` &&
+- max_cmd_len="$new_result" &&
+- test "$i" != 17 # 1/2 MB should be enough
+- do
+- i=`expr $i + 1`
+- testring="$testring$testring"
+- done
+- testring=
+- # Add a significant safety factor because C++ compilers can tack on massive
+- # amounts of additional arguments before passing them to the linker.
+- # It appears as though 1/2 is a usable value.
+- max_cmd_len=`expr $max_cmd_len \/ 2`
+-fi
++extracted_archives=
++extracted_serial=0
+
+ #####################################
+ # Shell function definitions:
+ # This seems to be the best place for them
+
++# func_mktempdir [string]
++# Make a temporary directory that won't clash with other running
++# libtool processes, and avoids race conditions if possible. If
++# given, STRING is the basename for that directory.
++func_mktempdir ()
++{
++ my_template="${TMPDIR-/tmp}/${1-$progname}"
++
++ if test "$run" = ":"; then
++ # Return a directory name, but don't create it in dry-run mode
++ my_tmpdir="${my_template}-$$"
++ else
++
++ # If mktemp works, use that first and foremost
++ my_tmpdir=`mktemp -d "${my_template}-XXXXXXXX" 2>/dev/null`
++
++ if test ! -d "$my_tmpdir"; then
++ # Failing that, at least try and use $RANDOM to avoid a race
++ my_tmpdir="${my_template}-${RANDOM-0}$$"
++
++ save_mktempdir_umask=`umask`
++ umask 0077
++ $mkdir "$my_tmpdir"
++ umask $save_mktempdir_umask
++ fi
++
++ # If we're not in dry-run mode, bomb out on failure
++ test -d "$my_tmpdir" || {
++ $echo "cannot create temporary directory \`$my_tmpdir'" 1>&2
++ exit $EXIT_FAILURE
++ }
++ fi
++
++ $echo "X$my_tmpdir" | $Xsed
++}
++
++
++# func_win32_libid arg
++# return the library type of file 'arg'
++#
+ # Need a lot of goo to handle *both* DLLs and import libs
+ # Has to be a shell function in order to 'eat' the argument
+ # that is supplied when $file_magic_command is called.
+-win32_libid () {
++func_win32_libid ()
++{
+ win32_libid_type="unknown"
+ win32_fileres=`file -L $1 2>/dev/null`
+ case $win32_fileres in
+@@ -161,17 +206,22 @@
+ ;;
+ *ar\ archive*) # could be an import, or static
+ if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null | \
+- grep -E 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
++ $EGREP -e 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
+ win32_nmres=`eval $NM -f posix -A $1 | \
+- sed -n -e '1,100{/ I /{x;/import/!{s/^/import/;h;p;};x;};}'`
+- if test "X$win32_nmres" = "Ximport" ; then
+- win32_libid_type="x86 archive import"
+- else
+- win32_libid_type="x86 archive static"
+- fi
++ $SED -n -e '1,100{
++ / I /{
++ s,.*,import,
++ p
++ q
++ }
++ }'`
++ case $win32_nmres in
++ import*) win32_libid_type="x86 archive import";;
++ *) win32_libid_type="x86 archive static";;
++ esac
+ fi
+ ;;
+- *DLL*)
++ *DLL*)
+ win32_libid_type="x86 DLL"
+ ;;
+ *executable*) # but shell scripts are "executable" too...
+@@ -185,9 +235,191 @@
+ $echo $win32_libid_type
+ }
+
++
++# func_infer_tag arg
++# Infer tagged configuration to use if any are available and
++# if one wasn't chosen via the "--tag" command line option.
++# Only attempt this if the compiler in the base compile
++# command doesn't match the default compiler.
++# arg is usually of the form 'gcc ...'
++func_infer_tag ()
++{
++ if test -n "$available_tags" && test -z "$tagname"; then
++ CC_quoted=
++ for arg in $CC; do
++ case $arg in
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
++ arg="\"$arg\""
++ ;;
++ esac
++ CC_quoted="$CC_quoted $arg"
++ done
++ case $@ in
++ # Blanks in the command may have been stripped by the calling shell,
++ # but not from the CC environment variable when configure was run.
++ " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*) ;;
++ # Blanks at the start of $base_compile will cause this to fail
++ # if we don't check for them as well.
++ *)
++ for z in $available_tags; do
++ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$progpath" > /dev/null; then
++ # Evaluate the configuration.
++ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $progpath`"
++ CC_quoted=
++ for arg in $CC; do
++ # Double-quote args containing other shell metacharacters.
++ case $arg in
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
++ arg="\"$arg\""
++ ;;
++ esac
++ CC_quoted="$CC_quoted $arg"
++ done
++ case "$@ " in
++ " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$echo $CC_quoted` "* | "`$echo $CC_quoted` "*)
++ # The compiler in the base compile command matches
++ # the one in the tagged configuration.
++ # Assume this is the tagged configuration we want.
++ tagname=$z
++ break
++ ;;
++ esac
++ fi
++ done
++ # If $tagname still isn't set, then no tagged configuration
++ # was found and let the user know that the "--tag" command
++ # line option must be used.
++ if test -z "$tagname"; then
++ $echo "$modename: unable to infer tagged configuration"
++ $echo "$modename: specify a tag with \`--tag'" 1>&2
++ exit $EXIT_FAILURE
++# else
++# $echo "$modename: using $tagname tagged configuration"
++ fi
++ ;;
++ esac
++ fi
++}
++
++
++# func_extract_an_archive dir oldlib
++func_extract_an_archive ()
++{
++ f_ex_an_ar_dir="$1"; shift
++ f_ex_an_ar_oldlib="$1"
++
++ $show "(cd $f_ex_an_ar_dir && $AR x $f_ex_an_ar_oldlib)"
++ $run eval "(cd \$f_ex_an_ar_dir && $AR x \$f_ex_an_ar_oldlib)" || exit $?
++ if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
++ :
++ else
++ $echo "$modename: ERROR: object name conflicts: $f_ex_an_ar_dir/$f_ex_an_ar_oldlib" 1>&2
++ exit $EXIT_FAILURE
++ fi
++}
++
++# func_extract_archives gentop oldlib ...
++func_extract_archives ()
++{
++ my_gentop="$1"; shift
++ my_oldlibs=${1+"$@"}
++ my_oldobjs=""
++ my_xlib=""
++ my_xabs=""
++ my_xdir=""
++ my_status=""
++
++ $show "${rm}r $my_gentop"
++ $run ${rm}r "$my_gentop"
++ $show "$mkdir $my_gentop"
++ $run $mkdir "$my_gentop"
++ my_status=$?
++ if test "$my_status" -ne 0 && test ! -d "$my_gentop"; then
++ exit $my_status
++ fi
++
++ for my_xlib in $my_oldlibs; do
++ # Extract the objects.
++ case $my_xlib in
++ [\\/]* | [A-Za-z]:[\\/]*) my_xabs="$my_xlib" ;;
++ *) my_xabs=`pwd`"/$my_xlib" ;;
++ esac
++ my_xlib=`$echo "X$my_xlib" | $Xsed -e 's%^.*/%%'`
++ my_xlib_u=$my_xlib
++ while :; do
++ case " $extracted_archives " in
++ *" $my_xlib_u "*)
++ extracted_serial=`expr $extracted_serial + 1`
++ my_xlib_u=lt$extracted_serial-$my_xlib ;;
++ *) break ;;
++ esac
++ done
++ extracted_archives="$extracted_archives $my_xlib_u"
++ my_xdir="$my_gentop/$my_xlib_u"
++
++ $show "${rm}r $my_xdir"
++ $run ${rm}r "$my_xdir"
++ $show "$mkdir $my_xdir"
++ $run $mkdir "$my_xdir"
++ exit_status=$?
++ if test "$exit_status" -ne 0 && test ! -d "$my_xdir"; then
++ exit $exit_status
++ fi
++ case $host in
++ *-darwin*)
++ $show "Extracting $my_xabs"
++ # Do not bother doing anything if just a dry run
++ if test -z "$run"; then
++ darwin_orig_dir=`pwd`
++ cd $my_xdir || exit $?
++ darwin_archive=$my_xabs
++ darwin_curdir=`pwd`
++ darwin_base_archive=`$echo "X$darwin_archive" | $Xsed -e 's%^.*/%%'`
++ darwin_arches=`lipo -info "$darwin_archive" 2>/dev/null | $EGREP Architectures 2>/dev/null`
++ if test -n "$darwin_arches"; then
++ darwin_arches=`echo "$darwin_arches" | $SED -e 's/.*are://'`
++ darwin_arch=
++ $show "$darwin_base_archive has multiple architectures $darwin_arches"
++ for darwin_arch in $darwin_arches ; do
++ mkdir -p "unfat-$$/${darwin_base_archive}-${darwin_arch}"
++ lipo -thin $darwin_arch -output "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}" "${darwin_archive}"
++ cd "unfat-$$/${darwin_base_archive}-${darwin_arch}"
++ func_extract_an_archive "`pwd`" "${darwin_base_archive}"
++ cd "$darwin_curdir"
++ $rm "unfat-$$/${darwin_base_archive}-${darwin_arch}/${darwin_base_archive}"
++ done # $darwin_arches
++ ## Okay now we have a bunch of thin objects, gotta fatten them up :)
++ darwin_filelist=`find unfat-$$ -type f -name \*.o -print -o -name \*.lo -print| xargs basename | sort -u | $NL2SP`
++ darwin_file=
++ darwin_files=
++ for darwin_file in $darwin_filelist; do
++ darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
++ lipo -create -output "$darwin_file" $darwin_files
++ done # $darwin_filelist
++ ${rm}r unfat-$$
++ cd "$darwin_orig_dir"
++ else
++ cd "$darwin_orig_dir"
++ func_extract_an_archive "$my_xdir" "$my_xabs"
++ fi # $darwin_arches
++ fi # $run
++ ;;
++ *)
++ func_extract_an_archive "$my_xdir" "$my_xabs"
++ ;;
++ esac
++ my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
++ done
++ func_extract_archives_result="$my_oldobjs"
++}
+ # End of Shell function definitions
+ #####################################
+
++# Darwin sucks
++eval std_shrext=\"$shrext_cmds\"
++
++disable_libs=no
++
+ # Parse our command line options once, thoroughly.
+ while test "$#" -gt 0
+ do
+@@ -207,12 +439,13 @@
+ ;;
+ tag)
+ tagname="$arg"
++ preserve_args="${preserve_args}=$arg"
+
+ # Check whether tagname contains only valid characters
+ case $tagname in
+ *[!-_A-Za-z0-9,/]*)
+ $echo "$progname: invalid tag name: $tagname" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+@@ -222,10 +455,10 @@
+ # not specially marked.
+ ;;
+ *)
+- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$0" > /dev/null; then
++ if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$" < "$progpath" > /dev/null; then
+ taglist="$taglist $tagname"
+ # Evaluate the configuration.
+- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $0`"
++ eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$tagname'$/,/^# ### END LIBTOOL TAG CONFIG: '$tagname'$/p' < $progpath`"
+ else
+ $echo "$progname: ignoring unknown tag $tagname" 1>&2
+ fi
+@@ -249,26 +482,28 @@
+ ;;
+
+ --version)
+- $echo "$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP"
+- $echo
+- $echo "Copyright (C) 2003 Free Software Foundation, Inc."
+- $echo "This is free software; see the source for copying conditions. There is NO"
+- $echo "warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
+- exit 0
++ echo "\
++$PROGRAM (GNU $PACKAGE) $VERSION$TIMESTAMP
++
++Copyright (C) 2007 Free Software Foundation, Inc.
++This is free software; see the source for copying conditions. There is NO
++warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
++ exit $?
+ ;;
+
+ --config)
+- ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $0
++ ${SED} -e '1,/^# ### BEGIN LIBTOOL CONFIG/d' -e '/^# ### END LIBTOOL CONFIG/,$d' $progpath
+ # Now print the configurations for the tags.
+ for tagname in $taglist; do
+- ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$0"
++ ${SED} -n -e "/^# ### BEGIN LIBTOOL TAG CONFIG: $tagname$/,/^# ### END LIBTOOL TAG CONFIG: $tagname$/p" < "$progpath"
+ done
+- exit 0
++ exit $?
+ ;;
+
+ --debug)
+ $echo "$progname: enabling shell trace mode"
+ set -x
++ preserve_args="$preserve_args $arg"
+ ;;
+
+ --dry-run | -n)
+@@ -287,7 +522,7 @@
+ else
+ $echo "disable static libraries"
+ fi
+- exit 0
++ exit $?
+ ;;
+
+ --finish) mode="finish" ;;
+@@ -299,13 +534,19 @@
+
+ --quiet | --silent)
+ show=:
++ preserve_args="$preserve_args $arg"
+ ;;
+
+- --tag) prevopt="--tag" prev=tag ;;
++ --tag)
++ prevopt="--tag"
++ prev=tag
++ preserve_args="$preserve_args --tag"
++ ;;
+ --tag=*)
+ set tag "$optarg" ${1+"$@"}
+ shift
+ prev=tag
++ preserve_args="$preserve_args --tag"
+ ;;
+
+ -dlopen)
+@@ -316,7 +557,7 @@
+ -*)
+ $echo "$modename: unrecognized option \`$arg'" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+
+ *)
+@@ -329,9 +570,21 @@
+ if test -n "$prevopt"; then
+ $echo "$modename: option \`$prevopt' requires an argument" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
++case $disable_libs in
++no)
++ ;;
++shared)
++ build_libtool_libs=no
++ build_old_libs=yes
++ ;;
++static)
++ build_old_libs=`case $build_libtool_libs in yes) echo no;; *) echo yes;; esac`
++ ;;
++esac
++
+ # If this variable is set in any of the actions, the command in it
+ # will be execed at the end. This prevents here-documents from being
+ # left over by shells.
+@@ -342,7 +595,7 @@
+ # Infer the operation mode.
+ if test -z "$mode"; then
+ $echo "*** Warning: inferring the mode of operation is deprecated." 1>&2
+- $echo "*** Future versions of Libtool will require -mode=MODE be specified." 1>&2
++ $echo "*** Future versions of Libtool will require --mode=MODE be specified." 1>&2
+ case $nonopt in
+ *cc | cc* | *++ | gcc* | *-gcc* | g++* | xlc*)
+ mode=link
+@@ -385,7 +638,7 @@
+ if test -n "$execute_dlfiles" && test "$mode" != execute; then
+ $echo "$modename: unrecognized option \`-dlopen'" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Change the help message to a mode-specific one.
+@@ -400,13 +653,15 @@
+ # Get the compilation command and the source file.
+ base_compile=
+ srcfile="$nonopt" # always keep a non-empty value in "srcfile"
++ suppress_opt=yes
+ suppress_output=
+ arg_mode=normal
+ libobj=
++ later=
+
+ for arg
+ do
+- case "$arg_mode" in
++ case $arg_mode in
+ arg )
+ # do not "continue". Instead, add this to base_compile
+ lastarg="$arg"
+@@ -425,24 +680,19 @@
+ -o)
+ if test -n "$libobj" ; then
+ $echo "$modename: you cannot specify \`-o' more than once" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ arg_mode=target
+ continue
+ ;;
+
+- -static)
+- build_old_libs=yes
+- continue
+- ;;
+-
+- -prefer-pic)
+- pic_mode=yes
++ -static | -prefer-pic | -prefer-non-pic)
++ later="$later $arg"
+ continue
+ ;;
+
+- -prefer-non-pic)
+- pic_mode=no
++ -no-suppress)
++ suppress_opt=no
+ continue
+ ;;
+
+@@ -455,7 +705,7 @@
+ args=`$echo "X$arg" | $Xsed -e "s/^-Wc,//"`
+ lastarg=
+ save_ifs="$IFS"; IFS=','
+- for arg in $args; do
++ for arg in $args; do
+ IFS="$save_ifs"
+
+ # Double-quote args containing other shell metacharacters.
+@@ -493,7 +743,10 @@
+ case $lastarg in
+ # Double-quote args containing other shell metacharacters.
+ # Many Bourne shells cannot handle close brackets correctly
+- # in scan sets, so we specify it separately.
++ # in scan sets, and some SunOS ksh mistreat backslash-escaping
++ # in scan sets (worked around with variable expansion),
++ # and furthermore cannot handle '|' '&' '(' ')' in scan sets
++ # at all, so we specify them separately.
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ lastarg="\"$lastarg\""
+ ;;
+@@ -505,11 +758,11 @@
+ case $arg_mode in
+ arg)
+ $echo "$modename: you must specify an argument for -Xcompile"
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ target)
+ $echo "$modename: you must specify a target with \`-o'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ *)
+ # Get the name of the library object.
+@@ -531,9 +784,10 @@
+ *.class) xform=class ;;
+ *.cpp) xform=cpp ;;
+ *.cxx) xform=cxx ;;
+- *.f90) xform=f90 ;;
++ *.[fF][09]?) xform=[fF][09]. ;;
+ *.for) xform=for ;;
+ *.java) xform=java ;;
++ *.obj) xform=obj ;;
+ esac
+
+ libobj=`$echo "X$libobj" | $Xsed -e "s/\.$xform$/.lo/"`
+@@ -542,51 +796,39 @@
+ *.lo) obj=`$echo "X$libobj" | $Xsed -e "$lo2o"` ;;
+ *)
+ $echo "$modename: cannot determine name of library object from \`$libobj'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+- # Infer tagged configuration to use if any are available and
+- # if one wasn't chosen via the "--tag" command line option.
+- # Only attempt this if the compiler in the base compile
+- # command doesn't match the default compiler.
+- if test -n "$available_tags" && test -z "$tagname"; then
+- case $base_compile in
+- # Blanks in the command may have been stripped by the calling shell,
+- # but not from the CC environment variable when configure was run.
+- " $CC "* | "$CC "* | " `$echo $CC` "* | "`$echo $CC` "*) ;;
+- # Blanks at the start of $base_compile will cause this to fail
+- # if we don't check for them as well.
+- *)
+- for z in $available_tags; do
+- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
+- # Evaluate the configuration.
+- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
+- case "$base_compile " in
+- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
+- # The compiler in the base compile command matches
+- # the one in the tagged configuration.
+- # Assume this is the tagged configuration we want.
+- tagname=$z
+- break
+- ;;
+- esac
+- fi
+- done
+- # If $tagname still isn't set, then no tagged configuration
+- # was found and let the user know that the "--tag" command
+- # line option must be used.
+- if test -z "$tagname"; then
+- $echo "$modename: unable to infer tagged configuration"
+- $echo "$modename: specify a tag with \`--tag'" 1>&2
+- exit 1
+-# else
+-# $echo "$modename: using $tagname tagged configuration"
+- fi
++ func_infer_tag $base_compile
++
++ for arg in $later; do
++ case $arg in
++ -static)
++ build_old_libs=yes
++ continue
++ ;;
++
++ -prefer-pic)
++ pic_mode=yes
++ continue
++ ;;
++
++ -prefer-non-pic)
++ pic_mode=no
++ continue
+ ;;
+ esac
+- fi
++ done
+
++ qlibobj=`$echo "X$libobj" | $Xsed -e "$sed_quote_subst"`
++ case $qlibobj in
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
++ qlibobj="\"$qlibobj\"" ;;
++ esac
++ test "X$libobj" != "X$qlibobj" \
++ && $echo "X$libobj" | grep '[]~#^*{};<>?"'"'"' &()|`$[]' \
++ && $echo "$modename: libobj name \`$libobj' may not contain shell special characters."
+ objname=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
+ xdir=`$echo "X$obj" | $Xsed -e 's%/[^/]*$%%'`
+ if test "X$xdir" = "X$obj"; then
+@@ -599,7 +841,7 @@
+ if test -z "$base_compile"; then
+ $echo "$modename: you must specify a compilation command" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Delete any leftover library objects.
+@@ -610,7 +852,7 @@
+ fi
+
+ $run $rm $removelist
+- trap "$run $rm $removelist; exit 1" 1 2 15
++ trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
+
+ # On Cygwin there's no "real" PIC flag so we must build both object types
+ case $host_os in
+@@ -629,7 +871,7 @@
+ output_obj=`$echo "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+ lockfile="$output_obj.lock"
+ removelist="$removelist $output_obj $lockfile"
+- trap "$run $rm $removelist; exit 1" 1 2 15
++ trap "$run $rm $removelist; exit $EXIT_FAILURE" 1 2 15
+ else
+ output_obj=
+ need_locks=no
+@@ -639,7 +881,7 @@
+ # Lock this critical section if it is needed
+ # We use this script file to make the link, it avoids creating a new file
+ if test "$need_locks" = yes; then
+- until $run ln "$0" "$lockfile" 2>/dev/null; do
++ until $run ln "$progpath" "$lockfile" 2>/dev/null; do
+ $show "Waiting for $lockfile to be removed"
+ sleep 2
+ done
+@@ -657,14 +899,19 @@
+ compiler."
+
+ $run $rm $removelist
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+- $echo $srcfile > "$lockfile"
++ $echo "$srcfile" > "$lockfile"
+ fi
+
+ if test -n "$fix_srcfile_path"; then
+ eval srcfile=\"$fix_srcfile_path\"
+ fi
++ qsrcfile=`$echo "X$srcfile" | $Xsed -e "$sed_quote_subst"`
++ case $qsrcfile in
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
++ qsrcfile="\"$qsrcfile\"" ;;
++ esac
+
+ $run $rm "$libobj" "${libobj}T"
+
+@@ -686,18 +933,18 @@
+ fbsd_hideous_sh_bug=$base_compile
+
+ if test "$pic_mode" != no; then
+- command="$base_compile $srcfile $pic_flag"
++ command="$base_compile $qsrcfile $pic_flag"
+ else
+ # Don't build PIC code
+- command="$base_compile $srcfile"
++ command="$base_compile $qsrcfile"
+ fi
+
+ if test ! -d "${xdir}$objdir"; then
+ $show "$mkdir ${xdir}$objdir"
+ $run $mkdir ${xdir}$objdir
+- status=$?
+- if test "$status" -ne 0 && test ! -d "${xdir}$objdir"; then
+- exit $status
++ exit_status=$?
++ if test "$exit_status" -ne 0 && test ! -d "${xdir}$objdir"; then
++ exit $exit_status
+ fi
+ fi
+
+@@ -712,7 +959,7 @@
+ if $run eval "$command"; then :
+ else
+ test -n "$output_obj" && $run $rm $removelist
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ if test "$need_locks" = warn &&
+@@ -732,7 +979,7 @@
+ compiler."
+
+ $run $rm $removelist
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Just move the object if needed, then go on to compile the next one
+@@ -753,7 +1000,9 @@
+ EOF
+
+ # Allow error messages only from the first compilation.
+- suppress_output=' >/dev/null 2>&1'
++ if test "$suppress_opt" = yes; then
++ suppress_output=' >/dev/null 2>&1'
++ fi
+ else
+ # No PIC object so indicate it doesn't exist in the libtool
+ # object file.
+@@ -767,9 +1016,9 @@
+ if test "$build_old_libs" = yes; then
+ if test "$pic_mode" != yes; then
+ # Don't build PIC code
+- command="$base_compile $srcfile"
++ command="$base_compile $qsrcfile"
+ else
+- command="$base_compile $srcfile $pic_flag"
++ command="$base_compile $qsrcfile $pic_flag"
+ fi
+ if test "$compiler_c_o" = yes; then
+ command="$command -o $obj"
+@@ -782,7 +1031,7 @@
+ if $run eval "$command"; then :
+ else
+ $run $rm $removelist
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ if test "$need_locks" = warn &&
+@@ -802,7 +1051,7 @@
+ compiler."
+
+ $run $rm $removelist
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Just move the object if needed
+@@ -840,7 +1089,7 @@
+ $run $rm "$lockfile"
+ fi
+
+- exit 0
++ exit $EXIT_SUCCESS
+ ;;
+
+ # libtool link mode
+@@ -866,7 +1115,7 @@
+ ;;
+ esac
+ libtool_args="$nonopt"
+- base_compile="$nonopt"
++ base_compile="$nonopt $@"
+ compile_command="$nonopt"
+ finalize_command="$nonopt"
+
+@@ -878,7 +1127,6 @@
+ old_convenience=
+ deplibs=
+ old_deplibs=
+- add_flags=
+ compiler_flags=
+ linker_flags=
+ dllsearchpath=
+@@ -899,6 +1147,8 @@
+ no_install=no
+ objs=
+ non_pic_objects=
++ notinst_path= # paths that contain not-installed libtool libraries
++ precious_files_regex=
+ prefer_static_libs=no
+ preload=no
+ prev=
+@@ -912,26 +1162,38 @@
+ vinfo=
+ vinfo_number=no
+
++ func_infer_tag $base_compile
++
+ # We need to know -static, to get the right output filenames.
+ for arg
+ do
+ case $arg in
+- -all-static | -static)
+- if test "X$arg" = "X-all-static"; then
++ -all-static | -static | -static-libtool-libs)
++ case $arg in
++ -all-static)
+ if test "$build_libtool_libs" = yes && test -z "$link_static_flag"; then
+ $echo "$modename: warning: complete static linking is impossible in this configuration" 1>&2
+ fi
+ if test -n "$link_static_flag"; then
+ dlopen_self=$dlopen_self_static
+ fi
+- else
++ prefer_static_libs=yes
++ ;;
++ -static)
+ if test -z "$pic_flag" && test -n "$link_static_flag"; then
+ dlopen_self=$dlopen_self_static
+ fi
+- fi
++ prefer_static_libs=built
++ ;;
++ -static-libtool-libs)
++ if test -z "$pic_flag" && test -n "$link_static_flag"; then
++ dlopen_self=$dlopen_self_static
++ fi
++ prefer_static_libs=yes
++ ;;
++ esac
+ build_libtool_libs=no
+ build_old_libs=yes
+- prefer_static_libs=yes
+ break
+ ;;
+ esac
+@@ -943,7 +1205,6 @@
+ # Go through the arguments, transforming them on the way.
+ while test "$#" -gt 0; do
+ arg="$1"
+- base_compile="$base_compile $arg"
+ shift
+ case $arg in
+ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+@@ -1007,7 +1268,7 @@
+ export_symbols="$arg"
+ if test ! -f "$arg"; then
+ $echo "$modename: symbol file \`$arg' does not exist"
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ prev=
+ continue
+@@ -1022,6 +1283,11 @@
+ prev=
+ continue
+ ;;
++ precious_regex)
++ precious_files_regex="$arg"
++ prev=
++ continue
++ ;;
+ release)
+ release="-$arg"
+ prev=
+@@ -1054,7 +1320,7 @@
+ test "$pic_object" = none && \
+ test "$non_pic_object" = none; then
+ $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Extract subdirectory from the argument.
+@@ -1102,12 +1368,17 @@
+ if test -z "$pic_object" || test "$pic_object" = none ; then
+ arg="$non_pic_object"
+ fi
++ else
++ # If the PIC object exists, use it instead.
++ # $xdir was prepended to $pic_object above.
++ non_pic_object="$pic_object"
++ non_pic_objects="$non_pic_objects $non_pic_object"
+ fi
+ else
+ # Only an error if not doing a dry-run.
+ if test -z "$run"; then
+ $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ else
+ # Dry-run case.
+
+@@ -1128,7 +1399,7 @@
+ done
+ else
+ $echo "$modename: link input file \`$save_arg' does not exist"
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ arg=$save_arg
+ prev=
+@@ -1140,7 +1411,7 @@
+ [\\/]* | [A-Za-z]:[\\/]*) ;;
+ *)
+ $echo "$modename: only absolute run-paths are allowed" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+ if test "$prev" = rpath; then
+@@ -1180,16 +1451,15 @@
+ finalize_command="$finalize_command $qarg"
+ continue
+ ;;
+- framework)
+- case $host in
+- *-*-darwin*)
+- case "$deplibs " in
+- *" $qarg.ltframework "*) ;;
+- *) deplibs="$deplibs $qarg.ltframework" # this is fixed later
+- ;;
+- esac
+- ;;
+- esac
++ shrext)
++ shrext_cmds="$arg"
++ prev=
++ continue
++ ;;
++ darwin_framework|darwin_framework_skip)
++ test "$prev" = "darwin_framework" && compiler_flags="$compiler_flags $arg"
++ compile_command="$compile_command $arg"
++ finalize_command="$finalize_command $arg"
+ prev=
+ continue
+ ;;
+@@ -1241,7 +1511,7 @@
+ -export-symbols | -export-symbols-regex)
+ if test -n "$export_symbols" || test -n "$export_symbols_regex"; then
+ $echo "$modename: more than one -exported-symbols argument is not allowed"
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ if test "X$arg" = "X-export-symbols"; then
+ prev=expsyms
+@@ -1251,6 +1521,18 @@
+ continue
+ ;;
+
++ -framework|-arch|-isysroot)
++ case " $CC " in
++ *" ${arg} ${1} "* | *" ${arg} ${1} "*)
++ prev=darwin_framework_skip ;;
++ *) compiler_flags="$compiler_flags $arg"
++ prev=darwin_framework ;;
++ esac
++ compile_command="$compile_command $arg"
++ finalize_command="$finalize_command $arg"
++ continue
++ ;;
++
+ -inst-prefix-dir)
+ prev=inst_prefix
+ continue
+@@ -1277,7 +1559,8 @@
+ absdir=`cd "$dir" && pwd`
+ if test -z "$absdir"; then
+ $echo "$modename: cannot determine absolute directory name of \`$dir'" 1>&2
+- exit 1
++ absdir="$dir"
++ notinst_path="$notinst_path $dir"
+ fi
+ dir="$absdir"
+ ;;
+@@ -1291,10 +1574,15 @@
+ esac
+ case $host in
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
++ testbindir=`$echo "X$dir" | $Xsed -e 's*/lib$*/bin*'`
+ case :$dllsearchpath: in
+ *":$dir:"*) ;;
+ *) dllsearchpath="$dllsearchpath:$dir";;
+ esac
++ case :$dllsearchpath: in
++ *":$testbindir:"*) ;;
++ *) dllsearchpath="$dllsearchpath:$testbindir";;
++ esac
+ ;;
+ esac
+ continue
+@@ -1303,26 +1591,35 @@
+ -l*)
+ if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
+ case $host in
+- *-*-cygwin* | *-*-pw32* | *-*-beos*)
++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos*)
+ # These systems don't actually have a C or math library (as such)
+ continue
+ ;;
+- *-*-mingw* | *-*-os2*)
++ *-*-os2*)
+ # These systems don't actually have a C library (as such)
+ test "X$arg" = "X-lc" && continue
+ ;;
+- *-*-openbsd* | *-*-freebsd*)
++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ # Do not include libc due to us having libc/libc_r.
+ test "X$arg" = "X-lc" && continue
+ ;;
+ *-*-rhapsody* | *-*-darwin1.[012])
+ # Rhapsody C and math libraries are in the System framework
+- deplibs="$deplibs System.ltframework"
++ deplibs="$deplibs -framework System"
+ continue
++ ;;
++ *-*-sco3.2v5* | *-*-sco5v6*)
++ # Causes problems with __ctype
++ test "X$arg" = "X-lc" && continue
++ ;;
++ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
++ # Compiler inserts libc in the correct place for threads to work
++ test "X$arg" = "X-lc" && continue
++ ;;
+ esac
+ elif test "X$arg" = "X-lc_r"; then
+ case $host in
+- *-*-openbsd*)
++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ # Do not include libc_r directly, use -pthread flag.
+ continue
+ ;;
+@@ -1332,18 +1629,42 @@
+ continue
+ ;;
+
++ # Tru64 UNIX uses -model [arg] to determine the layout of C++
++ # classes, name mangling, and exception handling.
++ -model)
++ compile_command="$compile_command $arg"
++ compiler_flags="$compiler_flags $arg"
++ finalize_command="$finalize_command $arg"
++ prev=xcompiler
++ continue
++ ;;
++
++ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
++ compiler_flags="$compiler_flags $arg"
++ compile_command="$compile_command $arg"
++ finalize_command="$finalize_command $arg"
++ continue
++ ;;
++
+ -module)
+ module=yes
+ continue
+ ;;
+
+- # gcc -m* arguments should be passed to the linker via $compiler_flags
+- # in order to pass architecture information to the linker
+- # (e.g. 32 vs 64-bit). This may also be accomplished via -Wl,-mfoo
+- # but this is not reliable with gcc because gcc may use -mfoo to
+- # select a different linker, different libraries, etc, while
+- # -Wl,-mfoo simply passes -mfoo to the linker.
+- -m*)
++ # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
++ # -r[0-9][0-9]* specifies the processor on the SGI compiler
++ # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
++ # +DA*, +DD* enable 64-bit mode on the HP compiler
++ # -q* pass through compiler args for the IBM compiler
++ # -m* pass through architecture-specific compiler args for GCC
++ # -m*, -t[45]*, -txscale* pass through architecture-specific
++ # compiler args for GCC
++ # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
++ # -F/path gives path to uninstalled frameworks, gcc on darwin
++ # @file GCC response files
++ -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
++ -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
++
+ # Unknown arguments in both finalize_command and compile_command need
+ # to be aesthetically quoted because they are evaled later.
+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+@@ -1354,9 +1675,7 @@
+ esac
+ compile_command="$compile_command $arg"
+ finalize_command="$finalize_command $arg"
+- if test "$with_gcc" = "yes" ; then
+- compiler_flags="$compiler_flags $arg"
+- fi
++ compiler_flags="$compiler_flags $arg"
+ continue
+ ;;
+
+@@ -1372,9 +1691,9 @@
+
+ -no-install)
+ case $host in
+- *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
++ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-darwin*)
+ # The PATH hackery in wrapper scripts is required on Windows
+- # in order for the loader to find any dlls it needs.
++ # and Darwin in order for the loader to find any dlls it needs.
+ $echo "$modename: warning: \`-no-install' is ignored for $host" 1>&2
+ $echo "$modename: warning: assuming \`-no-fast-install' instead" 1>&2
+ fast_install=no
+@@ -1396,6 +1715,11 @@
+
+ -o) prev=output ;;
+
++ -precious-files-regex)
++ prev=precious_regex
++ continue
++ ;;
++
+ -release)
+ prev=release
+ continue
+@@ -1418,7 +1742,7 @@
+ [\\/]* | [A-Za-z]:[\\/]*) ;;
+ *)
+ $echo "$modename: only absolute run-paths are allowed" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+ case "$xrpath " in
+@@ -1428,7 +1752,7 @@
+ continue
+ ;;
+
+- -static)
++ -static | -static-libtool-libs)
+ # The effects of -static are defined in a previous loop.
+ # We used to do the same as -all-static on platforms that
+ # didn't have a PIC flag, but the assumption that the effects
+@@ -1504,11 +1828,6 @@
+ continue
+ ;;
+
+- -framework)
+- prev=framework
+- continue
+- ;;
+-
+ # Some other compiler flag.
+ -* | +*)
+ # Unknown arguments in both finalize_command and compile_command need
+@@ -1519,7 +1838,6 @@
+ arg="\"$arg\""
+ ;;
+ esac
+- add_flags="$add_flags $arg"
+ ;;
+
+ *.$objext)
+@@ -1547,7 +1865,7 @@
+ test "$pic_object" = none && \
+ test "$non_pic_object" = none; then
+ $echo "$modename: cannot find name of object for \`$arg'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Extract subdirectory from the argument.
+@@ -1595,12 +1913,17 @@
+ if test -z "$pic_object" || test "$pic_object" = none ; then
+ arg="$non_pic_object"
+ fi
++ else
++ # If the PIC object exists, use it instead.
++ # $xdir was prepended to $pic_object above.
++ non_pic_object="$pic_object"
++ non_pic_objects="$non_pic_objects $non_pic_object"
+ fi
+ else
+ # Only an error if not doing a dry-run.
+ if test -z "$run"; then
+ $echo "$modename: \`$arg' is not a valid libtool object" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ else
+ # Dry-run case.
+
+@@ -1654,7 +1977,6 @@
+ arg="\"$arg\""
+ ;;
+ esac
+- add_flags="$add_flags $arg"
+ ;;
+ esac # arg
+
+@@ -1668,48 +1990,7 @@
+ if test -n "$prev"; then
+ $echo "$modename: the \`$prevarg' option requires an argument" 1>&2
+ $echo "$help" 1>&2
+- exit 1
+- fi
+-
+- # Infer tagged configuration to use if any are available and
+- # if one wasn't chosen via the "--tag" command line option.
+- # Only attempt this if the compiler in the base link
+- # command doesn't match the default compiler.
+- if test -n "$available_tags" && test -z "$tagname"; then
+- case $base_compile in
+- # Blanks in the command may have been stripped by the calling shell,
+- # but not from the CC environment variable when configure was run.
+- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*) ;;
+- # Blanks at the start of $base_compile will cause this to fail
+- # if we don't check for them as well.
+- *)
+- for z in $available_tags; do
+- if grep "^# ### BEGIN LIBTOOL TAG CONFIG: $z$" < "$0" > /dev/null; then
+- # Evaluate the configuration.
+- eval "`${SED} -n -e '/^# ### BEGIN LIBTOOL TAG CONFIG: '$z'$/,/^# ### END LIBTOOL TAG CONFIG: '$z'$/p' < $0`"
+- case $base_compile in
+- "$CC "* | " $CC "* | "`$echo $CC` "* | " `$echo $CC` "*)
+- # The compiler in $compile_command matches
+- # the one in the tagged configuration.
+- # Assume this is the tagged configuration we want.
+- tagname=$z
+- break
+- ;;
+- esac
+- fi
+- done
+- # If $tagname still isn't set, then no tagged configuration
+- # was found and let the user know that the "--tag" command
+- # line option must be used.
+- if test -z "$tagname"; then
+- $echo "$modename: unable to infer tagged configuration"
+- $echo "$modename: specify a tag with \`--tag'" 1>&2
+- exit 1
+-# else
+-# $echo "$modename: using $tagname tagged configuration"
+- fi
+- ;;
+- esac
++ exit $EXIT_FAILURE
+ fi
+
+ if test "$export_dynamic" = yes && test -n "$export_dynamic_flag_spec"; then
+@@ -1742,9 +2023,9 @@
+ if test ! -d "$output_objdir"; then
+ $show "$mkdir $output_objdir"
+ $run $mkdir $output_objdir
+- status=$?
+- if test "$status" -ne 0 && test ! -d "$output_objdir"; then
+- exit $status
++ exit_status=$?
++ if test "$exit_status" -ne 0 && test ! -d "$output_objdir"; then
++ exit $exit_status
+ fi
+ fi
+
+@@ -1753,7 +2034,7 @@
+ "")
+ $echo "$modename: you must specify an output file" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ *.$libext) linkmode=oldlib ;;
+ *.lo | *.$objext) linkmode=obj ;;
+@@ -1763,7 +2044,7 @@
+
+ case $host in
+ *cygwin* | *mingw* | *pw32*)
+- # don't eliminate duplcations in $postdeps and $predeps
++ # don't eliminate duplications in $postdeps and $predeps
+ duplicate_compiler_generated_deps=yes
+ ;;
+ *)
+@@ -1807,7 +2088,6 @@
+ newlib_search_path=
+ need_relink=no # whether we're linking any uninstalled libtool libraries
+ notinst_deplibs= # not-installed libtool libraries
+- notinst_path= # paths that contain not-installed libtool libraries
+ case $linkmode in
+ lib)
+ passes="conv link"
+@@ -1816,7 +2096,7 @@
+ *.la) ;;
+ *)
+ $echo "$modename: libraries can \`-dlopen' only libtool libraries: $file" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+ done
+@@ -1842,7 +2122,10 @@
+ case $pass in
+ dlopen) libs="$dlfiles" ;;
+ dlpreopen) libs="$dlprefiles" ;;
+- link) libs="$deplibs %DEPLIBS% $dependency_libs" ;;
++ link)
++ libs="$deplibs %DEPLIBS%"
++ test "X$link_all_deplibs" != Xno && libs="$libs $dependency_libs"
++ ;;
+ esac
+ fi
+ if test "$pass" = dlopen; then
+@@ -1854,18 +2137,23 @@
+ lib=
+ found=no
+ case $deplib in
++ -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
++ if test "$linkmode,$pass" = "prog,link"; then
++ compile_deplibs="$deplib $compile_deplibs"
++ finalize_deplibs="$deplib $finalize_deplibs"
++ else
++ compiler_flags="$compiler_flags $deplib"
++ fi
++ continue
++ ;;
+ -l*)
+ if test "$linkmode" != lib && test "$linkmode" != prog; then
+ $echo "$modename: warning: \`-l' is ignored for archives/objects" 1>&2
+ continue
+ fi
+- if test "$pass" = conv && test "$allow_undefined" = yes; then
+- deplibs="$deplib $deplibs"
+- continue
+- fi
+ name=`$echo "X$deplib" | $Xsed -e 's/^-l//'`
+ for searchdir in $newlib_search_path $lib_search_path $sys_lib_search_path $shlib_search_path; do
+- for search_ext in .la $shrext .so .a; do
++ for search_ext in .la $std_shrext .so .a; do
+ # Search the libtool library
+ lib="$searchdir/lib${name}${search_ext}"
+ if test -f "$lib"; then
+@@ -1926,18 +2214,6 @@
+ fi
+ fi
+ ;; # -l
+- *.ltframework)
+- if test "$linkmode,$pass" = "prog,link"; then
+- compile_deplibs="$deplib $compile_deplibs"
+- finalize_deplibs="$deplib $finalize_deplibs"
+- else
+- deplibs="$deplib $deplibs"
+- if test "$linkmode" = lib ; then
+- newdependency_libs="$deplib $newdependency_libs"
+- fi
+- fi
+- continue
+- ;;
+ -L*)
+ case $linkmode in
+ lib)
+@@ -1953,11 +2229,11 @@
+ fi
+ if test "$pass" = scan; then
+ deplibs="$deplib $deplibs"
+- newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ else
+ compile_deplibs="$deplib $compile_deplibs"
+ finalize_deplibs="$deplib $finalize_deplibs"
+ fi
++ newlib_search_path="$newlib_search_path "`$echo "X$deplib" | $Xsed -e 's/^-L//'`
+ ;;
+ *)
+ $echo "$modename: warning: \`-L' is ignored for archives/objects" 1>&2
+@@ -1985,7 +2261,22 @@
+ fi
+ case $linkmode in
+ lib)
+- if test "$deplibs_check_method" != pass_all; then
++ valid_a_lib=no
++ case $deplibs_check_method in
++ match_pattern*)
++ set dummy $deplibs_check_method
++ match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
++ if eval $echo \"$deplib\" 2>/dev/null \
++ | $SED 10q \
++ | $EGREP "$match_pattern_regex" > /dev/null; then
++ valid_a_lib=yes
++ fi
++ ;;
++ pass_all)
++ valid_a_lib=yes
++ ;;
++ esac
++ if test "$valid_a_lib" != yes; then
+ $echo
+ $echo "*** Warning: Trying to link with static lib archive $deplib."
+ $echo "*** I have the capability to make that library automatically link in when"
+@@ -2035,15 +2326,15 @@
+ esac # case $deplib
+ if test "$found" = yes || test -f "$lib"; then :
+ else
+- $echo "$modename: cannot find the library \`$lib'" 1>&2
+- exit 1
++ $echo "$modename: cannot find the library \`$lib' or unhandled argument \`$deplib'" 1>&2
++ exit $EXIT_FAILURE
+ fi
+
+ # Check to see that this really is a libtool archive.
+ if (${SED} -e '2q' $lib | grep "^# Generated by .*$PACKAGE") >/dev/null 2>&1; then :
+ else
+ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ ladir=`$echo "X$lib" | $Xsed -e 's%/[^/]*$%%'`
+@@ -2059,6 +2350,8 @@
+ # it will not redefine variables installed, or shouldnotlink
+ installed=yes
+ shouldnotlink=no
++ avoidtemprpath=
++
+
+ # Read the .la file
+ case $lib in
+@@ -2066,13 +2359,6 @@
+ *) . ./$lib ;;
+ esac
+
+- case $host in
+- *-*-darwin*)
+- # Convert "-framework foo" to "foo.ltframework" in dependency_libs
+- test -n "$dependency_libs" && dependency_libs=`$echo "X$dependency_libs" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
+- ;;
+- esac
+-
+ if test "$linkmode,$pass" = "lib,link" ||
+ test "$linkmode,$pass" = "prog,scan" ||
+ { test "$linkmode" != prog && test "$linkmode" != lib; }; then
+@@ -2083,33 +2369,32 @@
+ if test "$pass" = conv; then
+ # Only check for convenience libraries
+ deplibs="$lib $deplibs"
+- tmp_libs=
+- for deplib in $dependency_libs; do
+- #echo "Adding $deplib to \$deplibs"
+- deplibs="$deplib $deplibs"
+- if test "X$duplicate_deps" = "Xyes" ; then
+- case "$tmp_libs " in
+- *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+- esac
+- fi
+- tmp_libs="$tmp_libs $deplib"
+- done
+ if test -z "$libdir"; then
+ if test -z "$old_library"; then
+ $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ # It is a libtool convenience library, so add in its objects.
+ convenience="$convenience $ladir/$objdir/$old_library"
+ old_convenience="$old_convenience $ladir/$objdir/$old_library"
++ tmp_libs=
++ for deplib in $dependency_libs; do
++ deplibs="$deplib $deplibs"
++ if test "X$duplicate_deps" = "Xyes" ; then
++ case "$tmp_libs " in
++ *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
++ esac
++ fi
++ tmp_libs="$tmp_libs $deplib"
++ done
+ elif test "$linkmode" != prog && test "$linkmode" != lib; then
+ $echo "$modename: \`$lib' is not a convenience library" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ continue
+ fi # $pass = conv
+
+-
++
+ # Get the name of the library we link against.
+ linklib=
+ for l in $old_library $library_names; do
+@@ -2117,16 +2402,18 @@
+ done
+ if test -z "$linklib"; then
+ $echo "$modename: cannot find name of link library for \`$lib'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # This library was specified with -dlopen.
+ if test "$pass" = dlopen; then
+ if test -z "$libdir"; then
+ $echo "$modename: cannot -dlopen a convenience library: \`$lib'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+- if test -z "$dlname" || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
++ if test -z "$dlname" ||
++ test "$dlopen_support" != yes ||
++ test "$build_libtool_libs" = no; then
+ # If there is no dlname, no dlopen support or we're linking
+ # statically, we need to preload. We also need to preload any
+ # dependent libraries so libltdl's deplib preloader doesn't
+@@ -2163,11 +2450,19 @@
+ dir="$libdir"
+ absdir="$libdir"
+ fi
++ test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
+ else
+- dir="$ladir/$objdir"
+- absdir="$abs_ladir/$objdir"
+- # Remove this search path later
+- notinst_path="$notinst_path $abs_ladir"
++ if test ! -f "$ladir/$objdir/$linklib" && test -f "$abs_ladir/$linklib"; then
++ dir="$ladir"
++ absdir="$abs_ladir"
++ # Remove this search path later
++ notinst_path="$notinst_path $abs_ladir"
++ else
++ dir="$ladir/$objdir"
++ absdir="$abs_ladir/$objdir"
++ # Remove this search path later
++ notinst_path="$notinst_path $abs_ladir"
++ fi
+ fi # $installed = yes
+ name=`$echo "X$laname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+
+@@ -2175,7 +2470,7 @@
+ if test "$pass" = dlpreopen; then
+ if test -z "$libdir"; then
+ $echo "$modename: cannot -dlpreopen a convenience library: \`$lib'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ # Prefer using a static library (so that no silly _DYNAMIC symbols
+ # are required to link).
+@@ -2202,7 +2497,7 @@
+ continue
+ fi
+
+-
++
+ if test "$linkmode" = prog && test "$pass" != link; then
+ newlib_search_path="$newlib_search_path $ladir"
+ deplibs="$lib $deplibs"
+@@ -2238,14 +2533,16 @@
+
+ if test "$linkmode,$pass" = "prog,link"; then
+ if test -n "$library_names" &&
+- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
++ { { test "$prefer_static_libs" = no ||
++ test "$prefer_static_libs,$installed" = "built,yes"; } ||
++ test -z "$old_library"; }; then
+ # We need to hardcode the library path
+- if test -n "$shlibpath_var"; then
++ if test -n "$shlibpath_var" && test -z "$avoidtemprpath" ; then
+ # Make sure the rpath contains only unique directories.
+ case "$temp_rpath " in
+ *" $dir "*) ;;
+ *" $absdir "*) ;;
+- *) temp_rpath="$temp_rpath $dir" ;;
++ *) temp_rpath="$temp_rpath $absdir" ;;
+ esac
+ fi
+
+@@ -2282,24 +2579,29 @@
+ fi
+
+ link_static=no # Whether the deplib will be linked statically
++ use_static_libs=$prefer_static_libs
++ if test "$use_static_libs" = built && test "$installed" = yes ; then
++ use_static_libs=no
++ fi
+ if test -n "$library_names" &&
+- { test "$prefer_static_libs" = no || test -z "$old_library"; }; then
++ { test "$use_static_libs" = no || test -z "$old_library"; }; then
+ if test "$installed" = no; then
+ notinst_deplibs="$notinst_deplibs $lib"
+ need_relink=yes
+ fi
+ # This is a shared library
+-
+- # Warn about portability, can't link against -module's on some systems (darwin)
+- if test "$shouldnotlink" = yes && test "$pass" = link ; then
++
++ # Warn about portability, can't link against -module's on
++ # some systems (darwin)
++ if test "$shouldnotlink" = yes && test "$pass" = link ; then
+ $echo
+ if test "$linkmode" = prog; then
+ $echo "*** Warning: Linking the executable $output against the loadable module"
+ else
+ $echo "*** Warning: Linking the shared library $output against the loadable module"
+ fi
+- $echo "*** $linklib is not portable!"
+- fi
++ $echo "*** $linklib is not portable!"
++ fi
+ if test "$linkmode" = lib &&
+ test "$hardcode_into_libs" = yes; then
+ # Hardcode the library path.
+@@ -2357,9 +2659,10 @@
+ else
+ $show "extracting exported symbol list from \`$soname'"
+ save_ifs="$IFS"; IFS='~'
+- eval cmds=\"$extract_expsyms_cmds\"
++ cmds=$extract_expsyms_cmds
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+@@ -2370,9 +2673,10 @@
+ if test -f "$output_objdir/$newlib"; then :; else
+ $show "generating import library for \`$soname'"
+ save_ifs="$IFS"; IFS='~'
+- eval cmds=\"$old_archive_from_expsyms_cmds\"
++ cmds=$old_archive_from_expsyms_cmds
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+@@ -2393,11 +2697,15 @@
+ if test "$hardcode_direct" = no; then
+ add="$dir/$linklib"
+ case $host in
+- *-*-sco3.2v5* ) add_dir="-L$dir" ;;
++ *-*-sco3.2v5.0.[024]*) add_dir="-L$dir" ;;
++ *-*-sysv4*uw2*) add_dir="-L$dir" ;;
++ *-*-sysv5OpenUNIX* | *-*-sysv5UnixWare7.[01].[10]* | \
++ *-*-unixware7*) add_dir="-L$dir" ;;
+ *-*-darwin* )
+- # if the lib is a module then we can not link against it, someone
+- # is ignoring the new warnings I added
+- if /usr/bin/file -L $add 2> /dev/null | grep "bundle" >/dev/null ; then
++ # if the lib is a module then we can not link against
++ # it, someone is ignoring the new warnings I added
++ if /usr/bin/file -L $add 2> /dev/null |
++ $EGREP ": [^:]* bundle" >/dev/null ; then
+ $echo "** Warning, lib $linklib is a module, not a shared library"
+ if test -z "$old_library" ; then
+ $echo
+@@ -2405,7 +2713,7 @@
+ $echo "** The link will probably fail, sorry"
+ else
+ add="$dir/$old_library"
+- fi
++ fi
+ fi
+ esac
+ elif test "$hardcode_minus_L" = no; then
+@@ -2428,9 +2736,9 @@
+ add_dir="-L$dir"
+ # Try looking first in the location we're being installed to.
+ if test -n "$inst_prefix_dir"; then
+- case "$libdir" in
++ case $libdir in
+ [\\/]*)
+- add_dir="-L$inst_prefix_dir$libdir $add_dir"
++ add_dir="$add_dir -L$inst_prefix_dir$libdir"
+ ;;
+ esac
+ fi
+@@ -2447,7 +2755,7 @@
+
+ if test "$lib_linked" != yes; then
+ $echo "$modename: configuration error: unsupported hardcode properties"
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ if test -n "$add_shlibpath"; then
+@@ -2490,7 +2798,8 @@
+ esac
+ add="-l$name"
+ elif test "$hardcode_automatic" = yes; then
+- if test -n "$inst_prefix_dir" && test -f "$inst_prefix_dir$libdir/$linklib" ; then
++ if test -n "$inst_prefix_dir" &&
++ test -f "$inst_prefix_dir$libdir/$linklib" ; then
+ add="$inst_prefix_dir$libdir/$linklib"
+ else
+ add="$libdir/$linklib"
+@@ -2500,9 +2809,9 @@
+ add_dir="-L$libdir"
+ # Try looking first in the location we're being installed to.
+ if test -n "$inst_prefix_dir"; then
+- case "$libdir" in
++ case $libdir in
+ [\\/]*)
+- add_dir="-L$inst_prefix_dir$libdir $add_dir"
++ add_dir="$add_dir -L$inst_prefix_dir$libdir"
+ ;;
+ esac
+ fi
+@@ -2561,17 +2870,16 @@
+ fi
+ fi
+ else
+- convenience="$convenience $dir/$old_library"
+- old_convenience="$old_convenience $dir/$old_library"
+ deplibs="$dir/$old_library $deplibs"
+ link_static=yes
+ fi
+ fi # link shared/static library?
+
+ if test "$linkmode" = lib; then
+- #if test -n "$dependency_libs" &&
+- # { test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes ||
+- # test "$link_static" = yes; }; then
++ if test -n "$dependency_libs" &&
++ { test "$hardcode_into_libs" != yes ||
++ test "$build_old_libs" = yes ||
++ test "$link_static" = yes; }; then
+ # Extract -R from dependency_libs
+ temp_deplibs=
+ for libdir in $dependency_libs; do
+@@ -2585,7 +2893,7 @@
+ esac
+ done
+ dependency_libs="$temp_deplibs"
+- #fi
++ fi
+
+ newlib_search_path="$newlib_search_path $absdir"
+ # Link against this library
+@@ -2627,20 +2935,18 @@
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ if test -z "$libdir"; then
+ $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ if test "$absdir" != "$libdir"; then
+- # Sure, some shells/systems don't implement the -ef.
+- # Those will have to live with the warning.
+- test "$absdir" -ef "$libdir" > /dev/null 2>&1 ||
+- $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
++ $echo "$modename: warning: \`$deplib' seems to be moved" 1>&2
+ fi
+ path="$absdir"
+ fi
+ depdepl=
+ case $host in
+ *-*-darwin*)
+- # we do not want to link against static libs, but need to link against shared
++ # we do not want to link against static libs,
++ # but need to link against shared
+ eval deplibrary_names=`${SED} -n -e 's/^library_names=\(.*\)$/\1/p' $deplib`
+ if test -n "$deplibrary_names" ; then
+ for tmp in $deplibrary_names ; do
+@@ -2648,55 +2954,45 @@
+ done
+ if test -f "$path/$depdepl" ; then
+ depdepl="$path/$depdepl"
+- fi
++ fi
+ # do not add paths which are already there
+ case " $newlib_search_path " in
+ *" $path "*) ;;
+ *) newlib_search_path="$newlib_search_path $path";;
+ esac
+- path=""
+ fi
++ path=""
+ ;;
+ *)
+- path="-L$path"
+- ;;
+- esac
+-
++ path="-L$path"
++ ;;
++ esac
+ ;;
+- -l*)
++ -l*)
+ case $host in
+ *-*-darwin*)
+- # Again, we only want to link against shared libraries
+- eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
+- for tmp in $newlib_search_path ; do
+- if test -f "$tmp/lib$tmp_libs.dylib" ; then
+- eval depdepl="$tmp/lib$tmp_libs.dylib"
+- break
+- fi
+- done
+- path=""
++ # Again, we only want to link against shared libraries
++ eval tmp_libs=`$echo "X$deplib" | $Xsed -e "s,^\-l,,"`
++ for tmp in $newlib_search_path ; do
++ if test -f "$tmp/lib$tmp_libs.dylib" ; then
++ eval depdepl="$tmp/lib$tmp_libs.dylib"
++ break
++ fi
++ done
++ path=""
+ ;;
+ *) continue ;;
+- esac
+- ;;
+-
+- *.ltframework)
+- case $host in
+- *-*-darwin*)
+- depdepl="$deplib"
+- ;;
+ esac
+ ;;
+-
+ *) continue ;;
+ esac
+ case " $deplibs " in
+- *" $depdepl "*) ;;
+- *) deplibs="$deplibs $depdepl" ;;
+- esac
+- case " $deplibs " in
+ *" $path "*) ;;
+- *) deplibs="$deplibs $path" ;;
++ *) deplibs="$path $deplibs" ;;
++ esac
++ case " $deplibs " in
++ *" $depdepl "*) ;;
++ *) deplibs="$depdepl $deplibs" ;;
+ esac
+ done
+ fi # link_all_deplibs != no
+@@ -2783,7 +3079,8 @@
+ eval $var=\"$tmp_libs\"
+ done # for var
+ fi
+- # Last step: remove runtime libs from dependency_libs (they stay in deplibs)
++ # Last step: remove runtime libs from dependency_libs
++ # (they stay in deplibs)
+ tmp_libs=
+ for i in $dependency_libs ; do
+ case " $predeps $postdeps $compiler_lib_search_path " in
+@@ -2843,19 +3140,19 @@
+ case $outputname in
+ lib*)
+ name=`$echo "X$outputname" | $Xsed -e 's/\.la$//' -e 's/^lib//'`
+- eval shared_ext=\"$shrext\"
++ eval shared_ext=\"$shrext_cmds\"
+ eval libname=\"$libname_spec\"
+ ;;
+ *)
+ if test "$module" = no; then
+ $echo "$modename: libtool library \`$output' must begin with \`lib'" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ if test "$need_lib_prefix" != no; then
+ # Add the "lib" prefix for modules if required
+ name=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+- eval shared_ext=\"$shrext\"
++ eval shared_ext=\"$shrext_cmds\"
+ eval libname=\"$libname_spec\"
+ else
+ libname=`$echo "X$outputname" | $Xsed -e 's/\.la$//'`
+@@ -2866,7 +3163,7 @@
+ if test -n "$objs"; then
+ if test "$deplibs_check_method" != pass_all; then
+ $echo "$modename: cannot build libtool library \`$output' from non-libtool objects on this host:$objs" 2>&1
+- exit 1
++ exit $EXIT_FAILURE
+ else
+ $echo
+ $echo "*** Warning: Linking the shared library $output against the non-libtool"
+@@ -2914,13 +3211,13 @@
+ if test -n "$8"; then
+ $echo "$modename: too many parameters to \`-version-info'" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # convert absolute version numbers to libtool ages
+ # this retains compatibility with .la files and attempts
+ # to make the code below a bit more comprehensible
+-
++
+ case $vinfo_number in
+ yes)
+ number_major="$2"
+@@ -2934,7 +3231,7 @@
+ # which has an extra 1 added just for fun
+ #
+ case $version_type in
+- darwin|linux|osf|windows)
++ darwin|linux|osf|windows|none)
+ current=`expr $number_major + $number_minor`
+ age="$number_minor"
+ revision="$number_revision"
+@@ -2945,9 +3242,15 @@
+ age="0"
+ ;;
+ irix|nonstopux)
+- current=`expr $number_major + $number_minor - 1`
++ current=`expr $number_major + $number_minor`
+ age="$number_minor"
+ revision="$number_minor"
++ lt_irix_increment=no
++ ;;
++ *)
++ $echo "$modename: unknown library version type \`$version_type'" 1>&2
++ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
++ exit $EXIT_FAILURE
+ ;;
+ esac
+ ;;
+@@ -2960,36 +3263,36 @@
+
+ # Check that each of the things are valid numbers.
+ case $current in
+- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ *)
+- $echo "$modename: CURRENT \`$current' is not a nonnegative integer" 1>&2
++ $echo "$modename: CURRENT \`$current' must be a nonnegative integer" 1>&2
+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ case $revision in
+- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ *)
+- $echo "$modename: REVISION \`$revision' is not a nonnegative integer" 1>&2
++ $echo "$modename: REVISION \`$revision' must be a nonnegative integer" 1>&2
+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ case $age in
+- 0 | [1-9] | [1-9][0-9] | [1-9][0-9][0-9]) ;;
++ 0|[1-9]|[1-9][0-9]|[1-9][0-9][0-9]|[1-9][0-9][0-9][0-9]|[1-9][0-9][0-9][0-9][0-9]) ;;
+ *)
+- $echo "$modename: AGE \`$age' is not a nonnegative integer" 1>&2
++ $echo "$modename: AGE \`$age' must be a nonnegative integer" 1>&2
+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ if test "$age" -gt "$current"; then
+ $echo "$modename: AGE \`$age' is greater than the current interface number \`$current'" 1>&2
+ $echo "$modename: \`$vinfo' is not valid version information" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Calculate the version variables.
+@@ -3006,6 +3309,7 @@
+ versuffix="$major.$age.$revision"
+ # Darwin ld doesn't like 0 for these options...
+ minor_current=`expr $current + 1`
++ xlcverstring="${wl}-compatibility_version ${wl}$minor_current ${wl}-current_version ${wl}$minor_current.$revision"
+ verstring="-compatibility_version $minor_current -current_version $minor_current.$revision"
+ ;;
+
+@@ -3020,8 +3324,11 @@
+ ;;
+
+ irix | nonstopux)
+- major=`expr $current - $age + 1`
+-
++ if test "X$lt_irix_increment" = "Xno"; then
++ major=`expr $current - $age`
++ else
++ major=`expr $current - $age + 1`
++ fi
+ case $version_type in
+ nonstopux) verstring_prefix=nonstopux ;;
+ *) verstring_prefix=sgi ;;
+@@ -3078,7 +3385,7 @@
+ *)
+ $echo "$modename: unknown library version type \`$version_type'" 1>&2
+ $echo "Fatal configuration error. See the $PACKAGE docs for more information." 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+@@ -3129,9 +3436,15 @@
+ tempremovelist=`$echo "$output_objdir/*"`
+ for p in $tempremovelist; do
+ case $p in
+- *.$objext | *$exeext)
++ *.$objext)
+ ;;
+ $output_objdir/$outputname | $output_objdir/$libname.* | $output_objdir/${libname}${release}.*)
++ if test "X$precious_files_regex" != "X"; then
++ if echo $p | $EGREP -e "$precious_files_regex" >/dev/null 2>&1
++ then
++ continue
++ fi
++ fi
+ removelist="$removelist $p"
+ ;;
+ *) ;;
+@@ -3152,11 +3465,11 @@
+ fi
+
+ # Eliminate all temporary directories.
+- for path in $notinst_path; do
+- lib_search_path=`$echo "$lib_search_path " | ${SED} -e 's% $path % %g'`
+- deplibs=`$echo "$deplibs " | ${SED} -e 's% -L$path % %g'`
+- dependency_libs=`$echo "$dependency_libs " | ${SED} -e 's% -L$path % %g'`
+- done
++ #for path in $notinst_path; do
++ # lib_search_path=`$echo "$lib_search_path " | ${SED} -e "s% $path % %g"`
++ # deplibs=`$echo "$deplibs " | ${SED} -e "s% -L$path % %g"`
++ # dependency_libs=`$echo "$dependency_libs " | ${SED} -e "s% -L$path % %g"`
++ #done
+
+ if test -n "$xrpath"; then
+ # If the user specified any rpath flags, then add them.
+@@ -3168,7 +3481,7 @@
+ *) finalize_rpath="$finalize_rpath $libdir" ;;
+ esac
+ done
+- if true || test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
++ if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
+ dependency_libs="$temp_xrpath $dependency_libs"
+ fi
+ fi
+@@ -3201,14 +3514,19 @@
+ ;;
+ *-*-rhapsody* | *-*-darwin1.[012])
+ # Rhapsody C library is in the System framework
+- deplibs="$deplibs System.ltframework"
++ deplibs="$deplibs -framework System"
+ ;;
+ *-*-netbsd*)
+ # Don't link with libc until the a.out ld.so is fixed.
+ ;;
+- *-*-openbsd* | *-*-freebsd*)
++ *-*-openbsd* | *-*-freebsd* | *-*-dragonfly*)
+ # Do not include libc due to us having libc/libc_r.
+- test "X$arg" = "X-lc" && continue
++ ;;
++ *-*-sco3.2v5* | *-*-sco5v6*)
++ # Causes problems with __ctype
++ ;;
++ *-*-sysv4.2uw2* | *-*-sysv5* | *-*-unixware* | *-*-OpenUNIX*)
++ # Compiler inserts libc in the correct place for threads to work
+ ;;
+ *)
+ # Add libc to deplibs on all other systems if necessary.
+@@ -3252,13 +3570,12 @@
+ int main() { return 0; }
+ EOF
+ $rm conftest
+- $LTCC -o conftest conftest.c $deplibs
+- if test "$?" -eq 0 ; then
++ if $LTCC $LTCFLAGS -o conftest conftest.c $deplibs; then
+ ldd_output=`ldd conftest`
+ for i in $deplibs; do
+- name="`expr $i : '-l\(.*\)'`"
++ name=`expr $i : '-l\(.*\)'`
+ # If $name is empty we are operating on a -L argument.
+- if test "$name" != "" && test "$name" -ne "0"; then
++ if test "$name" != "" && test "$name" != "0"; then
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+ *" $i "*)
+@@ -3293,13 +3610,11 @@
+ # Error occurred in the first compile. Let's try to salvage
+ # the situation: Compile a separate program for each library.
+ for i in $deplibs; do
+- name="`expr $i : '-l\(.*\)'`"
++ name=`expr $i : '-l\(.*\)'`
+ # If $name is empty we are operating on a -L argument.
+ if test "$name" != "" && test "$name" != "0"; then
+ $rm conftest
+- $LTCC -o conftest conftest.c $i
+- # Did it work?
+- if test "$?" -eq 0 ; then
++ if $LTCC $LTCFLAGS -o conftest conftest.c $i; then
+ ldd_output=`ldd conftest`
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+ case " $predeps $postdeps " in
+@@ -3331,7 +3646,7 @@
+ droppeddeps=yes
+ $echo
+ $echo "*** Warning! Library $i is needed by this library but I was not able to"
+- $echo "*** make it link in! You will probably need to install it or some"
++ $echo "*** make it link in! You will probably need to install it or some"
+ $echo "*** library that it depends on before this library will be fully"
+ $echo "*** functional. Installing it before continuing would be even better."
+ fi
+@@ -3345,7 +3660,7 @@
+ set dummy $deplibs_check_method
+ file_magic_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+ for a_deplib in $deplibs; do
+- name="`expr $a_deplib : '-l\(.*\)'`"
++ name=`expr $a_deplib : '-l\(.*\)'`
+ # If $name is empty we are operating on a -L argument.
+ if test "$name" != "" && test "$name" != "0"; then
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+@@ -3414,7 +3729,7 @@
+ set dummy $deplibs_check_method
+ match_pattern_regex=`expr "$deplibs_check_method" : "$2 \(.*\)"`
+ for a_deplib in $deplibs; do
+- name="`expr $a_deplib : '-l\(.*\)'`"
++ name=`expr $a_deplib : '-l\(.*\)'`
+ # If $name is empty we are operating on a -L argument.
+ if test -n "$name" && test "$name" != "0"; then
+ if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
+@@ -3494,7 +3809,7 @@
+ case $host in
+ *-*-rhapsody* | *-*-darwin1.[012])
+ # On Rhapsody replace the C library is the System framework
+- newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
++ newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's/ -lc / -framework System /'`
+ ;;
+ esac
+
+@@ -3540,17 +3855,39 @@
+ fi
+ fi
+ fi
+- # Time to change all our "foo.ltframework" stuff back to "-framework foo"
+- case $host in
+- *-*-darwin*)
+- newdeplibs=`$echo "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+- dependency_libs=`$echo "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+- ;;
+- esac
+ # Done checking deplibs!
+ deplibs=$newdeplibs
+ fi
+
++
++ # move library search paths that coincide with paths to not yet
++ # installed libraries to the beginning of the library search list
++ new_libs=
++ for path in $notinst_path; do
++ case " $new_libs " in
++ *" -L$path/$objdir "*) ;;
++ *)
++ case " $deplibs " in
++ *" -L$path/$objdir "*)
++ new_libs="$new_libs -L$path/$objdir" ;;
++ esac
++ ;;
++ esac
++ done
++ for deplib in $deplibs; do
++ case $deplib in
++ -L*)
++ case " $new_libs " in
++ *" $deplib "*) ;;
++ *) new_libs="$new_libs $deplib" ;;
++ esac
++ ;;
++ *) new_libs="$new_libs $deplib" ;;
++ esac
++ done
++ deplibs="$new_libs"
++
++
+ # All the library-specific variables (install_libdir is set above).
+ library_names=
+ old_library=
+@@ -3563,7 +3900,7 @@
+ hardcode_libdirs=
+ dep_rpath=
+ rpath="$finalize_rpath"
+- test "$mode" != relink && test "$fast_install" = no && rpath="$compile_rpath$rpath"
++ test "$mode" != relink && rpath="$compile_rpath$rpath"
+ for libdir in $rpath; do
+ if test -n "$hardcode_libdir_flag_spec"; then
+ if test -n "$hardcode_libdir_separator"; then
+@@ -3595,7 +3932,10 @@
+ test -n "$hardcode_libdirs"; then
+ libdir="$hardcode_libdirs"
+ if test -n "$hardcode_libdir_flag_spec_ld"; then
+- eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
++ case $archive_cmds in
++ *\$LD*) eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\" ;;
++ *) eval dep_rpath=\"$hardcode_libdir_flag_spec\" ;;
++ esac
+ else
+ eval dep_rpath=\"$hardcode_libdir_flag_spec\"
+ fi
+@@ -3618,7 +3958,7 @@
+ fi
+
+ # Get the real and link names of the library.
+- eval shared_ext=\"$shrext\"
++ eval shared_ext=\"$shrext_cmds\"
+ eval library_names=\"$library_names_spec\"
+ set dummy $library_names
+ realname="$2"
+@@ -3634,6 +3974,7 @@
+ fi
+
+ lib="$output_objdir/$realname"
++ linknames=
+ for link
+ do
+ linknames="$linknames $link"
+@@ -3648,10 +3989,11 @@
+ $show "generating symbol list for \`$libname.la'"
+ export_symbols="$output_objdir/$libname.exp"
+ $run $rm $export_symbols
+- eval cmds=\"$export_symbols_cmds\"
++ cmds=$export_symbols_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ if len=`expr "X$cmd" : ".*"` &&
+ test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+ $show "$cmd"
+@@ -3661,6 +4003,9 @@
+ # The command line is too long to execute in one step.
+ $show "using reloadable object file for export list..."
+ skipped_export=:
++ # Break out early, otherwise skipped_export may be
++ # set to false by a later but shorter cmd.
++ break
+ fi
+ done
+ IFS="$save_ifs"
+@@ -3681,12 +4026,12 @@
+ for test_deplib in $deplibs; do
+ case " $convenience " in
+ *" $test_deplib "*) ;;
+- *)
++ *)
+ tmp_deplibs="$tmp_deplibs $test_deplib"
+ ;;
+ esac
+ done
+- deplibs="$tmp_deplibs"
++ deplibs="$tmp_deplibs"
+
+ if test -n "$convenience"; then
+ if test -n "$whole_archive_flag_spec"; then
+@@ -3694,67 +4039,13 @@
+ eval libobjs=\"\$libobjs $whole_archive_flag_spec\"
+ else
+ gentop="$output_objdir/${outputname}x"
+- $show "${rm}r $gentop"
+- $run ${rm}r "$gentop"
+- $show "$mkdir $gentop"
+- $run $mkdir "$gentop"
+- status=$?
+- if test "$status" -ne 0 && test ! -d "$gentop"; then
+- exit $status
+- fi
+ generated="$generated $gentop"
+
+- for xlib in $convenience; do
+- # Extract the objects.
+- case $xlib in
+- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+- *) xabs=`pwd`"/$xlib" ;;
+- esac
+- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+- xdir="$gentop/$xlib"
+-
+- $show "${rm}r $xdir"
+- $run ${rm}r "$xdir"
+- $show "$mkdir $xdir"
+- $run $mkdir "$xdir"
+- status=$?
+- if test "$status" -ne 0 && test ! -d "$xdir"; then
+- exit $status
+- fi
+- # We will extract separately just the conflicting names and we will no
+- # longer touch any unique names. It is faster to leave these extract
+- # automatically by $AR in one run.
+- $show "(cd $xdir && $AR x $xabs)"
+- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+- :
+- else
+- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+- $AR t "$xabs" | sort | uniq -cd | while read -r count name
+- do
+- i=1
+- while test "$i" -le "$count"
+- do
+- # Put our $i before any first dot (extension)
+- # Never overwrite any file
+- name_to="$name"
+- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+- do
+- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+- done
+- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+- i=`expr $i + 1`
+- done
+- done
+- fi
+-
+- libobjs="$libobjs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+- done
++ func_extract_archives $gentop $convenience
++ libobjs="$libobjs $func_extract_archives_result"
+ fi
+ fi
+-
++
+ if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
+ eval flag=\"$thread_safe_flag_spec\"
+ linker_flags="$linker_flags $flag"
+@@ -3765,31 +4056,27 @@
+ $run eval '(cd $output_objdir && $rm ${realname}U && $mv $realname ${realname}U)' || exit $?
+ fi
+
+- # Add all flags from the command line. We here create a library,
+- # but those flags were only added to compile_command and
+- # finalize_command, which are only used when creating executables.
+- # So do it by hand here.
+- compiler_flags="$compiler_flags $add_flags"
+- # Only add it to commands which use CC, instead of LD, i.e.
+- # only to $compiler_flags
+- #linker_flags="$linker_flags $add_flags"
+-
+ # Do each of the archive commands.
+ if test "$module" = yes && test -n "$module_cmds" ; then
+ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
+- eval cmds=\"$module_expsym_cmds\"
++ eval test_cmds=\"$module_expsym_cmds\"
++ cmds=$module_expsym_cmds
+ else
+- eval cmds=\"$module_cmds\"
++ eval test_cmds=\"$module_cmds\"
++ cmds=$module_cmds
+ fi
+ else
+ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+- eval cmds=\"$archive_expsym_cmds\"
++ eval test_cmds=\"$archive_expsym_cmds\"
++ cmds=$archive_expsym_cmds
+ else
+- eval cmds=\"$archive_cmds\"
++ eval test_cmds=\"$archive_cmds\"
++ cmds=$archive_cmds
+ fi
+ fi
+
+- if test "X$skipped_export" != "X:" && len=`expr "X$cmds" : ".*"` &&
++ if test "X$skipped_export" != "X:" &&
++ len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
+ test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+ :
+ else
+@@ -3808,6 +4095,7 @@
+ save_libobjs=$libobjs
+ fi
+ save_output=$output
++ output_la=`$echo "X$output" | $Xsed -e "$basename"`
+
+ # Clear the reloadable object creation command queue and
+ # initialize k to one.
+@@ -3817,13 +4105,13 @@
+ delfiles=
+ last_robj=
+ k=1
+- output=$output_objdir/$save_output-${k}.$objext
++ output=$output_objdir/$output_la-${k}.$objext
+ # Loop over the list of objects to be linked.
+ for obj in $save_libobjs
+ do
+ eval test_cmds=\"$reload_cmds $objlist $last_robj\"
+ if test "X$objlist" = X ||
+- { len=`expr "X$test_cmds" : ".*"` &&
++ { len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
+ test "$len" -le "$max_cmd_len"; }; then
+ objlist="$objlist $obj"
+ else
+@@ -3837,9 +4125,9 @@
+ # the last one created.
+ eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj\"
+ fi
+- last_robj=$output_objdir/$save_output-${k}.$objext
++ last_robj=$output_objdir/$output_la-${k}.$objext
+ k=`expr $k + 1`
+- output=$output_objdir/$save_output-${k}.$objext
++ output=$output_objdir/$output_la-${k}.$objext
+ objlist=$obj
+ len=1
+ fi
+@@ -3859,13 +4147,13 @@
+ eval concat_cmds=\"\$concat_cmds~$export_symbols_cmds\"
+ fi
+
+- # Set up a command to remove the reloadale object files
++ # Set up a command to remove the reloadable object files
+ # after they are used.
+ i=0
+ while test "$i" -lt "$k"
+ do
+ i=`expr $i + 1`
+- delfiles="$delfiles $output_objdir/$save_output-${i}.$objext"
++ delfiles="$delfiles $output_objdir/$output_la-${i}.$objext"
+ done
+
+ $echo "creating a temporary reloadable object file: $output"
+@@ -3890,28 +4178,54 @@
+ # value of $libobjs for piecewise linking.
+
+ # Do each of the archive commands.
++ if test "$module" = yes && test -n "$module_cmds" ; then
++ if test -n "$export_symbols" && test -n "$module_expsym_cmds"; then
++ cmds=$module_expsym_cmds
++ else
++ cmds=$module_cmds
++ fi
++ else
+ if test -n "$export_symbols" && test -n "$archive_expsym_cmds"; then
+- eval cmds=\"$archive_expsym_cmds\"
++ cmds=$archive_expsym_cmds
+ else
+- eval cmds=\"$archive_cmds\"
++ cmds=$archive_cmds
++ fi
+ fi
+
+ # Append the command to remove the reloadable object files
+ # to the just-reset $cmds.
+- eval cmds=\"\$cmds~$rm $delfiles\"
++ eval cmds=\"\$cmds~\$rm $delfiles\"
+ fi
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+- $run eval "$cmd" || exit $?
++ $run eval "$cmd" || {
++ lt_exit=$?
++
++ # Restore the uninstalled library and exit
++ if test "$mode" = relink; then
++ $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
++ fi
++
++ exit $lt_exit
++ }
+ done
+ IFS="$save_ifs"
+
+ # Restore the uninstalled library and exit
+ if test "$mode" = relink; then
+ $run eval '(cd $output_objdir && $rm ${realname}T && $mv $realname ${realname}T && $mv "$realname"U $realname)' || exit $?
+- exit 0
++
++ if test -n "$convenience"; then
++ if test -z "$whole_archive_flag_spec"; then
++ $show "${rm}r $gentop"
++ $run ${rm}r "$gentop"
++ fi
++ fi
++
++ exit $EXIT_SUCCESS
+ fi
+
+ # Create links to the real library.
+@@ -3959,7 +4273,7 @@
+ *.lo)
+ if test -n "$objs$old_deplibs"; then
+ $echo "$modename: cannot build library object \`$output' from non-libtool objects" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ libobj="$output"
+ obj=`$echo "X$output" | $Xsed -e "$lo2o"`
+@@ -3980,72 +4294,20 @@
+ reload_conv_objs=
+ gentop=
+ # reload_cmds runs $LD directly, so let us get rid of
+- # -Wl from whole_archive_flag_spec
++ # -Wl from whole_archive_flag_spec and hope we can get by with
++ # turning comma into space..
+ wl=
+
+ if test -n "$convenience"; then
+ if test -n "$whole_archive_flag_spec"; then
+- eval reload_conv_objs=\"\$reload_objs $whole_archive_flag_spec\"
++ eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
++ reload_conv_objs=$reload_objs\ `$echo "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
+ else
+ gentop="$output_objdir/${obj}x"
+- $show "${rm}r $gentop"
+- $run ${rm}r "$gentop"
+- $show "$mkdir $gentop"
+- $run $mkdir "$gentop"
+- status=$?
+- if test "$status" -ne 0 && test ! -d "$gentop"; then
+- exit $status
+- fi
+ generated="$generated $gentop"
+
+- for xlib in $convenience; do
+- # Extract the objects.
+- case $xlib in
+- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+- *) xabs=`pwd`"/$xlib" ;;
+- esac
+- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+- xdir="$gentop/$xlib"
+-
+- $show "${rm}r $xdir"
+- $run ${rm}r "$xdir"
+- $show "$mkdir $xdir"
+- $run $mkdir "$xdir"
+- status=$?
+- if test "$status" -ne 0 && test ! -d "$xdir"; then
+- exit $status
+- fi
+- # We will extract separately just the conflicting names and we will no
+- # longer touch any unique names. It is faster to leave these extract
+- # automatically by $AR in one run.
+- $show "(cd $xdir && $AR x $xabs)"
+- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+- :
+- else
+- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+- $AR t "$xabs" | sort | uniq -cd | while read -r count name
+- do
+- i=1
+- while test "$i" -le "$count"
+- do
+- # Put our $i before any first dot (extension)
+- # Never overwrite any file
+- name_to="$name"
+- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+- do
+- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+- done
+- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+- i=`expr $i + 1`
+- done
+- done
+- fi
+-
+- reload_conv_objs="$reload_objs "`find $xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+- done
++ func_extract_archives $gentop $convenience
++ reload_conv_objs="$reload_objs $func_extract_archives_result"
+ fi
+ fi
+
+@@ -4053,10 +4315,11 @@
+ reload_objs="$objs$old_deplibs "`$echo "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+
+ output="$obj"
+- eval cmds=\"$reload_cmds\"
++ cmds=$reload_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+@@ -4069,7 +4332,7 @@
+ $run ${rm}r $gentop
+ fi
+
+- exit 0
++ exit $EXIT_SUCCESS
+ fi
+
+ if test "$build_libtool_libs" != yes; then
+@@ -4082,17 +4345,18 @@
+ # accidentally link it into a program.
+ # $show "echo timestamp > $libobj"
+ # $run eval "echo timestamp > $libobj" || exit $?
+- exit 0
++ exit $EXIT_SUCCESS
+ fi
+
+ if test -n "$pic_flag" || test "$pic_mode" != default; then
+ # Only do commands if we really have different PIC objects.
+ reload_objs="$libobjs $reload_conv_objs"
+ output="$libobj"
+- eval cmds=\"$reload_cmds\"
++ cmds=$reload_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+@@ -4104,7 +4368,7 @@
+ $run ${rm}r $gentop
+ fi
+
+- exit 0
++ exit $EXIT_SUCCESS
+ ;;
+
+ prog)
+@@ -4129,24 +4393,50 @@
+ case $host in
+ *-*-rhapsody* | *-*-darwin1.[012])
+ # On Rhapsody replace the C library is the System framework
+- compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+- finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
++ compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
++ finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's/ -lc / -framework System /'`
+ ;;
+ esac
+
+ case $host in
+- *-*-darwin*)
++ *darwin*)
+ # Don't allow lazy linking, it breaks C++ global constructors
+ if test "$tagname" = CXX ; then
+ compile_command="$compile_command ${wl}-bind_at_load"
+ finalize_command="$finalize_command ${wl}-bind_at_load"
+ fi
+- # Time to change all our "foo.ltframework" stuff back to "-framework foo"
+- compile_deplibs=`$echo "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+- finalize_deplibs=`$echo "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+ ;;
+ esac
+
++
++ # move library search paths that coincide with paths to not yet
++ # installed libraries to the beginning of the library search list
++ new_libs=
++ for path in $notinst_path; do
++ case " $new_libs " in
++ *" -L$path/$objdir "*) ;;
++ *)
++ case " $compile_deplibs " in
++ *" -L$path/$objdir "*)
++ new_libs="$new_libs -L$path/$objdir" ;;
++ esac
++ ;;
++ esac
++ done
++ for deplib in $compile_deplibs; do
++ case $deplib in
++ -L*)
++ case " $new_libs " in
++ *" $deplib "*) ;;
++ *) new_libs="$new_libs $deplib" ;;
++ esac
++ ;;
++ *) new_libs="$new_libs $deplib" ;;
++ esac
++ done
++ compile_deplibs="$new_libs"
++
++
+ compile_command="$compile_command $compile_deplibs"
+ finalize_command="$finalize_command $finalize_deplibs"
+
+@@ -4191,10 +4481,15 @@
+ fi
+ case $host in
+ *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2*)
++ testbindir=`$echo "X$libdir" | $Xsed -e 's*/lib$*/bin*'`
+ case :$dllsearchpath: in
+ *":$libdir:"*) ;;
+ *) dllsearchpath="$dllsearchpath:$libdir";;
+ esac
++ case :$dllsearchpath: in
++ *":$testbindir:"*) ;;
++ *) dllsearchpath="$dllsearchpath:$testbindir";;
++ esac
+ ;;
+ esac
+ done
+@@ -4308,13 +4603,25 @@
+
+ # Prepare the list of exported symbols
+ if test -z "$export_symbols"; then
+- export_symbols="$output_objdir/$output.exp"
++ export_symbols="$output_objdir/$outputname.exp"
+ $run $rm $export_symbols
+- $run eval "${SED} -n -e '/^: @PROGRAM@$/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
++ $run eval "${SED} -n -e '/^: @PROGRAM@ $/d' -e 's/^.* \(.*\)$/\1/p' "'< "$nlist" > "$export_symbols"'
++ case $host in
++ *cygwin* | *mingw* )
++ $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
++ $run eval 'cat "$export_symbols" >> "$output_objdir/$outputname.def"'
++ ;;
++ esac
+ else
+- $run eval "${SED} -e 's/\([][.*^$]\)/\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$output.exp"'
+- $run eval 'grep -f "$output_objdir/$output.exp" < "$nlist" > "$nlist"T'
++ $run eval "${SED} -e 's/\([].[*^$]\)/\\\\\1/g' -e 's/^/ /' -e 's/$/$/'"' < "$export_symbols" > "$output_objdir/$outputname.exp"'
++ $run eval 'grep -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
+ $run eval 'mv "$nlist"T "$nlist"'
++ case $host in
++ *cygwin* | *mingw* )
++ $run eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
++ $run eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
++ ;;
++ esac
+ fi
+ fi
+
+@@ -4365,7 +4672,26 @@
+ #endif
+
+ /* The mapping between symbol names and symbols. */
++"
++
++ case $host in
++ *cygwin* | *mingw* )
++ $echo >> "$output_objdir/$dlsyms" "\
++/* DATA imports from DLLs on WIN32 can't be const, because
++ runtime relocations are performed -- see ld's documentation
++ on pseudo-relocs */
++struct {
++"
++ ;;
++ * )
++ $echo >> "$output_objdir/$dlsyms" "\
+ const struct {
++"
++ ;;
++ esac
++
++
++ $echo >> "$output_objdir/$dlsyms" "\
+ const char *name;
+ lt_ptr address;
+ }
+@@ -4412,20 +4738,33 @@
+ esac
+
+ # Now compile the dynamic symbol file.
+- $show "(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
+- $run eval '(cd $output_objdir && $LTCC -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
++ $show "(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable \"$dlsyms\")"
++ $run eval '(cd $output_objdir && $LTCC $LTCFLAGS -c$no_builtin_flag$pic_flag_for_symtable "$dlsyms")' || exit $?
+
+ # Clean up the generated files.
+ $show "$rm $output_objdir/$dlsyms $nlist ${nlist}S ${nlist}T"
+ $run $rm "$output_objdir/$dlsyms" "$nlist" "${nlist}S" "${nlist}T"
+
+ # Transform the symbol file into the correct name.
+- compile_command=`$echo "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
+- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%"`
++ case $host in
++ *cygwin* | *mingw* )
++ if test -f "$output_objdir/${outputname}.def" ; then
++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
++ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}.def $output_objdir/${outputname}S.${objext}%" | $NL2SP`
++ else
++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
++ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
++ fi
++ ;;
++ * )
++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
++ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s%@SYMFILE@%$output_objdir/${outputname}S.${objext}%" | $NL2SP`
++ ;;
++ esac
+ ;;
+ *)
+ $echo "$modename: unknown suffix for \`$dlsyms'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+ else
+@@ -4434,30 +4773,19 @@
+ # really was required.
+
+ # Nullify the symbol file.
+- compile_command=`$echo "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
+- finalize_command=`$echo "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
++ finalize_command=`$echo "X$finalize_command" | $SP2NL | $Xsed -e "s% @SYMFILE@%%" | $NL2SP`
+ fi
+
+- # AIX runtime linking requires linking programs with -Wl,-brtl and libs with -Wl,-G
+- # Also add -bnolibpath to the beginning of the link line, to clear the hardcoded runpath.
+- # Otherwise, things like the -L path to libgcc.a are accidentally hardcoded by ld.
+- # This does not apply on AIX for ia64, which uses a SysV linker.
+- case "$host" in
+- ia64-*-aix5*) ;;
+- *-*-aix4* | *-*-aix5*)
+- compile_command=`$echo "X$compile_command $wl-brtl" | $Xsed -e "s/\$CC/\$CC $wl-bnolibpath/1"`
+- finalize_command=`$echo "X$finalize_command $wl-brtl" | $Xsed -e "s/\$CC/\$CC $wl-bnolibpath/1"` ;;
+- esac
+-
+ if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
+ # Replace the output file specification.
+- compile_command=`$echo "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
++ compile_command=`$echo "X$compile_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$output"'%g' | $NL2SP`
+ link_command="$compile_command$compile_rpath"
+
+ # We have no uninstalled library dependencies, so finalize right now.
+ $show "$link_command"
+ $run eval "$link_command"
+- status=$?
++ exit_status=$?
+
+ # Delete the generated files.
+ if test -n "$dlsyms"; then
+@@ -4465,7 +4793,7 @@
+ $run $rm "$output_objdir/${outputname}S.${objext}"
+ fi
+
+- exit $status
++ exit $exit_status
+ fi
+
+ if test -n "$shlibpath_var"; then
+@@ -4524,7 +4852,7 @@
+ # Link the executable and exit
+ $show "$link_command"
+ $run eval "$link_command" || exit $?
+- exit 0
++ exit $EXIT_SUCCESS
+ fi
+
+ if test "$hardcode_action" = relink; then
+@@ -4538,7 +4866,7 @@
+ if test "$fast_install" != no; then
+ link_command="$finalize_var$compile_command$finalize_rpath"
+ if test "$fast_install" = yes; then
+- relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
++ relink_command=`$echo "X$compile_var$compile_command$compile_rpath" | $SP2NL | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g' | $NL2SP`
+ else
+ # fast_install is set to needless
+ relink_command=
+@@ -4575,14 +4903,14 @@
+ fi
+ done
+ relink_command="(cd `pwd`; $relink_command)"
+- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
++ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
+ fi
+
+ # Quote $echo for shipping.
+- if test "X$echo" = "X$SHELL $0 --fallback-echo"; then
+- case $0 in
+- [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $0 --fallback-echo";;
+- *) qecho="$SHELL `pwd`/$0 --fallback-echo";;
++ if test "X$echo" = "X$SHELL $progpath --fallback-echo"; then
++ case $progpath in
++ [\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
++ *) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
+ esac
+ qecho=`$echo "X$qecho" | $Xsed -e "$sed_quote_subst"`
+ else
+@@ -4604,11 +4932,13 @@
+ *) exeext= ;;
+ esac
+ case $host in
+- *mingw* )
+- cwrappersource=`$echo ${output_objdir}/lt-${outputname}.c`
+- cwrapper=`$echo ${output}.exe`
+- $rm $cwrappersource $cwrapper
+- trap "$rm $cwrappersource $cwrapper; exit 1" 1 2 15
++ *cygwin* | *mingw* )
++ output_name=`basename $output`
++ output_path=`dirname $output`
++ cwrappersource="$output_path/$objdir/lt-$output_name.c"
++ cwrapper="$output_path/$output_name.exe"
++ $rm $cwrappersource $cwrapper
++ trap "$rm $cwrappersource $cwrapper; exit $EXIT_FAILURE" 1 2 15
+
+ cat > $cwrappersource <<EOF
+
+@@ -4617,7 +4947,7 @@
+
+ The $output program cannot be directly executed until all the libtool
+ libraries that it depends on are installed.
+-
++
+ This wrapper executable should never be moved out of the build directory.
+ If it is, it will not operate correctly.
+
+@@ -4633,6 +4963,9 @@
+ #include <malloc.h>
+ #include <stdarg.h>
+ #include <assert.h>
++#include <string.h>
++#include <ctype.h>
++#include <sys/stat.h>
+
+ #if defined(PATH_MAX)
+ # define LT_PATHMAX PATH_MAX
+@@ -4643,15 +4976,19 @@
+ #endif
+
+ #ifndef DIR_SEPARATOR
+-#define DIR_SEPARATOR '/'
++# define DIR_SEPARATOR '/'
++# define PATH_SEPARATOR ':'
+ #endif
+
+ #if defined (_WIN32) || defined (__MSDOS__) || defined (__DJGPP__) || \
+ defined (__OS2__)
+-#define HAVE_DOS_BASED_FILE_SYSTEM
+-#ifndef DIR_SEPARATOR_2
+-#define DIR_SEPARATOR_2 '\\'
+-#endif
++# define HAVE_DOS_BASED_FILE_SYSTEM
++# ifndef DIR_SEPARATOR_2
++# define DIR_SEPARATOR_2 '\\'
++# endif
++# ifndef PATH_SEPARATOR_2
++# define PATH_SEPARATOR_2 ';'
++# endif
+ #endif
+
+ #ifndef DIR_SEPARATOR_2
+@@ -4661,17 +4998,32 @@
+ (((ch) == DIR_SEPARATOR) || ((ch) == DIR_SEPARATOR_2))
+ #endif /* DIR_SEPARATOR_2 */
+
++#ifndef PATH_SEPARATOR_2
++# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR)
++#else /* PATH_SEPARATOR_2 */
++# define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
++#endif /* PATH_SEPARATOR_2 */
++
+ #define XMALLOC(type, num) ((type *) xmalloc ((num) * sizeof(type)))
+ #define XFREE(stale) do { \
+ if (stale) { free ((void *) stale); stale = 0; } \
+ } while (0)
+
++/* -DDEBUG is fairly common in CFLAGS. */
++#undef DEBUG
++#if defined DEBUGWRAPPER
++# define DEBUG(format, ...) fprintf(stderr, format, __VA_ARGS__)
++#else
++# define DEBUG(format, ...)
++#endif
++
+ const char *program_name = NULL;
+
+ void * xmalloc (size_t num);
+ char * xstrdup (const char *string);
+-char * basename (const char *name);
+-char * fnqualify(const char *path);
++const char * base_name (const char *name);
++char * find_executable(const char *wrapper);
++int check_executable(const char *path);
+ char * strendzap(char *str, const char *pat);
+ void lt_fatal (const char *message, ...);
+
+@@ -4680,30 +5032,52 @@
+ {
+ char **newargz;
+ int i;
+-
+- program_name = (char *) xstrdup ((char *) basename (argv[0]));
++
++ program_name = (char *) xstrdup (base_name (argv[0]));
++ DEBUG("(main) argv[0] : %s\n",argv[0]);
++ DEBUG("(main) program_name : %s\n",program_name);
+ newargz = XMALLOC(char *, argc+2);
+ EOF
+
+- cat >> $cwrappersource <<EOF
+- newargz[0] = "$SHELL";
++ cat >> $cwrappersource <<EOF
++ newargz[0] = (char *) xstrdup("$SHELL");
+ EOF
+
+- cat >> $cwrappersource <<"EOF"
+- newargz[1] = fnqualify(argv[0]);
++ cat >> $cwrappersource <<"EOF"
++ newargz[1] = find_executable(argv[0]);
++ if (newargz[1] == NULL)
++ lt_fatal("Couldn't find %s", argv[0]);
++ DEBUG("(main) found exe at : %s\n",newargz[1]);
+ /* we know the script has the same name, without the .exe */
+ /* so make sure newargz[1] doesn't end in .exe */
+- strendzap(newargz[1],".exe");
++ strendzap(newargz[1],".exe");
+ for (i = 1; i < argc; i++)
+ newargz[i+1] = xstrdup(argv[i]);
+ newargz[argc+1] = NULL;
++
++ for (i=0; i<argc+1; i++)
++ {
++ DEBUG("(main) newargz[%d] : %s\n",i,newargz[i]);
++ ;
++ }
++
+ EOF
+
+- cat >> $cwrappersource <<EOF
++ case $host_os in
++ mingw*)
++ cat >> $cwrappersource <<EOF
++ execv("$SHELL",(char const **)newargz);
++EOF
++ ;;
++ *)
++ cat >> $cwrappersource <<EOF
+ execv("$SHELL",newargz);
+ EOF
++ ;;
++ esac
+
+- cat >> $cwrappersource <<"EOF"
++ cat >> $cwrappersource <<"EOF"
++ return 127;
+ }
+
+ void *
+@@ -4716,59 +5090,159 @@
+ return p;
+ }
+
+-char *
++char *
+ xstrdup (const char *string)
+ {
+ return string ? strcpy ((char *) xmalloc (strlen (string) + 1), string) : NULL
+ ;
+ }
+
+-char *
+-basename (const char *name)
++const char *
++base_name (const char *name)
+ {
+ const char *base;
+
+ #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+ /* Skip over the disk name in MSDOS pathnames. */
+- if (isalpha (name[0]) && name[1] == ':')
++ if (isalpha ((unsigned char)name[0]) && name[1] == ':')
+ name += 2;
+ #endif
+
+ for (base = name; *name; name++)
+ if (IS_DIR_SEPARATOR (*name))
+ base = name + 1;
+- return (char *) base;
++ return base;
++}
++
++int
++check_executable(const char * path)
++{
++ struct stat st;
++
++ DEBUG("(check_executable) : %s\n", path ? (*path ? path : "EMPTY!") : "NULL!");
++ if ((!path) || (!*path))
++ return 0;
++
++ if ((stat (path, &st) >= 0) &&
++ (
++ /* MinGW & native WIN32 do not support S_IXOTH or S_IXGRP */
++#if defined (S_IXOTH)
++ ((st.st_mode & S_IXOTH) == S_IXOTH) ||
++#endif
++#if defined (S_IXGRP)
++ ((st.st_mode & S_IXGRP) == S_IXGRP) ||
++#endif
++ ((st.st_mode & S_IXUSR) == S_IXUSR))
++ )
++ return 1;
++ else
++ return 0;
+ }
+
+-char *
+-fnqualify(const char *path)
++/* Searches for the full path of the wrapper. Returns
++ newly allocated full path name if found, NULL otherwise */
++char *
++find_executable (const char* wrapper)
+ {
+- size_t size;
+- char *p;
++ int has_slash = 0;
++ const char* p;
++ const char* p_next;
++ /* static buffer for getcwd */
+ char tmp[LT_PATHMAX + 1];
++ int tmp_len;
++ char* concat_name;
+
+- assert(path != NULL);
++ DEBUG("(find_executable) : %s\n", wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!");
+
+- /* Is it qualified already? */
++ if ((wrapper == NULL) || (*wrapper == '\0'))
++ return NULL;
++
++ /* Absolute path? */
++#if defined (HAVE_DOS_BASED_FILE_SYSTEM)
++ if (isalpha ((unsigned char)wrapper[0]) && wrapper[1] == ':')
++ {
++ concat_name = xstrdup (wrapper);
++ if (check_executable(concat_name))
++ return concat_name;
++ XFREE(concat_name);
++ }
++ else
++ {
++#endif
++ if (IS_DIR_SEPARATOR (wrapper[0]))
++ {
++ concat_name = xstrdup (wrapper);
++ if (check_executable(concat_name))
++ return concat_name;
++ XFREE(concat_name);
++ }
+ #if defined (HAVE_DOS_BASED_FILE_SYSTEM)
+- if (isalpha (path[0]) && path[1] == ':')
+- return xstrdup (path);
++ }
+ #endif
+- if (IS_DIR_SEPARATOR (path[0]))
+- return xstrdup (path);
+
+- /* prepend the current directory */
+- /* doesn't handle '~' */
++ for (p = wrapper; *p; p++)
++ if (*p == '/')
++ {
++ has_slash = 1;
++ break;
++ }
++ if (!has_slash)
++ {
++ /* no slashes; search PATH */
++ const char* path = getenv ("PATH");
++ if (path != NULL)
++ {
++ for (p = path; *p; p = p_next)
++ {
++ const char* q;
++ size_t p_len;
++ for (q = p; *q; q++)
++ if (IS_PATH_SEPARATOR(*q))
++ break;
++ p_len = q - p;
++ p_next = (*q == '\0' ? q : q + 1);
++ if (p_len == 0)
++ {
++ /* empty path: current directory */
++ if (getcwd (tmp, LT_PATHMAX) == NULL)
++ lt_fatal ("getcwd failed");
++ tmp_len = strlen(tmp);
++ concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
++ memcpy (concat_name, tmp, tmp_len);
++ concat_name[tmp_len] = '/';
++ strcpy (concat_name + tmp_len + 1, wrapper);
++ }
++ else
++ {
++ concat_name = XMALLOC(char, p_len + 1 + strlen(wrapper) + 1);
++ memcpy (concat_name, p, p_len);
++ concat_name[p_len] = '/';
++ strcpy (concat_name + p_len + 1, wrapper);
++ }
++ if (check_executable(concat_name))
++ return concat_name;
++ XFREE(concat_name);
++ }
++ }
++ /* not found in PATH; assume curdir */
++ }
++ /* Relative path | not found in path: prepend cwd */
+ if (getcwd (tmp, LT_PATHMAX) == NULL)
+ lt_fatal ("getcwd failed");
+- size = strlen(tmp) + 1 + strlen(path) + 1; /* +2 for '/' and '\0' */
+- p = XMALLOC(char, size);
+- sprintf(p, "%s%c%s", tmp, DIR_SEPARATOR, path);
+- return p;
++ tmp_len = strlen(tmp);
++ concat_name = XMALLOC(char, tmp_len + 1 + strlen(wrapper) + 1);
++ memcpy (concat_name, tmp, tmp_len);
++ concat_name[tmp_len] = '/';
++ strcpy (concat_name + tmp_len + 1, wrapper);
++
++ if (check_executable(concat_name))
++ return concat_name;
++ XFREE(concat_name);
++ return NULL;
+ }
+
+ char *
+-strendzap(char *str, const char *pat)
++strendzap(char *str, const char *pat)
+ {
+ size_t len, patlen;
+
+@@ -4788,7 +5262,7 @@
+ }
+
+ static void
+-lt_error_core (int exit_status, const char * mode,
++lt_error_core (int exit_status, const char * mode,
+ const char * message, va_list ap)
+ {
+ fprintf (stderr, "%s: %s: ", program_name, mode);
+@@ -4808,16 +5282,16 @@
+ va_end (ap);
+ }
+ EOF
+- # we should really use a build-platform specific compiler
+- # here, but OTOH, the wrappers (shell script and this C one)
+- # are only useful if you want to execute the "real" binary.
+- # Since the "real" binary is built for $host, then this
+- # wrapper might as well be built for $host, too.
+- $run $LTCC -s -o $cwrapper $cwrappersource
+- ;;
+- esac
+- $rm $output
+- trap "$rm $output; exit 1" 1 2 15
++ # we should really use a build-platform specific compiler
++ # here, but OTOH, the wrappers (shell script and this C one)
++ # are only useful if you want to execute the "real" binary.
++ # Since the "real" binary is built for $host, then this
++ # wrapper might as well be built for $host, too.
++ $run $LTCC $LTCFLAGS -s -o $cwrapper $cwrappersource
++ ;;
++ esac
++ $rm $output
++ trap "$rm $output; exit $EXIT_FAILURE" 1 2 15
+
+ $echo > $output "\
+ #! $SHELL
+@@ -4836,9 +5310,23 @@
+ Xsed='${SED} -e 1s/^X//'
+ sed_quote_subst='$sed_quote_subst'
+
++# Be Bourne compatible (taken from Autoconf:_AS_BOURNE_COMPATIBLE).
++if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then
++ emulate sh
++ NULLCMD=:
++ # Zsh 3.x and 4.x performs word splitting on \${1+\"\$@\"}, which
++ # is contrary to our usage. Disable this feature.
++ alias -g '\${1+\"\$@\"}'='\"\$@\"'
++ setopt NO_GLOB_SUBST
++else
++ 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
++
+ # The HP-UX ksh and POSIX shell print the target directory to stdout
+ # if CDPATH is set.
+-if test \"\${CDPATH+set}\" = set; then CDPATH=:; export CDPATH; fi
++(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
+
+ relink_command=\"$relink_command\"
+
+@@ -4917,7 +5405,7 @@
+ else
+ $echo \"\$relink_command_output\" >&2
+ $rm \"\$progdir/\$file\"
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ fi
+
+@@ -4967,34 +5455,32 @@
+ # Backslashes separate directories on plain windows
+ *-*-mingw | *-*-os2*)
+ $echo >> $output "\
+- exec \$progdir\\\\\$program \${1+\"\$@\"}
++ exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+ "
+ ;;
+
+ *)
+- # Need to set LD_LIBRARY_PATH, to the value already
+- # computed within libtool.
+ $echo >> $output "\
+- LD_LIBRARY_PATH=\"$rpath\" exec \$progdir/\$program \${1+\"\$@\"}
++ exec \"\$progdir/\$program\" \${1+\"\$@\"}
+ "
+ ;;
+ esac
+ $echo >> $output "\
+- \$echo \"\$0: cannot exec \$program \${1+\"\$@\"}\"
+- exit 1
++ \$echo \"\$0: cannot exec \$program \$*\"
++ exit $EXIT_FAILURE
+ fi
+ else
+ # The program doesn't exist.
+- \$echo \"\$0: error: \$progdir/\$program does not exist\" 1>&2
++ \$echo \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
+ \$echo \"This script is just a wrapper for \$program.\" 1>&2
+ $echo \"See the $PACKAGE documentation for more information.\" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ fi\
+ "
+ chmod +x $output
+ fi
+- exit 0
++ exit $EXIT_SUCCESS
+ ;;
+ esac
+
+@@ -5017,78 +5503,78 @@
+
+ if test -n "$addlibs"; then
+ gentop="$output_objdir/${outputname}x"
+- $show "${rm}r $gentop"
+- $run ${rm}r "$gentop"
+- $show "$mkdir $gentop"
+- $run $mkdir "$gentop"
+- status=$?
+- if test "$status" -ne 0 && test ! -d "$gentop"; then
+- exit $status
+- fi
+ generated="$generated $gentop"
+
+- # Add in members from convenience archives.
+- for xlib in $addlibs; do
+- # Extract the objects.
+- case $xlib in
+- [\\/]* | [A-Za-z]:[\\/]*) xabs="$xlib" ;;
+- *) xabs=`pwd`"/$xlib" ;;
+- esac
+- xlib=`$echo "X$xlib" | $Xsed -e 's%^.*/%%'`
+- xdir="$gentop/$xlib"
+-
+- $show "${rm}r $xdir"
+- $run ${rm}r "$xdir"
+- $show "$mkdir $xdir"
+- $run $mkdir "$xdir"
+- status=$?
+- if test "$status" -ne 0 && test ! -d "$xdir"; then
+- exit $status
+- fi
+- # We will extract separately just the conflicting names and we will no
+- # longer touch any unique names. It is faster to leave these extract
+- # automatically by $AR in one run.
+- $show "(cd $xdir && $AR x $xabs)"
+- $run eval "(cd \$xdir && $AR x \$xabs)" || exit $?
+- if ($AR t "$xabs" | sort | sort -uc >/dev/null 2>&1); then
+- :
+- else
+- $echo "$modename: warning: object name conflicts; renaming object files" 1>&2
+- $echo "$modename: warning: to ensure that they will not overwrite" 1>&2
+- $AR t "$xabs" | sort | uniq -cd | while read -r count name
+- do
+- i=1
+- while test "$i" -le "$count"
+- do
+- # Put our $i before any first dot (extension)
+- # Never overwrite any file
+- name_to="$name"
+- while test "X$name_to" = "X$name" || test -f "$xdir/$name_to"
+- do
+- name_to=`$echo "X$name_to" | $Xsed -e "s/\([^.]*\)/\1-$i/"`
+- done
+- $show "(cd $xdir && $AR xN $i $xabs '$name' && $mv '$name' '$name_to')"
+- $run eval "(cd \$xdir && $AR xN $i \$xabs '$name' && $mv '$name' '$name_to')" || exit $?
+- i=`expr $i + 1`
+- done
+- done
+- fi
+-
+- oldobjs="$oldobjs "`find $xdir -name \*.${objext} -print -o -name \*.lo -print | $NL2SP`
+- done
++ func_extract_archives $gentop $addlibs
++ oldobjs="$oldobjs $func_extract_archives_result"
+ fi
+
+- compiler_flags="$compiler_flags $add_flags"
+-
+ # Do each command in the archive commands.
+ if test -n "$old_archive_from_new_cmds" && test "$build_libtool_libs" = yes; then
+- eval cmds=\"$old_archive_from_new_cmds\"
++ cmds=$old_archive_from_new_cmds
+ else
++ # POSIX demands no paths to be encoded in archives. We have
++ # to avoid creating archives with duplicate basenames if we
++ # might have to extract them afterwards, e.g., when creating a
++ # static archive out of a convenience library, or when linking
++ # the entirety of a libtool archive into another (currently
++ # not supported by libtool).
++ if (for obj in $oldobjs
++ do
++ $echo "X$obj" | $Xsed -e 's%^.*/%%'
++ done | sort | sort -uc >/dev/null 2>&1); then
++ :
++ else
++ $echo "copying selected object files to avoid basename conflicts..."
++
++ if test -z "$gentop"; then
++ gentop="$output_objdir/${outputname}x"
++ generated="$generated $gentop"
++
++ $show "${rm}r $gentop"
++ $run ${rm}r "$gentop"
++ $show "$mkdir $gentop"
++ $run $mkdir "$gentop"
++ exit_status=$?
++ if test "$exit_status" -ne 0 && test ! -d "$gentop"; then
++ exit $exit_status
++ fi
++ fi
++
++ save_oldobjs=$oldobjs
++ oldobjs=
++ counter=1
++ for obj in $save_oldobjs
++ do
++ objbase=`$echo "X$obj" | $Xsed -e 's%^.*/%%'`
++ case " $oldobjs " in
++ " ") oldobjs=$obj ;;
++ *[\ /]"$objbase "*)
++ while :; do
++ # Make sure we don't pick an alternate name that also
++ # overlaps.
++ newobj=lt$counter-$objbase
++ counter=`expr $counter + 1`
++ case " $oldobjs " in
++ *[\ /]"$newobj "*) ;;
++ *) if test ! -f "$gentop/$newobj"; then break; fi ;;
++ esac
++ done
++ $show "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
++ $run ln "$obj" "$gentop/$newobj" ||
++ $run cp "$obj" "$gentop/$newobj"
++ oldobjs="$oldobjs $gentop/$newobj"
++ ;;
++ *) oldobjs="$oldobjs $obj" ;;
++ esac
++ done
++ fi
++
+ eval cmds=\"$old_archive_cmds\"
+
+ if len=`expr "X$cmds" : ".*"` &&
+ test "$len" -le "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+- :
++ cmds=$old_archive_cmds
+ else
+ # the command line is too long to link in one step, link in parts
+ $echo "using piecewise archive linking..."
+@@ -5097,31 +5583,18 @@
+ objlist=
+ concat_cmds=
+ save_oldobjs=$oldobjs
+- # GNU ar 2.10+ was changed to match POSIX; thus no paths are
+- # encoded into archives. This makes 'ar r' malfunction in
+- # this piecewise linking case whenever conflicting object
+- # names appear in distinct ar calls; check, warn and compensate.
+- if (for obj in $save_oldobjs
+- do
+- $echo "X$obj" | $Xsed -e 's%^.*/%%'
+- done | sort | sort -uc >/dev/null 2>&1); then
+- :
+- else
+- $echo "$modename: warning: object name conflicts; overriding AR_FLAGS to 'cq'" 1>&2
+- $echo "$modename: warning: to ensure that POSIX-compatible ar will work" 1>&2
+- AR_FLAGS=cq
+- fi
++
+ # Is there a better way of finding the last object in the list?
+ for obj in $save_oldobjs
+ do
+ last_oldobj=$obj
+- done
++ done
+ for obj in $save_oldobjs
+ do
+ oldobjs="$objlist $obj"
+ objlist="$objlist $obj"
+ eval test_cmds=\"$old_archive_cmds\"
+- if len=`expr "X$test_cmds" : ".*"` &&
++ if len=`expr "X$test_cmds" : ".*" 2>/dev/null` &&
+ test "$len" -le "$max_cmd_len"; then
+ :
+ else
+@@ -5129,7 +5602,7 @@
+ oldobjs=$objlist
+ if test "$obj" = "$last_oldobj" ; then
+ RANLIB=$save_RANLIB
+- fi
++ fi
+ test -z "$concat_cmds" || concat_cmds=$concat_cmds~
+ eval concat_cmds=\"\${concat_cmds}$old_archive_cmds\"
+ objlist=
+@@ -5140,12 +5613,13 @@
+ if test "X$oldobjs" = "X" ; then
+ eval cmds=\"\$concat_cmds\"
+ else
+- eval cmds=\"\$concat_cmds~$old_archive_cmds\"
++ eval cmds=\"\$concat_cmds~\$old_archive_cmds\"
+ fi
+ fi
+ fi
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
++ eval cmd=\"$cmd\"
+ IFS="$save_ifs"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+@@ -5177,11 +5651,13 @@
+ fi
+ done
+ # Quote the link command for shipping.
+- relink_command="(cd `pwd`; $SHELL $0 --mode=relink $libtool_args @inst_prefix_dir@)"
+- relink_command=`$echo "X$relink_command" | $Xsed -e "$sed_quote_subst"`
++ relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
++ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e "$sed_quote_subst" | $NL2SP`
+ if test "$hardcode_automatic" = yes ; then
+- relink_command=
+- fi
++ relink_command=
++ fi
++
++
+ # Only create the output if not a dry run.
+ if test -z "$run"; then
+ for installed in no yes; do
+@@ -5199,55 +5675,11 @@
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+ if test -z "$libdir"; then
+ $echo "$modename: \`$deplib' is not a valid libtool archive" 1>&2
+- exit 1
+- fi
+- if test "x$EGREP" = x ; then
+- EGREP=egrep
+- fi
+- # We do not want portage's install root ($D) present. Check only for
+- # this if the .la is being installed.
+- if test "$installed" = yes && test "$D"; then
+- eval mynewdependency_lib=`echo "$libdir/$name" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
+- else
+- mynewdependency_lib="$libdir/$name"
+- fi
+- # Do not add duplicates
+- if test "$mynewdependency_lib"; then
+- my_little_ninja_foo_1=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
+- if test -z "$my_little_ninja_foo_1"; then
+- newdependency_libs="$newdependency_libs $mynewdependency_lib"
+- fi
+- fi
+- ;;
+- *)
+- if test "$installed" = yes; then
+- # Rather use S=WORKDIR if our version of portage supports it.
+- # This is because some ebuild (gcc) do not use $S as buildroot.
+- if test "$PWORKDIR"; then
+- S="$PWORKDIR"
+- fi
+- # We do not want portage's build root ($S) present.
+- my_little_ninja_foo_2=`echo $deplib |$EGREP -e "$S"`
+- # We do not want portage's install root ($D) present.
+- my_little_ninja_foo_3=`echo $deplib |$EGREP -e "$D"`
+- if test -n "$my_little_ninja_foo_2" && test "$S"; then
+- mynewdependency_lib=""
+- elif test -n "$my_little_ninja_foo_3" && test "$D"; then
+- eval mynewdependency_lib=`echo "$deplib" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
+- else
+- mynewdependency_lib="$deplib"
+- fi
+- else
+- mynewdependency_lib="$deplib"
+- fi
+- # Do not add duplicates
+- if test "$mynewdependency_lib"; then
+- my_little_ninja_foo_4=`echo $newdependency_libs |$EGREP -e "$mynewdependency_lib"`
+- if test -z "$my_little_ninja_foo_4"; then
+- newdependency_libs="$newdependency_libs $mynewdependency_lib"
+- fi
++ exit $EXIT_FAILURE
+ fi
++ newdependency_libs="$newdependency_libs $libdir/$name"
+ ;;
++ *) newdependency_libs="$newdependency_libs $deplib" ;;
+ esac
+ done
+ dependency_libs="$newdependency_libs"
+@@ -5257,7 +5689,7 @@
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ if test -z "$libdir"; then
+ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ newdlfiles="$newdlfiles $libdir/$name"
+ done
+@@ -5268,11 +5700,30 @@
+ eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
+ if test -z "$libdir"; then
+ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ newdlprefiles="$newdlprefiles $libdir/$name"
+ done
+ dlprefiles="$newdlprefiles"
++ else
++ newdlfiles=
++ for lib in $dlfiles; do
++ case $lib in
++ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
++ *) abs=`pwd`"/$lib" ;;
++ esac
++ newdlfiles="$newdlfiles $abs"
++ done
++ dlfiles="$newdlfiles"
++ newdlprefiles=
++ for lib in $dlprefiles; do
++ case $lib in
++ [\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
++ *) abs=`pwd`"/$lib" ;;
++ esac
++ newdlprefiles="$newdlprefiles $abs"
++ done
++ dlprefiles="$newdlprefiles"
+ fi
+ $rm $output
+ # place dlname in correct position for cygwin
+@@ -5280,10 +5731,6 @@
+ case $host,$output,$installed,$module,$dlname in
+ *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+ esac
+- # Do not add duplicates
+- if test "$installed" = yes && test "$D"; then
+- install_libdir=`echo "$install_libdir" |sed -e "s:$D:/:g" -e 's:/\+:/:g'`
+- fi
+ $echo > $output "\
+ # $outputname - a libtool library file
+ # Generated by $PROGRAM - GNU $PACKAGE $VERSION$TIMESTAMP
+@@ -5320,7 +5767,7 @@
+
+ # Directory that this library needs to be installed in:
+ libdir='$install_libdir'"
+- if test "$installed" = no && test "$need_relink" = yes && test "$fast_install" = no; then
++ if test "$installed" = no && test "$need_relink" = yes; then
+ $echo >> $output "\
+ relink_command=\"$relink_command\""
+ fi
+@@ -5333,7 +5780,7 @@
+ $run eval '(cd $output_objdir && $rm $outputname && $LN_S ../$outputname $outputname)' || exit $?
+ ;;
+ esac
+- exit 0
++ exit $EXIT_SUCCESS
+ ;;
+
+ # libtool install mode
+@@ -5344,11 +5791,11 @@
+ # install_prog (especially on Windows NT).
+ if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
+ # Allow the use of GNU shtool's install command.
+- $echo "X$nonopt" | $Xsed | grep shtool > /dev/null; then
++ $echo "X$nonopt" | grep shtool > /dev/null; then
+ # Aesthetically quote it.
+ arg=`$echo "X$nonopt" | $Xsed -e "$sed_quote_subst"`
+ case $arg in
+- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ arg="\"$arg\""
+ ;;
+ esac
+@@ -5357,14 +5804,14 @@
+ shift
+ else
+ install_prog=
+- arg="$nonopt"
++ arg=$nonopt
+ fi
+
+ # The real first argument should be the name of the installation program.
+ # Aesthetically quote it.
+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+ case $arg in
+- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ arg="\"$arg\""
+ ;;
+ esac
+@@ -5382,28 +5829,31 @@
+ do
+ if test -n "$dest"; then
+ files="$files $dest"
+- dest="$arg"
++ dest=$arg
+ continue
+ fi
+
+ case $arg in
+ -d) isdir=yes ;;
+- -f) prev="-f" ;;
+- -g) prev="-g" ;;
+- -m) prev="-m" ;;
+- -o) prev="-o" ;;
++ -f)
++ case " $install_prog " in
++ *[\\\ /]cp\ *) ;;
++ *) prev=$arg ;;
++ esac
++ ;;
++ -g | -m | -o) prev=$arg ;;
+ -s)
+ stripme=" -s"
+ continue
+ ;;
+- -*) ;;
+-
++ -*)
++ ;;
+ *)
+ # If the previous option needed an argument, then skip it.
+ if test -n "$prev"; then
+ prev=
+ else
+- dest="$arg"
++ dest=$arg
+ continue
+ fi
+ ;;
+@@ -5412,7 +5862,7 @@
+ # Aesthetically quote the argument.
+ arg=`$echo "X$arg" | $Xsed -e "$sed_quote_subst"`
+ case $arg in
+- *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*)
++ *[\[\~\#\^\&\*\(\)\{\}\|\;\<\>\?\'\ \ ]*|*]*|"")
+ arg="\"$arg\""
+ ;;
+ esac
+@@ -5422,13 +5872,13 @@
+ if test -z "$install_prog"; then
+ $echo "$modename: you must specify an install program" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ if test -n "$prev"; then
+ $echo "$modename: the \`$prev' option requires an argument" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ if test -z "$files"; then
+@@ -5438,7 +5888,7 @@
+ $echo "$modename: you must specify a destination" 1>&2
+ fi
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Strip any trailing slash from the destination.
+@@ -5459,7 +5909,7 @@
+ if test "$#" -gt 2; then
+ $echo "$modename: \`$dest' is not a directory" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ fi
+ case $destdir in
+@@ -5471,7 +5921,7 @@
+ *)
+ $echo "$modename: \`$destdir' must be an absolute directory name" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+ done
+@@ -5500,7 +5950,7 @@
+ else
+ $echo "$modename: \`$file' is not a valid libtool archive" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ library_names=
+@@ -5542,14 +5992,14 @@
+ # but it's something to keep an eye on.
+ if test "$inst_prefix_dir" = "$destdir"; then
+ $echo "$modename: error: cannot install \`$file' to a directory not ending in $libdir" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ if test -n "$inst_prefix_dir"; then
+ # Stick the inst_prefix_dir data into the link command.
+- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
++ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%" | $NL2SP`
+ else
+- relink_command=`$echo "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
++ relink_command=`$echo "$relink_command" | $SP2NL | $SED "s%@inst_prefix_dir@%%" | $NL2SP`
+ fi
+
+ $echo "$modename: warning: relinking \`$file'" 1>&2
+@@ -5557,7 +6007,7 @@
+ if $run eval "$relink_command"; then :
+ else
+ $echo "$modename: error: relink \`$file' with the above command before installing it" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ fi
+
+@@ -5581,23 +6031,36 @@
+
+ if test "$#" -gt 0; then
+ # Delete the old symlinks, and create new ones.
++ # Try `ln -sf' first, because the `ln' binary might depend on
++ # the symlink we replace! Solaris /bin/ln does not understand -f,
++ # so we also need to try rm && ln -s.
+ for linkname
+ do
+ if test "$linkname" != "$realname"; then
+- $show "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
+- $run eval "(cd $destdir && $rm $linkname && $LN_S $realname $linkname)"
++ $show "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
++ $run eval "(cd $destdir && { $LN_S -f $realname $linkname || { $rm $linkname && $LN_S $realname $linkname; }; })"
+ fi
+ done
+ fi
+
+ # Do each command in the postinstall commands.
+ lib="$destdir/$realname"
+- eval cmds=\"$postinstall_cmds\"
++ cmds=$postinstall_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+- $run eval "$cmd" || exit $?
++ $run eval "$cmd" || {
++ lt_exit=$?
++
++ # Restore the uninstalled library and exit
++ if test "$mode" = relink; then
++ $run eval '(cd $output_objdir && $rm ${realname}T && $mv ${realname}U $realname)'
++ fi
++
++ exit $lt_exit
++ }
+ done
+ IFS="$save_ifs"
+ fi
+@@ -5635,7 +6098,7 @@
+ *)
+ $echo "$modename: cannot copy a libtool object to \`$destfile'" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+@@ -5653,7 +6116,7 @@
+ $show "$install_prog $staticobj $staticdest"
+ $run eval "$install_prog \$staticobj \$staticdest" || exit $?
+ fi
+- exit 0
++ exit $EXIT_SUCCESS
+ ;;
+
+ *)
+@@ -5691,23 +6154,21 @@
+ notinst_deplibs=
+ relink_command=
+
+- # To insure that "foo" is sourced, and not "foo.exe",
+- # finese the cygwin/MSYS system by explicitly sourcing "foo."
+- # which disallows the automatic-append-.exe behavior.
+- case $build in
+- *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
+- *) wrapperdot=${wrapper} ;;
+- esac
++ # Note that it is not necessary on cygwin/mingw to append a dot to
++ # foo even if both foo and FILE.exe exist: automatic-append-.exe
++ # behavior happens only for exec(3), not for open(2)! Also, sourcing
++ # `FILE.' does not work on cygwin managed mounts.
++ #
+ # If there is no directory component, then add one.
+- case $file in
+- */* | *\\*) . ${wrapperdot} ;;
+- *) . ./${wrapperdot} ;;
++ case $wrapper in
++ */* | *\\*) . ${wrapper} ;;
++ *) . ./${wrapper} ;;
+ esac
+
+ # Check the variables that should have been set.
+ if test -z "$notinst_deplibs"; then
+ $echo "$modename: invalid libtool wrapper script \`$wrapper'" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ finalize=yes
+@@ -5729,34 +6190,25 @@
+ done
+
+ relink_command=
+- # To insure that "foo" is sourced, and not "foo.exe",
+- # finese the cygwin/MSYS system by explicitly sourcing "foo."
+- # which disallows the automatic-append-.exe behavior.
+- case $build in
+- *cygwin* | *mingw*) wrapperdot=${wrapper}. ;;
+- *) wrapperdot=${wrapper} ;;
+- esac
++ # Note that it is not necessary on cygwin/mingw to append a dot to
++ # foo even if both foo and FILE.exe exist: automatic-append-.exe
++ # behavior happens only for exec(3), not for open(2)! Also, sourcing
++ # `FILE.' does not work on cygwin managed mounts.
++ #
+ # If there is no directory component, then add one.
+- case $file in
+- */* | *\\*) . ${wrapperdot} ;;
+- *) . ./${wrapperdot} ;;
++ case $wrapper in
++ */* | *\\*) . ${wrapper} ;;
++ *) . ./${wrapper} ;;
+ esac
+
+ outputname=
+ if test "$fast_install" = no && test -n "$relink_command"; then
+ if test "$finalize" = yes && test -z "$run"; then
+- tmpdir="/tmp"
+- test -n "$TMPDIR" && tmpdir="$TMPDIR"
+- tmpdir="$tmpdir/libtool-$$"
+- if $mkdir "$tmpdir" && chmod 700 "$tmpdir"; then :
+- else
+- $echo "$modename: error: cannot create temporary directory \`$tmpdir'" 1>&2
+- continue
+- fi
++ tmpdir=`func_mktempdir`
+ file=`$echo "X$file$stripped_ext" | $Xsed -e 's%^.*/%%'`
+ outputname="$tmpdir/$file"
+ # Replace the output file specification.
+- relink_command=`$echo "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
++ relink_command=`$echo "X$relink_command" | $SP2NL | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g' | $NL2SP`
+
+ $show "$relink_command"
+ if $run eval "$relink_command"; then :
+@@ -5776,7 +6228,7 @@
+ fi
+
+ # remove .exe since cygwin /usr/bin/install will append another
+- # one anyways
++ # one anyway
+ case $install_prog,$host in
+ */usr/bin/install*,*cygwin*)
+ case $file:$destfile in
+@@ -5808,16 +6260,17 @@
+ $show "$install_prog $file $oldlib"
+ $run eval "$install_prog \$file \$oldlib" || exit $?
+
+- if test -n "$stripme" && test -n "$striplib"; then
++ if test -n "$stripme" && test -n "$old_striplib"; then
+ $show "$old_striplib $oldlib"
+ $run eval "$old_striplib $oldlib" || exit $?
+ fi
+
+ # Do each command in the postinstall commands.
+- eval cmds=\"$old_postinstall_cmds\"
++ cmds=$old_postinstall_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || exit $?
+ done
+@@ -5831,9 +6284,9 @@
+ if test -n "$current_libdirs"; then
+ # Maybe just do a dry run.
+ test -n "$run" && current_libdirs=" -n$current_libdirs"
+- exec_cmd='$SHELL $0 --finish$current_libdirs'
++ exec_cmd='$SHELL $progpath $preserve_args --finish$current_libdirs'
+ else
+- exit 0
++ exit $EXIT_SUCCESS
+ fi
+ ;;
+
+@@ -5852,10 +6305,11 @@
+ for libdir in $libdirs; do
+ if test -n "$finish_cmds"; then
+ # Do each command in the finish commands.
+- eval cmds=\"$finish_cmds\"
++ cmds=$finish_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd" || admincmds="$admincmds
+ $cmd"
+@@ -5872,9 +6326,9 @@
+ fi
+
+ # Exit here if they wanted silent mode.
+- exit 0
++ test "$show" = : && exit $EXIT_SUCCESS
+
+- $echo "----------------------------------------------------------------------"
++ $echo "X----------------------------------------------------------------------" | $Xsed
+ $echo "Libraries have been installed in:"
+ for libdir in $libdirs; do
+ $echo " $libdir"
+@@ -5907,8 +6361,8 @@
+ $echo
+ $echo "See any operating system documentation about shared libraries for"
+ $echo "more information, such as the ld(1) and ld.so(8) manual pages."
+- $echo "----------------------------------------------------------------------"
+- exit 0
++ $echo "X----------------------------------------------------------------------" | $Xsed
++ exit $EXIT_SUCCESS
+ ;;
+
+ # libtool execute mode
+@@ -5920,7 +6374,7 @@
+ if test -z "$cmd"; then
+ $echo "$modename: you must specify a COMMAND" 1>&2
+ $echo "$help"
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Handle -dlopen flags immediately.
+@@ -5928,7 +6382,7 @@
+ if test ! -f "$file"; then
+ $echo "$modename: \`$file' is not a file" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ dir=
+@@ -5939,7 +6393,7 @@
+ else
+ $echo "$modename: \`$lib' is not a valid libtool archive" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # Read the libtool library.
+@@ -5965,8 +6419,10 @@
+ if test -f "$dir/$objdir/$dlname"; then
+ dir="$dir/$objdir"
+ else
+- $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
+- exit 1
++ if test ! -f "$dir/$dlname"; then
++ $echo "$modename: cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'" 1>&2
++ exit $EXIT_FAILURE
++ fi
+ fi
+ ;;
+
+@@ -6030,12 +6486,12 @@
+ fi
+
+ # Restore saved environment variables
+- if test "${save_LC_ALL+set}" = set; then
+- LC_ALL="$save_LC_ALL"; export LC_ALL
+- fi
+- if test "${save_LANG+set}" = set; then
+- LANG="$save_LANG"; export LANG
+- fi
++ for lt_var in LANG LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
++ do
++ eval "if test \"\${save_$lt_var+set}\" = set; then
++ $lt_var=\$save_$lt_var; export $lt_var
++ fi"
++ done
+
+ # Now prepare to actually exec the command.
+ exec_cmd="\$cmd$args"
+@@ -6046,7 +6502,7 @@
+ $echo "export $shlibpath_var"
+ fi
+ $echo "$cmd$args"
+- exit 0
++ exit $EXIT_SUCCESS
+ fi
+ ;;
+
+@@ -6074,7 +6530,7 @@
+ if test -z "$rm"; then
+ $echo "$modename: you must specify an RM program" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ rmdirs=
+@@ -6124,15 +6580,24 @@
+ rmfiles="$rmfiles $objdir/$n"
+ done
+ test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
+- test "$mode" = clean && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+
+- if test "$mode" = uninstall; then
++ case "$mode" in
++ clean)
++ case " $library_names " in
++ # " " in the beginning catches empty $dlname
++ *" $dlname "*) ;;
++ *) rmfiles="$rmfiles $objdir/$dlname" ;;
++ esac
++ test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
++ ;;
++ uninstall)
+ if test -n "$library_names"; then
+ # Do each command in the postuninstall commands.
+- eval cmds=\"$postuninstall_cmds\"
++ cmds=$postuninstall_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd"
+ if test "$?" -ne 0 && test "$rmforce" != yes; then
+@@ -6144,10 +6609,11 @@
+
+ if test -n "$old_library"; then
+ # Do each command in the old_postuninstall commands.
+- eval cmds=\"$old_postuninstall_cmds\"
++ cmds=$old_postuninstall_cmds
+ save_ifs="$IFS"; IFS='~'
+ for cmd in $cmds; do
+ IFS="$save_ifs"
++ eval cmd=\"$cmd\"
+ $show "$cmd"
+ $run eval "$cmd"
+ if test "$?" -ne 0 && test "$rmforce" != yes; then
+@@ -6157,7 +6623,8 @@
+ IFS="$save_ifs"
+ fi
+ # FIXME: should reinstall the best remaining shared library.
+- fi
++ ;;
++ esac
+ fi
+ ;;
+
+@@ -6186,7 +6653,7 @@
+ if test "$mode" = clean ; then
+ noexename=$name
+ case $file in
+- *.exe)
++ *.exe)
+ file=`$echo $file|${SED} 's,.exe$,,'`
+ noexename=`$echo $name|${SED} 's,.exe$,,'`
+ # $file with .exe has already been added to rmfiles,
+@@ -6231,20 +6698,20 @@
+ "")
+ $echo "$modename: you must specify a MODE" 1>&2
+ $echo "$generic_help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ if test -z "$exec_cmd"; then
+ $echo "$modename: invalid operation mode \`$mode'" 1>&2
+ $echo "$generic_help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+ fi # test -z "$show_help"
+
+ if test -n "$exec_cmd"; then
+ eval exec $exec_cmd
+- exit 1
++ exit $EXIT_FAILURE
+ fi
+
+ # We need to display help for each of the modes.
+@@ -6280,7 +6747,7 @@
+ a more detailed description of MODE.
+
+ Report bugs to <bug-libtool at gnu.org>."
+- exit 0
++ exit $EXIT_SUCCESS
+ ;;
+
+ clean)
+@@ -6381,9 +6848,9 @@
+ -dlpreopen FILE link in FILE and add its symbols to lt_preloaded_symbols
+ -export-dynamic allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
+ -export-symbols SYMFILE
+- try to export only the symbols listed in SYMFILE
++ try to export only the symbols listed in SYMFILE
+ -export-symbols-regex REGEX
+- try to export only the symbols matching REGEX
++ try to export only the symbols matching REGEX
+ -LLIBDIR search LIBDIR for required installed libraries
+ -lNAME OUTPUT-FILE requires the installed library libNAME
+ -module build a library that can dlopened
+@@ -6392,12 +6859,16 @@
+ -no-undefined declare that a library does not refer to external symbols
+ -o OUTPUT-FILE create OUTPUT-FILE from the specified objects
+ -objectlist FILE Use a list of object files found in FILE to specify objects
++ -precious-files-regex REGEX
++ don't remove output files matching REGEX
+ -release RELEASE specify package release information
+ -rpath LIBDIR the created library will eventually be installed in LIBDIR
+ -R[ ]LIBDIR add LIBDIR to the runtime path of programs and libraries
+- -static do not do any dynamic linking of libtool libraries
++ -static do not do any dynamic linking of uninstalled libtool libraries
++ -static-libtool-libs
++ do not do any dynamic linking of libtool libraries
+ -version-info CURRENT[:REVISION[:AGE]]
+- specify library version info [each variable defaults to 0]
++ specify library version info [each variable defaults to 0]
+
+ All other options (arguments beginning with \`-') are ignored.
+
+@@ -6433,14 +6904,14 @@
+ *)
+ $echo "$modename: invalid operation mode \`$mode'" 1>&2
+ $echo "$help" 1>&2
+- exit 1
++ exit $EXIT_FAILURE
+ ;;
+ esac
+
+ $echo
+ $echo "Try \`$modename --help' for more information about other modes."
+
+-exit 0
++exit $?
+
+ # The TAGs below are defined such that we never get into a situation
+ # in which we disable both kinds of libraries. Given conflicting
+@@ -6454,12 +6925,11 @@
+ # configuration. But we'll never go from static-only to shared-only.
+
+ # ### BEGIN LIBTOOL TAG CONFIG: disable-shared
+-build_libtool_libs=no
+-build_old_libs=yes
++disable_libs=shared
+ # ### END LIBTOOL TAG CONFIG: disable-shared
+
+ # ### BEGIN LIBTOOL TAG CONFIG: disable-static
+-build_old_libs=`case $build_libtool_libs in yes) $echo no;; *) $echo yes;; esac`
++disable_libs=static
+ # ### END LIBTOOL TAG CONFIG: disable-static
+
+ # Local Variables:
Deleted: kde-extras/krusader/tags/1.90.0-2/debian/patches/11_add_useractions_examples.diff
Copied: kde-extras/krusader/tags/1.90.0-2/debian/patches/11_add_useractions_examples.diff (from rev 11903, kde-extras/krusader/trunk/debian/patches/11_add_useractions_examples.diff)
===================================================================
--- kde-extras/krusader/tags/1.90.0-2/debian/patches/11_add_useractions_examples.diff (rev 0)
+++ kde-extras/krusader/tags/1.90.0-2/debian/patches/11_add_useractions_examples.diff 2008-08-10 17:01:44 UTC (rev 11904)
@@ -0,0 +1,100 @@
+--- a/krusader/useraction_examples.xml
++++ b/krusader/useraction_examples.xml
+@@ -310,4 +310,97 @@
+ You need krusader compiled with javascript support.</description>
+ <command>%_Script("calc.js")%</command>
+ </action>
++ <action name="archive2dir" >
++ <title>Archive to Dir</title>
++ <tooltip>Creates a directory with the archive name before unpacking</tooltip>
++ <icon>ark</icon>
++ <category>System</category>
++ <description>Creates a directory with the current archive name in the other panel before unpacking the files into it. It uses ark and tries to guess the directory name (archive name without file extension).</description>
++ <command>ark --guess-name --extract-to %oPath% %aCurrent%</command>
++ <defaultshortcut>Alt+Ctrl+U</defaultshortcut>
++ </action>
++ <action name="7z_current" >
++ <title>7zip current</title>
++ <tooltip>make an 7zip archive containing current file</tooltip>
++ <category>Compression</category>
++ <command>rm -f %aCurrent("Yes")%.7z; 7z a -mx=9 -mfb=128 -md=8m %aCurrent("Yes")%.7z %aCurrent("Yes")%</command>
++ <defaultshortcut>Ctrl+Ampersand</defaultshortcut>
++ </action>
++ <action name="7z_pack" >
++ <title>7zip pack</title>
++ <tooltip>7zip selected files with dialog and terminal with progress.</tooltip>
++ <category>Compression</category>
++ <command executionmode="terminal" >sh -c 'A=%_Ask("Enter file name of the archive:", "%oPath%%aCurrent(\"Yes\")%.7z", "7zip pack")% ; rm -f "$A"; 7z a -mx=9 -mfb=128 -md=8m "$A" %aList("Selected", " ", "Yes")% '</command>
++ </action>
++ <action name="7z_unpack" >
++ <title>7zip unpack</title>
++ <tooltip>unpack 7zip archives with dialog and terminal with progress.</tooltip>
++ <category>Compression</category>
++ <command executionmode="terminal" >sh -c 'A=%_Ask("Enter the path, where the archive should be unpacked to:", "%oPath%", "7zip unpack")% ; cd "$A"; for i in %aList("Selected")% ; do 7z x "$i"; done '</command>
++ </action>
++ <action name="tar.7z_pack" >
++ <title>make tar.7z archive</title>
++ <tooltip>7zip selected files with dialog and terminal with progress.</tooltip>
++ <category>Compression</category>
++ <command executionmode="terminal" >sh -c 'A=%_Ask("Enter file name of the archive:", "%oPath%%aCurrent(\"Yes\")%.tar.7z", "7zip pack")% ; rm -f "$A"; tar cvf - %aList("Selected", " ", "Yes")% | 7z a -mx=9 -mfb=128 -md=8m -si "$A" >/dev/null '</command>
++ </action>
++ <action name="tar.7z_unpack" >
++ <title>unpack tar.7z archive</title>
++ <tooltip>unpack 7zip archives with dialog and terminal with progress.</tooltip>
++ <category>Compression</category>
++ <command executionmode="terminal" >sh -c 'A=%_Ask("Enter the path, where the archive should be unpacked to:", "%oPath%", "7zip unpack")% ; cd "$A"; for i in %aList("Selected")% ; do 7z x -so "$i" 2>/dev/null | tar xvf - ; done '</command>
++ </action>
++ <action name="tgz_current" >
++ <title>zatarovat and zagzipovat</title>
++ <category>Compression</category>
++ <command>tar cf - %aCurrent("Yes")% | gzip -9 >%aCurrent%.tar.gz</command>
++ <defaultshortcut>Ctrl+Shift+Z</defaultshortcut>
++ </action>
++ <action name="gzip_current" >
++ <title>gzip current</title>
++ <tooltip>gzip current file with maximum (9) compression, preserving original file. In case of directory, it is first tarred.</tooltip>
++ <category>Compression</category>
++ <command>if [ -d %aCurrent("Yes")% ]; then tar cf - %aCurrent("Yes")% | gzip -9 >%aCurrent("Yes")%.tar.gz; else cat %aCurrent("Yes")% | gzip -9 >%aCurrent("Yes")%.gz; fi</command>
++ <defaultshortcut>Ctrl+Shift+G</defaultshortcut>
++ </action>
++ <action name="ar_pack" >
++ <title>pack an ar archive (.a, .deb, ...)</title>
++ <command>sh -c 'A=%_Ask("Enter file name of the archive:", "%oPath%%aCurrent(\"Yes\")%.a", "ar pack")% ; rm -f "$A"; ar -rc "$A" %aList("Selected", " ", "Yes")% '</command>
++ </action>
++ <action name="ar_unpack" >
++ <title>Unpack an ar archive (.a, .deb, ...)</title>
++ <command>sh -c 'A=%_Ask("Enter the path, where the archive should be unpacked to:", "%oPath%", "ar unpack")% ; cd "$A"; for i in %aList("Selected")% ; do ar x "$i"; done '</command>
++ </action>
++ <action name="decrypt_with_kgpg" >
++ <title>Decrypt with kgpg</title>
++ <tooltip>Decrypt with kgpg</tooltip>
++ <icon>kgpg_show</icon>
++ <category>System</category>
++ <description same_as="tooltip" />
++ <command>kgpg %aCurrent%</command>
++ </action>
++ <action name="encrypt_with_kgpg" >
++ <title>Encrypt with kgpg</title>
++ <tooltip>Encrypt with kgpg</tooltip>
++ <icon>kgpg_key1</icon>
++ <category>System</category>
++ <description same_as="tooltip" />
++ <command>kgpg -e %aCurrent%</command>
++ </action>
++ <action name="sign_with_kgpg" >
++ <title>Sign with kgpg</title>
++ <tooltip>Sign with kgpg</tooltip>
++ <icon>kgpg_sign</icon>
++ <category>System</category>
++ <description same_as="tooltip" />
++ <command>kgpg -S %aCurrent%</command>
++ </action>
++ <action name="verify_sig_with_kpgp" >
++ <title>Verify signature with kgpg</title>
++ <tooltip>Verify signature with kgpg</tooltip>
++ <icon>kgpg_identity</icon>
++ <category>System</category>
++ <description same_as="tooltip" />
++ <command>kgpg -V %aCurrent%</command>
++ </action>
+ </KrusaderUserActions>
Copied: kde-extras/krusader/tags/1.90.0-2/debian/patches/series (from rev 11903, kde-extras/krusader/trunk/debian/patches/series)
===================================================================
--- kde-extras/krusader/tags/1.90.0-2/debian/patches/series (rev 0)
+++ kde-extras/krusader/tags/1.90.0-2/debian/patches/series 2008-08-10 17:01:44 UTC (rev 11904)
@@ -0,0 +1,7 @@
+01_krusader_branch_r5981.diff
+02_autotools_update.diff
+03_libtool_update.diff
+04_am_maintainer_mode.diff
+05_pedantic-errors.diff
+06_disable_no_undefined.diff
+11_add_useractions_examples.diff
Deleted: kde-extras/krusader/tags/1.90.0-2/debian/rules
Copied: kde-extras/krusader/tags/1.90.0-2/debian/rules (from rev 11903, kde-extras/krusader/trunk/debian/rules)
===================================================================
--- kde-extras/krusader/tags/1.90.0-2/debian/rules (rev 0)
+++ kde-extras/krusader/tags/1.90.0-2/debian/rules 2008-08-10 17:01:44 UTC (rev 11904)
@@ -0,0 +1,27 @@
+#!/usr/bin/make -f
+
+include /usr/share/cdbs/1/rules/debhelper.mk
+include /usr/share/cdbs/1/class/kde.mk
+include /usr/share/cdbs/1/rules/patchsys-quilt.mk
+include /usr/share/cdbs/1/rules/utils.mk
+
+-include /usr/share/gnome-pkg-tools/1/rules/sf-get-source.mk
+
+DEB_DESTDIR = $(CURDIR)/debian/krusader/
+
+install/krusader::
+ # install xpm files used by menu
+ install -D -p -m0644 pics/cr16-app-krusader_root.xpm \
+ $(DEB_DESTDIR)/usr/share/pixmaps/krusader_root-16.xpm
+ install -D -p -m0644 pics/cr16-app-krusader_user.xpm \
+ $(DEB_DESTDIR)/usr/share/pixmaps/krusader_user-16.xpm
+ install -D -p -m0644 pics/cr32-app-krusader_root.xpm \
+ $(DEB_DESTDIR)/usr/share/pixmaps/krusader_root.xpm
+ install -D -p -m0644 pics/cr32-app-krusader_user.xpm \
+ $(DEB_DESTDIR)/usr/share/pixmaps/krusader_user.xpm
+ # install properly kio_isorc
+ install -D -p -m0644 iso/kio_isorc \
+ $(DEB_DESTDIR)/usr/share/config/kio_isorc
+
+binary-post-install/krusader::
+ rm -rf debian/krusader/etc/kde3/
More information about the pkg-kde-commits
mailing list