[Pkg-kde-commits] rev 2383 - people/chrsmrtn/packages/gwenview/debian/patches

Christopher Martin chrsmrtn at costa.debian.org
Sun Nov 27 15:41:59 UTC 2005


Author: chrsmrtn
Date: 2005-11-27 15:41:44 +0000 (Sun, 27 Nov 2005)
New Revision: 2383

Removed:
   people/chrsmrtn/packages/gwenview/debian/patches/01_gv1.3_branch_20051020.diff
Modified:
   people/chrsmrtn/packages/gwenview/debian/patches/98_buildprep.diff
Log:
No more branch diff needed (1.3.1 update) and updated buildprep.


Deleted: people/chrsmrtn/packages/gwenview/debian/patches/01_gv1.3_branch_20051020.diff

Modified: people/chrsmrtn/packages/gwenview/debian/patches/98_buildprep.diff
===================================================================
--- people/chrsmrtn/packages/gwenview/debian/patches/98_buildprep.diff	2005-11-27 15:40:17 UTC (rev 2382)
+++ people/chrsmrtn/packages/gwenview/debian/patches/98_buildprep.diff	2005-11-27 15:41:44 UTC (rev 2383)
@@ -2,7 +2,7 @@
 # vi: ft=diff
 --- acinclude.m4
 +++ acinclude.m4
-@@ -1684,15 +1684,6 @@
+@@ -1689,15 +1689,6 @@
         KDE_USE_CLOSURE_TRUE="#"
         KDE_USE_CLOSURE_FALSE=""
         KDE_NO_UNDEFINED=""
@@ -18,7 +18,7 @@
    fi
    AC_SUBST(KDE_USE_CLOSURE_TRUE)
    AC_SUBST(KDE_USE_CLOSURE_FALSE)
-@@ -2139,9 +2130,6 @@
+@@ -2144,9 +2135,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -28,24 +28,7 @@
  AC_TRY_COMPILE([
  $2
  ],
-@@ -3285,16 +3273,6 @@
- 
- AC_DEFUN([KDE_CHECK_AND_ADD_HIDDEN_VISIBILITY],
- [
--  if test "$GXX" = "yes"; then
--    KDE_CHECK_COMPILER_FLAG(fvisibility=hidden, 
--    [
--        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
--        KDE_CHECK_VISIBILITY_GCC_BUG
--
--        HAVE_GCC_VISIBILITY=1
--        AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
--    ])
--  fi
- ])
- 
- AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY],
-@@ -5800,30 +5778,15 @@
+@@ -5917,30 +5905,15 @@
    fi
  ])
  # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
@@ -66,7 +49,7 @@
 -##
 -## 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 Steet, Fifth Floor, Boston, MA 02110-1301, 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
@@ -81,7 +64,7 @@
  
  
  # AC_PROVIDE_IFELSE(MACRO-NAME, IF-PROVIDED, IF-NOT-PROVIDED)
-@@ -5883,7 +5846,7 @@
+@@ -6000,7 +5973,7 @@
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
@@ -90,7 +73,7 @@
  AC_SUBST(LIBTOOL)dnl
  
  # Prevent multiple expansion
-@@ -5933,7 +5896,7 @@
+@@ -6050,7 +6023,7 @@
  
  # Sed substitution that helps us do robust quoting.  It backslashifies
  # metacharacters that are still active within double-quoted strings.
@@ -99,7 +82,7 @@
  [sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g']
  
  # Same as above, but do not quote variable references.
-@@ -5953,7 +5916,7 @@
+@@ -6070,7 +6043,7 @@
  default_ofile=libtool
  can_build_shared=yes
  
@@ -108,7 +91,7 @@
  # which needs '.lib').
  libext=a
  ltmain="$ac_aux_dir/ltmain.sh"
-@@ -6001,6 +5964,8 @@
+@@ -6118,6 +6091,8 @@
    old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
  fi
  
@@ -117,7 +100,7 @@
  # Only perform the check for file, if the check method requires it
  case $deplibs_check_method in
  file_magic*)
-@@ -6046,6 +6011,48 @@
+@@ -6163,6 +6138,48 @@
  ])# _LT_AC_SYS_COMPILER
  
  
@@ -166,7 +149,7 @@
  # _LT_AC_SYS_LIBPATH_AIX
  # ----------------------
  # Links a minimal program and checks the executable
-@@ -6118,15 +6125,15 @@
+@@ -6235,15 +6252,15 @@
  
  # The HP-UX ksh and POSIX shell print the target directory to stdout
  # if CDPATH is set.
@@ -185,7 +168,7 @@
         (test "X$echo_test_string" = "X$echo_test_string") 2>/dev/null
      then
        break
-@@ -6295,14 +6302,13 @@
+@@ -6412,14 +6429,13 @@
    # Find out which ABI we are using.
    echo 'int i;' > conftest.$ac_ext
    if AC_TRY_EVAL(ac_compile); then
@@ -202,7 +185,7 @@
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
-@@ -6314,7 +6320,6 @@
+@@ -6431,7 +6447,6 @@
        esac
        ;;
      *64-bit*)
@@ -210,7 +193,7 @@
        case $host in
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
-@@ -6379,7 +6384,7 @@
+@@ -6496,7 +6511,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 \
@@ -219,7 +202,7 @@
     -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
     (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -6389,8 +6394,10 @@
+@@ -6506,8 +6521,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
@@ -232,7 +215,7 @@
         $2=yes
       fi
     fi
-@@ -6416,11 +6423,16 @@
+@@ -6533,11 +6550,16 @@
     LDFLAGS="$LDFLAGS $3"
     printf "$lt_simple_link_test_code" > conftest.$ac_ext
     if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -250,7 +233,7 @@
       else
         $2=yes
       fi
-@@ -6444,7 +6456,7 @@
+@@ -6561,7 +6583,7 @@
  AC_MSG_CHECKING([the maximum length of command line arguments])
  AC_CACHE_VAL([lt_cv_sys_max_cmd_len], [dnl
    i=0
@@ -259,7 +242,7 @@
  
    case $build_os in
    msdosdjgpp*)
-@@ -6473,20 +6485,53 @@
+@@ -6590,20 +6612,53 @@
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -319,7 +302,7 @@
      # 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.
-@@ -6582,7 +6627,7 @@
+@@ -6699,7 +6754,7 @@
  }]
  EOF
    if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -328,7 +311,7 @@
      lt_status=$?
      case x$lt_status in
        x$lt_dlno_uscore) $1 ;;
-@@ -6636,7 +6681,7 @@
+@@ -6753,7 +6808,7 @@
      lt_cv_dlopen_self=yes
      ])
     ;;
@@ -337,7 +320,7 @@
    *)
      AC_CHECK_FUNC([shl_load],
  	  [lt_cv_dlopen="shl_load"],
-@@ -6725,20 +6770,13 @@
+@@ -6842,20 +6897,13 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -359,7 +342,7 @@
     -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
     -e 's:$: $lt_compiler_flag:'`
     (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
-@@ -6750,13 +6788,18 @@
+@@ -6867,13 +6915,18 @@
     then
       # The compiler can only warn and ignore the option if not recognized
       # So say no if there are warnings
@@ -382,7 +365,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -6815,8 +6858,8 @@
+@@ -6932,8 +6985,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)" || \
@@ -393,7 +376,7 @@
  
    # We can hardcode non-existant directories.
    if test "$_LT_AC_TAGVAR(hardcode_direct, $1)" != no &&
-@@ -6873,7 +6916,7 @@
+@@ -6990,7 +7043,7 @@
     *)
    AC_MSG_RESULT([no])
      ;;
@@ -402,7 +385,7 @@
  fi
  ])# AC_LIBTOOL_SYS_LIB_STRIP
  
-@@ -6886,7 +6929,7 @@
+@@ -7003,7 +7056,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -411,7 +394,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -6896,7 +6939,20 @@
+@@ -7013,7 +7066,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -433,7 +416,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -6961,7 +7017,7 @@
+@@ -7078,7 +7144,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -442,7 +425,7 @@
    ;;
  
  beos*)
-@@ -6970,7 +7026,7 @@
+@@ -7087,7 +7153,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -451,7 +434,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -6986,7 +7042,7 @@
+@@ -7103,7 +7169,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -460,7 +443,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -6998,7 +7054,8 @@
+@@ -7115,7 +7181,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -470,7 +453,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -7028,7 +7085,7 @@
+@@ -7145,7 +7212,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -479,7 +462,7 @@
        ;;
      esac
      ;;
-@@ -7051,7 +7108,7 @@
+@@ -7168,7 +7235,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -488,16 +471,16 @@
    # 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"`
-@@ -7074,7 +7131,7 @@
+@@ -7191,7 +7258,7 @@
    dynamic_linker=no
    ;;
  
--freebsd*-gnu*)
+-kfreebsd*-gnu*)
 +kfreebsd*-gnu)
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -7086,8 +7143,17 @@
+@@ -7203,8 +7270,17 @@
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -517,7 +500,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -7105,7 +7171,7 @@
+@@ -7222,7 +7298,7 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -526,7 +509,7 @@
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
      ;;
-@@ -7132,9 +7198,9 @@
+@@ -7249,9 +7325,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -538,7 +521,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -7149,7 +7215,7 @@
+@@ -7266,7 +7342,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -547,7 +530,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -7160,7 +7226,7 @@
+@@ -7277,7 +7353,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -556,7 +539,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -7222,22 +7288,19 @@
+@@ -7339,22 +7415,19 @@
    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'
@@ -585,7 +568,7 @@
    # 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,
-@@ -7247,6 +7310,30 @@
+@@ -7364,6 +7437,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -616,7 +599,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -7256,7 +7343,7 @@
+@@ -7373,7 +7470,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -625,7 +608,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -7285,7 +7372,11 @@
+@@ -7402,7 +7499,11 @@
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
@@ -638,7 +621,7 @@
    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
-@@ -7305,7 +7396,7 @@
+@@ -7422,7 +7523,7 @@
  
  os2*)
    libname_spec='$name'
@@ -647,7 +630,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -7451,7 +7542,9 @@
+@@ -7568,7 +7669,9 @@
  
        case $tagname in
        CXX)
@@ -658,7 +641,7 @@
  	  AC_LIBTOOL_LANG_CXX_CONFIG
  	else
  	  tagname=""
-@@ -7513,7 +7606,7 @@
+@@ -7630,7 +7733,7 @@
  
  # AC_LIBTOOL_WIN32_DLL
  # --------------------
@@ -667,7 +650,7 @@
  AC_DEFUN([AC_LIBTOOL_WIN32_DLL],
  [AC_BEFORE([$0], [AC_LIBTOOL_SETUP])
  ])# AC_LIBTOOL_WIN32_DLL
-@@ -7687,7 +7780,7 @@
+@@ -7804,7 +7907,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -676,7 +659,7 @@
  	  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
-@@ -7797,7 +7890,7 @@
+@@ -7914,7 +8017,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,
@@ -685,7 +668,7 @@
        # 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'*)
-@@ -7829,7 +7922,7 @@
+@@ -7946,7 +8049,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,
@@ -694,7 +677,7 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -7856,6 +7949,15 @@
+@@ -7973,6 +8076,15 @@
  *) reload_flag=" $reload_flag" ;;
  esac
  reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -710,7 +693,7 @@
  ])# AC_PROG_LD_RELOAD_FLAG
  
  
-@@ -7889,44 +7991,36 @@
+@@ -8006,44 +8118,36 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -754,7 +737,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
--freebsd*)
+-freebsd* | kfreebsd*-gnu)
 +freebsd* | kfreebsd*-gnu | dragonfly*)
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      case $host_cpu in
@@ -766,7 +749,7 @@
        lt_cv_file_magic_cmd=/usr/bin/file
        lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
        ;;
-@@ -7942,7 +8036,7 @@
+@@ -8059,7 +8163,7 @@
  
  hpux10.20* | hpux11*)
    lt_cv_file_magic_cmd=/usr/bin/file
@@ -775,7 +758,7 @@
    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
-@@ -7959,42 +8053,21 @@
+@@ -8076,42 +8180,21 @@
    ;;
  
  irix5* | irix6* | nonstopux*)
@@ -825,7 +808,7 @@
    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
-@@ -8013,19 +8086,14 @@
+@@ -8130,19 +8213,14 @@
    ;;
  
  openbsd*)
@@ -847,7 +830,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
-@@ -8035,7 +8103,6 @@
+@@ -8152,7 +8230,6 @@
  
  solaris*)
    lt_cv_deplibs_check_method=pass_all
@@ -855,7 +838,7 @@
    ;;
  
  sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -8143,13 +8210,13 @@
+@@ -8260,13 +8337,13 @@
  # -----------------------------------
  # sets LIBLTDL to the link flags for the libltdl convenience library and
  # LTDLINCL to the include flags for the libltdl header and adds
@@ -876,7 +859,7 @@
  AC_DEFUN([AC_LIBLTDL_CONVENIENCE],
  [AC_BEFORE([$0],[AC_LIBTOOL_SETUP])dnl
    case $enable_ltdl_convenience in
-@@ -8168,13 +8235,13 @@
+@@ -8285,13 +8362,13 @@
  # -----------------------------------
  # sets LIBLTDL to the link flags for the libltdl installable library and
  # LTDLINCL to the include flags for the libltdl header and adds
@@ -897,7 +880,7 @@
  # 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
-@@ -8212,10 +8279,21 @@
+@@ -8329,10 +8406,21 @@
  # ---------------
  AC_DEFUN([_LT_AC_LANG_CXX],
  [AC_REQUIRE([AC_PROG_CXX])
@@ -920,7 +903,7 @@
  
  # AC_LIBTOOL_F77
  # --------------
-@@ -8288,6 +8366,10 @@
+@@ -8405,6 +8493,10 @@
  
  _LT_AC_SYS_COMPILER
  
@@ -931,7 +914,7 @@
  #
  # Check for any special shared library compilation flags.
  #
-@@ -8301,7 +8383,7 @@
+@@ -8418,7 +8510,7 @@
  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])
@@ -940,7 +923,7 @@
    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
-@@ -8342,7 +8424,7 @@
+@@ -8459,7 +8551,7 @@
  
  # On AIX, shared libraries and static libraries use the same namespace, and
  # are all built from PIC.
@@ -949,7 +932,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -8351,48 +8433,11 @@
+@@ -8468,48 +8560,11 @@
    fi
    ;;
  
@@ -1000,7 +983,7 @@
  esac
  AC_MSG_RESULT([$enable_shared])
  
-@@ -8417,7 +8462,7 @@
+@@ -8534,7 +8589,7 @@
  AC_DEFUN([_LT_AC_LANG_CXX_CONFIG],
  [AC_LANG_PUSH(C++)
  AC_REQUIRE([AC_PROG_CXX])
@@ -1009,7 +992,7 @@
  
  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
  _LT_AC_TAGVAR(allow_undefined_flag, $1)=
-@@ -8446,7 +8491,7 @@
+@@ -8563,7 +8618,7 @@
  _LT_AC_TAGVAR(compiler_lib_search_path, $1)=
  
  # Source file extension for C++ test sources.
@@ -1018,7 +1001,7 @@
  
  # Object file extension for compiled C++ test sources.
  objext=o
-@@ -8461,6 +8506,10 @@
+@@ -8578,6 +8633,10 @@
  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
  _LT_AC_SYS_COMPILER
  
@@ -1029,7 +1012,7 @@
  # Allow CC to be a program name with arguments.
  lt_save_CC=$CC
  lt_save_LD=$LD
-@@ -8482,7 +8531,7 @@
+@@ -8599,7 +8658,7 @@
  CC=${CXX-"c++"}
  compiler=$CC
  _LT_AC_TAGVAR(compiler, $1)=$CC
@@ -1038,7 +1021,7 @@
  
  # We don't want -fno-exception wen compiling C++ code, so set the
  # no_builtin_flag separately
-@@ -8500,8 +8549,8 @@
+@@ -8617,8 +8676,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
@@ -1049,7 +1032,7 @@
  
      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
      _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-@@ -8527,7 +8576,7 @@
+@@ -8644,7 +8703,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.
@@ -1058,7 +1041,7 @@
    fi
  
    # Commands to make compiler produce verbose output that lists
-@@ -8557,8 +8606,22 @@
+@@ -8674,8 +8733,22 @@
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
@@ -1083,7 +1066,7 @@
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
      fi
-@@ -8575,7 +8638,7 @@
+@@ -8692,7 +8765,7 @@
      _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
  
      if test "$GXX" = yes; then
@@ -1092,7 +1075,7 @@
        # 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`
-@@ -8596,6 +8659,9 @@
+@@ -8713,6 +8786,9 @@
  	fi
        esac
        shared_flag='-shared'
@@ -1102,7 +1085,7 @@
      else
        # not using gcc
        if test "$host_cpu" = ia64; then
-@@ -8604,15 +8670,16 @@
+@@ -8721,15 +8797,16 @@
  	shared_flag='-G'
        else
  	if test "$aix_use_runtimelinking" = yes; then
@@ -1123,7 +1106,7 @@
      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.
-@@ -8621,13 +8688,12 @@
+@@ -8738,13 +8815,12 @@
        _LT_AC_SYS_LIBPATH_AIX
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
  
@@ -1139,7 +1122,7 @@
        else
  	# Determine the default libpath from the value encoded in an empty executable.
  	_LT_AC_SYS_LIBPATH_AIX
-@@ -8641,8 +8707,8 @@
+@@ -8758,8 +8834,8 @@
  	# Exported symbols can be pulled into shared objects from archives
  	_LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
  	_LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
@@ -1150,7 +1133,7 @@
        fi
      fi
      ;;
-@@ -8655,16 +8721,17 @@
+@@ -8772,16 +8848,17 @@
      esac
      ;;
  
@@ -1170,7 +1153,7 @@
        # 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
-@@ -8673,70 +8740,81 @@
+@@ -8790,70 +8867,81 @@
  	echo EXPORTS > $output_objdir/$soname.def;
  	cat $export_symbols >> $output_objdir/$soname.def;
        fi~
@@ -1304,7 +1287,7 @@
  	# Green Hills C++ Compiler
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8747,14 +8825,14 @@
+@@ -8864,14 +8952,14 @@
  	;;
      esac
      ;;
@@ -1316,12 +1299,12 @@
    freebsd-elf*)
      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
      ;;
--  freebsd*)
+-  freebsd* | kfreebsd*-gnu)
 +  freebsd* | kfreebsd*-gnu | dragonfly*)
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      _LT_AC_TAGVAR(ld_shlibs, $1)=yes
-@@ -8771,12 +8849,12 @@
+@@ -8888,12 +8976,12 @@
  				# location of the library.
  
      case $cc_basename in
@@ -1337,7 +1320,7 @@
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
        # linking a shared library.
-@@ -8785,11 +8863,11 @@
+@@ -8902,11 +8990,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.
@@ -1351,7 +1334,7 @@
        else
          # FIXME: insert proper C++ library support
          _LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -8799,7 +8877,7 @@
+@@ -8916,7 +9004,7 @@
      ;;
    hpux10*|hpux11*)
      if test $with_gnu_ld = no; then
@@ -1360,7 +1343,7 @@
        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'
-@@ -8815,7 +8893,7 @@
+@@ -8932,7 +9020,7 @@
          ;;
        esac
      fi
@@ -1369,7 +1352,7 @@
      hppa*64*)
        _LT_AC_TAGVAR(hardcode_direct, $1)=no
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -8836,17 +8914,17 @@
+@@ -8953,17 +9041,17 @@
      esac
  
      case $cc_basename in
@@ -1391,7 +1374,7 @@
  	  ;;
  	esac
  	# Commands to make compiler produce verbose output that lists
-@@ -8862,12 +8940,12 @@
+@@ -8979,12 +9067,12 @@
        *)
  	if test "$GXX" = yes; then
  	  if test $with_gnu_ld = no; then
@@ -1406,7 +1389,7 @@
  	      ;;
  	    esac
  	  fi
-@@ -8880,9 +8958,9 @@
+@@ -8997,9 +9085,9 @@
      ;;
    irix5* | irix6*)
      case $cc_basename in
@@ -1418,7 +1401,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -8893,9 +8971,9 @@
+@@ -9010,9 +9098,9 @@
        *)
  	if test "$GXX" = yes; then
  	  if test "$with_gnu_ld" = no; then
@@ -1430,7 +1413,7 @@
  	  fi
  	fi
  	_LT_AC_TAGVAR(link_all_deplibs, $1)=yes
-@@ -8906,14 +8984,14 @@
+@@ -9023,14 +9111,14 @@
      ;;
    linux*)
      case $cc_basename in
@@ -1448,7 +1431,7 @@
  	# Commands to make compiler produce verbose output that lists
  	# what "hidden" libraries, object files and flags are used when
  	# linking a shared library.
-@@ -8931,20 +9009,44 @@
+@@ -9048,20 +9136,44 @@
  	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
  	;;
@@ -1499,7 +1482,7 @@
  
  	runpath_var=LD_RUN_PATH
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -8972,7 +9074,7 @@
+@@ -9089,7 +9201,7 @@
      ;;
    mvs*)
      case $cc_basename in
@@ -1508,7 +1491,7 @@
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
  	;;
-@@ -8982,7 +9084,7 @@
+@@ -9099,7 +9211,7 @@
  	;;
      esac
      ;;
@@ -1517,7 +1500,7 @@
      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=
-@@ -8993,15 +9095,31 @@
+@@ -9110,15 +9222,31 @@
      # 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::"'
      ;;
@@ -1551,7 +1534,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9011,14 +9129,14 @@
+@@ -9128,14 +9256,14 @@
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -Bstatic -o $oldlib $oldobjs'
  
  	;;
@@ -1569,7 +1552,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9036,7 +9154,7 @@
+@@ -9153,7 +9281,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1578,7 +1561,7 @@
  
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9055,13 +9173,13 @@
+@@ -9172,13 +9300,13 @@
      ;;
    osf4* | osf5*)
      case $cc_basename in
@@ -1594,7 +1577,7 @@
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9070,17 +9188,17 @@
+@@ -9187,17 +9315,17 @@
  	# the KAI C++ compiler.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -o $oldlib $oldobjs'
  	;;
@@ -1616,7 +1599,7 @@
  	  $rm $lib.exp'
  
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -9099,7 +9217,7 @@
+@@ -9216,7 +9344,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  _LT_AC_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
@@ -1625,7 +1608,7 @@
  
  	  _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
  	  _LT_AC_TAGVAR(hardcode_libdir_separator, $1)=:
-@@ -9123,7 +9241,7 @@
+@@ -9240,7 +9368,7 @@
    sco*)
      _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
      case $cc_basename in
@@ -1634,7 +1617,7 @@
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
  	;;
-@@ -9135,12 +9253,12 @@
+@@ -9252,12 +9380,12 @@
      ;;
    sunos4*)
      case $cc_basename in
@@ -1649,7 +1632,7 @@
  	# Lucid
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9153,36 +9271,33 @@
+@@ -9270,36 +9398,33 @@
      ;;
    solaris*)
      case $cc_basename in
@@ -1698,7 +1681,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -9190,9 +9305,9 @@
+@@ -9307,9 +9432,9 @@
  	# in the archive.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC -xar -o $oldlib $oldobjs'
  	;;
@@ -1710,7 +1693,7 @@
  
  	# The C++ compiler must be used to create the archive.
  	_LT_AC_TAGVAR(old_archive_cmds, $1)='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -9202,9 +9317,9 @@
+@@ -9319,9 +9444,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
@@ -1722,7 +1705,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -9213,9 +9328,9 @@
+@@ -9330,9 +9455,9 @@
  	  else
  	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	    # platform.
@@ -1734,7 +1717,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -9233,7 +9348,7 @@
+@@ -9350,7 +9475,7 @@
      ;;
    tandem*)
      case $cc_basename in
@@ -1743,7 +1726,7 @@
  	# NonStop-UX NCC 3.20
  	# FIXME: insert proper C++ library support
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
-@@ -9343,7 +9458,7 @@
+@@ -9460,7 +9585,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.
@@ -1752,7 +1735,7 @@
  
    for p in `eval $output_verbose_link_cmd`; do
      case $p in
-@@ -9383,7 +9498,7 @@
+@@ -9500,7 +9625,7 @@
         fi
         ;;
  
@@ -1761,7 +1744,7 @@
         # This assumes that the test object file only shows up
         # once in the compiler output.
         if test "$p" = "conftest.$objext"; then
-@@ -9419,6 +9534,21 @@
+@@ -9536,6 +9661,21 @@
  
  $rm -f confest.$objext
  
@@ -1783,7 +1766,7 @@
  case " $_LT_AC_TAGVAR(postdeps, $1) " in
  *" -lc "*) _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no ;;
  esac
-@@ -9469,12 +9599,16 @@
+@@ -9586,12 +9726,16 @@
  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
  _LT_AC_SYS_COMPILER
  
@@ -1801,7 +1784,7 @@
  
  AC_MSG_CHECKING([if libtool supports shared libraries])
  AC_MSG_RESULT([$can_build_shared])
-@@ -9484,7 +9618,7 @@
+@@ -9601,7 +9745,7 @@
  
  # On AIX, shared libraries and static libraries use the same namespace, and
  # are all built from PIC.
@@ -1810,7 +1793,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -9492,8 +9626,10 @@
+@@ -9609,8 +9753,10 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
@@ -1823,7 +1806,7 @@
    ;;
  esac
  AC_MSG_RESULT([$enable_shared])
-@@ -9544,20 +9680,27 @@
+@@ -9661,20 +9807,27 @@
  lt_simple_compile_test_code="class foo {}\n"
  
  # Code to be used in simple link tests
@@ -1852,7 +1835,7 @@
  ## 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
-@@ -9604,11 +9747,16 @@
+@@ -9721,11 +9874,16 @@
  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
  _LT_AC_SYS_COMPILER
  
@@ -1869,7 +1852,7 @@
  _LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
  
  AC_LIBTOOL_CONFIG($1)
-@@ -9634,11 +9782,12 @@
+@@ -9751,11 +9909,12 @@
    # without removal of \ escapes.
    if test -n "${ZSH_VERSION+set}" ; then
      setopt NO_GLOB_SUBST
@@ -1884,7 +1867,7 @@
      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 \
-@@ -9688,7 +9837,7 @@
+@@ -9805,7 +9964,7 @@
      _LT_AC_TAGVAR(archive_cmds, $1) | \
      _LT_AC_TAGVAR(archive_expsym_cmds, $1) | \
      _LT_AC_TAGVAR(module_cmds, $1) | \
@@ -1893,16 +1876,7 @@
      _LT_AC_TAGVAR(old_archive_from_expsyms_cmds, $1) | \
      _LT_AC_TAGVAR(export_symbols_cmds, $1) | \
      extract_expsyms_cmds | reload_cmds | finish_cmds | \
-@@ -9743,7 +9892,7 @@
- #
- # 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 Steet, Fifth Floor, Boston, MA 02110-1301, 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
-@@ -9754,11 +9903,11 @@
+@@ -9871,11 +10030,11 @@
  SED=$lt_SED
  
  # Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -1916,7 +1890,7 @@
  
  # The names of the tagged configurations supported by this script.
  available_tags=
-@@ -9789,6 +9938,12 @@
+@@ -9906,6 +10065,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -1929,7 +1903,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -9819,7 +9974,7 @@
+@@ -9936,7 +10101,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -1938,7 +1912,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -9850,7 +10005,7 @@
+@@ -9967,7 +10132,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -1947,7 +1921,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -9865,7 +10020,7 @@
+@@ -9982,7 +10147,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_[]_LT_AC_TAGVAR(lt_cv_prog_compiler_c_o, $1)
  
@@ -1956,7 +1930,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -10094,7 +10249,10 @@
+@@ -10211,7 +10376,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.
@@ -1968,7 +1942,7 @@
  fi
  ])# AC_LIBTOOL_CONFIG
  
-@@ -10136,9 +10294,6 @@
+@@ -10253,9 +10421,6 @@
  # Regexp to match symbols that can be accessed directly from C.
  sympat='\([[_A-Za-z]][[_A-Za-z0-9]]*\)'
  
@@ -1978,7 +1952,7 @@
  # 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'"
  
-@@ -10160,6 +10315,13 @@
+@@ -10277,6 +10442,13 @@
    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'"
    ;;
@@ -1992,7 +1966,7 @@
  irix* | nonstopux*)
    symcode='[[BCDEGRST]]'
    ;;
-@@ -10167,7 +10329,7 @@
+@@ -10284,7 +10456,7 @@
    symcode='[[BCDEGQRST]]'
    ;;
  solaris* | sysv5*)
@@ -2001,7 +1975,7 @@
    ;;
  sysv4)
    symcode='[[DFNSTU]]'
-@@ -10185,14 +10347,17 @@
+@@ -10302,14 +10474,17 @@
  # If we're using GNU nm, then use its standard symbol codes.
  case `$NM -V 2>&1` in
  *GNU* | *'with BFD'*)
@@ -2021,7 +1995,7 @@
  
    # Check to see that the pipe works correctly.
    pipe_works=no
-@@ -10356,7 +10521,7 @@
+@@ -10473,7 +10648,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -2030,7 +2004,7 @@
        hppa*64*|ia64*)
  	;;
        *)
-@@ -10381,18 +10546,28 @@
+@@ -10498,18 +10673,28 @@
  	;;
        chorus*)
  	case $cc_basename in
@@ -2062,11 +2036,11 @@
  	    # Green Hills C++ Compiler
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
  	    ;;
-@@ -10400,22 +10575,22 @@
+@@ -10517,22 +10702,22 @@
  	    ;;
  	esac
  	;;
--      freebsd*)
+-      freebsd* | kfreebsd*-gnu)
 +      freebsd* | kfreebsd*-gnu | dragonfly*)
  	# FreeBSD uses GNU C++
  	;;
@@ -2089,7 +2063,7 @@
  	    hppa*64*|ia64*)
  	      # +Z the default
  	      ;;
-@@ -10430,7 +10605,7 @@
+@@ -10547,7 +10732,7 @@
  	;;
        irix5* | irix6* | nonstopux*)
  	case $cc_basename in
@@ -2098,7 +2072,7 @@
  	    _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.
-@@ -10441,18 +10616,24 @@
+@@ -10558,18 +10743,24 @@
  	;;
        linux*)
  	case $cc_basename in
@@ -2127,7 +2101,7 @@
  	    # Compaq C++
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
  	    # Linux and Compaq Tru64 Unix objects are PIC.
-@@ -10469,25 +10650,25 @@
+@@ -10586,25 +10777,25 @@
  	;;
        mvs*)
  	case $cc_basename in
@@ -2158,7 +2132,7 @@
  	    # Digital/Compaq C++
  	    _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -10503,7 +10684,7 @@
+@@ -10620,7 +10811,7 @@
  	;;
        sco*)
  	case $cc_basename in
@@ -2167,7 +2141,7 @@
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
  	    ;;
  	  *)
-@@ -10512,13 +10693,13 @@
+@@ -10629,13 +10820,13 @@
  	;;
        solaris*)
  	case $cc_basename in
@@ -2183,7 +2157,7 @@
  	    # Green Hills C++ Compiler
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
  	    ;;
-@@ -10528,12 +10709,12 @@
+@@ -10645,12 +10836,12 @@
  	;;
        sunos4*)
  	case $cc_basename in
@@ -2198,7 +2172,7 @@
  	    # Lucid
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
  	    ;;
-@@ -10543,7 +10724,7 @@
+@@ -10660,7 +10851,7 @@
  	;;
        tandem*)
  	case $cc_basename in
@@ -2207,7 +2181,7 @@
  	    # NonStop-UX NCC 3.20
  	    _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
  	    ;;
-@@ -10614,7 +10795,7 @@
+@@ -10731,7 +10922,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -2216,7 +2190,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -10640,6 +10821,16 @@
+@@ -10757,6 +10948,16 @@
  	_LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -2233,7 +2207,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -10651,7 +10842,7 @@
+@@ -10768,7 +10969,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.
@@ -2242,7 +2216,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -10675,12 +10866,19 @@
+@@ -10792,12 +10993,19 @@
        ;;
  
      linux*)
@@ -2263,7 +2237,7 @@
        ccc*)
          _LT_AC_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
          # All Alpha code is PIC.
-@@ -10701,9 +10899,14 @@
+@@ -10818,9 +11026,14 @@
        ;;
  
      solaris*)
@@ -2279,7 +2253,7 @@
        ;;
  
      sunos4*)
-@@ -10725,6 +10928,11 @@
+@@ -10842,6 +11055,11 @@
        fi
        ;;
  
@@ -2291,7 +2265,7 @@
      uts4*)
        _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)='-pic'
        _LT_AC_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-@@ -10752,7 +10960,7 @@
+@@ -10869,7 +11087,7 @@
      [_LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
       _LT_AC_TAGVAR(lt_prog_compiler_can_build_shared, $1)=no])
  fi
@@ -2300,7 +2274,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      _LT_AC_TAGVAR(lt_prog_compiler_pic, $1)=
-@@ -10785,7 +10993,10 @@
+@@ -10902,7 +11120,10 @@
      _LT_AC_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
    ;;
    cygwin* | mingw*)
@@ -2312,7 +2286,7 @@
    ;;
    *)
      _LT_AC_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -10811,7 +11022,7 @@
+@@ -10928,7 +11149,7 @@
    _LT_AC_TAGVAR(link_all_deplibs, $1)=unknown
    _LT_AC_TAGVAR(hardcode_automatic, $1)=no
    _LT_AC_TAGVAR(module_cmds, $1)=
@@ -2321,7 +2295,7 @@
    _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*
-@@ -10828,7 +11039,8 @@
+@@ -10945,7 +11166,8 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -2331,7 +2305,7 @@
    case $host_os in
    cygwin* | mingw* | pw32*)
      # FIXME: the MSVC++ port hasn't been tested in a loooong time
-@@ -10848,6 +11060,27 @@
+@@ -10965,6 +11187,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -2359,7 +2333,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -10885,7 +11118,7 @@
+@@ -11002,7 +11245,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
@@ -2368,7 +2342,7 @@
        else
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -10895,13 +11128,13 @@
+@@ -11012,13 +11255,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'
@@ -2385,13 +2359,14 @@
  	# 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
-@@ -10910,19 +11143,51 @@
+@@ -11027,19 +11270,51 @@
  	  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}--image-base=0x10000000  ${wl}--out-implib,$lib'
-+      else
+       else
+-	ld_shlibs=no
 +	_LT_AC_TAGVAR(ld_shlibs, $1)=no
 +      fi
 +      ;;
@@ -2423,8 +2398,7 @@
 +	  $CC -shared'"$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
--	ld_shlibs=no
++      else
 +	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
        ;;
@@ -2442,7 +2416,7 @@
        fi
        ;;
  
-@@ -10940,8 +11205,8 @@
+@@ -11057,8 +11332,8 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -2453,7 +2427,7 @@
        else
  	_LT_AC_TAGVAR(ld_shlibs, $1)=no
        fi
-@@ -10956,24 +11221,19 @@
+@@ -11073,24 +11348,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -2485,7 +2459,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -11007,9 +11267,20 @@
+@@ -11124,9 +11394,20 @@
  	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
@@ -2508,7 +2482,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -11026,7 +11297,7 @@
+@@ -11143,7 +11424,7 @@
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
  
        if test "$GCC" = yes; then
@@ -2517,7 +2491,7 @@
  	# 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`
-@@ -11047,6 +11318,9 @@
+@@ -11164,6 +11445,9 @@
  	  fi
  	esac
  	shared_flag='-shared'
@@ -2527,7 +2501,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -11055,29 +11329,29 @@
+@@ -11172,29 +11456,29 @@
  	  shared_flag='-G'
  	else
    	if test "$aix_use_runtimelinking" = yes; then
@@ -2566,7 +2540,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 _LT_AC_SYS_LIBPATH_AIX
-@@ -11091,8 +11365,8 @@
+@@ -11208,8 +11492,8 @@
  	  # Exported symbols can be pulled into shared objects from archives
  	  _LT_AC_TAGVAR(whole_archive_flag_spec, $1)=' '
  	  _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=yes
@@ -2577,7 +2551,7 @@
  	fi
        fi
        ;;
-@@ -11105,7 +11379,7 @@
+@@ -11222,7 +11506,7 @@
        _LT_AC_TAGVAR(ld_shlibs, $1)=no
        ;;
  
@@ -2586,7 +2560,7 @@
        _LT_AC_TAGVAR(export_dynamic_flag_spec, $1)=-rdynamic
        ;;
  
-@@ -11115,69 +11389,69 @@
+@@ -11232,69 +11516,69 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
@@ -2702,18 +2676,18 @@
        ;;
  
      dgux*)
-@@ -11210,8 +11484,8 @@
+@@ -11327,8 +11611,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd*)
+-    freebsd* | kfreebsd*-gnu)
 -      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
 +    freebsd* | kfreebsd*-gnu | 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
-@@ -11219,7 +11493,7 @@
+@@ -11336,7 +11620,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -2722,7 +2696,7 @@
        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
-@@ -11235,16 +11509,16 @@
+@@ -11352,16 +11636,16 @@
  
      hpux10* | hpux11*)
        if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -2743,7 +2717,7 @@
  	hppa*64*|ia64*)
  	  _LT_AC_TAGVAR(archive_cmds, $1)='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
  	  ;;
-@@ -11254,7 +11528,7 @@
+@@ -11371,7 +11655,7 @@
  	esac
        fi
        if test "$with_gnu_ld" = no; then
@@ -2752,7 +2726,7 @@
  	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'
-@@ -11287,7 +11561,7 @@
+@@ -11404,7 +11688,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -2761,7 +2735,7 @@
        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'
-@@ -11297,7 +11571,7 @@
+@@ -11414,7 +11698,7 @@
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
        ;;
  
@@ -2770,7 +2744,7 @@
        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
-@@ -11320,7 +11594,8 @@
+@@ -11437,7 +11721,8 @@
        _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
@@ -2780,7 +2754,7 @@
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	_LT_AC_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
        else
-@@ -11330,7 +11605,7 @@
+@@ -11447,7 +11732,7 @@
  	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
  	   ;;
  	 *)
@@ -2789,7 +2763,7 @@
  	   _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -11341,14 +11616,14 @@
+@@ -11458,14 +11743,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
@@ -2806,7 +2780,7 @@
        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'
-@@ -11360,13 +11635,13 @@
+@@ -11477,13 +11762,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}\*'
@@ -2822,7 +2796,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	_LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
-@@ -11385,10 +11660,12 @@
+@@ -11502,10 +11787,12 @@
      solaris*)
        _LT_AC_TAGVAR(no_undefined_flag, $1)=' -z text'
        if test "$GCC" = yes; then
@@ -2837,7 +2811,7 @@
  	_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'
-@@ -11397,8 +11674,18 @@
+@@ -11514,8 +11801,18 @@
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
        case $host_os in
        solaris2.[[0-5]] | solaris2.[[0-5]].*) ;;
@@ -2858,7 +2832,7 @@
        esac
        _LT_AC_TAGVAR(link_all_deplibs, $1)=yes
        ;;
-@@ -11407,7 +11694,7 @@
+@@ -11524,7 +11821,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.
@@ -2867,7 +2841,7 @@
        else
  	_LT_AC_TAGVAR(archive_cmds, $1)='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -11467,9 +11754,9 @@
+@@ -11584,9 +11881,9 @@
     sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[[78]]* | unixware7*)
        _LT_AC_TAGVAR(no_undefined_flag, $1)='${wl}-z ${wl}text'
        if test "$GCC" = yes; then
@@ -2879,7 +2853,7 @@
        fi
        runpath_var='LD_RUN_PATH'
        _LT_AC_TAGVAR(hardcode_shlibpath_var, $1)=no
-@@ -11527,7 +11814,7 @@
+@@ -11644,7 +11941,7 @@
        AC_MSG_CHECKING([whether -lc should be explicitly linked in])
        $rm conftest*
        printf "$lt_simple_compile_test_code" > conftest.$ac_ext
@@ -2888,7 +2862,7 @@
        if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
          soname=conftest
          lib=conftest
-@@ -11661,7 +11948,7 @@
+@@ -11778,7 +12075,7 @@
  # 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
@@ -2910,7 +2884,7 @@
  # 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.
-@@ -11,12089 +11,53 @@
+@@ -11,12206 +11,53 @@
  # even the implied warranty of MERCHANTABILITY or FITNESS FOR A
  # PARTICULAR PURPOSE.
  
@@ -2936,7 +2910,7 @@
 -
 -dnl    You should have received a copy of the GNU Library General Public License
 -dnl    along with this library; see the file COPYING.LIB.  If not, write to
--dnl    the Free Software Foundation, Inc., 51 Franklin Steet, Fifth Floor,
+-dnl    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
 -dnl    Boston, MA 02110-1301, USA.
 -
 -dnl IMPORTANT NOTE:
@@ -3510,9 +3484,14 @@
 -              if test "$kde_qtsubver" -le 1; then
 -                kde32ornewer=
 -              fi
--              if test "$kde_qtsubver" -le 2 -o `$KDECONFIG --version | grep KDE | sed 's/KDE: \(...\).*/\1/'` = 3.2; then
+-              if test "$kde_qtsubver" -le 2; then
 -                kde33ornewer=
 -              fi
+-              if test "$KDECONFIG" != "compiled"; then
+-                if test `$KDECONFIG --version | grep KDE | sed 's/KDE: \(...\).*/\1/'` = 3.2; then
+-                  kde33ornewer=
+-                fi
+-              fi
 -            fi
 -        fi
 -
@@ -3526,7 +3505,7 @@
 -        fi
 -        KDE_FIND_PATH(xmllint, XMLLINT, [${prefix}/bin ${exec_prefix}/bin], [XMLLINT=""])
 -
--        if test -n "$MEINPROC" && test ! "$MEINPROC" = "compiled"; then  
+-        if test -n "$MEINPROC" -a "$MEINPROC" != "compiled"; then
 - 	    kde_sharedirs="/usr/share/kde /usr/local/share /usr/share /opt/kde3/share /opt/kde/share $prefix/share"
 -            test -n "$KDEDIR" && kde_sharedirs="$KDEDIR/share $kde_sharedirs"
 -            AC_FIND_FILE(apps/ksgmltools2/customization/kde-chunk.xsl, $kde_sharedirs, KDE_XSL_STYLESHEET)
@@ -4568,8 +4547,8 @@
 -
 -If you did install kdelibs, then the Qt version that is picked up by
 -this configure is not the same version you used to compile kdelibs. 
--The Qt Plugin installed by kdelibs is *ONLY* loadable if its the 
--same Qt version, compiled with the same compiler and the same Qt
+-The Qt Plugin installed by kdelibs is *ONLY* loadable if it is the 
+-_same Qt version_, compiled with the _same compiler_ and the same Qt
 -configuration settings.
 -])
 -fi
@@ -5423,22 +5402,16 @@
 -ac_save_CFLAGS="$CFLAGS"
 -CFLAGS="$CFLAGS $all_includes $USER_INCLUDES"
 -AC_TRY_LINK(
--[/* Override any gcc2 internal prototype to avoid an error.  */
--struct jpeg_decompress_struct;
--typedef struct jpeg_decompress_struct * j_decompress_ptr;
--typedef int size_t;
+-[
 -#ifdef __cplusplus
 -extern "C" {
 -#endif
--    void jpeg_CreateDecompress(j_decompress_ptr cinfo,
--                                    int version, size_t structsize);
+-void jpeg_CreateDecompress();
 -#ifdef __cplusplus
 -}
 -#endif
--/* We use char because int might match the return type of a gcc2
--    builtin and then its argument prototype would still apply.  */
 -],
--            [jpeg_CreateDecompress(0L, 0, 0);],
+-[jpeg_CreateDecompress();],
 -            eval "ac_cv_lib_jpeg_$1=-ljpeg$2",
 -            eval "ac_cv_lib_jpeg_$1=no")
 -LIBS="$ac_save_LIBS"
@@ -5645,7 +5618,74 @@
 -AC_SUBST(LIBTIFF)
 -])
 -
+-AC_DEFUN([KDE_FIND_LIBEXR],
+-[
+-AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
+-AC_REQUIRE([AC_FIND_ZLIB])
+-AC_CACHE_VAL(ac_cv_libexr,
+-[
+-  if test -z "$PKG_CONFIG"; then
+-    AC_PATH_PROG(PKG_CONFIG, pkg-config, no)
+-  fi
 -
+-  AC_MSG_CHECKING([for OpenEXR libraries])
+-
+-  if test "$PKG_CONFIG" = "no" ; then
+-     AC_MSG_RESULT(no)
+-     echo "*** The pkg-config script could not be found. Make sure it is"
+-     echo "*** in your path, or set the PKG_CONFIG environment variable"
+-     echo "*** to the full path to pkg-config."
+-     echo "*** Or see http://www.freedesktop.org/software/pkgconfig to get pkg-config."
+-  else
+-     if !(`$PKG_CONFIG --exists OpenEXR`) ; then
+-        AC_MSG_RESULT(no)
+-        EXRSTATUS=no
+-     else
+-        if !(`$PKG_CONFIG --atleast-version="1.1.1" OpenEXR`) ; then
+-           AC_MSG_RESULT(no)
+-           EXRSTATUS=old
+-        else
+-           kde_save_LIBS="$LIBS"
+-           LIBS="$LIBS $all_libraries $USER_LDFLAGS $LIBZ `pkg-config --libs OpenEXR`"
+-           AC_LANG_SAVE
+-           AC_LANG_CPLUSPLUS
+-           kde_save_CXXFLAGS="$CXXFLAGS"
+-           EXR_FLAGS=`$PKG_CONFIG --cflags OpenEXR`
+-           CXXFLAGS="$CXXFLAGS $all_includes $USER_INCLUDES $EXR_FLAGS"
+-
+-           AC_TRY_LINK(dnl
+-               [
+-               #include <ImfRgbaFile.h>
+-               ],
+-               [
+-               using namespace Imf;
+-               RgbaInputFile file ("dummy");
+-               return 0;
+-               ],
+-               eval "ac_cv_libexr='`pkg-config --libs OpenEXR`'",
+-               eval "ac_cv_libexr=no"
+-           )
+-           LIBS="$kde_save_LIBS"
+-           CXXFLAGS="$kde_save_CXXFLAGS"
+-           AC_LANG_RESTORE
+-           ])dnl
+-           if eval "test ! \"`echo $ac_cv_libexr`\" = no"; then
+-               AC_DEFINE_UNQUOTED(HAVE_EXR, 1, [Define if you have OpenEXR])
+-               LIB_EXR="$ac_cv_libexr"
+-               AC_MSG_RESULT($ac_cv_libexr)
+-           else
+-               AC_MSG_RESULT(no)
+-               LIB_EXR=""
+-           fi
+-        fi
+-     fi
+-  fi
+-  AC_SUBST(LIB_EXR)
+-  AC_SUBST(EXR_FLAGS)
+-])
+-
+-
+-
 -AC_DEFUN([AC_FIND_PNG],
 -[
 -AC_REQUIRE([KDE_CHECK_EXTRA_LIBS])
@@ -6024,8 +6064,7 @@
 -
 -  if test "$kde_use_warnings" = "yes"; then
 -      if test "$GCC" = "yes"; then
--        dnl ### FIXME: remove -Wno-non-virtual-dtor for KDE 4
--        CXXFLAGS="-Wall -W -Wpointer-arith -Wno-non-virtual-dtor $CXXFLAGS"
+-        CXXFLAGS="-Wall -W -Wpointer-arith $CXXFLAGS"
 -        case $host in
 -          *-*-linux-gnu)	
 -            CFLAGS="-std=iso9899:1990 -W -Wall -Wchar-subscripts -Wshadow -Wpointer-arith -Wmissing-prototypes -Wwrite-strings -D_XOPEN_SOURCE=500 -D_BSD_SOURCE $CFLAGS"
@@ -6036,7 +6075,8 @@
 -        esac
 -        KDE_CHECK_COMPILER_FLAG(Wundef,[CXXFLAGS="-Wundef $CXXFLAGS"])
 -        KDE_CHECK_COMPILER_FLAG(Wno-long-long,[CXXFLAGS="-Wno-long-long $CXXFLAGS"])
--        KDE_CHECK_COMPILER_FLAG(Wnon-virtual-dtor,[CXXFLAGS="-Wnon-virtual-dtor $CXXFLAGS"])
+-        dnl ### FIXME: revert for KDE 4
+-        KDE_CHECK_COMPILER_FLAG(Wno-non-virtual-dtor,[CXXFLAGS="$CXXFLAGS -Wno-non-virtual-dtor"])
 -     fi
 -  fi
 -
@@ -6208,25 +6248,77 @@
 -  ]
 -)
 -
--AC_DEFUN([KDE_CHECK_AND_ADD_HIDDEN_VISIBILITY],
+-AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY],
 -[
--  if test "$GXX" = "yes"; then
+-  AC_BEFORE([AC_PATH_QT_1_3], [KDE_ENABLE_HIDDEN_VISIBILITY])
+-
+-  AC_MSG_CHECKING([grepping for visibility push/pop in headers])
+-
+-  if test "x$GXX" = "xyes"; then
+-    AC_LANG_SAVE
+-    AC_LANG_CPLUSPLUS
+-    AC_EGREP_CPP(
+-       [GCC visibility push],
+-       [ #include <exception> 
+-       ], 
+-    [
+-      AC_MSG_RESULT(yes)
+-      kde_stdc_visibility_patched=yes ],
+-    [ 
+-      AC_MSG_RESULT(no)
+-      AC_MSG_WARN([Your libstdc++ doesn't appear to be patched for 
+-                   visibility support. Disabling -fvisibility=hidden])
+-
+-      kde_stdc_visibility_patched=no ])
+-
+-    AC_LANG_RESTORE
+-
+-    kde_have_gcc_visibility=no
 -    KDE_CHECK_COMPILER_FLAG(fvisibility=hidden, 
 -    [
+-      kde_have_gcc_visibility=yes
+-      dnl the whole toolchain is just a mess, gcc is just too buggy
+-      dnl to handle STL with visibility enabled. Lets reconsider 
+-      dnl when gcc 4.2 is out or when things get fixed in the compiler.
+-      dnl Contact mueller at kde.org for details.
+-      AC_ARG_ENABLE(gcc-hidden-visibility,
+-        AC_HELP_STRING([--enable-gcc-hidden-visibility],[toolchain hidden visibility [default=no]]),
+-          [kde_have_gcc_visibility=$enableval],
+-          [kde_have_gcc_visibility=no])
+-
+-      AC_CACHE_CHECK([if Qt is patched for -fvisibility], kde_cv_val_qt_gcc_visibility_patched,
+-        [
+-          AC_LANG_SAVE
+-          AC_LANG_CPLUSPLUS
+-
+-          safe_CXXFLAGS=$CXXFLAGS
+-          CXXFLAGS="$CXXFLAGS $all_includes"
+-
+-          AC_TRY_COMPILE(
+-          [
+-#include <qglobal.h>
+-#if Q_EXPORT - 0 != 0
+-/* if this compiles, then Q_EXPORT is undefined */
+-/* if Q_EXPORT is nonempty, this will break compilation */
+-#endif
+-          ], [/* elvis is alive */],
+-          kde_cv_val_qt_gcc_visibility_patched=no, kde_cv_val_qt_gcc_visibility_patched=yes)
+-
+-          CXXFLAGS=$safe_CXXFLAGS
+-          AC_LANG_RESTORE
+-        ]
+-      )
+-
+-      if test x$kde_have_gcc_visibility = "xyes" && test x$kde_stdc_visibility_patched = "xyes" && test x$kde_cv_val_qt_gcc_visibility_patched = "xyes"; then
 -        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
 -        KDE_CHECK_VISIBILITY_GCC_BUG
--
 -        HAVE_GCC_VISIBILITY=1
 -        AC_DEFINE_UNQUOTED(__KDE_HAVE_GCC_VISIBILITY, "$HAVE_GCC_VISIBILITY", [define to 1 if -fvisibility is supported])
+-      fi
 -    ])
 -  fi
 -])
 -
--AC_DEFUN([KDE_ENABLE_HIDDEN_VISIBILITY],
--[
--  AC_REQUIRE([KDE_CHECK_AND_ADD_HIDDEN_VISIBILITY])
--])
--
 -AC_DEFUN([KDE_ADD_DEPENDENCIES],
 -[
 -   [A]M_DEPENDENCIES(CC)
@@ -6686,7 +6778,8 @@
 -      ac_save_ldflags="$LDFLAGS"
 -      ac_save_cflags="$CFLAGS"
 -      ac_save_libs="$LIBS"
--      LDFLAGS="$LDFLAGS $DPMS_LDFLAGS $all_libraries -lX11 -lXext $LIBSOCKET"
+-      LDFLAGS="$LDFLAGS $DPMS_LDFLAGS $all_libraries"
+-      LIBS="-lX11 -lXext $LIBSOCKET"
 -      CFLAGS="$CFLAGS $X_INCLUDES"
 -      test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS"
 -      AC_TRY_LINK([
@@ -6697,12 +6790,7 @@
 -	  int foo_test_dpms()
 -	  { return DPMSSetTimeouts( 0, 0, 0, 0 ); }],[],
 -	  ac_cv_have_dpms="yes", [
--              LDFLAGS="$ac_save_ldflags"
--              CFLAGS="$ac_save_cflags"
--              LDFLAGS="$LDFLAGS $DPMS_LDFLAGS $all_libraries -lX11 -lXext $LIBSOCKET"
--              LIBS="$LIBS -lXdpms"
--              CFLAGS="$CFLAGS $X_INCLUDES"
--              test -n "$DPMS_INCLUDE" && CFLAGS="-I$DPMS_INCLUDE $CFLAGS"
+-              LIBS="-lXdpms $LIBS"
 -              AC_TRY_LINK([
 -	          #include <X11/Xproto.h>
 -        	  #include <X11/X.h>
@@ -6751,12 +6839,14 @@
 -   [Define if you have the DPMSCapable prototype in <X11/extensions/dpms.h>])
 - AC_CHECK_DECL(DPMSCapable,
 -   AC_DEFINE(HAVE_DPMSCAPABLE_PROTO),,
--   [#include <X11/extensions/dpms.h>])
+-   [#include <X11/Xlib.h>
+-   #include <X11/extensions/dpms.h>])
 - AH_TEMPLATE(HAVE_DPMSINFO_PROTO,
 -   [Define if you have the DPMSInfo prototype in <X11/extensions/dpms.h>])
 - AC_CHECK_DECL(DPMSInfo,
 -   AC_DEFINE(HAVE_DPMSINFO_PROTO),,
--   [#include <X11/extensions/dpms.h>])
+-   [#include <X11/Xlib.h>
+-   #include <X11/extensions/dpms.h>])
 - CFLAGS="$ac_save_cflags"
 - AC_SUBST(DPMSINC)
 - AC_SUBST(DPMSLIB)
@@ -8698,12 +8788,13 @@
 -
 -    CXXFLAGS=$safe_CXXFLAGS
 -    LDFLAGS=$safe_LDFLAGS
+-    AC_LANG_RESTORE
 -  ])
 -
 -  AC_MSG_CHECKING(if enabling -pie/fpie support)
 -
 -  AC_ARG_ENABLE(pie,
--    AS_HELP_STRING([--enable-pie],[platform supports PIE linking [default=detect]]),
+-    AC_HELP_STRING([--enable-pie],[platform supports PIE linking [default=detect]]),
 -      [kde_has_pie_support=$enableval],
 -      [kde_has_pie_support=detect])
 -
@@ -9977,7 +10068,7 @@
 -  dynamic_linker=no
 -  ;;
 -
--freebsd*-gnu*)
+-kfreebsd*-gnu*)
 -  version_type=linux
 -  need_lib_prefix=no
 -  need_version=no
@@ -10823,7 +10914,7 @@
 -  lt_cv_deplibs_check_method=pass_all
 -  ;;
 -
--freebsd*)
+-freebsd* | kfreebsd*-gnu)
 -  if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
 -    case $host_cpu in
 -    i*86 )
@@ -11653,7 +11744,7 @@
 -  freebsd-elf*)
 -    _LT_AC_TAGVAR(archive_cmds_need_lc, $1)=no
 -    ;;
--  freebsd*)
+-  freebsd* | kfreebsd*-gnu)
 -    # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
 -    # conventions
 -    _LT_AC_TAGVAR(ld_shlibs, $1)=yes
@@ -12634,7 +12725,7 @@
 -#
 -# 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 Steet, Fifth Floor, Boston, MA 02110-1301, 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
@@ -13291,7 +13382,7 @@
 -	    ;;
 -	esac
 -	;;
--      freebsd*)
+-      freebsd* | kfreebsd*-gnu)
 -	# FreeBSD uses GNU C++
 -	;;
 -      hpux9* | hpux10* | hpux11*)
@@ -14101,7 +14192,7 @@
 -      ;;
 -
 -    # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd*)
+-    freebsd* | kfreebsd*-gnu)
 -      _LT_AC_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
 -      _LT_AC_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
 -      _LT_AC_TAGVAR(hardcode_direct, $1)=yes
@@ -15041,7 +15132,7 @@
  
  # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
  # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
-@@ -12133,131 +97,55 @@
+@@ -12250,131 +97,55 @@
  # absolute PATH.  The drawback is that using absolute paths prevent a
  # configured tree to be moved without reconfiguration.
  
@@ -15210,7 +15301,7 @@
  
  # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
  # written in clear, in which case automake, when reading aclocal.m4,
-@@ -12266,7 +154,6 @@
+@@ -12383,7 +154,6 @@
  # CC etc. in the Makefile, will ask for an AC_PROG_CC use...
  
  
@@ -15218,7 +15309,7 @@
  # _AM_DEPENDENCIES(NAME)
  # ----------------------
  # See how the compiler implements dependency checking.
-@@ -12325,7 +212,9 @@
+@@ -12442,7 +212,9 @@
      : > sub/conftest.c
      for i in 1 2 3 4 5 6; do
        echo '#include "conftst'$i'.h"' >> sub/conftest.c
@@ -15229,7 +15320,7 @@
      done
      echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
  
-@@ -12353,9 +242,14 @@
+@@ -12470,9 +242,14 @@
         grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
        # icc doesn't choke on unknown options, it will just issue warnings
@@ -15247,7 +15338,7 @@
          am_cv_$1_dependencies_compiler_type=$depmode
          break
        fi
-@@ -12389,8 +283,8 @@
+@@ -12506,8 +283,8 @@
  # ------------
  AC_DEFUN([AM_DEP_TRACK],
  [AC_ARG_ENABLE(dependency-tracking,
@@ -15258,7 +15349,7 @@
  if test "x$enable_dependency_tracking" != xno; then
    am_depcomp="$ac_aux_dir/depcomp"
    AMDEPBACKSLASH='\'
-@@ -12399,110 +293,273 @@
+@@ -12516,110 +293,273 @@
  AC_SUBST([AMDEPBACKSLASH])
  ])
  
@@ -15623,7 +15714,7 @@
  
  # AM_MAKE_INCLUDE()
  # -----------------
-@@ -12546,94 +603,311 @@
+@@ -12663,94 +603,311 @@
  rm -f confinc confmf
  ])
  
@@ -16007,18 +16098,6 @@
 +]) # _AM_PROG_TAR
  
 +m4_include([acinclude.m4])
---- config.h.in
-+++ config.h.in
-@@ -250,9 +250,6 @@
- #endif
- 
- 
--/* define to 1 if -fvisibility is supported */
--#undef __KDE_HAVE_GCC_VISIBILITY
--
- 
- #if defined(__SVR4) && !defined(__svr4__)
- #define __svr4__ 1
 --- configure
 +++ configure
 @@ -278,15 +278,15 @@
@@ -16044,8 +16123,8 @@
  # include <unistd.h>
  #endif"
  
--ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM LIB_ARTS QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN GV_LIB_KIPI CCAS CCASFLAGS GV_ASM_DEFS LIBMNG PKG_CONFIG LIBEXIF_CFLAGS LIBEXIF_LIBS libexif_internal_TRUE libexif_internal_FALSE TOPSUBDIRS doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE src_SUBDIR_included_TRUE src_SUBDIR_included_FALSE translations_SUBDIR_included_TRUE translations_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
-+ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM LIB_ARTS QTDOCDIR KDE_HAVE_DOT DOXYGEN DOXYGEN_PROJECT_NAME DOXYGEN_PROJECT_NUMBER KDE_HAS_DOXYGEN GV_LIB_KIPI CCAS CCASFLAGS GV_ASM_DEFS LIBMNG PKG_CONFIG LIBEXIF_CFLAGS LIBEXIF_LIBS libexif_internal_TRUE libexif_internal_FALSE TOPSUBDIRS doc_SUBDIR_included_TRUE doc_SUBDIR_included_FALSE src_SUBDIR_included_TRUE src_SUBDIR_included_FALSE translations_SUBDIR_included_TRUE translations_SUBDIR_included_FALSE LIBOBJS LTLIBOBJS'
+-ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO AMTAR install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM AWK SET_MAKE am__leading_dot KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM GV_LIB_KIPI CCAS CCASFLAGS GV_ASM_DEFS LIBMNG PKG_CONFIG LIBEXIF_CFLAGS LIBEXIF_LIBS libexif_internal_TRUE libexif_internal_FALSE TOPSUBDIRS LIBOBJS LTLIBOBJS'
++ac_subst_vars='SHELL PATH_SEPARATOR PACKAGE_NAME PACKAGE_TARNAME PACKAGE_VERSION PACKAGE_STRING PACKAGE_BUGREPORT exec_prefix prefix program_transform_name bindir sbindir libexecdir datadir sysconfdir sharedstatedir localstatedir libdir includedir oldincludedir infodir mandir build_alias host_alias target_alias DEFS ECHO_C ECHO_N ECHO_T LIBS build build_cpu build_vendor build_os host host_cpu host_vendor host_os target target_cpu target_vendor target_os INSTALL_PROGRAM INSTALL_SCRIPT INSTALL_DATA CYGPATH_W PACKAGE VERSION ACLOCAL AUTOCONF AUTOMAKE AUTOHEADER MAKEINFO install_sh STRIP ac_ct_STRIP INSTALL_STRIP_PROGRAM mkdir_p AWK SET_MAKE am__leading_dot AMTAR am__tar am__untar MAINTAINER_MODE_TRUE MAINTAINER_MODE_FALSE MAINT KDECONFIG kde_libs_prefix kde_libs_htmldir CONF_FILES CC CFLAGS LDFLAGS CPPFLAGS ac_ct_CC EXEEXT OBJEXT DEPDIR am__include am__quote AMDEP_TRUE AMDEP_FALSE AMDEPBACKSLASH CCDEPMODE am__fastdepCC_TRUE am__fastdepCC_FALSE CPP CXX CXXFLAGS ac_ct_CXX CXXDEPMODE am__fastdepCXX_TRUE am__fastdepCXX_FALSE WOVERLOADED_VIRTUAL HAVE_GCC_VISIBILITY unsermake_enable_pch_TRUE unsermake_enable_pch_FALSE USE_EXCEPTIONS USE_RTTI CXXCPP NOOPT_CXXFLAGS NOOPT_CFLAGS ENABLE_PERMISSIVE_FLAG LDFLAGS_AS_NEEDED LDFLAGS_NEW_DTAGS KDE_USE_FINAL_TRUE KDE_USE_FINAL_FALSE KDE_USE_CLOSURE_TRUE KDE_USE_CLOSURE_FALSE KDE_NO_UNDEFINED KDE_USE_NMCHECK_TRUE KDE_USE_NMCHECK_FALSE EGREP LN_S ECHO AR ac_ct_AR RANLIB ac_ct_RANLIB F77 FFLAGS ac_ct_F77 LIBTOOL KDE_PLUGIN KDE_CHECK_PLUGIN MSGFMT GMSGFMT XGETTEXT LIBUTIL LIBCOMPAT LIBCRYPT LIBRESOLV LIB_POLL FRAMEWORK_COREAUDIO LIBSOCKET X_EXTRA_LIBS LIBUCB LIBDL KDE_USE_FPIE KDE_USE_PIE include_x11_TRUE include_x11_FALSE X_PRE_LIBS LIB_X11 LIB_XRENDER LIBSM X_INCLUDES X_LDFLAGS x_includes x_libraries QTE_NORTTI LIB_XEXT LIBPTHREAD USE_THREADS KDE_MT_LDFLAGS KDE_MT_LIBS USER_INCLUDES USER_LDFLAGS LIBZ LIBPNG LIBJPEG qt_libraries qt_includes QT_INCLUDES QT_LDFLAGS PERL MOC UIC UIC_TR LIB_QT LIB_QPE kde_qtver KDE_EXTRA_RPATH KDE_RPATH X_RPATH kde_libraries kde_includes KDE_LDFLAGS KDE_INCLUDES all_includes all_libraries AUTODIRS include_ARTS_TRUE include_ARTS_FALSE MAKEKDEWIDGETS KCONFIG_COMPILER KCFG_DEPENDENCIES DCOPIDLNG DCOPIDL DCOPIDL2CPP DCOP_DEPENDENCIES MCOPIDL ARTSCCONFIG MEINPROC KDE_XSL_STYLESHEET XMLLINT kde_htmldir kde_appsdir kde_icondir kde_sounddir kde_datadir kde_locale kde_confdir kde_kcfgdir kde_mimedir kde_wallpaperdir kde_bindir xdg_appsdir xdg_menudir xdg_directorydir kde_templatesdir kde_servicesdir kde_servicetypesdir kde_moduledir kdeinitdir kde_styledir kde_widgetdir LIB_KDED LIB_KDECORE LIB_KDEUI LIB_KIO LIB_KJS LIB_SMB LIB_KAB LIB_KABC LIB_KHTML LIB_KSPELL LIB_KPARTS LIB_KDEPRINT LIB_KUTILS LIB_KDEPIM LIB_KIMPROXY LIB_KNEWSTUFF LIB_KDNSSD LIB_KUNITTEST LIB_KSYCOCA LIB_KFILE LIB_KFM GV_LIB_KIPI CCAS CCASFLAGS GV_ASM_DEFS LIBMNG PKG_CONFIG LIBEXIF_CFLAGS LIBEXIF_LIBS libexif_internal_TRUE libexif_internal_FALSE TOPSUBDIRS LIBOBJS LTLIBOBJS'
  ac_subst_files=''
  
  # Initialize some variables set by options.
@@ -16084,7 +16163,7 @@
    --enable-pch            enables precompiled header support (currently only
                            KCC or gcc >=3.4+unsermake) default=no
    --enable-coverage       use gcc coverage testing
-@@ -1089,6 +1099,8 @@
+@@ -1091,6 +1101,8 @@
    CXXCPP      C++ preprocessor
    F77         Fortran 77 compiler command
    FFLAGS      Fortran 77 compiler flags
@@ -16093,7 +16172,7 @@
  
  Use these variables to override the choices made by `configure' or to help
  it to find libraries and programs with nonstandard names/locations.
-@@ -1652,7 +1664,7 @@
+@@ -1654,7 +1666,7 @@
  rm conftest.sed
  
  
@@ -16102,7 +16181,7 @@
  
  
            test -n "$INSTALL" && kde_save_INSTALL_given=$INSTALL
-@@ -1810,7 +1822,6 @@
+@@ -1812,7 +1824,6 @@
  fi
  echo "$as_me:$LINENO: result: yes" >&5
  echo "${ECHO_T}yes" >&6
@@ -16110,7 +16189,7 @@
  # expand $ac_aux_dir to an absolute path
  am_aux_dir=`cd $ac_aux_dir && pwd`
  
-@@ -1824,6 +1835,39 @@
+@@ -1826,6 +1837,39 @@
  echo "$as_me: WARNING: \`missing' script is too old or missing" >&2;}
  fi
  
@@ -16150,7 +16229,7 @@
  for ac_prog in gawk mawk nawk awk
  do
    # Extract the first word of "$ac_prog", so it can be a program name with args.
-@@ -1902,7 +1946,7 @@
+@@ -1904,7 +1948,7 @@
  fi
  rmdir .tst 2>/dev/null
  
@@ -16159,7 +16238,7 @@
  if test "`cd $srcdir && pwd`" != "`pwd`" &&
     test -f $srcdir/config.status; then
    { { echo "$as_me:$LINENO: error: source directory already configured; run \"make distclean\" there first" >&5
-@@ -1950,9 +1994,6 @@
+@@ -1952,9 +1996,6 @@
  
  MAKEINFO=${MAKEINFO-"${am_missing_run}makeinfo"}
  
@@ -16169,7 +16248,7 @@
  install_sh=${install_sh-"$am_aux_dir/install-sh"}
  
  # Installed binaries are usually stripped using `strip' when the user
-@@ -2045,6 +2086,38 @@
+@@ -2047,6 +2088,38 @@
  
  # We need awk for the "check" target.  The system "awk" is bad on
  # some platforms.
@@ -16208,7 +16287,7 @@
  
  
  
-@@ -3378,7 +3451,9 @@
+@@ -3380,7 +3453,9 @@
      : > sub/conftest.c
      for i in 1 2 3 4 5 6; do
        echo '#include "conftst'$i'.h"' >> sub/conftest.c
@@ -16219,7 +16298,7 @@
      done
      echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
  
-@@ -3406,9 +3481,14 @@
+@@ -3408,9 +3483,14 @@
         grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
        # icc doesn't choke on unknown options, it will just issue warnings
@@ -16237,7 +16316,7 @@
          am_cv_CC_dependencies_compiler_type=$depmode
          break
        fi
-@@ -4095,7 +4175,9 @@
+@@ -4097,7 +4177,9 @@
      : > sub/conftest.c
      for i in 1 2 3 4 5 6; do
        echo '#include "conftst'$i'.h"' >> sub/conftest.c
@@ -16248,7 +16327,7 @@
      done
      echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
  
-@@ -4123,9 +4205,14 @@
+@@ -4125,9 +4207,14 @@
         grep sub/conftest.${OBJEXT-o} sub/conftest.Po > /dev/null 2>&1 &&
         ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
        # icc doesn't choke on unknown options, it will just issue warnings
@@ -16266,7 +16345,7 @@
          am_cv_CXX_dependencies_compiler_type=$depmode
          break
        fi
-@@ -6593,183 +6680,6 @@
+@@ -6595,183 +6682,6 @@
         KDE_USE_CLOSURE_TRUE="#"
         KDE_USE_CLOSURE_FALSE=""
         KDE_NO_UNDEFINED=""
@@ -16450,7 +16529,7 @@
    fi
  
  
-@@ -6933,7 +6843,7 @@
+@@ -6935,7 +6845,7 @@
  # 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
@@ -16459,7 +16538,7 @@
    cat /dev/null > conftest.in
    lt_ac_count=0
    echo $ECHO_N "0123456789$ECHO_C" >conftest.in
-@@ -7038,7 +6948,7 @@
+@@ -7040,7 +6950,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,
@@ -16468,7 +16547,7 @@
        # 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'*)
-@@ -7072,7 +6982,7 @@
+@@ -7074,7 +6984,7 @@
  if test "${lt_cv_prog_gnu_ld+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -16477,7 +16556,7 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -7102,6 +7012,15 @@
+@@ -7104,6 +7014,15 @@
  *) reload_flag=" $reload_flag" ;;
  esac
  reload_cmds='$LD$reload_flag -o $output$reload_objs'
@@ -16493,7 +16572,7 @@
  
  echo "$as_me:$LINENO: checking for BSD-compatible nm" >&5
  echo $ECHO_N "checking for BSD-compatible nm... $ECHO_C" >&6
-@@ -7188,44 +7107,36 @@
+@@ -7190,44 +7109,36 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
@@ -16536,7 +16615,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
--freebsd*)
+-freebsd* | kfreebsd*-gnu)
 +freebsd* | kfreebsd*-gnu | dragonfly*)
    if echo __ELF__ | $CC -E - | grep __ELF__ > /dev/null; then
      case $host_cpu in
@@ -16548,7 +16627,7 @@
        lt_cv_file_magic_cmd=/usr/bin/file
        lt_cv_file_magic_test_file=`echo /usr/lib/libc.so.*`
        ;;
-@@ -7241,7 +7152,7 @@
+@@ -7243,7 +7154,7 @@
  
  hpux10.20* | hpux11*)
    lt_cv_file_magic_cmd=/usr/bin/file
@@ -16557,7 +16636,7 @@
    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
-@@ -7258,42 +7169,21 @@
+@@ -7260,42 +7171,21 @@
    ;;
  
  irix5* | irix6* | nonstopux*)
@@ -16607,7 +16686,7 @@
    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
-@@ -7312,19 +7202,14 @@
+@@ -7314,19 +7204,14 @@
    ;;
  
  openbsd*)
@@ -16629,7 +16708,7 @@
    lt_cv_deplibs_check_method=pass_all
    ;;
  
-@@ -7334,7 +7219,6 @@
+@@ -7336,7 +7221,6 @@
  
  solaris*)
    lt_cv_deplibs_check_method=pass_all
@@ -16637,16 +16716,16 @@
    ;;
  
  sysv4 | sysv4.2uw2* | sysv4.3* | sysv5*)
-@@ -7411,7 +7295,7 @@
+@@ -7413,7 +7297,7 @@
    ;;
  *-*-irix6*)
    # Find out which ABI we are using.
--  echo '#line 7414 "configure"' > conftest.$ac_ext
-+  echo '#line 7298 "configure"' > conftest.$ac_ext
+-  echo '#line 7416 "configure"' > conftest.$ac_ext
++  echo '#line 7300 "configure"' > conftest.$ac_ext
    if { (eval echo "$as_me:$LINENO: \"$ac_compile\"") >&5
    (eval $ac_compile) 2>&5
    ac_status=$?
-@@ -7454,14 +7338,13 @@
+@@ -7456,14 +7340,13 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); }; then
@@ -16663,7 +16742,7 @@
            LD="${LD-ld} -m elf32ppclinux"
            ;;
          s390x-*linux*)
-@@ -7473,7 +7356,6 @@
+@@ -7475,7 +7358,6 @@
        esac
        ;;
      *64-bit*)
@@ -16671,7 +16750,7 @@
        case $host in
          x86_64-*linux*)
            LD="${LD-ld} -m elf_x86_64"
-@@ -7960,6 +7842,243 @@
+@@ -7962,6 +7844,243 @@
  
  done
  
@@ -16915,16 +16994,16 @@
  ac_ext=f
  ac_compile='$F77 -c $FFLAGS conftest.$ac_ext >&5'
  ac_link='$F77 -o conftest$ac_exeext $FFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-@@ -8052,7 +8171,7 @@
+@@ -8054,7 +8173,7 @@
  
  
  # Provide some information about the compiler.
--echo "$as_me:8055:" \
-+echo "$as_me:8174:" \
+-echo "$as_me:8057:" \
++echo "$as_me:8176:" \
       "checking for Fortran 77 compiler version" >&5
  ac_compiler=`set X $ac_compile; echo $2`
  { (eval echo "$as_me:$LINENO: \"$ac_compiler --version </dev/null >&5\"") >&5
-@@ -8205,7 +8324,7 @@
+@@ -8207,7 +8326,7 @@
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
      i=0
@@ -16933,7 +17012,7 @@
  
    case $build_os in
    msdosdjgpp*)
-@@ -8234,20 +8353,53 @@
+@@ -8236,20 +8355,53 @@
      lt_cv_sys_max_cmd_len=8192;
      ;;
  
@@ -16993,7 +17072,7 @@
      # 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.
-@@ -8284,9 +8436,6 @@
+@@ -8286,9 +8438,6 @@
  # Regexp to match symbols that can be accessed directly from C.
  sympat='\([_A-Za-z][_A-Za-z0-9]*\)'
  
@@ -17003,7 +17082,7 @@
  # 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'"
  
-@@ -8308,6 +8457,13 @@
+@@ -8310,6 +8459,13 @@
    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'"
    ;;
@@ -17017,7 +17096,7 @@
  irix* | nonstopux*)
    symcode='[BCDEGRST]'
    ;;
-@@ -8315,7 +8471,7 @@
+@@ -8317,7 +8473,7 @@
    symcode='[BCDEGQRST]'
    ;;
  solaris* | sysv5*)
@@ -17026,7 +17105,7 @@
    ;;
  sysv4)
    symcode='[DFNSTU]'
-@@ -8333,14 +8489,17 @@
+@@ -8335,14 +8491,17 @@
  # If we're using GNU nm, then use its standard symbol codes.
  case `$NM -V 2>&1` in
  *GNU* | *'with BFD'*)
@@ -17046,7 +17125,7 @@
  
    # Check to see that the pipe works correctly.
    pipe_works=no
-@@ -8502,7 +8661,7 @@
+@@ -8504,7 +8663,7 @@
  
  # Sed substitution that helps us do robust quoting.  It backslashifies
  # metacharacters that are still active within double-quoted strings.
@@ -17055,7 +17134,7 @@
  sed_quote_subst='s/\([\\"\\`$\\\\]\)/\\\1/g'
  
  # Same as above, but do not quote variable references.
-@@ -8522,7 +8681,7 @@
+@@ -8524,7 +8683,7 @@
  default_ofile=libtool
  can_build_shared=yes
  
@@ -17064,7 +17143,7 @@
  # which needs '.lib').
  libext=a
  ltmain="$ac_aux_dir/ltmain.sh"
-@@ -8807,6 +8966,17 @@
+@@ -8809,6 +8968,17 @@
    old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
  fi
  
@@ -17082,7 +17161,7 @@
  # Only perform the check for file, if the check method requires it
  case $deplibs_check_method in
  file_magic*)
-@@ -8832,7 +9002,7 @@
+@@ -8834,7 +9004,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -17091,7 +17170,7 @@
  	  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
-@@ -8894,7 +9064,7 @@
+@@ -8896,7 +9066,7 @@
        if test -n "$file_magic_test_file"; then
  	case $deplibs_check_method in
  	"file_magic "*)
@@ -17100,7 +17179,7 @@
  	  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
-@@ -8993,6 +9163,20 @@
+@@ -8995,6 +9165,20 @@
  compiler=$CC
  
  
@@ -17121,7 +17200,7 @@
  #
  # Check for any special shared library compilation flags.
  #
-@@ -9029,11 +9213,16 @@
+@@ -9031,11 +9215,16 @@
     LDFLAGS="$LDFLAGS $lt_prog_compiler_static"
     printf "$lt_simple_link_test_code" > conftest.$ac_ext
     if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
@@ -17139,7 +17218,7 @@
       else
         lt_prog_compiler_static_works=yes
       fi
-@@ -9053,6 +9242,10 @@
+@@ -9055,6 +9244,10 @@
  
  
  
@@ -17150,7 +17229,7 @@
  
  lt_prog_compiler_no_builtin_flag=
  
-@@ -9075,18 +9268,20 @@
+@@ -9077,18 +9270,20 @@
     # 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 \
@@ -17158,13 +17237,13 @@
 +   -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:9081: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9274: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9083: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9276: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:9085: \$? = $ac_status" >&5
-+   echo "$as_me:9278: \$? = $ac_status" >&5
+-   echo "$as_me:9087: \$? = $ac_status" >&5
++   echo "$as_me:9280: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
 -     # So say no if there are warnings
@@ -17176,7 +17255,7 @@
         lt_cv_prog_compiler_rtti_exceptions=yes
       fi
     fi
-@@ -9163,7 +9358,7 @@
+@@ -9165,7 +9360,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -17185,7 +17264,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -9189,6 +9384,16 @@
+@@ -9191,6 +9386,16 @@
  	lt_prog_compiler_static='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -17202,7 +17281,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -9200,7 +9405,7 @@
+@@ -9202,7 +9407,7 @@
        lt_prog_compiler_wl='-Wl,'
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -17211,7 +17290,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -9224,12 +9429,19 @@
+@@ -9226,12 +9431,19 @@
        ;;
  
      linux*)
@@ -17232,7 +17311,7 @@
        ccc*)
          lt_prog_compiler_wl='-Wl,'
          # All Alpha code is PIC.
-@@ -9250,9 +9462,14 @@
+@@ -9252,9 +9464,14 @@
        ;;
  
      solaris*)
@@ -17248,7 +17327,7 @@
        ;;
  
      sunos4*)
-@@ -9274,6 +9491,11 @@
+@@ -9276,6 +9493,11 @@
        fi
        ;;
  
@@ -17260,7 +17339,7 @@
      uts4*)
        lt_prog_compiler_pic='-pic'
        lt_prog_compiler_static='-Bstatic'
-@@ -9308,18 +9530,20 @@
+@@ -9310,18 +9532,20 @@
     # 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 \
@@ -17268,13 +17347,13 @@
 +   -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:9314: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9536: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9316: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9538: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:9318: \$? = $ac_status" >&5
-+   echo "$as_me:9540: \$? = $ac_status" >&5
+-   echo "$as_me:9320: \$? = $ac_status" >&5
++   echo "$as_me:9542: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
 -     # So say no if there are warnings
@@ -17286,7 +17365,7 @@
         lt_prog_compiler_pic_works=yes
       fi
     fi
-@@ -9340,7 +9564,7 @@
+@@ -9342,7 +9566,7 @@
  fi
  
  fi
@@ -17295,7 +17374,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic=
-@@ -9362,38 +9586,36 @@
+@@ -9364,38 +9588,36 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -17316,13 +17395,13 @@
 +   -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:9381: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:9598: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:9383: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:9600: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:9385: \$? = $ac_status" >&5
-+   echo "$as_me:9602: \$? = $ac_status" >&5
+-   echo "$as_me:9387: \$? = $ac_status" >&5
++   echo "$as_me:9604: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
@@ -17346,7 +17425,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -9464,6 +9686,16 @@
+@@ -9466,6 +9688,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -17363,7 +17442,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -9484,6 +9716,27 @@
+@@ -9486,6 +9718,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -17391,7 +17470,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -9521,7 +9774,7 @@
+@@ -9523,7 +9776,7 @@
  	allow_undefined_flag=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -17400,7 +17479,7 @@
        else
  	ld_shlibs=no
        fi
-@@ -9531,13 +9784,13 @@
+@@ -9533,13 +9786,13 @@
        # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
        # as there is no search path for DLLs.
        hardcode_libdir_flag_spec='-L$libdir'
@@ -17417,18 +17496,17 @@
  	# If the export-symbols file already is a .def file (1st line
  	# is EXPORTS), use it as is; otherwise, prepend...
  	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -9546,19 +9799,51 @@
+@@ -9548,19 +9801,51 @@
  	  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}--image-base=0x10000000  ${wl}--out-implib,$lib'
-       else
- 	ld_shlibs=no
-       fi
-       ;;
- 
--    netbsd*)
++      else
++	ld_shlibs=no
++      fi
++      ;;
++
 +    linux*)
 +      if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
 +	tmp_addflag=
@@ -17456,11 +17534,12 @@
 +	  $CC -shared'"$tmp_addflag"' $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-version-script ${wl}$output_objdir/$libname.ver -o $lib'
 +	fi
 +	link_all_deplibs=no
-+      else
-+	ld_shlibs=no
-+      fi
-+      ;;
-+
+       else
+ 	ld_shlibs=no
+       fi
+       ;;
+ 
+-    netbsd*)
 +    netbsd* | netbsdelf*-gnu | knetbsd*-gnu)
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
@@ -17473,7 +17552,7 @@
        fi
        ;;
  
-@@ -9576,8 +9861,8 @@
+@@ -9578,8 +9863,8 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -17484,7 +17563,7 @@
        else
  	ld_shlibs=no
        fi
-@@ -9592,24 +9877,19 @@
+@@ -9594,24 +9879,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -17516,7 +17595,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -9643,9 +9923,20 @@
+@@ -9645,9 +9925,20 @@
  	else
  	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
  	fi
@@ -17539,7 +17618,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -9662,7 +9953,7 @@
+@@ -9664,7 +9955,7 @@
        link_all_deplibs=yes
  
        if test "$GCC" = yes; then
@@ -17548,7 +17627,7 @@
  	# 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`
-@@ -9683,6 +9974,9 @@
+@@ -9685,6 +9976,9 @@
  	  fi
  	esac
  	shared_flag='-shared'
@@ -17558,7 +17637,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -9691,21 +9985,22 @@
+@@ -9693,21 +9987,22 @@
  	  shared_flag='-G'
  	else
    	if test "$aix_use_runtimelinking" = yes; then
@@ -17586,7 +17665,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -9756,14 +10051,13 @@
+@@ -9758,14 +10053,13 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -17604,7 +17683,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -9827,8 +10121,8 @@
+@@ -9829,8 +10123,8 @@
  	  # Exported symbols can be pulled into shared objects from archives
  	  whole_archive_flag_spec=' '
  	  archive_cmds_need_lc=yes
@@ -17615,7 +17694,7 @@
  	fi
        fi
        ;;
-@@ -9841,7 +10135,7 @@
+@@ -9843,7 +10137,7 @@
        ld_shlibs=no
        ;;
  
@@ -17624,7 +17703,7 @@
        export_dynamic_flag_spec=-rdynamic
        ;;
  
-@@ -9851,13 +10145,13 @@
+@@ -9853,13 +10147,13 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec=' '
@@ -17641,7 +17720,7 @@
        # The linker will automatically build a .lib file if we build a DLL.
        old_archive_From_new_cmds='true'
        # FIXME: Should let the user specify the lib program.
-@@ -9867,52 +10161,52 @@
+@@ -9869,52 +10163,52 @@
        ;;
  
      darwin* | rhapsody*)
@@ -17734,18 +17813,18 @@
      fi
        ;;
  
-@@ -9946,8 +10240,8 @@
+@@ -9948,8 +10242,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd*)
+-    freebsd* | kfreebsd*-gnu)
 -      archive_cmds='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
 +    freebsd* | kfreebsd*-gnu | dragonfly*)
 +      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
        hardcode_libdir_flag_spec='-R$libdir'
        hardcode_direct=yes
        hardcode_shlibpath_var=no
-@@ -9955,7 +10249,7 @@
+@@ -9957,7 +10251,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -17754,7 +17833,7 @@
        else
  	archive_cmds='$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
-@@ -9971,16 +10265,16 @@
+@@ -9973,16 +10267,16 @@
  
      hpux10* | hpux11*)
        if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -17775,7 +17854,7 @@
  	hppa*64*|ia64*)
  	  archive_cmds='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
  	  ;;
-@@ -9990,7 +10284,7 @@
+@@ -9992,7 +10286,7 @@
  	esac
        fi
        if test "$with_gnu_ld" = no; then
@@ -17784,7 +17863,7 @@
  	hppa*64*)
  	  hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
  	  hardcode_libdir_flag_spec_ld='+b $libdir'
-@@ -10023,7 +10317,7 @@
+@@ -10025,7 +10319,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -17793,7 +17872,7 @@
        else
  	archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  	hardcode_libdir_flag_spec_ld='-rpath $libdir'
-@@ -10033,7 +10327,7 @@
+@@ -10035,7 +10329,7 @@
        link_all_deplibs=yes
        ;;
  
@@ -17802,7 +17881,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -10056,7 +10350,8 @@
+@@ -10058,7 +10352,8 @@
        hardcode_direct=yes
        hardcode_shlibpath_var=no
        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -17812,7 +17891,7 @@
  	hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec='${wl}-E'
        else
-@@ -10066,7 +10361,7 @@
+@@ -10068,7 +10363,7 @@
  	   hardcode_libdir_flag_spec='-R$libdir'
  	   ;;
  	 *)
@@ -17821,7 +17900,7 @@
  	   hardcode_libdir_flag_spec='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -10077,14 +10372,14 @@
+@@ -10079,14 +10374,14 @@
        hardcode_libdir_flag_spec='-L$libdir'
        hardcode_minus_L=yes
        allow_undefined_flag=unsupported
@@ -17838,7 +17917,7 @@
        else
  	allow_undefined_flag=' -expect_unresolved \*'
  	archive_cmds='$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'
-@@ -10096,13 +10391,13 @@
+@@ -10098,13 +10393,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
@@ -17854,7 +17933,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec='-rpath $libdir'
-@@ -10121,10 +10416,12 @@
+@@ -10123,10 +10418,12 @@
      solaris*)
        no_undefined_flag=' -z text'
        if test "$GCC" = yes; then
@@ -17869,7 +17948,7 @@
  	archive_cmds='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  	archive_expsym_cmds='$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'
-@@ -10133,8 +10430,18 @@
+@@ -10135,8 +10432,18 @@
        hardcode_shlibpath_var=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -17890,7 +17969,7 @@
        esac
        link_all_deplibs=yes
        ;;
-@@ -10143,7 +10450,7 @@
+@@ -10145,7 +10452,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.
@@ -17899,7 +17978,7 @@
        else
  	archive_cmds='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -10203,9 +10510,9 @@
+@@ -10205,9 +10512,9 @@
     sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
        no_undefined_flag='${wl}-z ${wl}text'
        if test "$GCC" = yes; then
@@ -17911,7 +17990,7 @@
        fi
        runpath_var='LD_RUN_PATH'
        hardcode_shlibpath_var=no
-@@ -10311,7 +10618,7 @@
+@@ -10313,7 +10620,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -17920,7 +17999,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -10321,7 +10628,20 @@
+@@ -10323,7 +10630,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -17942,7 +18021,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -10386,7 +10706,7 @@
+@@ -10388,7 +10708,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -17951,7 +18030,7 @@
    ;;
  
  beos*)
-@@ -10395,7 +10715,7 @@
+@@ -10397,7 +10717,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -17960,7 +18039,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -10411,7 +10731,7 @@
+@@ -10413,7 +10733,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -17969,7 +18048,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -10423,7 +10743,8 @@
+@@ -10425,7 +10745,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -17979,7 +18058,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -10453,7 +10774,7 @@
+@@ -10455,7 +10776,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -17988,7 +18067,7 @@
        ;;
      esac
      ;;
-@@ -10476,7 +10797,7 @@
+@@ -10478,7 +10799,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -17997,16 +18076,16 @@
    # 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"`
-@@ -10499,7 +10820,7 @@
+@@ -10501,7 +10822,7 @@
    dynamic_linker=no
    ;;
  
--freebsd*-gnu*)
+-kfreebsd*-gnu*)
 +kfreebsd*-gnu)
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -10511,8 +10832,17 @@
+@@ -10513,8 +10834,17 @@
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -18026,7 +18105,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -10530,7 +10860,7 @@
+@@ -10532,7 +10862,7 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -18035,7 +18114,7 @@
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
      ;;
-@@ -10557,9 +10887,9 @@
+@@ -10559,9 +10889,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -18047,7 +18126,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -10574,7 +10904,7 @@
+@@ -10576,7 +10906,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -18056,7 +18135,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -10585,7 +10915,7 @@
+@@ -10587,7 +10917,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -18065,7 +18144,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -10647,22 +10977,19 @@
+@@ -10649,22 +10979,19 @@
    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'
@@ -18094,7 +18173,7 @@
    # 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,
-@@ -10672,6 +10999,30 @@
+@@ -10674,6 +11001,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -18125,7 +18204,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -10681,7 +11032,7 @@
+@@ -10683,7 +11034,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -18134,7 +18213,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -10710,7 +11061,11 @@
+@@ -10712,7 +11063,11 @@
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
@@ -18147,7 +18226,7 @@
    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
-@@ -10730,7 +11085,7 @@
+@@ -10732,7 +11087,7 @@
  
  os2*)
    libname_spec='$name'
@@ -18156,7 +18235,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -10832,8 +11187,8 @@
+@@ -10834,8 +11189,8 @@
  echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
  hardcode_action=
  if test -n "$hardcode_libdir_flag_spec" || \
@@ -18167,16 +18246,16 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct" != no &&
-@@ -11492,7 +11847,7 @@
+@@ -11494,7 +11849,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 11495 "configure"
-+#line 11850 "configure"
+-#line 11497 "configure"
++#line 11852 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11558,7 +11913,7 @@
+@@ -11560,7 +11915,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -18185,16 +18264,16 @@
      lt_status=$?
      case x$lt_status in
        x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -11590,7 +11945,7 @@
+@@ -11592,7 +11947,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 11593 "configure"
-+#line 11948 "configure"
+-#line 11595 "configure"
++#line 11950 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -11656,7 +12011,7 @@
+@@ -11658,7 +12013,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -18203,7 +18282,7 @@
      lt_status=$?
      case x$lt_status in
        x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -11706,7 +12061,7 @@
+@@ -11708,7 +12063,7 @@
  
  # On AIX, shared libraries and static libraries use the same namespace, and
  # are all built from PIC.
@@ -18212,7 +18291,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -11715,47 +12070,10 @@
+@@ -11717,47 +12072,10 @@
    fi
    ;;
  
@@ -18261,7 +18340,7 @@
      ;;
  esac
  echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -11781,7 +12099,8 @@
+@@ -11783,7 +12101,8 @@
    # 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.
@@ -18271,16 +18350,7 @@
      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 \
-@@ -11884,7 +12203,7 @@
- #
- # 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 Steet, Fifth Floor, Boston, MA 02110-1301, 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
-@@ -11895,11 +12214,11 @@
+@@ -11897,11 +12216,11 @@
  SED=$lt_SED
  
  # Sed that helps us avoid accidentally triggering echo(1) options like -n.
@@ -18294,7 +18364,7 @@
  
  # The names of the tagged configurations supported by this script.
  available_tags=
-@@ -11929,6 +12248,12 @@
+@@ -11931,6 +12250,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -18307,7 +18377,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -11959,7 +12284,7 @@
+@@ -11961,7 +12286,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -18316,7 +18386,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -11990,7 +12315,7 @@
+@@ -11992,7 +12317,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -18325,7 +18395,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -12005,7 +12330,7 @@
+@@ -12007,7 +12332,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o
  
@@ -18334,7 +18404,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -12232,7 +12557,10 @@
+@@ -12234,7 +12559,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.
@@ -18346,7 +18416,7 @@
  fi
  
  
-@@ -12297,7 +12625,9 @@
+@@ -12299,7 +12627,9 @@
  
        case $tagname in
        CXX)
@@ -18357,7 +18427,7 @@
  	  ac_ext=cc
  ac_cpp='$CXXCPP $CPPFLAGS'
  ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-@@ -12334,7 +12664,7 @@
+@@ -12336,7 +12666,7 @@
  compiler_lib_search_path_CXX=
  
  # Source file extension for C++ test sources.
@@ -18366,7 +18436,7 @@
  
  # Object file extension for compiled C++ test sources.
  objext=o
-@@ -12355,6 +12685,20 @@
+@@ -12357,6 +12687,20 @@
  compiler=$CC
  
  
@@ -18387,7 +18457,7 @@
  # Allow CC to be a program name with arguments.
  lt_save_CC=$CC
  lt_save_LD=$LD
-@@ -12376,7 +12720,16 @@
+@@ -12378,7 +12722,16 @@
  CC=${CXX-"c++"}
  compiler=$CC
  compiler_CXX=$CC
@@ -18405,7 +18475,7 @@
  
  # We don't want -fno-exception wen compiling C++ code, so set the
  # no_builtin_flag separately
-@@ -12447,7 +12800,7 @@
+@@ -12449,7 +12802,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,
@@ -18414,7 +18484,7 @@
        # 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'*)
-@@ -12481,7 +12834,7 @@
+@@ -12483,7 +12836,7 @@
  if test "${lt_cv_prog_gnu_ld+set}" = set; then
    echo $ECHO_N "(cached) $ECHO_C" >&6
  else
@@ -18423,7 +18493,7 @@
  case `$LD -v 2>&1 </dev/null` in
  *GNU* | *'with BFD'*)
    lt_cv_prog_gnu_ld=yes
-@@ -12500,8 +12853,8 @@
+@@ -12502,8 +12855,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
@@ -18434,7 +18504,7 @@
  
      hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
      export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-@@ -12527,7 +12880,7 @@
+@@ -12529,7 +12882,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.
@@ -18443,7 +18513,7 @@
    fi
  
    # Commands to make compiler produce verbose output that lists
-@@ -12558,8 +12911,22 @@
+@@ -12560,8 +12913,22 @@
        exp_sym_flag='-Bexport'
        no_entry_flag=""
      else
@@ -18468,7 +18538,7 @@
        exp_sym_flag='-bexport'
        no_entry_flag='-bnoentry'
      fi
-@@ -12576,7 +12943,7 @@
+@@ -12578,7 +12945,7 @@
      link_all_deplibs_CXX=yes
  
      if test "$GXX" = yes; then
@@ -18477,7 +18547,7 @@
        # 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`
-@@ -12597,6 +12964,9 @@
+@@ -12599,6 +12966,9 @@
  	fi
        esac
        shared_flag='-shared'
@@ -18487,7 +18557,7 @@
      else
        # not using gcc
        if test "$host_cpu" = ia64; then
-@@ -12605,15 +12975,16 @@
+@@ -12607,15 +12977,16 @@
  	shared_flag='-G'
        else
  	if test "$aix_use_runtimelinking" = yes; then
@@ -18508,7 +18578,7 @@
      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.
-@@ -12672,13 +13043,12 @@
+@@ -12674,13 +13045,12 @@
  
        hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
  
@@ -18524,7 +18594,7 @@
        else
  	# Determine the default libpath from the value encoded in an empty executable.
  	cat >conftest.$ac_ext <<_ACEOF
-@@ -12742,8 +13112,8 @@
+@@ -12744,8 +13114,8 @@
  	# Exported symbols can be pulled into shared objects from archives
  	whole_archive_flag_spec_CXX=' '
  	archive_cmds_need_lc_CXX=yes
@@ -18535,7 +18605,7 @@
        fi
      fi
      ;;
-@@ -12756,16 +13126,17 @@
+@@ -12758,16 +13128,17 @@
      esac
      ;;
  
@@ -18555,7 +18625,7 @@
        # If the export-symbols file already is a .def file (1st line
        # is EXPORTS), use it as is; otherwise, prepend...
        archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -12774,70 +13145,81 @@
+@@ -12776,70 +13147,81 @@
  	echo EXPORTS > $output_objdir/$soname.def;
  	cat $export_symbols >> $output_objdir/$soname.def;
        fi~
@@ -18689,7 +18759,7 @@
  	# Green Hills C++ Compiler
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -12848,14 +13230,14 @@
+@@ -12850,14 +13232,14 @@
  	;;
      esac
      ;;
@@ -18701,12 +18771,12 @@
    freebsd-elf*)
      archive_cmds_need_lc_CXX=no
      ;;
--  freebsd*)
+-  freebsd* | kfreebsd*-gnu)
 +  freebsd* | kfreebsd*-gnu | dragonfly*)
      # FreeBSD 3 and later use GNU C++ and GNU ld with standard ELF
      # conventions
      ld_shlibs_CXX=yes
-@@ -12872,12 +13254,12 @@
+@@ -12874,12 +13256,12 @@
  				# location of the library.
  
      case $cc_basename in
@@ -18722,7 +18792,7 @@
        # Commands to make compiler produce verbose output that lists
        # what "hidden" libraries, object files and flags are used when
        # linking a shared library.
-@@ -12886,11 +13268,11 @@
+@@ -12888,11 +13270,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.
@@ -18736,7 +18806,7 @@
        else
          # FIXME: insert proper C++ library support
          ld_shlibs_CXX=no
-@@ -12900,7 +13282,7 @@
+@@ -12902,7 +13284,7 @@
      ;;
    hpux10*|hpux11*)
      if test $with_gnu_ld = no; then
@@ -18745,7 +18815,7 @@
        hppa*64*)
  	hardcode_libdir_flag_spec_CXX='${wl}+b ${wl}$libdir'
  	hardcode_libdir_flag_spec_ld_CXX='+b $libdir'
-@@ -12916,7 +13298,7 @@
+@@ -12918,7 +13300,7 @@
          ;;
        esac
      fi
@@ -18754,7 +18824,7 @@
      hppa*64*)
        hardcode_direct_CXX=no
        hardcode_shlibpath_var_CXX=no
-@@ -12937,17 +13319,17 @@
+@@ -12939,17 +13321,17 @@
      esac
  
      case $cc_basename in
@@ -18776,7 +18846,7 @@
  	  ;;
  	esac
  	# Commands to make compiler produce verbose output that lists
-@@ -12963,12 +13345,12 @@
+@@ -12965,12 +13347,12 @@
        *)
  	if test "$GXX" = yes; then
  	  if test $with_gnu_ld = no; then
@@ -18791,7 +18861,7 @@
  	      ;;
  	    esac
  	  fi
-@@ -12981,9 +13363,9 @@
+@@ -12983,9 +13365,9 @@
      ;;
    irix5* | irix6*)
      case $cc_basename in
@@ -18803,7 +18873,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -ar", where "CC" is the IRIX C++ compiler.  This is
-@@ -12994,9 +13376,9 @@
+@@ -12996,9 +13378,9 @@
        *)
  	if test "$GXX" = yes; then
  	  if test "$with_gnu_ld" = no; then
@@ -18815,7 +18885,7 @@
  	  fi
  	fi
  	link_all_deplibs_CXX=yes
-@@ -13007,14 +13389,14 @@
+@@ -13009,14 +13391,14 @@
      ;;
    linux*)
      case $cc_basename in
@@ -18833,7 +18903,7 @@
  	# Commands to make compiler produce verbose output that lists
  	# what "hidden" libraries, object files and flags are used when
  	# linking a shared library.
-@@ -13032,20 +13414,44 @@
+@@ -13034,20 +13416,44 @@
  	# "CC -Bstatic", where "CC" is the KAI C++ compiler.
  	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
  	;;
@@ -18884,7 +18954,7 @@
  
  	runpath_var=LD_RUN_PATH
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13073,7 +13479,7 @@
+@@ -13075,7 +13481,7 @@
      ;;
    mvs*)
      case $cc_basename in
@@ -18893,7 +18963,7 @@
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
  	;;
-@@ -13083,7 +13489,7 @@
+@@ -13085,7 +13491,7 @@
  	;;
      esac
      ;;
@@ -18902,7 +18972,7 @@
      if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
        archive_cmds_CXX='$LD -Bshareable  -o $lib $predep_objects $libobjs $deplibs $postdep_objects $linker_flags'
        wlarc=
-@@ -13094,15 +13500,31 @@
+@@ -13096,15 +13502,31 @@
      # 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::"'
      ;;
@@ -18936,7 +19006,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13112,14 +13534,14 @@
+@@ -13114,14 +13536,14 @@
  	old_archive_cmds_CXX='$CC -Bstatic -o $oldlib $oldobjs'
  
  	;;
@@ -18954,7 +19024,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13137,7 +13559,7 @@
+@@ -13139,7 +13561,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -18963,7 +19033,7 @@
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13156,13 +13578,13 @@
+@@ -13158,13 +13580,13 @@
      ;;
    osf4* | osf5*)
      case $cc_basename in
@@ -18979,7 +19049,7 @@
  
  	hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
  	hardcode_libdir_separator_CXX=:
-@@ -13171,17 +13593,17 @@
+@@ -13173,17 +13595,17 @@
  	# the KAI C++ compiler.
  	old_archive_cmds_CXX='$CC -o $oldlib $oldobjs'
  	;;
@@ -19001,7 +19071,7 @@
  	  $rm $lib.exp'
  
  	hardcode_libdir_flag_spec_CXX='-rpath $libdir'
-@@ -13200,7 +13622,7 @@
+@@ -13202,7 +13624,7 @@
        *)
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
@@ -19010,7 +19080,7 @@
  
  	  hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
  	  hardcode_libdir_separator_CXX=:
-@@ -13224,7 +13646,7 @@
+@@ -13226,7 +13648,7 @@
    sco*)
      archive_cmds_need_lc_CXX=no
      case $cc_basename in
@@ -19019,7 +19089,7 @@
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
  	;;
-@@ -13236,12 +13658,12 @@
+@@ -13238,12 +13660,12 @@
      ;;
    sunos4*)
      case $cc_basename in
@@ -19034,7 +19104,7 @@
  	# Lucid
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13254,36 +13676,33 @@
+@@ -13256,36 +13678,33 @@
      ;;
    solaris*)
      case $cc_basename in
@@ -19083,7 +19153,7 @@
  
  	# Archives containing C++ object files must be created using
  	# "CC -xar", where "CC" is the Sun C++ compiler.  This is
-@@ -13291,9 +13710,9 @@
+@@ -13293,9 +13712,9 @@
  	# in the archive.
  	old_archive_cmds_CXX='$CC -xar -o $oldlib $oldobjs'
  	;;
@@ -19095,7 +19165,7 @@
  
  	# The C++ compiler must be used to create the archive.
  	old_archive_cmds_CXX='$CC $LDFLAGS -archive -o $oldlib $oldobjs'
-@@ -13303,9 +13722,9 @@
+@@ -13305,9 +13724,9 @@
  	if test "$GXX" = yes && test "$with_gnu_ld" = no; then
  	  no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
  	  if $CC --version | grep -v '^2\.7' > /dev/null; then
@@ -19107,7 +19177,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13314,9 +13733,9 @@
+@@ -13316,9 +13735,9 @@
  	  else
  	    # g++ 2.7 appears to require `-G' NOT `-shared' on this
  	    # platform.
@@ -19119,7 +19189,7 @@
  
  	    # Commands to make compiler produce verbose output that lists
  	    # what "hidden" libraries, object files and flags are used when
-@@ -13334,7 +13753,7 @@
+@@ -13336,7 +13755,7 @@
      ;;
    tandem*)
      case $cc_basename in
@@ -19128,7 +19198,7 @@
  	# NonStop-UX NCC 3.20
  	# FIXME: insert proper C++ library support
  	ld_shlibs_CXX=no
-@@ -13361,6 +13780,10 @@
+@@ -13363,6 +13782,10 @@
  GCC_CXX="$GXX"
  LD_CXX="$LD"
  
@@ -19139,7 +19209,7 @@
  
  cat > conftest.$ac_ext <<EOF
  class Foo
-@@ -13387,7 +13810,7 @@
+@@ -13389,7 +13812,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.
@@ -19148,7 +19218,7 @@
  
    for p in `eval $output_verbose_link_cmd`; do
      case $p in
-@@ -13427,7 +13850,7 @@
+@@ -13429,7 +13852,7 @@
         fi
         ;;
  
@@ -19157,7 +19227,7 @@
         # This assumes that the test object file only shows up
         # once in the compiler output.
         if test "$p" = "conftest.$objext"; then
-@@ -13463,6 +13886,20 @@
+@@ -13465,6 +13888,20 @@
  
  $rm -f confest.$objext
  
@@ -19178,7 +19248,7 @@
  case " $postdeps_CXX " in
  *" -lc "*) archive_cmds_need_lc_CXX=no ;;
  esac
-@@ -13518,7 +13955,7 @@
+@@ -13520,7 +13957,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -19187,7 +19257,7 @@
        hppa*64*|ia64*)
  	;;
        *)
-@@ -13543,18 +13980,28 @@
+@@ -13545,18 +13982,28 @@
  	;;
        chorus*)
  	case $cc_basename in
@@ -19219,11 +19289,11 @@
  	    # Green Hills C++ Compiler
  	    lt_prog_compiler_pic_CXX='-pic'
  	    ;;
-@@ -13562,22 +14009,22 @@
+@@ -13564,22 +14011,22 @@
  	    ;;
  	esac
  	;;
--      freebsd*)
+-      freebsd* | kfreebsd*-gnu)
 +      freebsd* | kfreebsd*-gnu | dragonfly*)
  	# FreeBSD uses GNU C++
  	;;
@@ -19246,7 +19316,7 @@
  	    hppa*64*|ia64*)
  	      # +Z the default
  	      ;;
-@@ -13592,7 +14039,7 @@
+@@ -13594,7 +14041,7 @@
  	;;
        irix5* | irix6* | nonstopux*)
  	case $cc_basename in
@@ -19255,7 +19325,7 @@
  	    lt_prog_compiler_wl_CXX='-Wl,'
  	    lt_prog_compiler_static_CXX='-non_shared'
  	    # CC pic flag -KPIC is the default.
-@@ -13603,18 +14050,24 @@
+@@ -13605,18 +14052,24 @@
  	;;
        linux*)
  	case $cc_basename in
@@ -19283,7 +19353,7 @@
  	    # Compaq C++
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
  	    # Linux and Compaq Tru64 Unix objects are PIC.
-@@ -13631,25 +14084,25 @@
+@@ -13633,25 +14086,25 @@
  	;;
        mvs*)
  	case $cc_basename in
@@ -19314,7 +19384,7 @@
  	    # Digital/Compaq C++
  	    lt_prog_compiler_wl_CXX='-Wl,'
  	    # Make sure the PIC flag is empty.  It appears that all Alpha
-@@ -13665,7 +14118,7 @@
+@@ -13667,7 +14120,7 @@
  	;;
        sco*)
  	case $cc_basename in
@@ -19323,7 +19393,7 @@
  	    lt_prog_compiler_pic_CXX='-fPIC'
  	    ;;
  	  *)
-@@ -13674,13 +14127,13 @@
+@@ -13676,13 +14129,13 @@
  	;;
        solaris*)
  	case $cc_basename in
@@ -19339,7 +19409,7 @@
  	    # Green Hills C++ Compiler
  	    lt_prog_compiler_pic_CXX='-PIC'
  	    ;;
-@@ -13690,12 +14143,12 @@
+@@ -13692,12 +14145,12 @@
  	;;
        sunos4*)
  	case $cc_basename in
@@ -19354,7 +19424,7 @@
  	    # Lucid
  	    lt_prog_compiler_pic_CXX='-pic'
  	    ;;
-@@ -13705,7 +14158,7 @@
+@@ -13707,7 +14160,7 @@
  	;;
        tandem*)
  	case $cc_basename in
@@ -19363,7 +19433,7 @@
  	    # NonStop-UX NCC 3.20
  	    lt_prog_compiler_pic_CXX='-KPIC'
  	    ;;
-@@ -13746,18 +14199,20 @@
+@@ -13748,18 +14201,20 @@
     # 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 \
@@ -19371,13 +19441,13 @@
 +   -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:13752: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14205: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:13754: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14207: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:13756: \$? = $ac_status" >&5
-+   echo "$as_me:14209: \$? = $ac_status" >&5
+-   echo "$as_me:13758: \$? = $ac_status" >&5
++   echo "$as_me:14211: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
 -     # So say no if there are warnings
@@ -19389,7 +19459,7 @@
         lt_prog_compiler_pic_works_CXX=yes
       fi
     fi
-@@ -13778,7 +14233,7 @@
+@@ -13780,7 +14235,7 @@
  fi
  
  fi
@@ -19398,7 +19468,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic_CXX=
-@@ -13800,38 +14255,36 @@
+@@ -13802,38 +14257,36 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -19419,13 +19489,13 @@
 +   -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:13819: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:14267: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:13821: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:14269: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:13823: \$? = $ac_status" >&5
-+   echo "$as_me:14271: \$? = $ac_status" >&5
+-   echo "$as_me:13825: \$? = $ac_status" >&5
++   echo "$as_me:14273: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
@@ -19449,7 +19519,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -13881,7 +14334,10 @@
+@@ -13883,7 +14336,10 @@
      export_symbols_cmds_CXX="$ltdll_cmds"
    ;;
    cygwin* | mingw*)
@@ -19461,7 +19531,7 @@
    ;;
    *)
      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-@@ -13964,7 +14420,7 @@
+@@ -13966,7 +14422,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -19470,7 +19540,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -13974,7 +14430,20 @@
+@@ -13976,7 +14432,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -19492,7 +19562,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -14039,7 +14508,7 @@
+@@ -14041,7 +14510,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -19501,7 +19571,7 @@
    ;;
  
  beos*)
-@@ -14048,7 +14517,7 @@
+@@ -14050,7 +14519,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -19510,7 +19580,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -14064,7 +14533,7 @@
+@@ -14066,7 +14535,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -19519,7 +19589,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -14076,7 +14545,8 @@
+@@ -14078,7 +14547,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -19529,7 +19599,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -14106,7 +14576,7 @@
+@@ -14108,7 +14578,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -19538,7 +19608,7 @@
        ;;
      esac
      ;;
-@@ -14129,7 +14599,7 @@
+@@ -14131,7 +14601,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -19547,16 +19617,16 @@
    # 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"`
-@@ -14152,7 +14622,7 @@
+@@ -14154,7 +14624,7 @@
    dynamic_linker=no
    ;;
  
--freebsd*-gnu*)
+-kfreebsd*-gnu*)
 +kfreebsd*-gnu)
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -14164,8 +14634,17 @@
+@@ -14166,8 +14636,17 @@
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -19576,7 +19646,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -14183,7 +14662,7 @@
+@@ -14185,7 +14664,7 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -19585,7 +19655,7 @@
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
      ;;
-@@ -14210,9 +14689,9 @@
+@@ -14212,9 +14691,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -19597,7 +19667,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -14227,7 +14706,7 @@
+@@ -14229,7 +14708,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -19606,7 +19676,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -14238,7 +14717,7 @@
+@@ -14240,7 +14719,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -19615,7 +19685,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -14300,22 +14779,19 @@
+@@ -14302,22 +14781,19 @@
    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'
@@ -19644,7 +19714,7 @@
    # 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,
-@@ -14325,6 +14801,30 @@
+@@ -14327,6 +14803,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -19675,7 +19745,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -14334,7 +14834,7 @@
+@@ -14336,7 +14836,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -19684,7 +19754,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -14363,7 +14863,11 @@
+@@ -14365,7 +14865,11 @@
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
@@ -19697,7 +19767,7 @@
    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
-@@ -14383,7 +14887,7 @@
+@@ -14385,7 +14889,7 @@
  
  os2*)
    libname_spec='$name'
@@ -19706,7 +19776,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -14485,8 +14989,8 @@
+@@ -14487,8 +14991,8 @@
  echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
  hardcode_action_CXX=
  if test -n "$hardcode_libdir_flag_spec_CXX" || \
@@ -19717,16 +19787,16 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct_CXX" != no &&
-@@ -15145,7 +15649,7 @@
+@@ -15147,7 +15651,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 15148 "configure"
-+#line 15652 "configure"
+-#line 15150 "configure"
++#line 15654 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -15211,7 +15715,7 @@
+@@ -15213,7 +15717,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -19735,16 +19805,16 @@
      lt_status=$?
      case x$lt_status in
        x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -15243,7 +15747,7 @@
+@@ -15245,7 +15749,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 15246 "configure"
-+#line 15750 "configure"
+-#line 15248 "configure"
++#line 15752 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -15309,7 +15813,7 @@
+@@ -15311,7 +15815,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -19753,7 +19823,7 @@
      lt_status=$?
      case x$lt_status in
        x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -15360,7 +15864,8 @@
+@@ -15362,7 +15866,8 @@
    # 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.
@@ -19763,7 +19833,7 @@
      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 \
-@@ -15460,6 +15965,12 @@
+@@ -15462,6 +15967,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -19776,7 +19846,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -15490,7 +16001,7 @@
+@@ -15492,7 +16003,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -19785,7 +19855,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -15521,7 +16032,7 @@
+@@ -15523,7 +16034,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -19794,7 +19864,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -15536,7 +16047,7 @@
+@@ -15538,7 +16049,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_CXX
  
@@ -19803,7 +19873,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -15738,7 +16249,10 @@
+@@ -15740,7 +16251,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.
@@ -19815,7 +19885,7 @@
  fi
  
  
-@@ -15814,12 +16328,35 @@
+@@ -15816,12 +16330,35 @@
  compiler=$CC
  
  
@@ -19852,7 +19922,7 @@
  
  echo "$as_me:$LINENO: checking if libtool supports shared libraries" >&5
  echo $ECHO_N "checking if libtool supports shared libraries... $ECHO_C" >&6
-@@ -15832,7 +16369,7 @@
+@@ -15834,7 +16371,7 @@
  
  # On AIX, shared libraries and static libraries use the same namespace, and
  # are all built from PIC.
@@ -19861,7 +19931,7 @@
  aix3*)
    test "$enable_shared" = yes && enable_static=no
    if test -n "$RANLIB"; then
-@@ -15840,8 +16377,10 @@
+@@ -15842,8 +16379,10 @@
      postinstall_cmds='$RANLIB $lib'
    fi
    ;;
@@ -19874,7 +19944,7 @@
    ;;
  esac
  echo "$as_me:$LINENO: result: $enable_shared" >&5
-@@ -15918,7 +16457,7 @@
+@@ -15920,7 +16459,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -19883,7 +19953,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -15944,6 +16483,16 @@
+@@ -15946,6 +16485,16 @@
  	lt_prog_compiler_static_F77='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -19900,7 +19970,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -15955,7 +16504,7 @@
+@@ -15957,7 +16506,7 @@
        lt_prog_compiler_wl_F77='-Wl,'
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -19909,7 +19979,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -15979,12 +16528,19 @@
+@@ -15981,12 +16530,19 @@
        ;;
  
      linux*)
@@ -19930,7 +20000,7 @@
        ccc*)
          lt_prog_compiler_wl_F77='-Wl,'
          # All Alpha code is PIC.
-@@ -16005,9 +16561,14 @@
+@@ -16007,9 +16563,14 @@
        ;;
  
      solaris*)
@@ -19946,7 +20016,7 @@
        ;;
  
      sunos4*)
-@@ -16029,6 +16590,11 @@
+@@ -16031,6 +16592,11 @@
        fi
        ;;
  
@@ -19958,7 +20028,7 @@
      uts4*)
        lt_prog_compiler_pic_F77='-pic'
        lt_prog_compiler_static_F77='-Bstatic'
-@@ -16063,18 +16629,20 @@
+@@ -16065,18 +16631,20 @@
     # 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 \
@@ -19966,13 +20036,13 @@
 +   -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:16069: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16635: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16071: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16637: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:16073: \$? = $ac_status" >&5
-+   echo "$as_me:16639: \$? = $ac_status" >&5
+-   echo "$as_me:16075: \$? = $ac_status" >&5
++   echo "$as_me:16641: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
 -     # So say no if there are warnings
@@ -19984,7 +20054,7 @@
         lt_prog_compiler_pic_works_F77=yes
       fi
     fi
-@@ -16095,7 +16663,7 @@
+@@ -16097,7 +16665,7 @@
  fi
  
  fi
@@ -19993,7 +20063,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic_F77=
-@@ -16117,38 +16685,36 @@
+@@ -16119,38 +16687,36 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -20014,13 +20084,13 @@
 +   -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:16136: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:16697: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:16138: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:16699: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:16140: \$? = $ac_status" >&5
-+   echo "$as_me:16701: \$? = $ac_status" >&5
+-   echo "$as_me:16142: \$? = $ac_status" >&5
++   echo "$as_me:16703: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
@@ -20044,7 +20114,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -16219,6 +16785,16 @@
+@@ -16221,6 +16787,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -20061,7 +20131,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -16239,6 +16815,27 @@
+@@ -16241,6 +16817,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -20089,7 +20159,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -16276,7 +16873,7 @@
+@@ -16278,7 +16875,7 @@
  	allow_undefined_flag_F77=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -20098,7 +20168,7 @@
        else
  	ld_shlibs_F77=no
        fi
-@@ -16286,13 +16883,13 @@
+@@ -16288,13 +16885,13 @@
        # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, F77) is actually meaningless,
        # as there is no search path for DLLs.
        hardcode_libdir_flag_spec_F77='-L$libdir'
@@ -20115,7 +20185,7 @@
  	# If the export-symbols file already is a .def file (1st line
  	# is EXPORTS), use it as is; otherwise, prepend...
  	archive_expsym_cmds_F77='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -16301,19 +16898,51 @@
+@@ -16303,19 +16900,51 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -20172,7 +20242,7 @@
        fi
        ;;
  
-@@ -16331,8 +16960,8 @@
+@@ -16333,8 +16962,8 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -20183,7 +20253,7 @@
        else
  	ld_shlibs_F77=no
        fi
-@@ -16347,24 +16976,19 @@
+@@ -16349,24 +16978,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -20215,7 +20285,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -16398,9 +17022,20 @@
+@@ -16400,9 +17024,20 @@
  	else
  	  export_symbols_cmds_F77='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
  	fi
@@ -20238,7 +20308,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -16417,7 +17052,7 @@
+@@ -16419,7 +17054,7 @@
        link_all_deplibs_F77=yes
  
        if test "$GCC" = yes; then
@@ -20247,7 +20317,7 @@
  	# 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`
-@@ -16438,6 +17073,9 @@
+@@ -16440,6 +17075,9 @@
  	  fi
  	esac
  	shared_flag='-shared'
@@ -20257,7 +20327,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -16446,21 +17084,22 @@
+@@ -16448,21 +17086,22 @@
  	  shared_flag='-G'
  	else
    	if test "$aix_use_runtimelinking" = yes; then
@@ -20285,7 +20355,7 @@
        program main
  
        end
-@@ -16501,14 +17140,13 @@
+@@ -16503,14 +17142,13 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -20303,7 +20373,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -16562,8 +17200,8 @@
+@@ -16564,8 +17202,8 @@
  	  # Exported symbols can be pulled into shared objects from archives
  	  whole_archive_flag_spec_F77=' '
  	  archive_cmds_need_lc_F77=yes
@@ -20314,7 +20384,7 @@
  	fi
        fi
        ;;
-@@ -16576,7 +17214,7 @@
+@@ -16578,7 +17216,7 @@
        ld_shlibs_F77=no
        ;;
  
@@ -20323,7 +20393,7 @@
        export_dynamic_flag_spec_F77=-rdynamic
        ;;
  
-@@ -16586,68 +17224,68 @@
+@@ -16588,68 +17226,68 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_F77=' '
@@ -20436,18 +20506,18 @@
      fi
        ;;
  
-@@ -16681,8 +17319,8 @@
+@@ -16683,8 +17321,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd*)
+-    freebsd* | kfreebsd*-gnu)
 -      archive_cmds_F77='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
 +    freebsd* | kfreebsd*-gnu | dragonfly*)
 +      archive_cmds_F77='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
        hardcode_libdir_flag_spec_F77='-R$libdir'
        hardcode_direct_F77=yes
        hardcode_shlibpath_var_F77=no
-@@ -16690,7 +17328,7 @@
+@@ -16692,7 +17330,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -20456,7 +20526,7 @@
        else
  	archive_cmds_F77='$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
-@@ -16706,16 +17344,16 @@
+@@ -16708,16 +17346,16 @@
  
      hpux10* | hpux11*)
        if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -20477,7 +20547,7 @@
  	hppa*64*|ia64*)
  	  archive_cmds_F77='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
  	  ;;
-@@ -16725,7 +17363,7 @@
+@@ -16727,7 +17365,7 @@
  	esac
        fi
        if test "$with_gnu_ld" = no; then
@@ -20486,7 +20556,7 @@
  	hppa*64*)
  	  hardcode_libdir_flag_spec_F77='${wl}+b ${wl}$libdir'
  	  hardcode_libdir_flag_spec_ld_F77='+b $libdir'
-@@ -16758,7 +17396,7 @@
+@@ -16760,7 +17398,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -20495,7 +20565,7 @@
        else
  	archive_cmds_F77='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  	hardcode_libdir_flag_spec_ld_F77='-rpath $libdir'
-@@ -16768,7 +17406,7 @@
+@@ -16770,7 +17408,7 @@
        link_all_deplibs_F77=yes
        ;;
  
@@ -20504,7 +20574,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_F77='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -16791,7 +17429,8 @@
+@@ -16793,7 +17431,8 @@
        hardcode_direct_F77=yes
        hardcode_shlibpath_var_F77=no
        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -20514,7 +20584,7 @@
  	hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_F77='${wl}-E'
        else
-@@ -16801,7 +17440,7 @@
+@@ -16803,7 +17442,7 @@
  	   hardcode_libdir_flag_spec_F77='-R$libdir'
  	   ;;
  	 *)
@@ -20523,7 +20593,7 @@
  	   hardcode_libdir_flag_spec_F77='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -16812,14 +17451,14 @@
+@@ -16814,14 +17453,14 @@
        hardcode_libdir_flag_spec_F77='-L$libdir'
        hardcode_minus_L_F77=yes
        allow_undefined_flag_F77=unsupported
@@ -20540,7 +20610,7 @@
        else
  	allow_undefined_flag_F77=' -expect_unresolved \*'
  	archive_cmds_F77='$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'
-@@ -16831,13 +17470,13 @@
+@@ -16833,13 +17472,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_F77=' ${wl}-expect_unresolved ${wl}\*'
@@ -20556,7 +20626,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec_F77='-rpath $libdir'
-@@ -16856,10 +17495,12 @@
+@@ -16858,10 +17497,12 @@
      solaris*)
        no_undefined_flag_F77=' -z text'
        if test "$GCC" = yes; then
@@ -20571,7 +20641,7 @@
  	archive_cmds_F77='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  	archive_expsym_cmds_F77='$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'
-@@ -16868,8 +17509,18 @@
+@@ -16870,8 +17511,18 @@
        hardcode_shlibpath_var_F77=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -20592,7 +20662,7 @@
        esac
        link_all_deplibs_F77=yes
        ;;
-@@ -16878,7 +17529,7 @@
+@@ -16880,7 +17531,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.
@@ -20601,7 +20671,7 @@
        else
  	archive_cmds_F77='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -16938,9 +17589,9 @@
+@@ -16940,9 +17591,9 @@
     sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
        no_undefined_flag_F77='${wl}-z ${wl}text'
        if test "$GCC" = yes; then
@@ -20613,7 +20683,7 @@
        fi
        runpath_var='LD_RUN_PATH'
        hardcode_shlibpath_var_F77=no
-@@ -17046,7 +17697,7 @@
+@@ -17048,7 +17699,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -20622,7 +20692,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -17056,7 +17707,20 @@
+@@ -17058,7 +17709,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -20644,7 +20714,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -17121,7 +17785,7 @@
+@@ -17123,7 +17787,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -20653,7 +20723,7 @@
    ;;
  
  beos*)
-@@ -17130,7 +17794,7 @@
+@@ -17132,7 +17796,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -20662,7 +20732,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -17146,7 +17810,7 @@
+@@ -17148,7 +17812,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -20671,7 +20741,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -17158,7 +17822,8 @@
+@@ -17160,7 +17824,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -20681,7 +20751,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -17188,7 +17853,7 @@
+@@ -17190,7 +17855,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -20690,7 +20760,7 @@
        ;;
      esac
      ;;
-@@ -17211,7 +17876,7 @@
+@@ -17213,7 +17878,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -20699,16 +20769,16 @@
    # 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"`
-@@ -17234,7 +17899,7 @@
+@@ -17236,7 +17901,7 @@
    dynamic_linker=no
    ;;
  
--freebsd*-gnu*)
+-kfreebsd*-gnu*)
 +kfreebsd*-gnu)
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -17246,8 +17911,17 @@
+@@ -17248,8 +17913,17 @@
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -20728,7 +20798,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -17265,7 +17939,7 @@
+@@ -17267,7 +17941,7 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -20737,7 +20807,7 @@
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
      ;;
-@@ -17292,9 +17966,9 @@
+@@ -17294,9 +17968,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -20749,7 +20819,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -17309,7 +17983,7 @@
+@@ -17311,7 +17985,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -20758,7 +20828,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -17320,7 +17994,7 @@
+@@ -17322,7 +17996,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -20767,7 +20837,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -17382,22 +18056,19 @@
+@@ -17384,22 +18058,19 @@
    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'
@@ -20796,7 +20866,7 @@
    # 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,
-@@ -17407,6 +18078,30 @@
+@@ -17409,6 +18080,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -20827,7 +20897,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -17416,7 +18111,7 @@
+@@ -17418,7 +18113,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -20836,7 +20906,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -17445,7 +18140,11 @@
+@@ -17447,7 +18142,11 @@
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
@@ -20849,7 +20919,7 @@
    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
-@@ -17465,7 +18164,7 @@
+@@ -17467,7 +18166,7 @@
  
  os2*)
    libname_spec='$name'
@@ -20858,7 +20928,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -17567,8 +18266,8 @@
+@@ -17569,8 +18268,8 @@
  echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
  hardcode_action_F77=
  if test -n "$hardcode_libdir_flag_spec_F77" || \
@@ -20869,7 +20939,7 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct_F77" != no &&
-@@ -17644,7 +18343,8 @@
+@@ -17646,7 +18345,8 @@
    # 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.
@@ -20879,7 +20949,7 @@
      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 \
-@@ -17744,6 +18444,12 @@
+@@ -17746,6 +18446,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -20892,7 +20962,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -17774,7 +18480,7 @@
+@@ -17776,7 +18482,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -20901,7 +20971,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -17805,7 +18511,7 @@
+@@ -17807,7 +18513,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -20910,7 +20980,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -17820,7 +18526,7 @@
+@@ -17822,7 +18528,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_F77
  
@@ -20919,7 +20989,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -18022,7 +18728,10 @@
+@@ -18024,7 +18730,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.
@@ -20931,7 +21001,7 @@
  fi
  
  
-@@ -18055,7 +18764,7 @@
+@@ -18057,7 +18766,7 @@
  lt_simple_compile_test_code="class foo {}\n"
  
  # Code to be used in simple link tests
@@ -20940,7 +21010,7 @@
  
  # ltmain only uses $CC for tagged configurations so make sure $CC is set.
  
-@@ -18066,15 +18775,45 @@
+@@ -18068,15 +18777,45 @@
  compiler=$CC
  
  
@@ -20986,7 +21056,7 @@
  
  lt_prog_compiler_no_builtin_flag_GCJ=
  
-@@ -18097,18 +18836,20 @@
+@@ -18099,18 +18838,20 @@
     # 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 \
@@ -20994,13 +21064,13 @@
 +   -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:18103: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:18842: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18105: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:18844: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:18107: \$? = $ac_status" >&5
-+   echo "$as_me:18846: \$? = $ac_status" >&5
+-   echo "$as_me:18109: \$? = $ac_status" >&5
++   echo "$as_me:18848: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
 -     # So say no if there are warnings
@@ -21012,7 +21082,7 @@
         lt_cv_prog_compiler_rtti_exceptions=yes
       fi
     fi
-@@ -18185,7 +18926,7 @@
+@@ -18187,7 +18928,7 @@
      hpux*)
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -21021,7 +21091,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -18211,6 +18952,16 @@
+@@ -18213,6 +18954,16 @@
  	lt_prog_compiler_static_GCJ='-bnso -bI:/lib/syscalls.exp'
        fi
        ;;
@@ -21038,7 +21108,7 @@
  
      mingw* | pw32* | os2*)
        # This hack is so that the source file can tell whether it is being
-@@ -18222,7 +18973,7 @@
+@@ -18224,7 +18975,7 @@
        lt_prog_compiler_wl_GCJ='-Wl,'
        # PIC is the default for IA64 HP-UX and 64-bit HP-UX, but
        # not for PA HP-UX.
@@ -21047,7 +21117,7 @@
        hppa*64*|ia64*)
  	# +Z the default
  	;;
-@@ -18246,12 +18997,19 @@
+@@ -18248,12 +18999,19 @@
        ;;
  
      linux*)
@@ -21068,7 +21138,7 @@
        ccc*)
          lt_prog_compiler_wl_GCJ='-Wl,'
          # All Alpha code is PIC.
-@@ -18272,9 +19030,14 @@
+@@ -18274,9 +19032,14 @@
        ;;
  
      solaris*)
@@ -21084,7 +21154,7 @@
        ;;
  
      sunos4*)
-@@ -18296,6 +19059,11 @@
+@@ -18298,6 +19061,11 @@
        fi
        ;;
  
@@ -21096,7 +21166,7 @@
      uts4*)
        lt_prog_compiler_pic_GCJ='-pic'
        lt_prog_compiler_static_GCJ='-Bstatic'
-@@ -18330,18 +19098,20 @@
+@@ -18332,18 +19100,20 @@
     # 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 \
@@ -21104,13 +21174,13 @@
 +   -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:18336: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:19104: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18338: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19106: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>conftest.err)
     ac_status=$?
     cat conftest.err >&5
--   echo "$as_me:18340: \$? = $ac_status" >&5
-+   echo "$as_me:19108: \$? = $ac_status" >&5
+-   echo "$as_me:18342: \$? = $ac_status" >&5
++   echo "$as_me:19110: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s "$ac_outfile"; then
       # The compiler can only warn and ignore the option if not recognized
 -     # So say no if there are warnings
@@ -21122,7 +21192,7 @@
         lt_prog_compiler_pic_works_GCJ=yes
       fi
     fi
-@@ -18362,7 +19132,7 @@
+@@ -18364,7 +19134,7 @@
  fi
  
  fi
@@ -21131,7 +21201,7 @@
    # For platforms which do not support PIC, -DPIC is meaningless:
    *djgpp*)
      lt_prog_compiler_pic_GCJ=
-@@ -18384,38 +19154,36 @@
+@@ -18386,38 +19156,36 @@
     mkdir out
     printf "$lt_simple_compile_test_code" > conftest.$ac_ext
  
@@ -21152,13 +21222,13 @@
 +   -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:18403: $lt_compile\"" >&5)
-+   (eval echo "\"\$as_me:19166: $lt_compile\"" >&5)
+-   (eval echo "\"\$as_me:18405: $lt_compile\"" >&5)
++   (eval echo "\"\$as_me:19168: $lt_compile\"" >&5)
     (eval "$lt_compile" 2>out/conftest.err)
     ac_status=$?
     cat out/conftest.err >&5
--   echo "$as_me:18407: \$? = $ac_status" >&5
-+   echo "$as_me:19170: \$? = $ac_status" >&5
+-   echo "$as_me:18409: \$? = $ac_status" >&5
++   echo "$as_me:19172: \$? = $ac_status" >&5
     if (exit $ac_status) && test -s out/conftest2.$ac_objext
     then
       # The compiler can only warn and ignore the option if not recognized
@@ -21182,7 +21252,7 @@
     cd ..
     rmdir conftest
     $rm conftest*
-@@ -18486,6 +19254,16 @@
+@@ -18488,6 +19256,16 @@
    # rely on this symbol name, it's probably fine to never include it in
    # preloaded symbol tables.
    extract_expsyms_cmds=
@@ -21199,7 +21269,7 @@
  
    case $host_os in
    cygwin* | mingw* | pw32*)
-@@ -18506,6 +19284,27 @@
+@@ -18508,6 +19286,27 @@
      # If archive_cmds runs LD, not CC, wlarc should be empty
      wlarc='${wl}'
  
@@ -21227,7 +21297,7 @@
      # See if GNU ld supports shared libraries.
      case $host_os in
      aix3* | aix4* | aix5*)
-@@ -18543,7 +19342,7 @@
+@@ -18545,7 +19344,7 @@
  	allow_undefined_flag_GCJ=unsupported
  	# Joseph Beckenbach <jrb3 at best.com> says some releases of gcc
  	# support --undefined.  This deserves some investigation.  FIXME
@@ -21236,7 +21306,7 @@
        else
  	ld_shlibs_GCJ=no
        fi
-@@ -18553,13 +19352,13 @@
+@@ -18555,13 +19354,13 @@
        # _LT_AC_TAGVAR(hardcode_libdir_flag_spec, GCJ) is actually meaningless,
        # as there is no search path for DLLs.
        hardcode_libdir_flag_spec_GCJ='-L$libdir'
@@ -21253,7 +21323,7 @@
  	# If the export-symbols file already is a .def file (1st line
  	# is EXPORTS), use it as is; otherwise, prepend...
  	archive_expsym_cmds_GCJ='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-@@ -18568,19 +19367,51 @@
+@@ -18570,19 +19369,51 @@
  	  echo EXPORTS > $output_objdir/$soname.def;
  	  cat $export_symbols >> $output_objdir/$soname.def;
  	fi~
@@ -21310,7 +21380,7 @@
        fi
        ;;
  
-@@ -18598,8 +19429,8 @@
+@@ -18600,8 +19431,8 @@
  
  EOF
        elif $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -21321,7 +21391,7 @@
        else
  	ld_shlibs_GCJ=no
        fi
-@@ -18614,24 +19445,19 @@
+@@ -18616,24 +19447,19 @@
  
      *)
        if $LD --help 2>&1 | grep ': supported targets:.* elf' > /dev/null; then
@@ -21353,7 +21423,7 @@
      fi
    else
      # PORTME fill in a description of your system's linker (not GNU ld)
-@@ -18665,9 +19491,20 @@
+@@ -18667,9 +19493,20 @@
  	else
  	  export_symbols_cmds_GCJ='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$2 == "T") || (\$2 == "D") || (\$2 == "B")) && (substr(\$3,1,1) != ".")) { print \$3 } }'\'' | sort -u > $export_symbols'
  	fi
@@ -21376,7 +21446,7 @@
  	exp_sym_flag='-bexport'
  	no_entry_flag='-bnoentry'
        fi
-@@ -18684,7 +19521,7 @@
+@@ -18686,7 +19523,7 @@
        link_all_deplibs_GCJ=yes
  
        if test "$GCC" = yes; then
@@ -21385,7 +21455,7 @@
  	# 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`
-@@ -18705,6 +19542,9 @@
+@@ -18707,6 +19544,9 @@
  	  fi
  	esac
  	shared_flag='-shared'
@@ -21395,7 +21465,7 @@
        else
  	# not using gcc
  	if test "$host_cpu" = ia64; then
-@@ -18713,21 +19553,22 @@
+@@ -18715,21 +19555,22 @@
  	  shared_flag='-G'
  	else
    	if test "$aix_use_runtimelinking" = yes; then
@@ -21423,7 +21493,7 @@
  /* confdefs.h.  */
  _ACEOF
  cat confdefs.h >>conftest.$ac_ext
-@@ -18778,14 +19619,13 @@
+@@ -18780,14 +19621,13 @@
        conftest$ac_exeext conftest.$ac_ext
  if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
  
@@ -21441,7 +21511,7 @@
  	else
  	 # Determine the default libpath from the value encoded in an empty executable.
  	 cat >conftest.$ac_ext <<_ACEOF
-@@ -18849,8 +19689,8 @@
+@@ -18851,8 +19691,8 @@
  	  # Exported symbols can be pulled into shared objects from archives
  	  whole_archive_flag_spec_GCJ=' '
  	  archive_cmds_need_lc_GCJ=yes
@@ -21452,7 +21522,7 @@
  	fi
        fi
        ;;
-@@ -18863,7 +19703,7 @@
+@@ -18865,7 +19705,7 @@
        ld_shlibs_GCJ=no
        ;;
  
@@ -21461,7 +21531,7 @@
        export_dynamic_flag_spec_GCJ=-rdynamic
        ;;
  
-@@ -18873,68 +19713,68 @@
+@@ -18875,68 +19715,68 @@
        # hardcode_libdir_flag_spec is actually meaningless, as there is
        # no search path for DLLs.
        hardcode_libdir_flag_spec_GCJ=' '
@@ -21574,18 +21644,18 @@
      fi
        ;;
  
-@@ -18968,8 +19808,8 @@
+@@ -18970,8 +19810,8 @@
        ;;
  
      # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
--    freebsd*)
+-    freebsd* | kfreebsd*-gnu)
 -      archive_cmds_GCJ='$CC -shared -o $lib $compiler_flags $libobjs $deplibs'
 +    freebsd* | kfreebsd*-gnu | dragonfly*)
 +      archive_cmds_GCJ='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
        hardcode_libdir_flag_spec_GCJ='-R$libdir'
        hardcode_direct_GCJ=yes
        hardcode_shlibpath_var_GCJ=no
-@@ -18977,7 +19817,7 @@
+@@ -18979,7 +19819,7 @@
  
      hpux9*)
        if test "$GCC" = yes; then
@@ -21594,7 +21664,7 @@
        else
  	archive_cmds_GCJ='$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
-@@ -18993,16 +19833,16 @@
+@@ -18995,16 +19835,16 @@
  
      hpux10* | hpux11*)
        if test "$GCC" = yes -a "$with_gnu_ld" = no; then
@@ -21615,7 +21685,7 @@
  	hppa*64*|ia64*)
  	  archive_cmds_GCJ='$LD -b +h $soname -o $lib $libobjs $deplibs $linker_flags'
  	  ;;
-@@ -19012,7 +19852,7 @@
+@@ -19014,7 +19854,7 @@
  	esac
        fi
        if test "$with_gnu_ld" = no; then
@@ -21624,7 +21694,7 @@
  	hppa*64*)
  	  hardcode_libdir_flag_spec_GCJ='${wl}+b ${wl}$libdir'
  	  hardcode_libdir_flag_spec_ld_GCJ='+b $libdir'
-@@ -19045,7 +19885,7 @@
+@@ -19047,7 +19887,7 @@
  
      irix5* | irix6* | nonstopux*)
        if test "$GCC" = yes; then
@@ -21633,7 +21703,7 @@
        else
  	archive_cmds_GCJ='$LD -shared $libobjs $deplibs $linker_flags -soname $soname `test -n "$verstring" && echo -set_version $verstring` -update_registry ${output_objdir}/so_locations -o $lib'
  	hardcode_libdir_flag_spec_ld_GCJ='-rpath $libdir'
-@@ -19055,7 +19895,7 @@
+@@ -19057,7 +19897,7 @@
        link_all_deplibs_GCJ=yes
        ;;
  
@@ -21642,7 +21712,7 @@
        if echo __ELF__ | $CC -E - | grep __ELF__ >/dev/null; then
  	archive_cmds_GCJ='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'  # a.out
        else
-@@ -19078,7 +19918,8 @@
+@@ -19080,7 +19920,8 @@
        hardcode_direct_GCJ=yes
        hardcode_shlibpath_var_GCJ=no
        if test -z "`echo __ELF__ | $CC -E - | grep __ELF__`" || test "$host_os-$host_cpu" = "openbsd2.8-powerpc"; then
@@ -21652,7 +21722,7 @@
  	hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	export_dynamic_flag_spec_GCJ='${wl}-E'
        else
-@@ -19088,7 +19929,7 @@
+@@ -19090,7 +19931,7 @@
  	   hardcode_libdir_flag_spec_GCJ='-R$libdir'
  	   ;;
  	 *)
@@ -21661,7 +21731,7 @@
  	   hardcode_libdir_flag_spec_GCJ='${wl}-rpath,$libdir'
  	   ;;
         esac
-@@ -19099,14 +19940,14 @@
+@@ -19101,14 +19942,14 @@
        hardcode_libdir_flag_spec_GCJ='-L$libdir'
        hardcode_minus_L_GCJ=yes
        allow_undefined_flag_GCJ=unsupported
@@ -21678,7 +21748,7 @@
        else
  	allow_undefined_flag_GCJ=' -expect_unresolved \*'
  	archive_cmds_GCJ='$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'
-@@ -19118,13 +19959,13 @@
+@@ -19120,13 +19961,13 @@
      osf4* | osf5*)	# as osf3* with the addition of -msym flag
        if test "$GCC" = yes; then
  	allow_undefined_flag_GCJ=' ${wl}-expect_unresolved ${wl}\*'
@@ -21694,7 +21764,7 @@
  
  	# Both c and cxx compiler support -rpath directly
  	hardcode_libdir_flag_spec_GCJ='-rpath $libdir'
-@@ -19143,10 +19984,12 @@
+@@ -19145,10 +19986,12 @@
      solaris*)
        no_undefined_flag_GCJ=' -z text'
        if test "$GCC" = yes; then
@@ -21709,7 +21779,7 @@
  	archive_cmds_GCJ='$LD -G${allow_undefined_flag} -h $soname -o $lib $libobjs $deplibs $linker_flags'
  	archive_expsym_cmds_GCJ='$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'
-@@ -19155,8 +19998,18 @@
+@@ -19157,8 +20000,18 @@
        hardcode_shlibpath_var_GCJ=no
        case $host_os in
        solaris2.[0-5] | solaris2.[0-5].*) ;;
@@ -21730,7 +21800,7 @@
        esac
        link_all_deplibs_GCJ=yes
        ;;
-@@ -19165,7 +20018,7 @@
+@@ -19167,7 +20020,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.
@@ -21739,7 +21809,7 @@
        else
  	archive_cmds_GCJ='$LD -assert pure-text -Bstatic -o $lib $libobjs $deplibs $linker_flags'
        fi
-@@ -19225,9 +20078,9 @@
+@@ -19227,9 +20080,9 @@
     sysv5OpenUNIX8* | sysv5UnixWare7* |  sysv5uw[78]* | unixware7*)
        no_undefined_flag_GCJ='${wl}-z ${wl}text'
        if test "$GCC" = yes; then
@@ -21751,7 +21821,7 @@
        fi
        runpath_var='LD_RUN_PATH'
        hardcode_shlibpath_var_GCJ=no
-@@ -19333,7 +20186,7 @@
+@@ -19335,7 +20188,7 @@
  library_names_spec=
  libname_spec='lib$name'
  soname_spec=
@@ -21760,7 +21830,7 @@
  postinstall_cmds=
  postuninstall_cmds=
  finish_cmds=
-@@ -19343,7 +20196,20 @@
+@@ -19345,7 +20198,20 @@
  version_type=none
  dynamic_linker="$host_os ld.so"
  sys_lib_dlsearch_path_spec="/lib /usr/lib"
@@ -21782,7 +21852,7 @@
  need_lib_prefix=unknown
  hardcode_into_libs=no
  
-@@ -19408,7 +20274,7 @@
+@@ -19410,7 +20276,7 @@
  amigaos*)
    library_names_spec='$libname.ixlibrary $libname.a'
    # Create ${libname}_ixlibrary.a entries in /sys/libs.
@@ -21791,7 +21861,7 @@
    ;;
  
  beos*)
-@@ -19417,7 +20283,7 @@
+@@ -19419,7 +20285,7 @@
    shlibpath_var=LIBRARY_PATH
    ;;
  
@@ -21800,7 +21870,7 @@
    version_type=linux
    need_version=no
    library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
-@@ -19433,7 +20299,7 @@
+@@ -19435,7 +20301,7 @@
  
  cygwin* | mingw* | pw32*)
    version_type=windows
@@ -21809,7 +21879,7 @@
    need_version=no
    need_lib_prefix=no
  
-@@ -19445,7 +20311,8 @@
+@@ -19447,7 +20313,8 @@
        dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i;echo \$dlname'\''`~
        dldir=$destdir/`dirname \$dlpath`~
        test -d \$dldir || mkdir -p \$dldir~
@@ -21819,7 +21889,7 @@
      postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
        dlpath=$dir/\$dldll~
         $rm \$dlpath'
-@@ -19475,7 +20342,7 @@
+@@ -19477,7 +20344,7 @@
        ;;
      pw32*)
        # pw32 DLLs use 'pw' prefix rather than 'lib'
@@ -21828,7 +21898,7 @@
        ;;
      esac
      ;;
-@@ -19498,7 +20365,7 @@
+@@ -19500,7 +20367,7 @@
    soname_spec='${libname}${release}${major}$shared_ext'
    shlibpath_overrides_runpath=yes
    shlibpath_var=DYLD_LIBRARY_PATH
@@ -21837,16 +21907,16 @@
    # 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"`
-@@ -19521,7 +20388,7 @@
+@@ -19523,7 +20390,7 @@
    dynamic_linker=no
    ;;
  
--freebsd*-gnu*)
+-kfreebsd*-gnu*)
 +kfreebsd*-gnu)
    version_type=linux
    need_lib_prefix=no
    need_version=no
-@@ -19533,8 +20400,17 @@
+@@ -19535,8 +20402,17 @@
    dynamic_linker='GNU ld.so'
    ;;
  
@@ -21866,7 +21936,7 @@
    version_type=freebsd-$objformat
    case $version_type in
      freebsd-elf*)
-@@ -19552,7 +20428,7 @@
+@@ -19554,7 +20430,7 @@
    freebsd2*)
      shlibpath_overrides_runpath=yes
      ;;
@@ -21875,7 +21945,7 @@
      shlibpath_overrides_runpath=yes
      hardcode_into_libs=yes
      ;;
-@@ -19579,9 +20455,9 @@
+@@ -19581,9 +20457,9 @@
    version_type=sunos
    need_lib_prefix=no
    need_version=no
@@ -21887,7 +21957,7 @@
      hardcode_into_libs=yes
      dynamic_linker="$host_os dld.so"
      shlibpath_var=LD_LIBRARY_PATH
-@@ -19596,7 +20472,7 @@
+@@ -19598,7 +20474,7 @@
      sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
      ;;
     hppa*64*)
@@ -21896,7 +21966,7 @@
       hardcode_into_libs=yes
       dynamic_linker="$host_os dld.sl"
       shlibpath_var=LD_LIBRARY_PATH # How should we handle SHLIB_PATH
-@@ -19607,7 +20483,7 @@
+@@ -19609,7 +20485,7 @@
       sys_lib_dlsearch_path_spec=$sys_lib_search_path_spec
       ;;
     *)
@@ -21905,7 +21975,7 @@
      dynamic_linker="$host_os dld.sl"
      shlibpath_var=SHLIB_PATH
      shlibpath_overrides_runpath=no # +s is required to enable SHLIB_PATH
-@@ -19669,22 +20545,19 @@
+@@ -19671,22 +20547,19 @@
    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'
@@ -21934,7 +22004,7 @@
    # 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,
-@@ -19694,6 +20567,30 @@
+@@ -19696,6 +20569,30 @@
    dynamic_linker='GNU/Linux ld.so'
    ;;
  
@@ -21965,7 +22035,7 @@
  netbsd*)
    version_type=sunos
    need_lib_prefix=no
-@@ -19703,7 +20600,7 @@
+@@ -19705,7 +20602,7 @@
      finish_cmds='PATH="\$PATH:/sbin" ldconfig -m $libdir'
      dynamic_linker='NetBSD (a.out) ld.so'
    else
@@ -21974,7 +22044,7 @@
      soname_spec='${libname}${release}${shared_ext}$major'
      dynamic_linker='NetBSD ld.elf_so'
    fi
-@@ -19732,7 +20629,11 @@
+@@ -19734,7 +20631,11 @@
  openbsd*)
    version_type=sunos
    need_lib_prefix=no
@@ -21987,7 +22057,7 @@
    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
-@@ -19752,7 +20653,7 @@
+@@ -19754,7 +20655,7 @@
  
  os2*)
    libname_spec='$name'
@@ -21996,7 +22066,7 @@
    need_lib_prefix=no
    library_names_spec='$libname${shared_ext} $libname.a'
    dynamic_linker='OS/2 ld.exe'
-@@ -19854,8 +20755,8 @@
+@@ -19856,8 +20757,8 @@
  echo $ECHO_N "checking how to hardcode library paths into programs... $ECHO_C" >&6
  hardcode_action_GCJ=
  if test -n "$hardcode_libdir_flag_spec_GCJ" || \
@@ -22007,16 +22077,16 @@
  
    # We can hardcode non-existant directories.
    if test "$hardcode_direct_GCJ" != no &&
-@@ -20514,7 +21415,7 @@
+@@ -20516,7 +21417,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 20517 "configure"
-+#line 21418 "configure"
+-#line 20519 "configure"
++#line 21420 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -20580,7 +21481,7 @@
+@@ -20582,7 +21483,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -22025,16 +22095,16 @@
      lt_status=$?
      case x$lt_status in
        x$lt_dlno_uscore) lt_cv_dlopen_self=yes ;;
-@@ -20612,7 +21513,7 @@
+@@ -20614,7 +21515,7 @@
    lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
    lt_status=$lt_dlunknown
    cat > conftest.$ac_ext <<EOF
--#line 20615 "configure"
-+#line 21516 "configure"
+-#line 20617 "configure"
++#line 21518 "configure"
  #include "confdefs.h"
  
  #if HAVE_DLFCN_H
-@@ -20678,7 +21579,7 @@
+@@ -20680,7 +21581,7 @@
    ac_status=$?
    echo "$as_me:$LINENO: \$? = $ac_status" >&5
    (exit $ac_status); } && test -s conftest${ac_exeext} 2>/dev/null; then
@@ -22043,7 +22113,7 @@
      lt_status=$?
      case x$lt_status in
        x$lt_dlno_uscore) lt_cv_dlopen_self_static=yes ;;
-@@ -20729,7 +21630,8 @@
+@@ -20731,7 +21632,8 @@
    # 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.
@@ -22053,7 +22123,7 @@
      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 \
-@@ -20829,6 +21731,12 @@
+@@ -20831,6 +21733,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -22066,7 +22136,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -20859,7 +21767,7 @@
+@@ -20861,7 +21769,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -22075,7 +22145,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -20890,7 +21798,7 @@
+@@ -20892,7 +21800,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -22084,7 +22154,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -20905,7 +21813,7 @@
+@@ -20907,7 +21815,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_GCJ
  
@@ -22093,7 +22163,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -21107,7 +22015,10 @@
+@@ -21109,7 +22017,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.
@@ -22105,7 +22175,7 @@
  fi
  
  
-@@ -21150,11 +22061,35 @@
+@@ -21152,11 +22063,35 @@
  compiler=$CC
  
  
@@ -22141,7 +22211,7 @@
  lt_cv_prog_compiler_c_o_RC=yes
  
  # The else clause should only fire when bootstrapping the
-@@ -21170,7 +22105,8 @@
+@@ -21172,7 +22107,8 @@
    # 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.
@@ -22151,7 +22221,7 @@
      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 \
-@@ -21270,6 +22206,12 @@
+@@ -21272,6 +22208,12 @@
  # The host system.
  host_alias=$host_alias
  host=$host
@@ -22164,7 +22234,7 @@
  
  # An echo program that does not interpret backslashes.
  echo=$lt_echo
-@@ -21300,7 +22242,7 @@
+@@ -21302,7 +22244,7 @@
  NM=$lt_NM
  
  # A symbol stripping program
@@ -22173,7 +22243,7 @@
  
  # Used to examine libraries when file_magic_cmd begins "file"
  MAGIC_CMD=$MAGIC_CMD
-@@ -21331,7 +22273,7 @@
+@@ -21333,7 +22275,7 @@
  libext="$libext"
  
  # Shared library suffix (normally ".so").
@@ -22182,7 +22252,7 @@
  
  # Executable file suffix (normally "").
  exeext="$exeext"
-@@ -21346,7 +22288,7 @@
+@@ -21348,7 +22290,7 @@
  # Does compiler simultaneously support -c and -o options?
  compiler_c_o=$lt_lt_cv_prog_compiler_c_o_RC
  
@@ -22191,7 +22261,7 @@
  need_locks=$lt_need_locks
  
  # Do we need the lib prefix for modules?
-@@ -21548,7 +22490,10 @@
+@@ -21550,7 +22492,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.
@@ -22203,7 +22273,7 @@
  fi
  
  
-@@ -21595,7 +22540,7 @@
+@@ -21597,7 +22542,7 @@
  LIBTOOL_DEPS="$ac_aux_dir/ltmain.sh"
  
  # Always use our own libtool.
@@ -22212,7 +22282,7 @@
  
  # Prevent multiple expansion
  
-@@ -21994,9 +22939,6 @@
+@@ -21996,9 +22941,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -22222,7 +22292,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -22213,9 +23155,6 @@
+@@ -22215,9 +23157,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -22232,7 +22302,7 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -24397,9 +25336,6 @@
+@@ -24398,9 +25337,6 @@
  save_CXXFLAGS="$CXXFLAGS"
  kde_safe_LIBS="$LIBS"
  LIBS="$LIBS $X_EXTRA_LIBS"
@@ -22242,48 +22312,48 @@
  cat >conftest.$ac_ext <<_ACEOF
  /* confdefs.h.  */
  _ACEOF
-@@ -29295,7 +30231,7 @@
+@@ -29290,7 +30226,7 @@
  do
    for j in jpeglib.h;
    do
--    echo "configure: 29298: $i/$j" >&5
-+    echo "configure: 30234: $i/$j" >&5
+-    echo "configure: 29293: $i/$j" >&5
++    echo "configure: 30229: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        jpeg_incdir=$i
-@@ -29593,7 +30529,7 @@
+@@ -29588,7 +30524,7 @@
  do
    for j in $kde_qt_header;
    do
--    echo "configure: 29596: $i/$j" >&5
-+    echo "configure: 30532: $i/$j" >&5
+-    echo "configure: 29591: $i/$j" >&5
++    echo "configure: 30527: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        qt_incdir=$i
-@@ -30429,7 +31365,7 @@
+@@ -30424,7 +31360,7 @@
  do
    for j in $kde_check_header;
    do
--    echo "configure: 30432: $i/$j" >&5
-+    echo "configure: 31368: $i/$j" >&5
+-    echo "configure: 30427: $i/$j" >&5
++    echo "configure: 31363: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_incdir=$i
-@@ -30459,7 +31395,7 @@
+@@ -30454,7 +31390,7 @@
  do
    for j in $kde_check_lib;
    do
--    echo "configure: 30462: $i/$j" >&5
-+    echo "configure: 31398: $i/$j" >&5
+-    echo "configure: 30457: $i/$j" >&5
++    echo "configure: 31393: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_libdir=$i
-@@ -30477,7 +31413,7 @@
+@@ -30472,7 +31408,7 @@
  do
    for j in "kde3/plugins/designer/kdewidgets.la";
    do
--    echo "configure: 30480: $i/$j" >&5
-+    echo "configure: 31416: $i/$j" >&5
+-    echo "configure: 30475: $i/$j" >&5
++    echo "configure: 31411: $i/$j" >&5
      if test -r "$i/$j"; then
        echo "taking that" >&5
        kde_widgetdir=$i
@@ -22296,219 +22366,7 @@
      if test -r "$i/$j"; then
        echo "taking that" >&5
        KDE_XSL_STYLESHEET=$i
-@@ -32178,7 +33114,7 @@
- do
-   for j in qsql.html;
-   do
--    echo "configure: 32181: $i/$j" >&5
-+    echo "configure: 33117: $i/$j" >&5
-     if test -r "$i/$j"; then
-       echo "taking that" >&5
-       QTDOCDIR=$i
-@@ -32339,202 +33275,6 @@
- #MIN_CONFIG(3.2)
- 
- 
--  if test "$GXX" = "yes"; then
--
--echo "$as_me:$LINENO: checking whether $CXX supports -fvisibility=hidden" >&5
--echo $ECHO_N "checking whether $CXX supports -fvisibility=hidden... $ECHO_C" >&6
--kde_cache=`echo fvisibility=hidden | sed 'y% .=/+-,%____p__%'`
--if eval "test \"\${kde_cv_prog_cxx_$kde_cache+set}\" = set"; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--
--
--
--   ac_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
--ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--
--
--  save_CXXFLAGS="$CXXFLAGS"
--  CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
--  cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--int
--main ()
--{
-- return 0;
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  eval "kde_cv_prog_cxx_$kde_cache=yes"
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--  CXXFLAGS="$save_CXXFLAGS"
--  ac_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
--
--fi
--
--if eval "test \"`echo '$kde_cv_prog_cxx_'$kde_cache`\" = yes"; then
-- echo "$as_me:$LINENO: result: yes" >&5
--echo "${ECHO_T}yes" >&6
-- :
--
--        CXXFLAGS="$CXXFLAGS -fvisibility=hidden"
--
--    echo "$as_me:$LINENO: checking for gcc -fvisibility-inlines-hidden bug" >&5
--echo $ECHO_N "checking for gcc -fvisibility-inlines-hidden bug... $ECHO_C" >&6
--if test "${kde_cv_val_gcc_visibility_bug+set}" = set; then
--  echo $ECHO_N "(cached) $ECHO_C" >&6
--else
--
--
--
--         ac_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
--ac_link='rm -rf SunWS_cache; ${CXX-g++} -o conftest${ac_exeext} $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS 1>&5'
--
--
--
--        safe_CXXFLAGS=$CXXFLAGS
--        safe_LDFLAGS=$LDFLAGS
--        CXXFLAGS="$CXXFLAGS -fPIC -fvisibility-inlines-hidden -O0"
--        LDFLAGS="$LDFLAGS -shared -fPIC"
--
--        cat >conftest.$ac_ext <<_ACEOF
--/* confdefs.h.  */
--_ACEOF
--cat confdefs.h >>conftest.$ac_ext
--cat >>conftest.$ac_ext <<_ACEOF
--/* end confdefs.h.  */
--
--          /* http://gcc.gnu.org/bugzilla/show_bug.cgi?id=19664 */
--	  #include <string>
--          int some_function( void ) __attribute__ ((visibility("default")));
--          int some_function( void )
--          {
--	    std::string s("blafasel");
--            return 0;
--          }
--
--int
--main ()
--{
--/* elvis is alive */
--  ;
--  return 0;
--}
--_ACEOF
--rm -f conftest.$ac_objext conftest$ac_exeext
--if { (eval echo "$as_me:$LINENO: \"$ac_link\"") >&5
--  (eval $ac_link) 2>conftest.er1
--  ac_status=$?
--  grep -v '^ *+' conftest.er1 >conftest.err
--  rm -f conftest.er1
--  cat conftest.err >&5
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); } &&
--	 { ac_try='test -z "$ac_cxx_werror_flag"			 || test ! -s conftest.err'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; } &&
--	 { ac_try='test -s conftest$ac_exeext'
--  { (eval echo "$as_me:$LINENO: \"$ac_try\"") >&5
--  (eval $ac_try) 2>&5
--  ac_status=$?
--  echo "$as_me:$LINENO: \$? = $ac_status" >&5
--  (exit $ac_status); }; }; then
--  kde_cv_val_gcc_visibility_bug=no
--else
--  echo "$as_me: failed program was:" >&5
--sed 's/^/| /' conftest.$ac_ext >&5
--
--kde_cv_val_gcc_visibility_bug=yes
--fi
--rm -f conftest.err conftest.$ac_objext \
--      conftest$ac_exeext conftest.$ac_ext
--
--        CXXFLAGS=$safe_CXXFLAGS
--        LDFLAGS=$safe_LDFLAGS
--        ac_ext=cc
--ac_cpp='$CXXCPP $CPPFLAGS'
--ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
--ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
--ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
--
--
--
--fi
--echo "$as_me:$LINENO: result: $kde_cv_val_gcc_visibility_bug" >&5
--echo "${ECHO_T}$kde_cv_val_gcc_visibility_bug" >&6
--
--    if test x$kde_cv_val_gcc_visibility_bug = xno; then
--      CXXFLAGS="$CXXFLAGS -fvisibility-inlines-hidden"
--    fi
--
--
--
--        HAVE_GCC_VISIBILITY=1
--
--cat >>confdefs.h <<_ACEOF
--#define __KDE_HAVE_GCC_VISIBILITY "$HAVE_GCC_VISIBILITY"
--_ACEOF
--
--
--else
-- echo "$as_me:$LINENO: result: no" >&5
--echo "${ECHO_T}no" >&6
-- :
--
--fi
--
--  fi
- 
- 
- 
-@@ -32832,9 +33572,9 @@
+@@ -32793,9 +33729,9 @@
  #
  # By default we simply use the C compiler to build assembly code.
  
@@ -22521,43 +22379,7 @@
  
  
  
-@@ -32856,7 +33596,7 @@
- int
- main ()
- {
-- __asm__("pxor %%mm0, %%mm0" : : : "%mm0")
-+ __asm__("pxor %mm0, %mm0")
-   ;
-   return 0;
- }
-@@ -32909,7 +33649,7 @@
- int
- main ()
- {
-- __asm__("xorps %%xmm0, %%xmm0" : : : "%xmm0")
-+ __asm__("xorps %xmm0, %xmm0")
-   ;
-   return 0;
- }
-@@ -32962,7 +33702,7 @@
- int
- main ()
- {
-- __asm__("xorpd %%xmm0, %%xmm0" : : : "%xmm0")
-+ __asm__("xorpd %xmm0, %xmm0")
-   ;
-   return 0;
- }
-@@ -33015,7 +33755,7 @@
- int
- main ()
- {
-- __asm__("femms" : : )
-+ __asm__("femms")
-   ;
-   return 0;
- }
-@@ -33897,6 +34637,13 @@
+@@ -33800,6 +34736,13 @@
  LTLIBOBJS=$ac_ltlibobjs
  
  
@@ -22571,7 +22393,7 @@
  if test -z "${AMDEP_TRUE}" && test -z "${AMDEP_FALSE}"; then
    { { echo "$as_me:$LINENO: error: conditional \"AMDEP\" was never defined.
  Usually this means the macro was only invoked conditionally." >&5
-@@ -34640,14 +35387,20 @@
+@@ -34508,14 +35451,20 @@
  s, at AUTOMAKE@,$AUTOMAKE,;t t
  s, at AUTOHEADER@,$AUTOHEADER,;t t
  s, at MAKEINFO@,$MAKEINFO,;t t
@@ -22593,7 +22415,7 @@
  s, at KDECONFIG@,$KDECONFIG,;t t
  s, at kde_libs_prefix@,$kde_libs_prefix,;t t
  s, at kde_libs_htmldir@,$kde_libs_htmldir,;t t
-@@ -35469,27 +36222,21 @@
+@@ -35324,27 +36273,21 @@
    else
      continue
    fi
@@ -22638,55 +22460,19 @@
 +++ configure.in
 @@ -42,6 +42,8 @@
  dnl Automake doc recommends to do this only here. (Janos)
- AM_INIT_AUTOMAKE(gwenview-1.3.0, "3.4.89") dnl searches for some needed programs
+ AM_INIT_AUTOMAKE(gwenview-1.3.1, "3.5.0") dnl searches for some needed programs
  
 +AM_MAINTAINER_MODE
 +
  KDE_SET_PREFIX
  
  dnl generate the config header
-@@ -129,7 +131,7 @@
-   AC_MSG_CHECKING(for assembler support for IA32 extensions)
-  
-   dnl MMX check
--  AC_TRY_COMPILE(, [ __asm__("pxor %%mm0, %%mm0" : : : "%mm0") ],
-+  AC_TRY_COMPILE(, [ __asm__("pxor %mm0, %mm0") ],
-   [
-     echo $ECHO_N "MMX yes$ECHO_C"
-     AC_DEFINE_UNQUOTED(HAVE_X86_MMX, 1, [Define to 1 if the assembler supports MMX instructions.])
-@@ -137,7 +139,7 @@
-   ], [ echo $ECHO_N "MMX no$ECHO_C" ])
- 
-   dnl SSE check
--  AC_TRY_COMPILE(,[ __asm__("xorps %%xmm0, %%xmm0" : : : "%xmm0") ],
-+  AC_TRY_COMPILE(,[ __asm__("xorps %xmm0, %xmm0") ],
-   [
-     echo $ECHO_N ", SSE yes$ECHO_C"
-     AC_DEFINE_UNQUOTED(HAVE_X86_SSE, 1, [Define to 1 if the assembler supports SSE instructions.])
-@@ -145,7 +147,7 @@
-   ], [ echo $ECHO_N ", SSE no$ECHO_C" ])
- 
-   dnl SSE2 check
--  AC_TRY_COMPILE(, [ __asm__("xorpd %%xmm0, %%xmm0" : : : "%xmm0") ],
-+  AC_TRY_COMPILE(, [ __asm__("xorpd %xmm0, %xmm0") ],
-   [
-     echo $ECHO_N ", SSE2 yes$ECHO_C"
-     AC_DEFINE_UNQUOTED(HAVE_X86_SSE2, 1, [Define to 1 if the assembler supports SSE2 instructions.])
-@@ -153,7 +155,7 @@
-   ], [ echo $ECHO_N ", SSE2 no$ECHO_C" ])
-  
-   dnl 3DNOW check
--  AC_TRY_COMPILE(, [ __asm__("femms" : : ) ],
-+  AC_TRY_COMPILE(, [ __asm__("femms") ],
-   [
-     echo $ECHO_N ", 3DNOW yes$ECHO_C"
-     AC_DEFINE_UNQUOTED(HAVE_X86_3DNOW, 1, [Define to 1 if the assembler supports 3DNOW instructions.])
 --- doc/Makefile.in
 +++ doc/Makefile.in
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -22734,7 +22520,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +177,9 @@
+@@ -158,6 +171,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -22744,7 +22530,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +238,8 @@
+@@ -215,6 +231,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -22753,7 +22539,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +291,7 @@
+@@ -264,6 +282,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -22761,7 +22547,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -299,27 +318,53 @@
+@@ -286,27 +305,53 @@
  xdg_menudir = @xdg_menudir@
  KDE_LANG = en
  KDE_DOCS = gwenview
@@ -22828,7 +22614,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -336,12 +381,6 @@
+@@ -323,12 +368,6 @@
  ctags: CTAGS
  CTAGS:
  
@@ -22841,7 +22627,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -357,7 +396,7 @@
+@@ -344,7 +383,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -22850,7 +22636,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -375,7 +414,6 @@
+@@ -362,7 +401,6 @@
  check-am: all-am
  check: check-am
  all-am: Makefile
@@ -22858,7 +22644,7 @@
  installdirs:
  install: install-am
  install-exec: install-exec-am
-@@ -398,7 +436,7 @@
+@@ -385,7 +423,7 @@
  clean-generic:
  
  distclean-generic:
@@ -22867,7 +22653,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -419,6 +457,8 @@
+@@ -406,6 +444,8 @@
  
  dvi-am:
  
@@ -22876,7 +22662,7 @@
  info: info-am
  
  info-am:
-@@ -455,10 +495,10 @@
+@@ -442,10 +482,10 @@
  
  .PHONY: all all-am check check-am clean clean-generic clean-libtool \
  	distclean distclean-generic distclean-libtool distdir dvi \
@@ -22891,7 +22677,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
  	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
  	uninstall-info-am
-@@ -468,10 +508,10 @@
+@@ -455,10 +495,10 @@
  .NOEXPORT:
  
  #>+ 2
@@ -22904,7 +22690,7 @@
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
-@@ -498,27 +538,36 @@
+@@ -485,27 +525,36 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview
@@ -22952,7 +22738,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -22962,15 +22748,15 @@
  # This Makefile.in is free software; the Free Software Foundation
  # gives unlimited permission to copy and/or distribute it,
  # with or without modifications, as long as this notice is preserved.
-@@ -16,7 +16,6 @@
- @SET_MAKE@
+@@ -14,7 +14,6 @@
+ # PARTICULAR PURPOSE.
  
- # COMPILE_BEFORE_digikamimageplugins = digikam
+ @SET_MAKE@
 -
  srcdir = @srcdir@
  top_srcdir = @top_srcdir@
  VPATH = @srcdir@
-@@ -24,7 +23,6 @@
+@@ -22,7 +21,6 @@
  pkglibdir = $(libdir)/@PACKAGE@
  pkgincludedir = $(includedir)/@PACKAGE@
  top_builddir = .
@@ -22978,13 +22764,12 @@
  am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
  INSTALL = @INSTALL@
  install_sh_DATA = $(install_sh) -c -m 644
-@@ -41,6 +39,55 @@
+@@ -39,6 +37,54 @@
  build_triplet = @build@
  host_triplet = @host@
  target_triplet = @target@
 +DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
-+	$(srcdir)/Makefile.in $(srcdir)/admin/Doxyfile.am \
-+	$(srcdir)/admin/deps.am $(srcdir)/config.h.in \
++	$(srcdir)/Makefile.in $(srcdir)/config.h.in \
 +	$(top_srcdir)/configure AUTHORS COPYING ChangeLog INSTALL NEWS \
 +	TODO admin/compile admin/config.guess admin/config.sub \
 +	admin/depcomp admin/install-sh admin/ltmain.sh admin/missing \
@@ -23034,7 +22819,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -166,6 +213,9 @@
+@@ -158,6 +204,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23044,7 +22829,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -224,6 +274,8 @@
+@@ -215,6 +264,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -23053,7 +22838,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -275,6 +327,7 @@
+@@ -264,6 +315,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -23061,13 +22846,10 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -299,63 +352,64 @@
- xdg_appsdir = @xdg_appsdir@
+@@ -285,59 +337,62 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
--
- AUTOMAKE_OPTIONS = foreign 1.5
- SUBDIRS = $(TOPSUBDIRS)
+ SUBDIRS = src doc translations
 -subdir = .
 -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 -mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
@@ -23086,11 +22868,10 @@
 -	all-recursive install-data-recursive install-exec-recursive \
 -	installdirs-recursive install-recursive uninstall-recursive \
 -	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/admin/Doxyfile.am \
--	$(srcdir)/admin/deps.am $(srcdir)/configure AUTHORS COPYING \
--	ChangeLog INSTALL Makefile.am NEWS TODO acinclude.m4 aclocal.m4 \
--	admin/compile admin/config.guess admin/config.sub admin/depcomp \
--	admin/install-sh admin/ltmain.sh admin/missing \
+-DIST_COMMON = README $(srcdir)/Makefile.in $(srcdir)/configure AUTHORS \
+-	COPYING ChangeLog INSTALL Makefile.am NEWS TODO acinclude.m4 \
+-	aclocal.m4 admin/compile admin/config.guess admin/config.sub \
+-	admin/depcomp admin/install-sh admin/ltmain.sh admin/missing \
 -	admin/mkinstalldirs admin/ylwrap config.h.in configure \
 -	configure.in
 -DIST_SUBDIRS = $(SUBDIRS)
@@ -23103,10 +22884,10 @@
 -
 -am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
 - configure.lineno
--$(srcdir)/Makefile.in:  Makefile.am $(srcdir)/admin/deps.am $(srcdir)/admin/Doxyfile.am $(top_srcdir)/configure.in $(ACLOCAL_M4)
+-$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
 +am--refresh:
 +	@:
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am $(srcdir)/admin/deps.am $(srcdir)/admin/Doxyfile.am $(am__configure_deps)
++$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
 +#>- 	@for dep in $?; do \
 +#>- 	  case '$(am__configure_deps)' in \
 +#>- 	    *$$dep*) \
@@ -23118,8 +22899,9 @@
 +#>- 	done; \
 +#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
  #>- 	cd $(top_srcdir) && \
- #>- 	  $(AUTOMAKE) --foreign  Makefile
+-#>- 	  $(AUTOMAKE) --gnu  Makefile
 -#>+ 3
++#>- 	  $(AUTOMAKE) --foreign  Makefile
 +#>+ 14
 +	@for dep in $?; do \
 +	  case '$(am__configure_deps)' in \
@@ -23133,7 +22915,8 @@
 +	done; \
 +	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  Makefile'; \
  	cd $(top_srcdir) && \
- 	  $(AUTOMAKE) --foreign  Makefile
+-	  $(AUTOMAKE) --gnu  Makefile
++	  $(AUTOMAKE) --foreign  Makefile
  	cd $(top_srcdir) && perl admin/am_edit Makefile.in
 -Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
 -	cd $(top_builddir) && $(SHELL) ./config.status $@ $(am__depfiles_maybe)
@@ -23164,7 +22947,7 @@
  	cd $(srcdir) && $(ACLOCAL) $(ACLOCAL_AMFLAGS)
  
  config.h: stamp-h1
-@@ -367,10 +421,10 @@
+@@ -349,10 +404,10 @@
  stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
  	@rm -f stamp-h1
  	cd $(top_builddir) && $(SHELL) ./config.status config.h
@@ -23178,7 +22961,7 @@
  
  distclean-hdr:
  	-rm -f config.h stamp-h1
-@@ -392,7 +446,13 @@
+@@ -374,7 +429,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -23193,7 +22976,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -404,7 +464,7 @@
+@@ -386,7 +447,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -23202,7 +22985,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -412,7 +472,13 @@
+@@ -394,7 +455,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -23217,7 +23000,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -433,7 +499,7 @@
+@@ -415,7 +482,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -23226,7 +23009,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -444,14 +510,6 @@
+@@ -426,14 +493,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -23241,7 +23024,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -460,19 +518,22 @@
+@@ -442,19 +501,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -23266,7 +23049,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -482,10 +543,11 @@
+@@ -464,10 +526,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -23282,7 +23065,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES) config.h.in $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -508,26 +570,11 @@
+@@ -490,26 +553,11 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -23305,12 +23088,12 @@
  distdir: $(DISTFILES)
  	$(am__remove_distdir)
  	mkdir $(distdir)
--	$(mkinstalldirs) $(distdir)/./admin $(distdir)/admin
+-	$(mkinstalldirs) $(distdir)/admin
 +	$(mkdir_p) $(distdir)/admin
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
  	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's|.|.|g'`; \
  	list='$(DISTFILES)'; for file in $$list; do \
-@@ -539,7 +586,7 @@
+@@ -521,7 +569,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -23319,7 +23102,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -554,15 +601,17 @@
+@@ -536,15 +584,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -23342,7 +23125,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -573,19 +622,46 @@
+@@ -555,19 +605,46 @@
  	  ! -type d ! -perm -444 -exec $(SHELL) $(install_sh) -c -m a+r {} {} \; \
  	|| chmod -R a+r $(distdir)
  dist-gzip: distdir
@@ -23393,7 +23176,7 @@
  	chmod -R a-w $(distdir); chmod a+w $(distdir)
  	mkdir $(distdir)/_build
  	mkdir $(distdir)/_inst
-@@ -605,19 +681,20 @@
+@@ -587,19 +664,20 @@
  	        distuninstallcheck \
  	  && chmod -R a-w "$$dc_install_base" \
  	  && ({ \
@@ -23419,7 +23202,7 @@
  distuninstallcheck:
  	@cd $(distuninstallcheck_dir) \
  	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
-@@ -641,7 +718,6 @@
+@@ -623,7 +701,6 @@
  all-am: Makefile config.h
  installdirs: installdirs-recursive
  installdirs-am:
@@ -23427,7 +23210,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -661,7 +737,7 @@
+@@ -643,7 +720,7 @@
  clean-generic:
  
  distclean-generic:
@@ -23436,7 +23219,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -677,13 +753,15 @@
+@@ -659,13 +736,15 @@
  distclean: distclean-recursive
  	-rm -f $(am__CONFIG_DISTCLEAN_FILES)
  	-rm -f Makefile
@@ -23454,7 +23237,7 @@
  info: info-recursive
  
  info-am:
-@@ -720,24 +798,21 @@
+@@ -702,38 +781,36 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -23469,35 +23252,31 @@
  	distclean-recursive distclean-tags distcleancheck distdir \
 -	distuninstallcheck dvi dvi-am dvi-recursive info info-am \
 -	info-recursive install install-am install-data install-data-am \
--	install-data-local install-data-recursive install-exec \
--	install-exec-am install-exec-recursive install-info \
--	install-info-am install-info-recursive install-man \
--	install-recursive install-strip installcheck installcheck-am \
--	installdirs installdirs-am installdirs-recursive \
--	maintainer-clean maintainer-clean-generic \
--	maintainer-clean-recursive mostlyclean mostlyclean-generic \
--	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
--	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
--	uninstall uninstall-am uninstall-info-am \
--	uninstall-info-recursive uninstall-local uninstall-recursive
+-	install-data-recursive install-exec install-exec-am \
+-	install-exec-recursive install-info install-info-am \
+-	install-info-recursive install-man install-recursive \
 +	distuninstallcheck dvi dvi-am html html-am info info-am \
-+	install install-am install-data install-data-am \
-+	install-data-local install-exec install-exec-am install-info \
-+	install-info-am install-man install-strip installcheck \
-+	installcheck-am installdirs installdirs-am maintainer-clean \
-+	maintainer-clean-generic maintainer-clean-recursive \
-+	mostlyclean mostlyclean-generic mostlyclean-libtool \
-+	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+	uninstall uninstall-am uninstall-info-am uninstall-local
++	install install-am install-data install-data-am install-exec \
++	install-exec-am install-info install-info-am install-man \
+ 	install-strip installcheck installcheck-am installdirs \
+-	installdirs-am installdirs-recursive maintainer-clean \
+-	maintainer-clean-generic maintainer-clean-recursive mostlyclean \
+-	mostlyclean-generic mostlyclean-libtool mostlyclean-recursive \
+-	pdf pdf-am pdf-recursive ps ps-am ps-recursive tags \
+-	tags-recursive uninstall uninstall-am uninstall-info-am \
+-	uninstall-info-recursive uninstall-recursive
++	installdirs-am maintainer-clean maintainer-clean-generic \
++	maintainer-clean-recursive mostlyclean mostlyclean-generic \
++	mostlyclean-libtool mostlyclean-recursive pdf pdf-am ps ps-am \
++	tags tags-recursive uninstall uninstall-am uninstall-info-am
  
- $(top_srcdir)/acinclude.m4: $(top_srcdir)/admin/acinclude.m4.in $(top_srcdir)/admin/libtool.m4.in $(top_srcdir)/admin/cvs.sh $(top_srcdir)/admin/pkg.m4.in
- 	@cd $(top_srcdir) && $(SHELL) admin/cvs.sh acinclude_m4
-@@ -850,15 +925,16 @@
+ # Tell versions [3.59,3.63) of GNU make to not export all variables.
+ # Otherwise a system limit (for SysV at least) may be exceeded.
  .NOEXPORT:
  
  #>+ 2
--KDE_DIST=Mainpage.dox subdirs Makefile.in configure.in.bot configure.files Makefile.am.in.wo Makefile.cvs configure.in.in Makefile.am.in 
-+KDE_DIST=stamp-h.in Mainpage.dox subdirs Makefile.in configure.in.bot configure.files config.h.in Makefile.am.in.wo configure.in Makefile.cvs aclocal.m4 configure.in.in configure Makefile.am acinclude.m4 Makefile.am.in 
+-KDE_DIST=subdirs Makefile.in configure.files configure.in.in 
++KDE_DIST=stamp-h.in subdirs Makefile.in configure.files config.h.in configure.in aclocal.m4 configure.in.in Makefile.am configure acinclude.m4 
  
  #>+ 2
  docs-am:
@@ -23506,7 +23285,7 @@
 +#>+ 7
  force-reedit:
 -		cd $(top_srcdir) && \
--	  $(AUTOMAKE) --foreign  Makefile
+-	  $(AUTOMAKE) --gnu  Makefile
 +	 \
 +	      cd $(srcdir) && $(AUTOMAKE) --foreign  \
 +	
@@ -23518,7 +23297,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -23624,7 +23403,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +237,9 @@
+@@ -158,6 +231,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -23634,7 +23413,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +298,8 @@
+@@ -215,6 +291,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -23643,7 +23422,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +351,7 @@
+@@ -264,6 +342,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -23651,7 +23430,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -297,16 +376,13 @@
+@@ -284,16 +363,13 @@
  xdg_appsdir = @xdg_appsdir@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
@@ -23668,7 +23447,7 @@
  #>- gwenview_la_SOURCES = \
  #>- 	bookmarkowner.cpp \
  #>- 	bookmarkviewcontroller.cpp \
-@@ -342,7 +418,6 @@
+@@ -329,7 +405,6 @@
  	history.cpp \
  	main.cpp configfileoperationspage.cpp configfullscreenpage.cpp configimagelistpage.cpp configimageviewpage.cpp configmiscpage.cpp branchpropertiesdialogbase.cpp
  
@@ -23676,7 +23455,7 @@
  #>- gwenview_la_LIBADD = ../gvcore/libgwenviewcore.la
  #>+ 1
  gwenview_la_LIBADD = libkdeinit_gwenview.la
-@@ -352,157 +427,108 @@
+@@ -339,157 +414,108 @@
  
  # set the include path for X, qt and KDE
  INCLUDES = -I$(srcdir)/.. $(all_includes)
@@ -23891,7 +23670,7 @@
  	  echo "rm -f \"$${dir}/so_locations\""; \
  	  rm -f "$${dir}/so_locations"; \
  	done
-@@ -511,18 +537,17 @@
+@@ -498,18 +524,17 @@
  @KDE_USE_CLOSURE_TRUE at gwenview.la: gwenview.la.closure $(gwenview_la_OBJECTS) $(gwenview_la_DEPENDENCIES) 
  @KDE_USE_CLOSURE_FALSE at gwenview.la: $(gwenview_la_OBJECTS) $(gwenview_la_DEPENDENCIES) 
  	$(CXXLINK) -rpath $(kdeinitdir) $(gwenview_la_LDFLAGS) $(gwenview_la_OBJECTS) $(gwenview_la_LIBADD) $(LIBS)
@@ -23913,7 +23692,7 @@
  	  else :; fi; \
  	done
  
-@@ -530,8 +555,8 @@
+@@ -517,8 +542,8 @@
  	@$(NORMAL_UNINSTALL)
  	@list='$(bin_PROGRAMS)'; for p in $$list; do \
  	  f=`echo "$$p" | sed 's,^.*/,,;s/$(EXEEXT)$$//;$(transform);s/$$/$(EXEEXT)/'`; \
@@ -23924,7 +23703,7 @@
  	done
  
  clean-binPROGRAMS:
-@@ -542,7 +567,7 @@
+@@ -529,7 +554,7 @@
  	done
  
  mostlyclean-compile:
@@ -23933,7 +23712,7 @@
  
  distclean-compile:
  	-rm -f *.tab.c
-@@ -558,37 +583,25 @@
+@@ -545,37 +570,25 @@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/metaedit.Plo at am__quote@
  
  .cpp.o:
@@ -23983,7 +23762,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -599,33 +612,24 @@
+@@ -586,33 +599,24 @@
  distclean-libtool:
  	-rm -f libtool
  uninstall-info-am:
@@ -24024,7 +23803,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -634,6 +638,7 @@
+@@ -621,6 +625,7 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -24032,7 +23811,7 @@
  
  TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -645,10 +650,11 @@
+@@ -632,10 +637,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -24048,7 +23827,7 @@
  ctags: CTAGS
  CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -671,12 +677,6 @@
+@@ -658,12 +664,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -24061,7 +23840,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -690,7 +690,7 @@
+@@ -677,7 +677,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -24070,7 +23849,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -710,9 +710,10 @@
+@@ -697,9 +697,10 @@
  all-am: Makefile $(LTLIBRARIES) $(PROGRAMS) $(DATA)
  install-binPROGRAMS: install-libLTLIBRARIES
  
@@ -24083,7 +23862,7 @@
  install: install-am
  install-exec: install-exec-am
  install-data: install-data-am
-@@ -732,7 +733,7 @@
+@@ -719,7 +720,7 @@
  clean-generic:
  
  distclean-generic:
@@ -24092,7 +23871,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -757,6 +758,8 @@
+@@ -744,6 +745,8 @@
  
  dvi-am:
  
@@ -24101,7 +23880,7 @@
  info: info-am
  
  info-am:
-@@ -797,16 +800,17 @@
+@@ -784,16 +787,17 @@
  	clean-generic clean-kdeinitLTLIBRARIES clean-libLTLIBRARIES \
  	clean-libtool ctags distclean distclean-compile \
  	distclean-generic distclean-libtool distclean-tags distdir dvi \
@@ -24129,7 +23908,7 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-@@ -840,13 +844,6 @@
+@@ -828,13 +832,6 @@
  gwenview_DEPENDENCIES = libkdeinit_gwenview.la
  
  #>+ 3
@@ -24143,7 +23922,7 @@
  history.moc: $(srcdir)/history.h
  	$(MOC) $(srcdir)/history.h -o history.moc
  
-@@ -861,18 +858,18 @@
+@@ -849,18 +846,18 @@
  mocs: configdialog.moc
  
  #>+ 3
@@ -24168,7 +23947,7 @@
  
  #>+ 3
  dirview.moc: $(srcdir)/dirview.h
-@@ -882,18 +879,25 @@
+@@ -870,18 +867,25 @@
  mocs: dirview.moc
  
  #>+ 3
@@ -24200,7 +23979,7 @@
  
  #>+ 8
  gwenview.la.closure: $(gwenview_la_OBJECTS) $(gwenview_la_DEPENDENCIES)
-@@ -906,10 +910,10 @@
+@@ -894,10 +898,10 @@
  
  #>+ 3
  clean-metasources:
@@ -24213,7 +23992,7 @@
  
  #>+ 9
  clean-ui:
-@@ -928,10 +932,19 @@
+@@ -916,10 +920,19 @@
  #>+ 2
  docs-am:
  
@@ -24236,7 +24015,7 @@
  	cd $(top_srcdir) && perl admin/am_edit src/app/Makefile.in
  
  
-@@ -958,7 +971,7 @@
+@@ -946,7 +959,7 @@
  
  
  #>+ 11
@@ -24250,7 +24029,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -24301,7 +24080,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +189,9 @@
+@@ -158,6 +183,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24311,7 +24090,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +250,8 @@
+@@ -215,6 +243,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -24320,7 +24099,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +303,7 @@
+@@ -264,6 +294,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -24328,7 +24107,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -304,31 +335,54 @@
+@@ -291,31 +322,54 @@
  # file for konqueror integration
  konqservicedir = $(kde_datadir)/konqueror/servicemenus
  konqservice_DATA = konqgwenview.desktop
@@ -24399,7 +24178,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -339,41 +393,39 @@
+@@ -326,41 +380,39 @@
  distclean-libtool:
  	-rm -f libtool
  uninstall-info-am:
@@ -24455,7 +24234,7 @@
  	done
  tags: TAGS
  TAGS:
-@@ -381,12 +433,6 @@
+@@ -368,12 +420,6 @@
  ctags: CTAGS
  CTAGS:
  
@@ -24468,7 +24247,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -400,7 +446,7 @@
+@@ -387,7 +433,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -24477,7 +24256,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -418,9 +464,10 @@
+@@ -405,9 +451,10 @@
  check-am: all-am
  check: check-am
  all-am: Makefile $(DATA)
@@ -24490,7 +24269,7 @@
  install: install-am
  install-exec: install-exec-am
  install-data: install-data-am
-@@ -440,7 +487,7 @@
+@@ -427,7 +474,7 @@
  clean-generic:
  
  distclean-generic:
@@ -24499,7 +24278,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -461,6 +508,8 @@
+@@ -448,6 +495,8 @@
  
  dvi-am:
  
@@ -24508,7 +24287,7 @@
  info: info-am
  
  info-am:
-@@ -496,29 +545,39 @@
+@@ -483,29 +532,39 @@
  
  .PHONY: all all-am check check-am clean clean-generic clean-libtool \
  	distclean distclean-generic distclean-libtool distdir dvi \
@@ -24565,7 +24344,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -24617,7 +24396,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +181,9 @@
+@@ -158,6 +175,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24627,7 +24406,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +242,8 @@
+@@ -215,6 +235,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -24636,7 +24415,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +295,7 @@
+@@ -264,6 +286,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -24644,7 +24423,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,30 +321,53 @@
+@@ -285,30 +308,53 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  man_MANS = gwenview.1
@@ -24714,7 +24493,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -332,11 +378,9 @@
+@@ -319,11 +365,9 @@
  distclean-libtool:
  	-rm -f libtool
  uninstall-info-am:
@@ -24727,7 +24506,7 @@
  	@list='$(man1_MANS) $(dist_man1_MANS) $(nodist_man1_MANS)'; \
  	l2='$(man_MANS) $(dist_man_MANS) $(nodist_man_MANS)'; \
  	for i in $$l2; do \
-@@ -355,8 +399,8 @@
+@@ -342,8 +386,8 @@
  	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
  	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
  	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -24738,7 +24517,7 @@
  	done
  uninstall-man1:
  	@$(NORMAL_UNINSTALL)
-@@ -376,8 +420,8 @@
+@@ -363,8 +407,8 @@
  	  inst=`echo $$i | sed -e 's/\\.[0-9a-z]*$$//'`; \
  	  inst=`echo $$inst | sed -e 's/^.*\///'`; \
  	  inst=`echo $$inst | sed '$(transform)'`.$$ext; \
@@ -24749,7 +24528,7 @@
  	done
  tags: TAGS
  TAGS:
-@@ -385,12 +429,6 @@
+@@ -372,12 +416,6 @@
  ctags: CTAGS
  CTAGS:
  
@@ -24762,7 +24541,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -404,7 +442,7 @@
+@@ -391,7 +429,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -24771,7 +24550,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -422,9 +460,10 @@
+@@ -409,9 +447,10 @@
  check-am: all-am
  check: check-am
  all-am: Makefile $(MANS)
@@ -24784,7 +24563,7 @@
  install: install-am
  install-exec: install-exec-am
  install-data: install-data-am
-@@ -444,7 +483,7 @@
+@@ -431,7 +470,7 @@
  clean-generic:
  
  distclean-generic:
@@ -24793,7 +24572,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -465,6 +504,8 @@
+@@ -452,6 +491,8 @@
  
  dvi-am:
  
@@ -24802,7 +24581,7 @@
  info: info-am
  
  info-am:
-@@ -501,28 +542,38 @@
+@@ -488,28 +529,38 @@
  
  .PHONY: all all-am check check-am clean clean-generic clean-libtool \
  	distclean distclean-generic distclean-libtool distdir dvi \
@@ -24857,7 +24636,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -24985,7 +24764,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +259,9 @@
+@@ -158,6 +253,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -24995,7 +24774,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +320,8 @@
+@@ -215,6 +313,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -25004,7 +24783,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +373,7 @@
+@@ -264,6 +364,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -25012,7 +24791,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -297,33 +398,26 @@
+@@ -284,33 +385,26 @@
  xdg_appsdir = @xdg_appsdir@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
@@ -25048,7 +24827,7 @@
  #>- libgwenviewcore_la_SOURCES = \
  #>- 	printdialog.cpp \
  #>- 	printdialogpagebase.ui \
-@@ -418,243 +512,79 @@
+@@ -405,243 +499,79 @@
  	 \
  	thumbnaildetailsdialog.cpp printdialogpagebase.cpp externaltooldialogbase.cpp slideshowdialogbase.cpp thumbnaildetailsdialogbase.cpp gvconfig.cpp
  
@@ -25340,7 +25119,7 @@
  	  echo "rm -f \"$${dir}/so_locations\""; \
  	  rm -f "$${dir}/so_locations"; \
  	done
-@@ -665,7 +595,7 @@
+@@ -652,7 +582,7 @@
  	$(CXXLINK) -rpath $(libdir) $(libgwenviewcore_la_LDFLAGS) $(libgwenviewcore_la_OBJECTS) $(libgwenviewcore_la_LIBADD) $(LIBS)
  
  mostlyclean-compile:
@@ -25349,7 +25128,7 @@
  
  distclean-compile:
  	-rm -f *.tab.c
-@@ -712,37 +642,25 @@
+@@ -699,37 +629,25 @@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/xpm.Plo at am__quote@
  
  .cpp.o:
@@ -25399,7 +25178,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -753,33 +671,24 @@
+@@ -740,33 +658,24 @@
  distclean-libtool:
  	-rm -f libtool
  uninstall-info-am:
@@ -25440,7 +25219,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -788,6 +697,7 @@
+@@ -775,6 +684,7 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -25448,7 +25227,7 @@
  
  TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -799,10 +709,11 @@
+@@ -786,10 +696,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -25464,7 +25243,7 @@
  ctags: CTAGS
  CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -825,12 +736,6 @@
+@@ -812,12 +723,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -25477,7 +25256,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -844,7 +749,7 @@
+@@ -831,7 +736,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -25486,7 +25265,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -862,9 +767,10 @@
+@@ -849,9 +754,10 @@
  check-am: all-am
  check: check-am
  all-am: Makefile $(LTLIBRARIES) $(DATA) $(HEADERS)
@@ -25499,7 +25278,7 @@
  install: install-am
  install-exec: install-exec-am
  install-data: install-data-am
-@@ -884,7 +790,7 @@
+@@ -871,7 +777,7 @@
  clean-generic:
  
  distclean-generic:
@@ -25508,7 +25287,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -909,6 +815,8 @@
+@@ -896,6 +802,8 @@
  
  dvi-am:
  
@@ -25517,7 +25296,7 @@
  info: info-am
  
  info-am:
-@@ -947,15 +855,16 @@
+@@ -934,15 +842,16 @@
  .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
  	clean-libLTLIBRARIES clean-libtool ctags distclean \
  	distclean-compile distclean-generic distclean-libtool \
@@ -25539,7 +25318,7 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-@@ -1013,18 +922,18 @@
+@@ -1000,18 +909,18 @@
  mocs: externaltoolcontext.moc
  
  #>+ 3
@@ -25564,7 +25343,7 @@
  
  #>+ 3
  fullscreenbar.moc: $(srcdir)/fullscreenbar.h
-@@ -1055,18 +964,18 @@
+@@ -1042,18 +951,18 @@
  mocs: filedetailview.moc
  
  #>+ 3
@@ -25589,7 +25368,7 @@
  
  #>+ 3
  documentloadedimpl.moc: $(srcdir)/documentloadedimpl.h
-@@ -1097,18 +1006,18 @@
+@@ -1084,18 +993,18 @@
  mocs: externaltooldialog.moc
  
  #>+ 3
@@ -25614,7 +25393,7 @@
  
  #>+ 3
  externaltoolaction.moc: $(srcdir)/externaltoolaction.h
-@@ -1132,18 +1041,18 @@
+@@ -1119,18 +1028,18 @@
  mocs: slideshow.moc
  
  #>+ 3
@@ -25639,7 +25418,7 @@
  
  #>+ 3
  fileopobject.moc: $(srcdir)/fileopobject.h
-@@ -1154,10 +1063,10 @@
+@@ -1141,10 +1050,10 @@
  
  #>+ 3
  clean-metasources:
@@ -25652,7 +25431,7 @@
  
  #>+ 7
  clean-ui:
-@@ -1179,10 +1088,19 @@
+@@ -1166,10 +1075,19 @@
  #>+ 2
  docs-am:
  
@@ -25675,7 +25454,7 @@
  	cd $(top_srcdir) && perl admin/am_edit src/gvcore/Makefile.in
  
  
-@@ -1209,7 +1127,7 @@
+@@ -1196,7 +1114,7 @@
  
  
  #>+ 11
@@ -25689,7 +25468,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -25780,7 +25559,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +222,9 @@
+@@ -158,6 +216,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -25790,7 +25569,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +283,8 @@
+@@ -215,6 +276,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -25799,7 +25578,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +336,7 @@
+@@ -264,6 +327,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -25807,7 +25586,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -302,7 +366,6 @@
+@@ -289,7 +353,6 @@
  # These are not really libraries, but modules dynamically opened.
  # So they should be installed in kde_module_dir, which is usually $kde_prefix/lib/kde3
  kde_module_LTLIBRARIES = libgvdirpart.la
@@ -25815,7 +25594,7 @@
  libgvdirpart_la_SOURCES = gvdirpart.cpp
  libgvdirpart_la_LIBADD = $(LIB_KPARTS) ../gvcore/libgwenviewcore.la
  libgvdirpart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-@@ -316,91 +379,79 @@
+@@ -303,91 +366,79 @@
  
  # Install the .desktop file into the kde_services directory
  kde_services_DATA = gvdirpart.desktop
@@ -25955,7 +25734,7 @@
  	  echo "rm -f \"$${dir}/so_locations\""; \
  	  rm -f "$${dir}/so_locations"; \
  	done
-@@ -411,7 +462,7 @@
+@@ -398,7 +449,7 @@
  	$(CXXLINK) -rpath $(kde_moduledir) $(libgvdirpart_la_LDFLAGS) $(libgvdirpart_la_OBJECTS) $(libgvdirpart_la_LIBADD) $(LIBS)
  
  mostlyclean-compile:
@@ -25964,7 +25743,7 @@
  
  distclean-compile:
  	-rm -f *.tab.c
-@@ -419,37 +470,25 @@
+@@ -406,37 +457,25 @@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gvdirpart.Plo at am__quote@
  
  .cpp.o:
@@ -26014,7 +25793,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -460,51 +499,41 @@
+@@ -447,51 +486,41 @@
  distclean-libtool:
  	-rm -f libtool
  uninstall-info-am:
@@ -26080,7 +25859,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -513,6 +542,7 @@
+@@ -500,6 +529,7 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -26088,7 +25867,7 @@
  
  TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -524,10 +554,11 @@
+@@ -511,10 +541,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -26104,7 +25883,7 @@
  ctags: CTAGS
  CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -550,12 +581,6 @@
+@@ -537,12 +568,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -26117,7 +25896,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -569,7 +594,7 @@
+@@ -556,7 +581,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -26126,7 +25905,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -587,9 +612,10 @@
+@@ -574,9 +599,10 @@
  check-am: all-am
  check: check-am
  all-am: Makefile $(LTLIBRARIES) $(DATA)
@@ -26139,7 +25918,7 @@
  install: install-am
  install-exec: install-exec-am
  install-data: install-data-am
-@@ -609,7 +635,7 @@
+@@ -596,7 +622,7 @@
  clean-generic:
  
  distclean-generic:
@@ -26148,7 +25927,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -634,6 +660,8 @@
+@@ -621,6 +647,8 @@
  
  dvi-am:
  
@@ -26157,7 +25936,7 @@
  info: info-am
  
  info-am:
-@@ -681,8 +709,8 @@
+@@ -668,8 +696,8 @@
  .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
  	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
  	distclean-compile distclean-generic distclean-libtool \
@@ -26168,7 +25947,7 @@
  	install-exec-am install-gvDATA install-info install-info-am \
  	install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
  	install-man install-strip installcheck installcheck-am \
-@@ -717,7 +745,7 @@
+@@ -704,7 +732,7 @@
  	-rm -f  gvdirpart.moc
  
  #>+ 2
@@ -26177,7 +25956,7 @@
  
  #>+ 3
  clean-closures:
-@@ -728,37 +756,46 @@
+@@ -715,37 +743,46 @@
  
  #>+ 28
  install-kde-icons:
@@ -26247,7 +26026,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -26338,7 +26117,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +222,9 @@
+@@ -158,6 +216,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26348,7 +26127,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +283,8 @@
+@@ -215,6 +276,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -26357,7 +26136,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +336,7 @@
+@@ -264,6 +327,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -26365,7 +26144,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -302,7 +366,6 @@
+@@ -289,7 +353,6 @@
  # These are not really libraries, but modules dynamically opened.
  # So they should be installed in kde_module_dir, which is usually $kde_prefix/lib/kde3
  kde_module_LTLIBRARIES = libgvimagepart.la
@@ -26373,7 +26152,7 @@
  libgvimagepart_la_SOURCES = gvimagepart.cpp
  libgvimagepart_la_LIBADD = $(LIB_KPARTS) ../gvcore/libgwenviewcore.la
  libgvimagepart_la_LDFLAGS = $(all_libraries) $(KDE_PLUGIN)
-@@ -316,89 +379,78 @@
+@@ -303,89 +366,78 @@
  
  # Install the .desktop file into the kde_services directory
  kde_services_DATA = gvimagepart.desktop
@@ -26511,7 +26290,7 @@
  	  echo "rm -f \"$${dir}/so_locations\""; \
  	  rm -f "$${dir}/so_locations"; \
  	done
-@@ -409,7 +461,7 @@
+@@ -396,7 +448,7 @@
  	$(CXXLINK) -rpath $(kde_moduledir) $(libgvimagepart_la_LDFLAGS) $(libgvimagepart_la_OBJECTS) $(libgvimagepart_la_LIBADD) $(LIBS)
  
  mostlyclean-compile:
@@ -26520,7 +26299,7 @@
  
  distclean-compile:
  	-rm -f *.tab.c
-@@ -417,37 +469,25 @@
+@@ -404,37 +456,25 @@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/gvimagepart.Plo at am__quote@
  
  .cpp.o:
@@ -26570,7 +26349,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -458,51 +498,41 @@
+@@ -445,51 +485,41 @@
  distclean-libtool:
  	-rm -f libtool
  uninstall-info-am:
@@ -26636,7 +26415,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -511,6 +541,7 @@
+@@ -498,6 +528,7 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -26644,7 +26423,7 @@
  
  TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -522,10 +553,11 @@
+@@ -509,10 +540,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -26660,7 +26439,7 @@
  ctags: CTAGS
  CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -548,12 +580,6 @@
+@@ -535,12 +567,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -26673,7 +26452,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -567,7 +593,7 @@
+@@ -554,7 +580,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -26682,7 +26461,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -585,9 +611,10 @@
+@@ -572,9 +598,10 @@
  check-am: all-am
  check: check-am
  all-am: Makefile $(LTLIBRARIES) $(DATA)
@@ -26695,7 +26474,7 @@
  install: install-am
  install-exec: install-exec-am
  install-data: install-data-am
-@@ -607,7 +634,7 @@
+@@ -594,7 +621,7 @@
  clean-generic:
  
  distclean-generic:
@@ -26704,7 +26483,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -632,6 +659,8 @@
+@@ -619,6 +646,8 @@
  
  dvi-am:
  
@@ -26713,7 +26492,7 @@
  info: info-am
  
  info-am:
-@@ -676,8 +705,8 @@
+@@ -663,8 +692,8 @@
  .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
  	clean-kde_moduleLTLIBRARIES clean-libtool ctags distclean \
  	distclean-compile distclean-generic distclean-libtool \
@@ -26724,7 +26503,7 @@
  	install-exec-am install-gvDATA install-info install-info-am \
  	install-kde_moduleLTLIBRARIES install-kde_servicesDATA \
  	install-man install-strip installcheck installcheck-am \
-@@ -712,7 +741,7 @@
+@@ -699,7 +728,7 @@
  	-rm -f  gvimagepart.moc
  
  #>+ 2
@@ -26733,7 +26512,7 @@
  
  #>+ 3
  clean-closures:
-@@ -721,10 +750,19 @@
+@@ -708,10 +737,19 @@
  #>+ 2
  docs-am:
  
@@ -26761,7 +26540,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -26869,7 +26648,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +239,9 @@
+@@ -158,6 +233,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -26879,7 +26658,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +300,8 @@
+@@ -215,6 +293,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -26888,7 +26667,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +353,7 @@
+@@ -264,6 +344,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -26896,7 +26675,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -297,19 +378,16 @@
+@@ -284,13 +365,13 @@
  xdg_appsdir = @xdg_appsdir@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
@@ -26908,9 +26687,13 @@
 - at libexif_internal_FALSE@GV_LIBEXIF_LIBS = $(LIBEXIF_LIBS)
 - at libexif_internal_TRUE@GV_LIBEXIF_CFLAGS = -I$(srcdir)/../libgvexif
  @libexif_internal_FALSE at GV_LIBEXIF_CFLAGS = $(LIBEXIF_CFLAGS)
--
 + at libexif_internal_TRUE@GV_LIBEXIF_CFLAGS = -I$(srcdir)/../libgvexif
- AM_CPPFLAGS = -I$(srcdir) -I$(srcdir)/.. $(GV_LIBEXIF_CFLAGS) $(all_includes)
+ 
+ # QT_CLEAN_NAMESPACE is needed when building with automake, otherwise
+ # compilation fails in jpegcontent.cpp
+@@ -298,9 +379,7 @@
+ 	-DQT_CLEAN_NAMESPACE
+ 
  AM_CCASFLAGS = -I$(srcdir) $(GV_ASM_DEFS)
 -
  noinst_LTLIBRARIES = libgvimageutils.la
@@ -26918,7 +26701,7 @@
  libgvimageutils_la_SOURCES = \
  	imageutils.cpp \
  	jpegcontent.cpp \
-@@ -319,7 +397,6 @@
+@@ -310,7 +389,6 @@
  	jpeg-data.c \
  	jpeg-marker.c
  
@@ -26926,7 +26709,7 @@
  noinst_HEADERS = \
  	orientation.h \
  	imageutils.h \
-@@ -329,123 +406,67 @@
+@@ -320,123 +398,67 @@
  	transupp.h \
  	jpegerrormanager.h
  
@@ -27090,7 +26873,7 @@
  	  echo "rm -f \"$${dir}/so_locations\""; \
  	  rm -f "$${dir}/so_locations"; \
  	done
-@@ -463,7 +484,7 @@
+@@ -454,7 +476,7 @@
  	$(CXXLINK) $(testjpegcontent_LDFLAGS) $(testjpegcontent_OBJECTS) $(testjpegcontent_LDADD) $(LIBS)
  
  mostlyclean-compile:
@@ -27099,7 +26882,7 @@
  
  distclean-compile:
  	-rm -f *.tab.c
-@@ -477,79 +498,55 @@
+@@ -468,79 +490,55 @@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/transupp.Plo at am__quote@
  
  .S.o:
@@ -27206,7 +26989,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -561,14 +558,6 @@
+@@ -552,14 +550,6 @@
  	-rm -f libtool
  uninstall-info-am:
  
@@ -27221,7 +27004,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -577,6 +566,7 @@
+@@ -568,6 +558,7 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -27229,7 +27012,7 @@
  
  TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -588,10 +578,11 @@
+@@ -579,10 +570,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -27245,7 +27028,7 @@
  ctags: CTAGS
  CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -614,12 +605,6 @@
+@@ -605,12 +597,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -27258,7 +27041,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -633,7 +618,7 @@
+@@ -624,7 +610,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -27267,7 +27050,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -652,7 +637,6 @@
+@@ -643,7 +629,6 @@
  	$(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS)
  check: check-am
  all-am: Makefile $(LTLIBRARIES) $(HEADERS)
@@ -27275,7 +27058,7 @@
  installdirs:
  install: install-am
  install-exec: install-exec-am
-@@ -673,7 +657,7 @@
+@@ -664,7 +649,7 @@
  clean-generic:
  
  distclean-generic:
@@ -27284,7 +27067,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -698,6 +682,8 @@
+@@ -689,6 +674,8 @@
  
  dvi-am:
  
@@ -27293,7 +27076,7 @@
  info: info-am
  
  info-am:
-@@ -732,31 +718,41 @@
+@@ -723,31 +710,41 @@
  
  uninstall-am: uninstall-info-am
  
@@ -27354,7 +27137,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -27430,7 +27213,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +207,9 @@
+@@ -158,6 +201,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27440,7 +27223,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +268,8 @@
+@@ -215,6 +261,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -27449,7 +27232,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +321,7 @@
+@@ -264,6 +312,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -27457,7 +27240,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,9 +347,7 @@
+@@ -285,9 +334,7 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  INCLUDES = -I$(srcdir) -I$(srcdir)/..
@@ -27467,7 +27250,7 @@
  libgvexif_la_SOURCES = \
  	exif-byte-order.c \
  	exif-content.c \
-@@ -312,9 +359,7 @@
+@@ -299,9 +346,7 @@
  	exif-tag.c \
  	exif-utils.c
  
@@ -27477,7 +27260,7 @@
  noinst_HEADERS = \
  	exif-byte-order.h \
  	exif-content.h \
-@@ -329,82 +374,60 @@
+@@ -316,82 +361,60 @@
  	jpeg-marker.h \
  	i18n.h 
  
@@ -27600,7 +27383,7 @@
  	  echo "rm -f \"$${dir}/so_locations\""; \
  	  rm -f "$${dir}/so_locations"; \
  	done
-@@ -412,7 +435,7 @@
+@@ -399,7 +422,7 @@
  	$(LINK)  $(libgvexif_la_LDFLAGS) $(libgvexif_la_OBJECTS) $(libgvexif_la_LIBADD) $(LIBS)
  
  mostlyclean-compile:
@@ -27609,7 +27392,7 @@
  
  distclean-compile:
  	-rm -f *.tab.c
-@@ -428,37 +451,25 @@
+@@ -415,37 +438,25 @@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/exif-utils.Plo at am__quote@
  
  .c.o:
@@ -27659,7 +27442,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -470,14 +481,6 @@
+@@ -457,14 +468,6 @@
  	-rm -f libtool
  uninstall-info-am:
  
@@ -27674,7 +27457,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -486,6 +489,7 @@
+@@ -473,6 +476,7 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -27682,7 +27465,7 @@
  
  TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -497,10 +501,11 @@
+@@ -484,10 +488,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -27698,7 +27481,7 @@
  ctags: CTAGS
  CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -523,12 +528,6 @@
+@@ -510,12 +515,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -27711,7 +27494,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -542,7 +541,7 @@
+@@ -529,7 +528,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -27720,7 +27503,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -560,7 +559,6 @@
+@@ -547,7 +546,6 @@
  check-am: all-am
  check: check-am
  all-am: Makefile $(LTLIBRARIES) $(HEADERS)
@@ -27728,7 +27511,7 @@
  installdirs:
  install: install-am
  install-exec: install-exec-am
-@@ -581,7 +579,7 @@
+@@ -568,7 +566,7 @@
  clean-generic:
  
  distclean-generic:
@@ -27737,7 +27520,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -606,6 +604,8 @@
+@@ -593,6 +591,8 @@
  
  dvi-am:
  
@@ -27746,7 +27529,7 @@
  info: info-am
  
  info-am:
-@@ -643,28 +643,38 @@
+@@ -630,28 +630,38 @@
  .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
  	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
  	distclean-compile distclean-generic distclean-libtool \
@@ -27798,7 +27581,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -27863,7 +27646,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +194,9 @@
+@@ -158,6 +188,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -27873,7 +27656,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +255,8 @@
+@@ -215,6 +248,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -27882,7 +27665,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +308,7 @@
+@@ -264,6 +299,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -27890,7 +27673,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -301,45 +337,55 @@
+@@ -288,45 +324,55 @@
  # Do *NOT* indent the content of the ifs, this will break the generated
  # Makefile
  @libexif_internal_TRUE at LIBGVEXIFDIR = libgvexif
@@ -27975,7 +27758,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -358,7 +404,13 @@
+@@ -345,7 +391,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -27990,7 +27773,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -370,7 +422,7 @@
+@@ -357,7 +409,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -27999,7 +27782,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -378,7 +430,13 @@
+@@ -365,7 +417,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -28014,7 +27797,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -399,7 +457,7 @@
+@@ -386,7 +444,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -28023,7 +27806,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -410,14 +468,6 @@
+@@ -397,14 +455,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -28038,7 +27821,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -426,19 +476,22 @@
+@@ -413,19 +463,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -28063,7 +27846,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -448,10 +501,11 @@
+@@ -435,10 +488,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -28079,7 +27862,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -474,12 +528,6 @@
+@@ -461,12 +515,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -28092,7 +27875,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -493,7 +541,7 @@
+@@ -480,7 +528,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -28101,7 +27884,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -510,13 +558,15 @@
+@@ -497,13 +545,15 @@
  	done
  	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
  	  if test "$$subdir" = .; then :; else \
@@ -28121,7 +27904,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -526,7 +576,6 @@
+@@ -513,7 +563,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -28129,7 +27912,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -546,7 +595,7 @@
+@@ -533,7 +582,7 @@
  clean-generic:
  
  distclean-generic:
@@ -28138,7 +27921,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -568,6 +617,8 @@
+@@ -555,6 +604,8 @@
  
  dvi-am:
  
@@ -28147,7 +27930,7 @@
  info: info-recursive
  
  info-am:
-@@ -602,22 +653,18 @@
+@@ -589,22 +640,18 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -28181,12 +27964,12 @@
  
  
  messages: rc.cpp
-@@ -629,15 +676,24 @@
+@@ -616,15 +663,24 @@
  .NOEXPORT:
  
  #>+ 2
--KDE_DIST=Makefile.in HACKING configure.in.in 
-+KDE_DIST=Makefile.in HACKING configure.in.in Makefile.am 
+-KDE_DIST=Makefile.in HACKING 
++KDE_DIST=Makefile.in HACKING Makefile.am 
  
  #>+ 2
  docs-am:
@@ -28215,7 +27998,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -28263,7 +28046,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +177,9 @@
+@@ -158,6 +171,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28273,7 +28056,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +238,8 @@
+@@ -215,6 +231,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -28282,7 +28065,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +291,7 @@
+@@ -264,6 +282,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -28290,7 +28073,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -299,27 +318,53 @@
+@@ -286,27 +305,53 @@
  xdg_menudir = @xdg_menudir@
  icondir = $(kde_datadir)/gwenview/icons
  icon_ICON = AUTO
@@ -28357,7 +28140,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -336,12 +381,6 @@
+@@ -323,12 +368,6 @@
  ctags: CTAGS
  CTAGS:
  
@@ -28370,7 +28153,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -355,7 +394,7 @@
+@@ -342,7 +381,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -28379,7 +28162,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -373,7 +412,6 @@
+@@ -360,7 +399,6 @@
  check-am: all-am
  check: check-am
  all-am: Makefile
@@ -28387,7 +28170,7 @@
  installdirs:
  install: install-am
  install-exec: install-exec-am
-@@ -394,7 +432,7 @@
+@@ -381,7 +419,7 @@
  clean-generic:
  
  distclean-generic:
@@ -28396,7 +28179,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -415,6 +453,8 @@
+@@ -402,6 +440,8 @@
  
  dvi-am:
  
@@ -28405,7 +28188,7 @@
  info: info-am
  
  info-am:
-@@ -453,10 +493,10 @@
+@@ -440,10 +480,10 @@
  
  .PHONY: all all-am check check-am clean clean-generic clean-libtool \
  	distclean distclean-generic distclean-libtool distdir dvi \
@@ -28420,7 +28203,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
  	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
  	uninstall-info-am
-@@ -466,83 +506,92 @@
+@@ -453,83 +493,92 @@
  .NOEXPORT:
  
  #>+ 2
@@ -28563,7 +28346,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -28611,7 +28394,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +177,9 @@
+@@ -158,6 +171,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28621,7 +28404,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +238,8 @@
+@@ -215,6 +231,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -28630,7 +28413,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +291,7 @@
+@@ -264,6 +282,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -28638,7 +28421,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,27 +317,53 @@
+@@ -285,27 +304,53 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  KDE_ICON = AUTO
@@ -28705,7 +28488,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -335,12 +380,6 @@
+@@ -322,12 +367,6 @@
  ctags: CTAGS
  CTAGS:
  
@@ -28718,7 +28501,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -354,7 +393,7 @@
+@@ -341,7 +380,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -28727,7 +28510,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -372,7 +411,6 @@
+@@ -359,7 +398,6 @@
  check-am: all-am
  check: check-am
  all-am: Makefile
@@ -28735,7 +28518,7 @@
  installdirs:
  install: install-am
  install-exec: install-exec-am
-@@ -393,7 +431,7 @@
+@@ -380,7 +418,7 @@
  clean-generic:
  
  distclean-generic:
@@ -28744,7 +28527,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -414,6 +452,8 @@
+@@ -401,6 +439,8 @@
  
  dvi-am:
  
@@ -28753,7 +28536,7 @@
  info: info-am
  
  info-am:
-@@ -452,10 +492,10 @@
+@@ -439,10 +479,10 @@
  
  .PHONY: all all-am check check-am clean clean-generic clean-libtool \
  	distclean distclean-generic distclean-libtool distdir dvi \
@@ -28768,7 +28551,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
  	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
  	uninstall-info-am
-@@ -465,7 +505,7 @@
+@@ -452,7 +492,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -28777,7 +28560,7 @@
  
  #>+ 2
  docs-am:
-@@ -474,32 +514,41 @@
+@@ -461,32 +501,41 @@
  install-kde-icons:
  	$(mkinstalldirs) $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps
  	$(INSTALL_DATA) $(srcdir)/hi32-app-gwenview.png $(DESTDIR)$(kde_icondir)/hicolor/32x32/apps/gwenview.png
@@ -28833,7 +28616,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -28882,7 +28665,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +187,9 @@
+@@ -158,6 +181,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -28892,7 +28675,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +248,8 @@
+@@ -215,6 +241,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -28901,7 +28684,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +301,7 @@
+@@ -264,6 +292,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -28909,7 +28692,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -299,29 +328,53 @@
+@@ -286,29 +315,53 @@
  xdg_menudir = @xdg_menudir@
  cursorsdir = $(kde_datadir)/gwenview/cursors
  cursors_DATA = zoom.png 
@@ -28978,7 +28761,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -332,23 +385,22 @@
+@@ -319,23 +372,22 @@
  distclean-libtool:
  	-rm -f libtool
  uninstall-info-am:
@@ -29009,7 +28792,7 @@
  	done
  tags: TAGS
  TAGS:
-@@ -356,12 +408,6 @@
+@@ -343,12 +395,6 @@
  ctags: CTAGS
  CTAGS:
  
@@ -29022,7 +28805,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -375,7 +421,7 @@
+@@ -362,7 +408,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -29031,7 +28814,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -393,9 +439,10 @@
+@@ -380,9 +426,10 @@
  check-am: all-am
  check: check-am
  all-am: Makefile $(DATA)
@@ -29044,7 +28827,7 @@
  install: install-am
  install-exec: install-exec-am
  install-data: install-data-am
-@@ -415,7 +462,7 @@
+@@ -402,7 +449,7 @@
  clean-generic:
  
  distclean-generic:
@@ -29053,7 +28836,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -436,6 +483,8 @@
+@@ -423,6 +470,8 @@
  
  dvi-am:
  
@@ -29062,7 +28845,7 @@
  info: info-am
  
  info-am:
-@@ -470,28 +519,37 @@
+@@ -457,28 +506,37 @@
  
  .PHONY: all all-am check check-am clean clean-generic clean-libtool \
  	distclean distclean-generic distclean-libtool distdir dvi \
@@ -29116,7 +28899,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -29180,7 +28963,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29190,7 +28973,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
+@@ -215,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -29199,7 +28982,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +307,7 @@
+@@ -264,6 +298,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -29207,7 +28990,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
+@@ -285,40 +320,53 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  SUBDIRS = action app cursor thumbnail
@@ -29287,7 +29070,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -350,7 +398,13 @@
+@@ -337,7 +385,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -29302,7 +29085,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
+@@ -349,7 +403,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -29311,7 +29094,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
+@@ -357,7 +411,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -29326,7 +29109,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
+@@ -378,7 +438,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -29335,7 +29118,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
+@@ -389,14 +449,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -29350,7 +29133,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
+@@ -405,19 +457,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -29375,7 +29158,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -440,10 +495,11 @@
+@@ -427,10 +482,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -29391,7 +29174,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
+@@ -453,12 +509,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -29404,7 +29187,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
+@@ -472,7 +522,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -29413,7 +29196,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -500,15 +550,17 @@
+@@ -487,15 +537,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -29436,7 +29219,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -518,7 +570,6 @@
+@@ -505,7 +557,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -29444,7 +29227,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -538,7 +589,7 @@
+@@ -525,7 +576,7 @@
  clean-generic:
  
  distclean-generic:
@@ -29453,7 +29236,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
+@@ -547,6 +598,8 @@
  
  dvi-am:
  
@@ -29462,7 +29245,7 @@
  info: info-recursive
  
  info-am:
-@@ -594,37 +647,42 @@
+@@ -581,37 +634,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -29529,7 +29312,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -29578,7 +29361,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +187,9 @@
+@@ -158,6 +181,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29588,7 +29371,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +248,8 @@
+@@ -215,6 +241,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -29597,7 +29380,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +301,7 @@
+@@ -264,6 +292,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -29605,7 +29388,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -299,29 +328,53 @@
+@@ -286,29 +315,53 @@
  xdg_menudir = @xdg_menudir@
  thumbnaildir = $(kde_datadir)/gwenview/thumbnail
  thumbnail_DATA = wait.png
@@ -29674,7 +29457,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -332,23 +385,22 @@
+@@ -319,23 +372,22 @@
  distclean-libtool:
  	-rm -f libtool
  uninstall-info-am:
@@ -29705,7 +29488,7 @@
  	done
  tags: TAGS
  TAGS:
-@@ -356,12 +408,6 @@
+@@ -343,12 +395,6 @@
  ctags: CTAGS
  CTAGS:
  
@@ -29718,7 +29501,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -375,7 +421,7 @@
+@@ -362,7 +408,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -29727,7 +29510,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -393,9 +439,10 @@
+@@ -380,9 +426,10 @@
  check-am: all-am
  check: check-am
  all-am: Makefile $(DATA)
@@ -29740,7 +29523,7 @@
  install: install-am
  install-exec: install-exec-am
  install-data: install-data-am
-@@ -415,7 +462,7 @@
+@@ -402,7 +449,7 @@
  clean-generic:
  
  distclean-generic:
@@ -29749,7 +29532,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -436,6 +483,8 @@
+@@ -423,6 +470,8 @@
  
  dvi-am:
  
@@ -29758,7 +29541,7 @@
  info: info-am
  
  info-am:
-@@ -470,28 +519,38 @@
+@@ -457,28 +506,38 @@
  
  .PHONY: all all-am check check-am clean clean-generic clean-libtool \
  	distclean distclean-generic distclean-libtool distdir dvi \
@@ -29813,7 +29596,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -29874,7 +29657,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +192,9 @@
+@@ -158,6 +186,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -29884,7 +29667,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +253,8 @@
+@@ -215,6 +246,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -29893,7 +29676,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +306,7 @@
+@@ -264,6 +297,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -29901,7 +29684,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -301,46 +335,65 @@
+@@ -288,46 +322,65 @@
  tools_DATA = gimp.desktop wallpaper.desktop tiledwallpaper.desktop \
  		   konqueror.desktop
  
@@ -29990,7 +29773,7 @@
  	  else :; fi; \
  	done
  
-@@ -348,8 +401,8 @@
+@@ -335,8 +388,8 @@
  	@$(NORMAL_UNINSTALL)
  	@list='$(update_SCRIPTS)'; for p in $$list; do \
  	  f=`echo "$$p" | sed 's|^.*/||;$(transform)'`; \
@@ -30001,7 +29784,7 @@
  	done
  
  mostlyclean-libtool:
-@@ -361,41 +414,39 @@
+@@ -348,41 +401,39 @@
  distclean-libtool:
  	-rm -f libtool
  uninstall-info-am:
@@ -30057,7 +29840,7 @@
  	done
  tags: TAGS
  TAGS:
-@@ -403,12 +454,6 @@
+@@ -390,12 +441,6 @@
  ctags: CTAGS
  CTAGS:
  
@@ -30070,7 +29853,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -422,7 +467,7 @@
+@@ -409,7 +454,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -30079,7 +29862,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -440,9 +485,10 @@
+@@ -427,9 +472,10 @@
  check-am: all-am
  check: check-am
  all-am: Makefile $(SCRIPTS) $(DATA)
@@ -30092,7 +29875,7 @@
  install: install-am
  install-exec: install-exec-am
  install-data: install-data-am
-@@ -462,7 +508,7 @@
+@@ -449,7 +495,7 @@
  clean-generic:
  
  distclean-generic:
@@ -30101,7 +29884,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -483,6 +529,8 @@
+@@ -470,6 +516,8 @@
  
  dvi-am:
  
@@ -30110,7 +29893,7 @@
  info: info-am
  
  info-am:
-@@ -514,16 +562,16 @@
+@@ -501,16 +549,16 @@
  
  ps-am:
  
@@ -30134,7 +29917,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
  	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
  	uninstall-info-am uninstall-toolsDATA uninstall-updateDATA \
-@@ -534,15 +582,24 @@
+@@ -521,15 +569,24 @@
  .NOEXPORT:
  
  #>+ 2
@@ -30168,7 +29951,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -30250,7 +30033,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +213,9 @@
+@@ -158,6 +207,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30260,7 +30043,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +274,8 @@
+@@ -215,6 +267,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -30269,7 +30052,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +327,7 @@
+@@ -264,6 +318,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -30277,7 +30060,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,91 +353,69 @@
+@@ -285,91 +340,69 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  INCLUDES = -I$(srcdir) -I$(srcdir)/.. $(all_includes)
@@ -30409,7 +30192,7 @@
  	  echo "rm -f \"$${dir}/so_locations\""; \
  	  rm -f "$${dir}/so_locations"; \
  	done
-@@ -390,7 +423,7 @@
+@@ -377,7 +410,7 @@
  	$(CXXLINK)  $(libtsthread_la_LDFLAGS) $(libtsthread_la_OBJECTS) $(libtsthread_la_LIBADD) $(LIBS)
  
  mostlyclean-compile:
@@ -30418,7 +30201,7 @@
  
  distclean-compile:
  	-rm -f *.tab.c
-@@ -399,37 +432,25 @@
+@@ -386,37 +419,25 @@
  @AMDEP_TRUE@@am__include@ @am__quote at ./$(DEPDIR)/tswaitcondition.Plo at am__quote@
  
  .cpp.o:
@@ -30468,7 +30251,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -441,14 +462,6 @@
+@@ -428,14 +449,6 @@
  	-rm -f libtool
  uninstall-info-am:
  
@@ -30483,7 +30266,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -457,6 +470,7 @@
+@@ -444,6 +457,7 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -30491,7 +30274,7 @@
  
  TAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -468,10 +482,11 @@
+@@ -455,10 +469,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -30507,7 +30290,7 @@
  ctags: CTAGS
  CTAGS:  $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -494,12 +509,6 @@
+@@ -481,12 +496,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -30520,7 +30303,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -513,7 +522,7 @@
+@@ -500,7 +509,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -30529,7 +30312,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -531,7 +540,6 @@
+@@ -518,7 +527,6 @@
  check-am: all-am
  check: check-am
  all-am: Makefile $(LTLIBRARIES) $(HEADERS)
@@ -30537,7 +30320,7 @@
  installdirs:
  install: install-am
  install-exec: install-exec-am
-@@ -552,7 +560,7 @@
+@@ -539,7 +547,7 @@
  clean-generic:
  
  distclean-generic:
@@ -30546,7 +30329,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -577,6 +585,8 @@
+@@ -564,6 +572,8 @@
  
  dvi-am:
  
@@ -30555,7 +30338,7 @@
  info: info-am
  
  info-am:
-@@ -614,13 +624,14 @@
+@@ -601,13 +611,14 @@
  .PHONY: CTAGS GTAGS all all-am check check-am clean clean-generic \
  	clean-libtool clean-noinstLTLIBRARIES ctags distclean \
  	distclean-compile distclean-generic distclean-libtool \
@@ -30574,7 +30357,7 @@
  
  # Tell versions [3.59,3.63) of GNU make to not export all variables.
  # Otherwise a system limit (for SysV at least) may be exceeded.
-@@ -638,15 +649,24 @@
+@@ -625,15 +636,24 @@
  	-rm -f  tsthread.moc
  
  #>+ 2
@@ -30608,7 +30391,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -30672,7 +30455,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -30682,7 +30465,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
+@@ -215,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -30691,7 +30474,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +307,7 @@
+@@ -264,6 +298,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -30699,7 +30482,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
+@@ -285,40 +320,53 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  SUBDIRS = messages
@@ -30779,7 +30562,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -350,7 +398,13 @@
+@@ -337,7 +385,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -30794,7 +30577,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
+@@ -349,7 +403,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -30803,7 +30586,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
+@@ -357,7 +411,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -30818,7 +30601,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
+@@ -378,7 +438,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -30827,7 +30610,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
+@@ -389,14 +449,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -30842,7 +30625,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
+@@ -405,19 +457,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -30867,7 +30650,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -440,10 +495,11 @@
+@@ -427,10 +482,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -30883,7 +30666,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
+@@ -453,12 +509,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -30896,7 +30679,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
+@@ -472,7 +522,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -30905,7 +30688,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -500,15 +550,17 @@
+@@ -487,15 +537,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -30928,7 +30711,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -518,7 +570,6 @@
+@@ -505,7 +557,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -30936,7 +30719,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -538,7 +589,7 @@
+@@ -525,7 +576,7 @@
  clean-generic:
  
  distclean-generic:
@@ -30945,7 +30728,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
+@@ -547,6 +598,8 @@
  
  dvi-am:
  
@@ -30954,7 +30737,7 @@
  info: info-recursive
  
  info-am:
-@@ -594,37 +647,42 @@
+@@ -581,37 +634,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -31021,7 +30804,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -31087,7 +30870,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31097,7 +30880,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
+@@ -215,6 +249,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -31106,7 +30889,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +309,7 @@
+@@ -264,6 +300,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -31114,7 +30897,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
+@@ -292,40 +329,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -31194,7 +30977,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -357,7 +407,13 @@
+@@ -344,7 +394,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -31209,7 +30992,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
+@@ -356,7 +412,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -31218,7 +31001,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
+@@ -364,7 +420,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -31233,7 +31016,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
+@@ -385,7 +447,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -31242,7 +31025,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
+@@ -396,14 +458,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -31257,7 +31040,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
+@@ -412,19 +466,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -31282,7 +31065,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -447,10 +504,11 @@
+@@ -434,10 +491,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -31298,7 +31081,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
+@@ -460,14 +518,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -31313,7 +31096,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -496,7 +546,7 @@
+@@ -483,7 +533,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -31322,7 +31105,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -511,15 +561,17 @@
+@@ -498,15 +548,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -31345,7 +31128,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -529,7 +581,6 @@
+@@ -516,7 +568,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -31353,7 +31136,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -551,7 +602,7 @@
+@@ -538,7 +589,7 @@
  clean-generic:
  
  distclean-generic:
@@ -31362,7 +31145,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
+@@ -560,6 +611,8 @@
  
  dvi-am:
  
@@ -31371,7 +31154,7 @@
  info: info-recursive
  
  info-am:
-@@ -611,29 +664,25 @@
+@@ -598,29 +651,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -31413,7 +31196,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
+@@ -661,10 +710,19 @@
  #>+ 2
  docs-am:
  
@@ -31441,7 +31224,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -31505,7 +31288,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31515,7 +31298,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
+@@ -215,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -31524,7 +31307,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +307,7 @@
+@@ -264,6 +298,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -31532,7 +31315,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
+@@ -285,40 +320,53 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  SUBDIRS = messages
@@ -31612,7 +31395,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -350,7 +398,13 @@
+@@ -337,7 +385,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -31627,7 +31410,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
+@@ -349,7 +403,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -31636,7 +31419,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
+@@ -357,7 +411,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -31651,7 +31434,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
+@@ -378,7 +438,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -31660,7 +31443,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
+@@ -389,14 +449,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -31675,7 +31458,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
+@@ -405,19 +457,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -31700,7 +31483,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -440,10 +495,11 @@
+@@ -427,10 +482,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -31716,7 +31499,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
+@@ -453,12 +509,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -31729,7 +31512,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
+@@ -472,7 +522,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -31738,7 +31521,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -500,15 +550,17 @@
+@@ -487,15 +537,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -31761,7 +31544,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -518,7 +570,6 @@
+@@ -505,7 +557,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -31769,7 +31552,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -538,7 +589,7 @@
+@@ -525,7 +576,7 @@
  clean-generic:
  
  distclean-generic:
@@ -31778,7 +31561,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
+@@ -547,6 +598,8 @@
  
  dvi-am:
  
@@ -31787,7 +31570,7 @@
  info: info-recursive
  
  info-am:
-@@ -594,37 +647,42 @@
+@@ -581,37 +634,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -31854,7 +31637,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -31920,7 +31703,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -31930,7 +31713,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
+@@ -215,6 +249,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -31939,7 +31722,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +309,7 @@
+@@ -264,6 +300,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -31947,7 +31730,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
+@@ -292,40 +329,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -32027,7 +31810,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -357,7 +407,13 @@
+@@ -344,7 +394,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -32042,7 +31825,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
+@@ -356,7 +412,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -32051,7 +31834,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
+@@ -364,7 +420,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -32066,7 +31849,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
+@@ -385,7 +447,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -32075,7 +31858,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
+@@ -396,14 +458,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -32090,7 +31873,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
+@@ -412,19 +466,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -32115,7 +31898,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -447,10 +504,11 @@
+@@ -434,10 +491,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -32131,7 +31914,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
+@@ -460,14 +518,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -32146,7 +31929,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -496,7 +546,7 @@
+@@ -483,7 +533,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -32155,7 +31938,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -511,15 +561,17 @@
+@@ -498,15 +548,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -32178,7 +31961,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -529,7 +581,6 @@
+@@ -516,7 +568,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -32186,7 +31969,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -551,7 +602,7 @@
+@@ -538,7 +589,7 @@
  clean-generic:
  
  distclean-generic:
@@ -32195,7 +31978,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
+@@ -560,6 +611,8 @@
  
  dvi-am:
  
@@ -32204,7 +31987,7 @@
  info: info-recursive
  
  info-am:
-@@ -611,29 +664,25 @@
+@@ -598,29 +651,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -32246,7 +32029,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
+@@ -661,10 +710,19 @@
  #>+ 2
  docs-am:
  
@@ -32274,7 +32057,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -32338,7 +32121,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32348,7 +32131,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
+@@ -215,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -32357,7 +32140,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +307,7 @@
+@@ -264,6 +298,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -32365,7 +32148,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
+@@ -285,40 +320,53 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  SUBDIRS = messages
@@ -32445,7 +32228,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -350,7 +398,13 @@
+@@ -337,7 +385,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -32460,7 +32243,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
+@@ -349,7 +403,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -32469,7 +32252,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
+@@ -357,7 +411,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -32484,7 +32267,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
+@@ -378,7 +438,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -32493,7 +32276,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
+@@ -389,14 +449,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -32508,7 +32291,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
+@@ -405,19 +457,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -32533,7 +32316,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -440,10 +495,11 @@
+@@ -427,10 +482,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -32549,7 +32332,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
+@@ -453,12 +509,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -32562,7 +32345,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
+@@ -472,7 +522,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -32571,7 +32354,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -500,15 +550,17 @@
+@@ -487,15 +537,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -32594,7 +32377,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -518,7 +570,6 @@
+@@ -505,7 +557,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -32602,7 +32385,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -538,7 +589,7 @@
+@@ -525,7 +576,7 @@
  clean-generic:
  
  distclean-generic:
@@ -32611,7 +32394,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
+@@ -547,6 +598,8 @@
  
  dvi-am:
  
@@ -32620,7 +32403,7 @@
  info: info-recursive
  
  info-am:
-@@ -594,37 +647,42 @@
+@@ -581,37 +634,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -32687,7 +32470,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -32753,7 +32536,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -32763,7 +32546,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
+@@ -215,6 +249,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -32772,7 +32555,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +309,7 @@
+@@ -264,6 +300,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -32780,7 +32563,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
+@@ -292,40 +329,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -32860,7 +32643,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -357,7 +407,13 @@
+@@ -344,7 +394,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -32875,7 +32658,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
+@@ -356,7 +412,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -32884,7 +32667,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
+@@ -364,7 +420,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -32899,7 +32682,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
+@@ -385,7 +447,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -32908,7 +32691,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
+@@ -396,14 +458,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -32923,7 +32706,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
+@@ -412,19 +466,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -32948,7 +32731,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -447,10 +504,11 @@
+@@ -434,10 +491,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -32964,7 +32747,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
+@@ -460,14 +518,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -32979,7 +32762,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -496,7 +546,7 @@
+@@ -483,7 +533,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -32988,7 +32771,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -511,15 +561,17 @@
+@@ -498,15 +548,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -33011,7 +32794,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -529,7 +581,6 @@
+@@ -516,7 +568,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -33019,7 +32802,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -551,7 +602,7 @@
+@@ -538,7 +589,7 @@
  clean-generic:
  
  distclean-generic:
@@ -33028,7 +32811,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
+@@ -560,6 +611,8 @@
  
  dvi-am:
  
@@ -33037,7 +32820,7 @@
  info: info-recursive
  
  info-am:
-@@ -611,29 +664,25 @@
+@@ -598,29 +651,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -33079,7 +32862,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
+@@ -661,10 +710,19 @@
  #>+ 2
  docs-am:
  
@@ -33107,7 +32890,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -33171,7 +32954,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33181,7 +32964,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
+@@ -215,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -33190,7 +32973,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +307,7 @@
+@@ -264,6 +298,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -33198,7 +32981,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
+@@ -285,40 +320,53 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  SUBDIRS = messages
@@ -33278,7 +33061,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -350,7 +398,13 @@
+@@ -337,7 +385,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -33293,7 +33076,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
+@@ -349,7 +403,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -33302,7 +33085,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
+@@ -357,7 +411,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -33317,7 +33100,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
+@@ -378,7 +438,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -33326,7 +33109,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
+@@ -389,14 +449,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -33341,7 +33124,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
+@@ -405,19 +457,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -33366,7 +33149,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -440,10 +495,11 @@
+@@ -427,10 +482,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -33382,7 +33165,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
+@@ -453,12 +509,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -33395,7 +33178,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
+@@ -472,7 +522,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -33404,7 +33187,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -500,15 +550,17 @@
+@@ -487,15 +537,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -33427,7 +33210,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -518,7 +570,6 @@
+@@ -505,7 +557,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -33435,7 +33218,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -538,7 +589,7 @@
+@@ -525,7 +576,7 @@
  clean-generic:
  
  distclean-generic:
@@ -33444,7 +33227,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
+@@ -547,6 +598,8 @@
  
  dvi-am:
  
@@ -33453,7 +33236,7 @@
  info: info-recursive
  
  info-am:
-@@ -594,37 +647,42 @@
+@@ -581,37 +634,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -33520,7 +33303,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -33586,7 +33369,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -33596,7 +33379,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
+@@ -215,6 +249,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -33605,7 +33388,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +309,7 @@
+@@ -264,6 +300,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -33613,7 +33396,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
+@@ -292,40 +329,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -33693,7 +33476,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -357,7 +407,13 @@
+@@ -344,7 +394,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -33708,7 +33491,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
+@@ -356,7 +412,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -33717,7 +33500,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
+@@ -364,7 +420,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -33732,7 +33515,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
+@@ -385,7 +447,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -33741,7 +33524,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
+@@ -396,14 +458,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -33756,7 +33539,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
+@@ -412,19 +466,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -33781,7 +33564,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -447,10 +504,11 @@
+@@ -434,10 +491,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -33797,7 +33580,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
+@@ -460,14 +518,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -33812,7 +33595,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -496,7 +546,7 @@
+@@ -483,7 +533,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -33821,7 +33604,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -511,15 +561,17 @@
+@@ -498,15 +548,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -33844,7 +33627,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -529,7 +581,6 @@
+@@ -516,7 +568,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -33852,7 +33635,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -551,7 +602,7 @@
+@@ -538,7 +589,7 @@
  clean-generic:
  
  distclean-generic:
@@ -33861,7 +33644,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
+@@ -560,6 +611,8 @@
  
  dvi-am:
  
@@ -33870,7 +33653,7 @@
  info: info-recursive
  
  info-am:
-@@ -611,29 +664,25 @@
+@@ -598,29 +651,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -33912,7 +33695,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
+@@ -661,10 +710,19 @@
  #>+ 2
  docs-am:
  
@@ -33940,7 +33723,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -34004,7 +33787,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34014,7 +33797,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
+@@ -215,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -34023,7 +33806,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +307,7 @@
+@@ -264,6 +298,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -34031,7 +33814,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
+@@ -285,40 +320,53 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  SUBDIRS = messages
@@ -34111,7 +33894,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -350,7 +398,13 @@
+@@ -337,7 +385,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -34126,7 +33909,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
+@@ -349,7 +403,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -34135,7 +33918,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
+@@ -357,7 +411,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -34150,7 +33933,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
+@@ -378,7 +438,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -34159,7 +33942,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
+@@ -389,14 +449,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -34174,7 +33957,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
+@@ -405,19 +457,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -34199,7 +33982,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -440,10 +495,11 @@
+@@ -427,10 +482,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -34215,7 +33998,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
+@@ -453,12 +509,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -34228,7 +34011,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
+@@ -472,7 +522,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -34237,7 +34020,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -500,15 +550,17 @@
+@@ -487,15 +537,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -34260,7 +34043,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -518,7 +570,6 @@
+@@ -505,7 +557,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -34268,7 +34051,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -538,7 +589,7 @@
+@@ -525,7 +576,7 @@
  clean-generic:
  
  distclean-generic:
@@ -34277,7 +34060,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
+@@ -547,6 +598,8 @@
  
  dvi-am:
  
@@ -34286,7 +34069,7 @@
  info: info-recursive
  
  info-am:
-@@ -594,37 +647,42 @@
+@@ -581,37 +634,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -34353,7 +34136,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -34419,7 +34202,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34429,7 +34212,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
+@@ -215,6 +249,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -34438,7 +34221,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +309,7 @@
+@@ -264,6 +300,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -34446,7 +34229,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
+@@ -292,40 +329,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -34526,7 +34309,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -357,7 +407,13 @@
+@@ -344,7 +394,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -34541,7 +34324,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
+@@ -356,7 +412,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -34550,7 +34333,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
+@@ -364,7 +420,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -34565,7 +34348,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
+@@ -385,7 +447,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -34574,7 +34357,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
+@@ -396,14 +458,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -34589,7 +34372,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
+@@ -412,19 +466,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -34614,7 +34397,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -447,10 +504,11 @@
+@@ -434,10 +491,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -34630,7 +34413,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
+@@ -460,14 +518,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -34645,7 +34428,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -496,7 +546,7 @@
+@@ -483,7 +533,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -34654,7 +34437,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -511,15 +561,17 @@
+@@ -498,15 +548,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -34677,7 +34460,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -529,7 +581,6 @@
+@@ -516,7 +568,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -34685,7 +34468,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -551,7 +602,7 @@
+@@ -538,7 +589,7 @@
  clean-generic:
  
  distclean-generic:
@@ -34694,7 +34477,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
+@@ -560,6 +611,8 @@
  
  dvi-am:
  
@@ -34703,7 +34486,7 @@
  info: info-recursive
  
  info-am:
-@@ -611,29 +664,25 @@
+@@ -598,29 +651,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -34745,7 +34528,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
+@@ -661,10 +710,19 @@
  #>+ 2
  docs-am:
  
@@ -34773,7 +34556,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -34837,7 +34620,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -34847,7 +34630,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
+@@ -215,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -34856,7 +34639,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +307,7 @@
+@@ -264,6 +298,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -34864,7 +34647,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
+@@ -285,40 +320,53 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  SUBDIRS = messages
@@ -34944,7 +34727,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -350,7 +398,13 @@
+@@ -337,7 +385,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -34959,7 +34742,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
+@@ -349,7 +403,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -34968,7 +34751,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
+@@ -357,7 +411,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -34983,7 +34766,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
+@@ -378,7 +438,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -34992,7 +34775,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
+@@ -389,14 +449,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -35007,7 +34790,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
+@@ -405,19 +457,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -35032,7 +34815,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -440,10 +495,11 @@
+@@ -427,10 +482,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -35048,7 +34831,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
+@@ -453,12 +509,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -35061,7 +34844,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
+@@ -472,7 +522,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -35070,7 +34853,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -500,15 +550,17 @@
+@@ -487,15 +537,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -35093,7 +34876,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -518,7 +570,6 @@
+@@ -505,7 +557,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -35101,7 +34884,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -538,7 +589,7 @@
+@@ -525,7 +576,7 @@
  clean-generic:
  
  distclean-generic:
@@ -35110,7 +34893,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
+@@ -547,6 +598,8 @@
  
  dvi-am:
  
@@ -35119,7 +34902,7 @@
  info: info-recursive
  
  info-am:
-@@ -594,37 +647,42 @@
+@@ -581,37 +634,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -35186,7 +34969,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -35252,7 +35035,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35262,7 +35045,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
+@@ -215,6 +249,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -35271,7 +35054,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +309,7 @@
+@@ -264,6 +300,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -35279,7 +35062,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
+@@ -292,40 +329,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -35359,7 +35142,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -357,7 +407,13 @@
+@@ -344,7 +394,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -35374,7 +35157,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
+@@ -356,7 +412,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -35383,7 +35166,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
+@@ -364,7 +420,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -35398,7 +35181,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
+@@ -385,7 +447,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -35407,7 +35190,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
+@@ -396,14 +458,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -35422,7 +35205,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
+@@ -412,19 +466,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -35447,7 +35230,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -447,10 +504,11 @@
+@@ -434,10 +491,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -35463,7 +35246,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
+@@ -460,14 +518,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -35478,7 +35261,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -496,7 +546,7 @@
+@@ -483,7 +533,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -35487,7 +35270,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -511,15 +561,17 @@
+@@ -498,15 +548,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -35510,7 +35293,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -529,7 +581,6 @@
+@@ -516,7 +568,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -35518,7 +35301,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -551,7 +602,7 @@
+@@ -538,7 +589,7 @@
  clean-generic:
  
  distclean-generic:
@@ -35527,7 +35310,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
+@@ -560,6 +611,8 @@
  
  dvi-am:
  
@@ -35536,7 +35319,7 @@
  info: info-recursive
  
  info-am:
-@@ -611,29 +664,25 @@
+@@ -598,29 +651,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -35578,7 +35361,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
+@@ -661,10 +710,19 @@
  #>+ 2
  docs-am:
  
@@ -35606,7 +35389,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -35654,7 +35437,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +177,9 @@
+@@ -158,6 +171,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35664,7 +35447,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +238,8 @@
+@@ -215,6 +231,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -35673,7 +35456,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +291,7 @@
+@@ -264,6 +282,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -35681,7 +35464,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -299,27 +318,53 @@
+@@ -286,27 +305,53 @@
  xdg_menudir = @xdg_menudir@
  KDE_LANG = da
  KDE_DOCS = gwenview
@@ -35748,7 +35531,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -336,12 +381,6 @@
+@@ -323,12 +368,6 @@
  ctags: CTAGS
  CTAGS:
  
@@ -35761,7 +35544,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -357,7 +396,7 @@
+@@ -344,7 +383,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -35770,7 +35553,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -375,7 +414,6 @@
+@@ -362,7 +401,6 @@
  check-am: all-am
  check: check-am
  all-am: Makefile
@@ -35778,7 +35561,7 @@
  installdirs:
  install: install-am
  install-exec: install-exec-am
-@@ -398,7 +436,7 @@
+@@ -385,7 +423,7 @@
  clean-generic:
  
  distclean-generic:
@@ -35787,7 +35570,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -419,6 +457,8 @@
+@@ -406,6 +444,8 @@
  
  dvi-am:
  
@@ -35796,7 +35579,7 @@
  info: info-am
  
  info-am:
-@@ -455,10 +495,10 @@
+@@ -442,10 +482,10 @@
  
  .PHONY: all all-am check check-am clean clean-generic clean-libtool \
  	distclean distclean-generic distclean-libtool distdir dvi \
@@ -35811,7 +35594,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
  	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
  	uninstall-info-am
-@@ -468,10 +508,10 @@
+@@ -455,10 +495,10 @@
  .NOEXPORT:
  
  #>+ 2
@@ -35824,7 +35607,7 @@
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
-@@ -498,27 +538,36 @@
+@@ -485,27 +525,36 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview
@@ -35872,7 +35655,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -35936,7 +35719,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -35946,7 +35729,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
+@@ -215,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -35955,7 +35738,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +307,7 @@
+@@ -264,6 +298,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -35963,7 +35746,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
+@@ -285,40 +320,53 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  SUBDIRS = messages doc
@@ -36043,7 +35826,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -350,7 +398,13 @@
+@@ -337,7 +385,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -36058,7 +35841,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
+@@ -349,7 +403,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -36067,7 +35850,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
+@@ -357,7 +411,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -36082,7 +35865,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
+@@ -378,7 +438,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -36091,7 +35874,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
+@@ -389,14 +449,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -36106,7 +35889,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
+@@ -405,19 +457,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -36131,7 +35914,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -440,10 +495,11 @@
+@@ -427,10 +482,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -36147,7 +35930,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
+@@ -453,12 +509,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -36160,7 +35943,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
+@@ -472,7 +522,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -36169,7 +35952,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -500,15 +550,17 @@
+@@ -487,15 +537,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -36192,7 +35975,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -518,7 +570,6 @@
+@@ -505,7 +557,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -36200,7 +35983,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -538,7 +589,7 @@
+@@ -525,7 +576,7 @@
  clean-generic:
  
  distclean-generic:
@@ -36209,7 +35992,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
+@@ -547,6 +598,8 @@
  
  dvi-am:
  
@@ -36218,7 +36001,7 @@
  info: info-recursive
  
  info-am:
-@@ -594,37 +647,42 @@
+@@ -581,37 +634,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -36285,7 +36068,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -36351,7 +36134,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -36361,7 +36144,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
+@@ -215,6 +249,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -36370,7 +36153,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +309,7 @@
+@@ -264,6 +300,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -36378,7 +36161,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
+@@ -292,40 +329,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -36458,7 +36241,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -357,7 +407,13 @@
+@@ -344,7 +394,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -36473,7 +36256,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
+@@ -356,7 +412,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -36482,7 +36265,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
+@@ -364,7 +420,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -36497,7 +36280,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
+@@ -385,7 +447,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -36506,7 +36289,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
+@@ -396,14 +458,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -36521,7 +36304,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
+@@ -412,19 +466,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -36546,7 +36329,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -447,10 +504,11 @@
+@@ -434,10 +491,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -36562,7 +36345,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
+@@ -460,14 +518,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -36577,7 +36360,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -496,7 +546,7 @@
+@@ -483,7 +533,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -36586,7 +36369,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -511,15 +561,17 @@
+@@ -498,15 +548,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -36609,7 +36392,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -529,7 +581,6 @@
+@@ -516,7 +568,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -36617,7 +36400,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -551,7 +602,7 @@
+@@ -538,7 +589,7 @@
  clean-generic:
  
  distclean-generic:
@@ -36626,7 +36409,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
+@@ -560,6 +611,8 @@
  
  dvi-am:
  
@@ -36635,7 +36418,7 @@
  info: info-recursive
  
  info-am:
-@@ -611,29 +664,25 @@
+@@ -598,29 +651,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -36677,7 +36460,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
+@@ -661,10 +710,19 @@
  #>+ 2
  docs-am:
  
@@ -36705,7 +36488,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -36753,7 +36536,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +177,9 @@
+@@ -158,6 +171,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -36763,7 +36546,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +238,8 @@
+@@ -215,6 +231,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -36772,7 +36555,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +291,7 @@
+@@ -264,6 +282,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -36780,7 +36563,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -299,27 +318,53 @@
+@@ -286,27 +305,53 @@
  xdg_menudir = @xdg_menudir@
  KDE_LANG = de
  KDE_DOCS = gwenview
@@ -36847,7 +36630,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -336,12 +381,6 @@
+@@ -323,12 +368,6 @@
  ctags: CTAGS
  CTAGS:
  
@@ -36860,7 +36643,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -357,7 +396,7 @@
+@@ -344,7 +383,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -36869,7 +36652,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -375,7 +414,6 @@
+@@ -362,7 +401,6 @@
  check-am: all-am
  check: check-am
  all-am: Makefile
@@ -36877,7 +36660,7 @@
  installdirs:
  install: install-am
  install-exec: install-exec-am
-@@ -398,7 +436,7 @@
+@@ -385,7 +423,7 @@
  clean-generic:
  
  distclean-generic:
@@ -36886,7 +36669,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -419,6 +457,8 @@
+@@ -406,6 +444,8 @@
  
  dvi-am:
  
@@ -36895,7 +36678,7 @@
  info: info-am
  
  info-am:
-@@ -455,10 +495,10 @@
+@@ -442,10 +482,10 @@
  
  .PHONY: all all-am check check-am clean clean-generic clean-libtool \
  	distclean distclean-generic distclean-libtool distdir dvi \
@@ -36910,7 +36693,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
  	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
  	uninstall-info-am
-@@ -468,10 +508,10 @@
+@@ -455,10 +495,10 @@
  .NOEXPORT:
  
  #>+ 2
@@ -36923,7 +36706,7 @@
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
-@@ -498,27 +538,36 @@
+@@ -485,27 +525,36 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview
@@ -36971,7 +36754,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -37035,7 +36818,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37045,7 +36828,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
+@@ -215,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -37054,7 +36837,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +307,7 @@
+@@ -264,6 +298,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -37062,7 +36845,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
+@@ -285,40 +320,53 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  SUBDIRS = messages doc
@@ -37142,7 +36925,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -350,7 +398,13 @@
+@@ -337,7 +385,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -37157,7 +36940,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
+@@ -349,7 +403,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -37166,7 +36949,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
+@@ -357,7 +411,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -37181,7 +36964,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
+@@ -378,7 +438,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -37190,7 +36973,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
+@@ -389,14 +449,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -37205,7 +36988,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
+@@ -405,19 +457,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -37230,7 +37013,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -440,10 +495,11 @@
+@@ -427,10 +482,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -37246,7 +37029,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
+@@ -453,12 +509,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -37259,7 +37042,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
+@@ -472,7 +522,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -37268,7 +37051,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -500,15 +550,17 @@
+@@ -487,15 +537,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -37291,7 +37074,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -518,7 +570,6 @@
+@@ -505,7 +557,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -37299,7 +37082,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -538,7 +589,7 @@
+@@ -525,7 +576,7 @@
  clean-generic:
  
  distclean-generic:
@@ -37308,7 +37091,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
+@@ -547,6 +598,8 @@
  
  dvi-am:
  
@@ -37317,7 +37100,7 @@
  info: info-recursive
  
  info-am:
-@@ -594,37 +647,42 @@
+@@ -581,37 +634,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -37384,7 +37167,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -37450,7 +37233,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37460,7 +37243,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
+@@ -215,6 +249,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -37469,7 +37252,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +309,7 @@
+@@ -264,6 +300,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -37477,7 +37260,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
+@@ -292,40 +329,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -37557,7 +37340,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -357,7 +407,13 @@
+@@ -344,7 +394,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -37572,7 +37355,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
+@@ -356,7 +412,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -37581,7 +37364,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
+@@ -364,7 +420,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -37596,7 +37379,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
+@@ -385,7 +447,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -37605,7 +37388,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
+@@ -396,14 +458,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -37620,7 +37403,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
+@@ -412,19 +466,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -37645,7 +37428,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -447,10 +504,11 @@
+@@ -434,10 +491,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -37661,7 +37444,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
+@@ -460,14 +518,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -37676,7 +37459,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -496,7 +546,7 @@
+@@ -483,7 +533,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -37685,7 +37468,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -511,15 +561,17 @@
+@@ -498,15 +548,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -37708,7 +37491,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -529,7 +581,6 @@
+@@ -516,7 +568,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -37716,7 +37499,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -551,7 +602,7 @@
+@@ -538,7 +589,7 @@
  clean-generic:
  
  distclean-generic:
@@ -37725,7 +37508,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
+@@ -560,6 +611,8 @@
  
  dvi-am:
  
@@ -37734,7 +37517,7 @@
  info: info-recursive
  
  info-am:
-@@ -611,29 +664,25 @@
+@@ -598,29 +651,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -37776,7 +37559,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
+@@ -661,10 +710,19 @@
  #>+ 2
  docs-am:
  
@@ -37804,7 +37587,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -37868,7 +37651,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -37878,7 +37661,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
+@@ -215,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -37887,7 +37670,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +307,7 @@
+@@ -264,6 +298,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -37895,7 +37678,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
+@@ -285,40 +320,53 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  SUBDIRS = messages
@@ -37975,7 +37758,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -350,7 +398,13 @@
+@@ -337,7 +385,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -37990,7 +37773,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
+@@ -349,7 +403,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -37999,7 +37782,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
+@@ -357,7 +411,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -38014,7 +37797,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
+@@ -378,7 +438,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -38023,7 +37806,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
+@@ -389,14 +449,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -38038,7 +37821,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
+@@ -405,19 +457,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -38063,7 +37846,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -440,10 +495,11 @@
+@@ -427,10 +482,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -38079,7 +37862,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
+@@ -453,12 +509,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -38092,7 +37875,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
+@@ -472,7 +522,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -38101,7 +37884,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -500,15 +550,17 @@
+@@ -487,15 +537,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -38124,7 +37907,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -518,7 +570,6 @@
+@@ -505,7 +557,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -38132,7 +37915,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -538,7 +589,7 @@
+@@ -525,7 +576,7 @@
  clean-generic:
  
  distclean-generic:
@@ -38141,7 +37924,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
+@@ -547,6 +598,8 @@
  
  dvi-am:
  
@@ -38150,7 +37933,7 @@
  info: info-recursive
  
  info-am:
-@@ -594,37 +647,42 @@
+@@ -581,37 +634,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -38217,7 +38000,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -38283,7 +38066,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -38293,7 +38076,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
+@@ -215,6 +249,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -38302,7 +38085,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +309,7 @@
+@@ -264,6 +300,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -38310,7 +38093,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
+@@ -292,40 +329,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -38390,7 +38173,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -357,7 +407,13 @@
+@@ -344,7 +394,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -38405,7 +38188,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
+@@ -356,7 +412,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -38414,7 +38197,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
+@@ -364,7 +420,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -38429,7 +38212,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
+@@ -385,7 +447,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -38438,7 +38221,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
+@@ -396,14 +458,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -38453,7 +38236,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
+@@ -412,19 +466,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -38478,7 +38261,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -447,10 +504,11 @@
+@@ -434,10 +491,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -38494,7 +38277,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
+@@ -460,14 +518,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -38509,7 +38292,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -496,7 +546,7 @@
+@@ -483,7 +533,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -38518,7 +38301,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -511,15 +561,17 @@
+@@ -498,15 +548,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -38541,7 +38324,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -529,7 +581,6 @@
+@@ -516,7 +568,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -38549,7 +38332,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -551,7 +602,7 @@
+@@ -538,7 +589,7 @@
  clean-generic:
  
  distclean-generic:
@@ -38558,7 +38341,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
+@@ -560,6 +611,8 @@
  
  dvi-am:
  
@@ -38567,7 +38350,7 @@
  info: info-recursive
  
  info-am:
-@@ -611,29 +664,25 @@
+@@ -598,29 +651,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -38609,7 +38392,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
+@@ -661,10 +710,19 @@
  #>+ 2
  docs-am:
  
@@ -38632,1678 +38415,12 @@
  	cd $(top_srcdir) && perl admin/am_edit translations/el/messages/Makefile.in
  
  
---- translations/en_GB/Makefile.in
-+++ translations/en_GB/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
- # @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
- 
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,37 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = translations/en_GB
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- 	html-recursive info-recursive install-data-recursive \
-+#>- 	install-exec-recursive install-info-recursive \
-+#>- 	install-recursive installcheck-recursive installdirs-recursive \
-+#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- 	uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+	html-recursive info-recursive install-data-recursive \
-+	install-exec-recursive install-info-recursive \
-+	install-recursive installcheck-recursive installdirs-recursive \
-+	pdf-recursive ps-recursive uninstall-info-recursive \
-+	uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -273,6 +307,7 @@
- libexif_internal_TRUE = @libexif_internal_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
- xdg_directorydir = @xdg_directorydir@
- xdg_menudir = @xdg_menudir@
- SUBDIRS = messages
--subdir = translations/en_GB
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
--#>- 	all-recursive install-data-recursive install-exec-recursive \
--#>- 	installdirs-recursive install-recursive uninstall-recursive \
--#>- 	check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--	ps-recursive install-info-recursive uninstall-info-recursive \
--	all-recursive install-data-recursive install-exec-recursive \
--	installdirs-recursive install-recursive uninstall-recursive \
--	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
- all: docs-am  all-recursive
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  translations/en_GB/Makefile'; \
- #>- 	cd $(top_srcdir) && \
--#>- 	  $(AUTOMAKE) --gnu  translations/en_GB/Makefile
--#>+ 3
-+#>- 	  $(AUTOMAKE) --foreign  translations/en_GB/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  translations/en_GB/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  translations/en_GB/Makefile
-+	  $(AUTOMAKE) --foreign  translations/en_GB/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit translations/en_GB/Makefile.in
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-@@ -350,7 +398,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
- 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- 	done
- 
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
- 	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
- 	mkid -fID $$unique
-+tags: TAGS
- 
- TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
--	if (etags --etags-include --version) >/dev/null 2>&1; then \
-+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- 	  include_option=--etags-include; \
-+	  empty_fix=.; \
- 	else \
- 	  include_option=--include; \
-+	  empty_fix=; \
- 	fi; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
--	    test -f $$subdir/TAGS && \
-+	    test ! -f $$subdir/TAGS || \
- 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- 	  fi; \
- 	done; \
-@@ -440,10 +495,11 @@
- 	  done | \
- 	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$tags$$unique" \
--	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
--	     $$tags $$unique
--
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
- 
- distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- distdir: $(DISTFILES)
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -500,15 +550,17 @@
- 	    || exit 1; \
- 	  fi; \
- 	done
--	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
--	    test -d $(distdir)/$$subdir \
--	    || mkdir $(distdir)/$$subdir \
-+	    test -d "$(distdir)/$$subdir" \
-+	    || $(mkdir_p) "$(distdir)/$$subdir" \
- 	    || exit 1; \
-+	    distdir=`$(am__cd) $(distdir) && pwd`; \
-+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- 	    (cd $$subdir && \
- 	      $(MAKE) $(AM_MAKEFLAGS) \
--	        top_distdir="$(top_distdir)" \
--	        distdir=../$(distdir)/$$subdir \
-+	        top_distdir="$$top_distdir" \
-+	        distdir="$$distdir/$$subdir" \
- 	        distdir) \
- 	      || exit 1; \
- 	  fi; \
-@@ -518,7 +570,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -538,7 +589,7 @@
- clean-generic:
- 
- distclean-generic:
--	-rm -f $(CONFIG_CLEAN_FILES)
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
- 
- dvi-am:
- 
-+html: html-recursive
-+
- info: info-recursive
- 
- info-am:
-@@ -594,37 +647,42 @@
- 
- uninstall-info: uninstall-info-recursive
- 
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
--	clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+	clean clean-generic clean-libtool clean-recursive ctags \
- 	ctags-recursive distclean distclean-generic distclean-libtool \
--	distclean-recursive distclean-tags distdir dvi dvi-am \
--	dvi-recursive info info-am info-recursive install install-am \
--	install-data install-data-am install-data-recursive \
--	install-exec install-exec-am install-exec-recursive \
--	install-info install-info-am install-info-recursive install-man \
--	install-recursive install-strip installcheck installcheck-am \
--	installdirs installdirs-am installdirs-recursive \
--	maintainer-clean maintainer-clean-generic \
--	maintainer-clean-recursive mostlyclean mostlyclean-generic \
--	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
--	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
--	uninstall uninstall-am uninstall-info-am \
--	uninstall-info-recursive uninstall-recursive
-+	distclean-recursive distclean-tags distdir dvi dvi-am html \
-+	html-am info info-am install install-am install-data \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-strip installcheck \
-+	installcheck-am installdirs installdirs-am maintainer-clean \
-+	maintainer-clean-generic maintainer-clean-recursive \
-+	mostlyclean mostlyclean-generic mostlyclean-libtool \
-+	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+	uninstall uninstall-am uninstall-info-am
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=Makefile.in 
-+KDE_DIST=Makefile.in Makefile.am 
- 
- #>+ 2
- docs-am:
- 
--#>+ 6
-+#>+ 15
- force-reedit:
--		cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  translations/en_GB/Makefile
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  translations/en_GB/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  translations/en_GB/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit translations/en_GB/Makefile.in
- 
- 
---- translations/en_GB/messages/Makefile.in
-+++ translations/en_GB/messages/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
- # @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
- 
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = translations/en_GB/messages
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- 	html-recursive info-recursive install-data-recursive \
-+#>- 	install-exec-recursive install-info-recursive \
-+#>- 	install-recursive installcheck-recursive installdirs-recursive \
-+#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- 	uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+	html-recursive info-recursive install-data-recursive \
-+	install-exec-recursive install-info-recursive \
-+	install-recursive installcheck-recursive installdirs-recursive \
-+	pdf-recursive ps-recursive uninstall-info-recursive \
-+	uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -273,6 +309,7 @@
- libexif_internal_TRUE = @libexif_internal_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
- #>+ 2
- POFILES = gwenview.po
- GMOFILES = gwenview.gmo
--subdir = translations/en_GB/messages
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
--#>- 	all-recursive install-data-recursive install-exec-recursive \
--#>- 	installdirs-recursive install-recursive uninstall-recursive \
--#>- 	check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--	ps-recursive install-info-recursive uninstall-info-recursive \
--	all-recursive install-data-recursive install-exec-recursive \
--	installdirs-recursive install-recursive uninstall-recursive \
--	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
- all: all-nls docs-am  all-recursive
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  translations/en_GB/messages/Makefile'; \
- #>- 	cd $(top_srcdir) && \
--#>- 	  $(AUTOMAKE) --gnu  translations/en_GB/messages/Makefile
--#>+ 3
-+#>- 	  $(AUTOMAKE) --foreign  translations/en_GB/messages/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  translations/en_GB/messages/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  translations/en_GB/messages/Makefile
-+	  $(AUTOMAKE) --foreign  translations/en_GB/messages/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit translations/en_GB/messages/Makefile.in
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-@@ -357,7 +407,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
- 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- 	done
- 
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
- 	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
- 	mkid -fID $$unique
-+tags: TAGS
- 
- TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
--	if (etags --etags-include --version) >/dev/null 2>&1; then \
-+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- 	  include_option=--etags-include; \
-+	  empty_fix=.; \
- 	else \
- 	  include_option=--include; \
-+	  empty_fix=; \
- 	fi; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
--	    test -f $$subdir/TAGS && \
-+	    test ! -f $$subdir/TAGS || \
- 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- 	  fi; \
- 	done; \
-@@ -447,10 +504,11 @@
- 	  done | \
- 	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$tags$$unique" \
--	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
--	     $$tags $$unique
--
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
- 
- distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--#>+ 1
--DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -496,7 +546,7 @@
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -511,15 +561,17 @@
- 	    || exit 1; \
- 	  fi; \
- 	done
--	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
--	    test -d $(distdir)/$$subdir \
--	    || mkdir $(distdir)/$$subdir \
-+	    test -d "$(distdir)/$$subdir" \
-+	    || $(mkdir_p) "$(distdir)/$$subdir" \
- 	    || exit 1; \
-+	    distdir=`$(am__cd) $(distdir) && pwd`; \
-+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- 	    (cd $$subdir && \
- 	      $(MAKE) $(AM_MAKEFLAGS) \
--	        top_distdir="$(top_distdir)" \
--	        distdir=../$(distdir)/$$subdir \
-+	        top_distdir="$$top_distdir" \
-+	        distdir="$$distdir/$$subdir" \
- 	        distdir) \
- 	      || exit 1; \
- 	  fi; \
-@@ -529,7 +581,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -551,7 +602,7 @@
- clean-generic:
- 
- distclean-generic:
--	-rm -f $(CONFIG_CLEAN_FILES)
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
- 
- dvi-am:
- 
-+html: html-recursive
-+
- info: info-recursive
- 
- info-am:
-@@ -611,29 +664,25 @@
- 
- uninstall-info: uninstall-info-recursive
- 
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
--	clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+	clean clean-generic clean-libtool clean-recursive ctags \
- 	ctags-recursive distclean distclean-generic distclean-libtool \
--	distclean-recursive distclean-tags distdir dvi dvi-am \
--	dvi-recursive info info-am info-recursive install install-am \
--	install-data install-data-am install-data-recursive \
--	install-exec install-exec-am install-exec-recursive \
--	install-info install-info-am install-info-recursive install-man \
--	install-recursive install-strip installcheck installcheck-am \
--	installdirs installdirs-am installdirs-recursive \
--	maintainer-clean maintainer-clean-generic \
--	maintainer-clean-recursive mostlyclean mostlyclean-generic \
--	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
--	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
--	uninstall uninstall-am uninstall-info-am \
--	uninstall-info-recursive uninstall-recursive
-+	distclean-recursive distclean-tags distdir dvi dvi-am html \
-+	html-am info info-am install install-am install-data \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-strip installcheck \
-+	installcheck-am installdirs installdirs-am maintainer-clean \
-+	maintainer-clean-generic maintainer-clean-recursive \
-+	mostlyclean mostlyclean-generic mostlyclean-libtool \
-+	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+	uninstall uninstall-am uninstall-info-am
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=gwenview.po Makefile.in 
-+KDE_DIST=gwenview.po Makefile.in Makefile.am 
- 
- #>+ 4
- gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
- #>+ 2
- docs-am:
- 
--#>+ 6
-+#>+ 15
- force-reedit:
--		cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  translations/en_GB/messages/Makefile
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  translations/en_GB/messages/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  translations/en_GB/messages/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit translations/en_GB/messages/Makefile.in
- 
- 
---- translations/es/Makefile.in
-+++ translations/es/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
- # @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
- 
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,37 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = translations/es
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- 	html-recursive info-recursive install-data-recursive \
-+#>- 	install-exec-recursive install-info-recursive \
-+#>- 	install-recursive installcheck-recursive installdirs-recursive \
-+#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- 	uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+	html-recursive info-recursive install-data-recursive \
-+	install-exec-recursive install-info-recursive \
-+	install-recursive installcheck-recursive installdirs-recursive \
-+	pdf-recursive ps-recursive uninstall-info-recursive \
-+	uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -273,6 +307,7 @@
- libexif_internal_TRUE = @libexif_internal_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
- xdg_directorydir = @xdg_directorydir@
- xdg_menudir = @xdg_menudir@
- SUBDIRS = messages
--subdir = translations/es
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
--#>- 	all-recursive install-data-recursive install-exec-recursive \
--#>- 	installdirs-recursive install-recursive uninstall-recursive \
--#>- 	check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--	ps-recursive install-info-recursive uninstall-info-recursive \
--	all-recursive install-data-recursive install-exec-recursive \
--	installdirs-recursive install-recursive uninstall-recursive \
--	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
- all: docs-am  all-recursive
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  translations/es/Makefile'; \
- #>- 	cd $(top_srcdir) && \
--#>- 	  $(AUTOMAKE) --gnu  translations/es/Makefile
--#>+ 3
-+#>- 	  $(AUTOMAKE) --foreign  translations/es/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  translations/es/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  translations/es/Makefile
-+	  $(AUTOMAKE) --foreign  translations/es/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit translations/es/Makefile.in
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-@@ -350,7 +398,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
- 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- 	done
- 
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
- 	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
- 	mkid -fID $$unique
-+tags: TAGS
- 
- TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
--	if (etags --etags-include --version) >/dev/null 2>&1; then \
-+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- 	  include_option=--etags-include; \
-+	  empty_fix=.; \
- 	else \
- 	  include_option=--include; \
-+	  empty_fix=; \
- 	fi; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
--	    test -f $$subdir/TAGS && \
-+	    test ! -f $$subdir/TAGS || \
- 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- 	  fi; \
- 	done; \
-@@ -440,10 +495,11 @@
- 	  done | \
- 	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$tags$$unique" \
--	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
--	     $$tags $$unique
--
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
- 
- distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- distdir: $(DISTFILES)
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -500,15 +550,17 @@
- 	    || exit 1; \
- 	  fi; \
- 	done
--	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
--	    test -d $(distdir)/$$subdir \
--	    || mkdir $(distdir)/$$subdir \
-+	    test -d "$(distdir)/$$subdir" \
-+	    || $(mkdir_p) "$(distdir)/$$subdir" \
- 	    || exit 1; \
-+	    distdir=`$(am__cd) $(distdir) && pwd`; \
-+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- 	    (cd $$subdir && \
- 	      $(MAKE) $(AM_MAKEFLAGS) \
--	        top_distdir="$(top_distdir)" \
--	        distdir=../$(distdir)/$$subdir \
-+	        top_distdir="$$top_distdir" \
-+	        distdir="$$distdir/$$subdir" \
- 	        distdir) \
- 	      || exit 1; \
- 	  fi; \
-@@ -518,7 +570,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -538,7 +589,7 @@
- clean-generic:
- 
- distclean-generic:
--	-rm -f $(CONFIG_CLEAN_FILES)
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
- 
- dvi-am:
- 
-+html: html-recursive
-+
- info: info-recursive
- 
- info-am:
-@@ -594,37 +647,42 @@
- 
- uninstall-info: uninstall-info-recursive
- 
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
--	clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+	clean clean-generic clean-libtool clean-recursive ctags \
- 	ctags-recursive distclean distclean-generic distclean-libtool \
--	distclean-recursive distclean-tags distdir dvi dvi-am \
--	dvi-recursive info info-am info-recursive install install-am \
--	install-data install-data-am install-data-recursive \
--	install-exec install-exec-am install-exec-recursive \
--	install-info install-info-am install-info-recursive install-man \
--	install-recursive install-strip installcheck installcheck-am \
--	installdirs installdirs-am installdirs-recursive \
--	maintainer-clean maintainer-clean-generic \
--	maintainer-clean-recursive mostlyclean mostlyclean-generic \
--	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
--	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
--	uninstall uninstall-am uninstall-info-am \
--	uninstall-info-recursive uninstall-recursive
-+	distclean-recursive distclean-tags distdir dvi dvi-am html \
-+	html-am info info-am install install-am install-data \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-strip installcheck \
-+	installcheck-am installdirs installdirs-am maintainer-clean \
-+	maintainer-clean-generic maintainer-clean-recursive \
-+	mostlyclean mostlyclean-generic mostlyclean-libtool \
-+	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+	uninstall uninstall-am uninstall-info-am
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=Makefile.in 
-+KDE_DIST=Makefile.in Makefile.am 
- 
- #>+ 2
- docs-am:
- 
--#>+ 6
-+#>+ 15
- force-reedit:
--		cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  translations/es/Makefile
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  translations/es/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  translations/es/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit translations/es/Makefile.in
- 
- 
---- translations/es/messages/Makefile.in
-+++ translations/es/messages/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
- # @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
- 
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = translations/es/messages
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- 	html-recursive info-recursive install-data-recursive \
-+#>- 	install-exec-recursive install-info-recursive \
-+#>- 	install-recursive installcheck-recursive installdirs-recursive \
-+#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- 	uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+	html-recursive info-recursive install-data-recursive \
-+	install-exec-recursive install-info-recursive \
-+	install-recursive installcheck-recursive installdirs-recursive \
-+	pdf-recursive ps-recursive uninstall-info-recursive \
-+	uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -273,6 +309,7 @@
- libexif_internal_TRUE = @libexif_internal_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
- #>+ 2
- POFILES = gwenview.po
- GMOFILES = gwenview.gmo
--subdir = translations/es/messages
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
--#>- 	all-recursive install-data-recursive install-exec-recursive \
--#>- 	installdirs-recursive install-recursive uninstall-recursive \
--#>- 	check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--	ps-recursive install-info-recursive uninstall-info-recursive \
--	all-recursive install-data-recursive install-exec-recursive \
--	installdirs-recursive install-recursive uninstall-recursive \
--	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
- all: all-nls docs-am  all-recursive
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  translations/es/messages/Makefile'; \
- #>- 	cd $(top_srcdir) && \
--#>- 	  $(AUTOMAKE) --gnu  translations/es/messages/Makefile
--#>+ 3
-+#>- 	  $(AUTOMAKE) --foreign  translations/es/messages/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  translations/es/messages/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  translations/es/messages/Makefile
-+	  $(AUTOMAKE) --foreign  translations/es/messages/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit translations/es/messages/Makefile.in
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-@@ -357,7 +407,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
- 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- 	done
- 
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
- 	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
- 	mkid -fID $$unique
-+tags: TAGS
- 
- TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
--	if (etags --etags-include --version) >/dev/null 2>&1; then \
-+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- 	  include_option=--etags-include; \
-+	  empty_fix=.; \
- 	else \
- 	  include_option=--include; \
-+	  empty_fix=; \
- 	fi; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
--	    test -f $$subdir/TAGS && \
-+	    test ! -f $$subdir/TAGS || \
- 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- 	  fi; \
- 	done; \
-@@ -447,10 +504,11 @@
- 	  done | \
- 	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$tags$$unique" \
--	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
--	     $$tags $$unique
--
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
- 
- distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--#>+ 1
--DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -496,7 +546,7 @@
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -511,15 +561,17 @@
- 	    || exit 1; \
- 	  fi; \
- 	done
--	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
--	    test -d $(distdir)/$$subdir \
--	    || mkdir $(distdir)/$$subdir \
-+	    test -d "$(distdir)/$$subdir" \
-+	    || $(mkdir_p) "$(distdir)/$$subdir" \
- 	    || exit 1; \
-+	    distdir=`$(am__cd) $(distdir) && pwd`; \
-+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- 	    (cd $$subdir && \
- 	      $(MAKE) $(AM_MAKEFLAGS) \
--	        top_distdir="$(top_distdir)" \
--	        distdir=../$(distdir)/$$subdir \
-+	        top_distdir="$$top_distdir" \
-+	        distdir="$$distdir/$$subdir" \
- 	        distdir) \
- 	      || exit 1; \
- 	  fi; \
-@@ -529,7 +581,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -551,7 +602,7 @@
- clean-generic:
- 
- distclean-generic:
--	-rm -f $(CONFIG_CLEAN_FILES)
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
- 
- dvi-am:
- 
-+html: html-recursive
-+
- info: info-recursive
- 
- info-am:
-@@ -611,29 +664,25 @@
- 
- uninstall-info: uninstall-info-recursive
- 
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
--	clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+	clean clean-generic clean-libtool clean-recursive ctags \
- 	ctags-recursive distclean distclean-generic distclean-libtool \
--	distclean-recursive distclean-tags distdir dvi dvi-am \
--	dvi-recursive info info-am info-recursive install install-am \
--	install-data install-data-am install-data-recursive \
--	install-exec install-exec-am install-exec-recursive \
--	install-info install-info-am install-info-recursive install-man \
--	install-recursive install-strip installcheck installcheck-am \
--	installdirs installdirs-am installdirs-recursive \
--	maintainer-clean maintainer-clean-generic \
--	maintainer-clean-recursive mostlyclean mostlyclean-generic \
--	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
--	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
--	uninstall uninstall-am uninstall-info-am \
--	uninstall-info-recursive uninstall-recursive
-+	distclean-recursive distclean-tags distdir dvi dvi-am html \
-+	html-am info info-am install install-am install-data \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-strip installcheck \
-+	installcheck-am installdirs installdirs-am maintainer-clean \
-+	maintainer-clean-generic maintainer-clean-recursive \
-+	mostlyclean mostlyclean-generic mostlyclean-libtool \
-+	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+	uninstall uninstall-am uninstall-info-am
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=gwenview.po Makefile.in 
-+KDE_DIST=gwenview.po Makefile.in Makefile.am 
- 
- #>+ 4
- gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
- #>+ 2
- docs-am:
- 
--#>+ 6
-+#>+ 15
- force-reedit:
--		cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  translations/es/messages/Makefile
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  translations/es/messages/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  translations/es/messages/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit translations/es/messages/Makefile.in
- 
- 
 --- translations/et/doc/Makefile.in
 +++ translations/et/doc/Makefile.in
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -40351,7 +38468,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +177,9 @@
+@@ -158,6 +171,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -40361,7 +38478,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +238,8 @@
+@@ -215,6 +231,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -40370,7 +38487,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +291,7 @@
+@@ -264,6 +282,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -40378,7 +38495,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -299,27 +318,53 @@
+@@ -286,27 +305,53 @@
  xdg_menudir = @xdg_menudir@
  KDE_LANG = et
  KDE_DOCS = gwenview
@@ -40445,7 +38562,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -336,12 +381,6 @@
+@@ -323,12 +368,6 @@
  ctags: CTAGS
  CTAGS:
  
@@ -40458,7 +38575,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -357,7 +396,7 @@
+@@ -344,7 +383,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -40467,7 +38584,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -375,7 +414,6 @@
+@@ -362,7 +401,6 @@
  check-am: all-am
  check: check-am
  all-am: Makefile
@@ -40475,7 +38592,7 @@
  installdirs:
  install: install-am
  install-exec: install-exec-am
-@@ -398,7 +436,7 @@
+@@ -385,7 +423,7 @@
  clean-generic:
  
  distclean-generic:
@@ -40484,7 +38601,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -419,6 +457,8 @@
+@@ -406,6 +444,8 @@
  
  dvi-am:
  
@@ -40493,7 +38610,7 @@
  info: info-am
  
  info-am:
-@@ -455,10 +495,10 @@
+@@ -442,10 +482,10 @@
  
  .PHONY: all all-am check check-am clean clean-generic clean-libtool \
  	distclean distclean-generic distclean-libtool distdir dvi \
@@ -40508,7 +38625,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
  	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
  	uninstall-info-am
-@@ -468,10 +508,10 @@
+@@ -455,10 +495,10 @@
  .NOEXPORT:
  
  #>+ 2
@@ -40521,7 +38638,7 @@
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
-@@ -498,27 +538,36 @@
+@@ -485,27 +525,36 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview
@@ -40569,7 +38686,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -40633,7 +38750,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -40643,7 +38760,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
+@@ -215,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -40652,7 +38769,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +307,7 @@
+@@ -264,6 +298,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -40660,7 +38777,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
+@@ -285,40 +320,53 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  SUBDIRS = messages doc
@@ -40740,7 +38857,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -350,7 +398,13 @@
+@@ -337,7 +385,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -40755,7 +38872,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
+@@ -349,7 +403,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -40764,7 +38881,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
+@@ -357,7 +411,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -40779,7 +38896,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
+@@ -378,7 +438,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -40788,7 +38905,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
+@@ -389,14 +449,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -40803,7 +38920,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
+@@ -405,19 +457,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -40828,7 +38945,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -440,10 +495,11 @@
+@@ -427,10 +482,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -40844,7 +38961,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
+@@ -453,12 +509,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -40857,7 +38974,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
+@@ -472,7 +522,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -40866,7 +38983,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -500,15 +550,17 @@
+@@ -487,15 +537,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -40889,7 +39006,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -518,7 +570,6 @@
+@@ -505,7 +557,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -40897,7 +39014,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -538,7 +589,7 @@
+@@ -525,7 +576,7 @@
  clean-generic:
  
  distclean-generic:
@@ -40906,7 +39023,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
+@@ -547,6 +598,8 @@
  
  dvi-am:
  
@@ -40915,7 +39032,7 @@
  info: info-recursive
  
  info-am:
-@@ -594,37 +647,42 @@
+@@ -581,37 +634,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -40982,7 +39099,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -41048,7 +39165,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -41058,7 +39175,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
+@@ -215,6 +249,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -41067,7 +39184,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +309,7 @@
+@@ -264,6 +300,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -41075,7 +39192,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
+@@ -292,40 +329,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -41155,7 +39272,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -357,7 +407,13 @@
+@@ -344,7 +394,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -41170,7 +39287,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
+@@ -356,7 +412,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -41179,7 +39296,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
+@@ -364,7 +420,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -41194,7 +39311,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
+@@ -385,7 +447,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -41203,7 +39320,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
+@@ -396,14 +458,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -41218,7 +39335,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
+@@ -412,19 +466,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -41243,7 +39360,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -447,10 +504,11 @@
+@@ -434,10 +491,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -41259,7 +39376,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
+@@ -460,14 +518,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -41274,7 +39391,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -496,7 +546,7 @@
+@@ -483,7 +533,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -41283,7 +39400,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -511,15 +561,17 @@
+@@ -498,15 +548,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -41306,7 +39423,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -529,7 +581,6 @@
+@@ -516,7 +568,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -41314,7 +39431,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -551,7 +602,7 @@
+@@ -538,7 +589,7 @@
  clean-generic:
  
  distclean-generic:
@@ -41323,7 +39440,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
+@@ -560,6 +611,8 @@
  
  dvi-am:
  
@@ -41332,7 +39449,7 @@
  info: info-recursive
  
  info-am:
-@@ -611,29 +664,25 @@
+@@ -598,29 +651,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -41374,7 +39491,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
+@@ -661,10 +710,19 @@
  #>+ 2
  docs-am:
  
@@ -41402,7 +39519,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -41466,7 +39583,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -41476,7 +39593,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
+@@ -215,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -41485,7 +39602,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +307,7 @@
+@@ -264,6 +298,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -41493,7 +39610,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
+@@ -285,40 +320,53 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  SUBDIRS = messages
@@ -41573,7 +39690,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -350,7 +398,13 @@
+@@ -337,7 +385,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -41588,7 +39705,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
+@@ -349,7 +403,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -41597,7 +39714,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
+@@ -357,7 +411,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -41612,7 +39729,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
+@@ -378,7 +438,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -41621,7 +39738,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
+@@ -389,14 +449,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -41636,7 +39753,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
+@@ -405,19 +457,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -41661,7 +39778,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -440,10 +495,11 @@
+@@ -427,10 +482,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -41677,7 +39794,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
+@@ -453,12 +509,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -41690,7 +39807,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
+@@ -472,7 +522,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -41699,7 +39816,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -500,15 +550,17 @@
+@@ -487,15 +537,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -41722,7 +39839,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -518,7 +570,6 @@
+@@ -505,7 +557,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -41730,7 +39847,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -538,7 +589,7 @@
+@@ -525,7 +576,7 @@
  clean-generic:
  
  distclean-generic:
@@ -41739,7 +39856,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
+@@ -547,6 +598,8 @@
  
  dvi-am:
  
@@ -41748,7 +39865,7 @@
  info: info-recursive
  
  info-am:
-@@ -594,37 +647,42 @@
+@@ -581,37 +634,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -41815,7 +39932,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -41881,7 +39998,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -41891,7 +40008,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
+@@ -215,6 +249,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -41900,7 +40017,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +309,7 @@
+@@ -264,6 +300,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -41908,7 +40025,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
+@@ -292,40 +329,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -41988,7 +40105,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -357,7 +407,13 @@
+@@ -344,7 +394,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -42003,7 +40120,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
+@@ -356,7 +412,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -42012,7 +40129,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
+@@ -364,7 +420,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -42027,7 +40144,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
+@@ -385,7 +447,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -42036,7 +40153,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
+@@ -396,14 +458,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -42051,7 +40168,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
+@@ -412,19 +466,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -42076,7 +40193,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -447,10 +504,11 @@
+@@ -434,10 +491,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -42092,7 +40209,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
+@@ -460,14 +518,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -42107,7 +40224,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -496,7 +546,7 @@
+@@ -483,7 +533,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -42116,7 +40233,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -511,15 +561,17 @@
+@@ -498,15 +548,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -42139,7 +40256,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -529,7 +581,6 @@
+@@ -516,7 +568,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -42147,7 +40264,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -551,7 +602,7 @@
+@@ -538,7 +589,7 @@
  clean-generic:
  
  distclean-generic:
@@ -42156,7 +40273,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
+@@ -560,6 +611,8 @@
  
  dvi-am:
  
@@ -42165,7 +40282,7 @@
  info: info-recursive
  
  info-am:
-@@ -611,29 +664,25 @@
+@@ -598,29 +651,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -42207,7 +40324,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
+@@ -661,10 +710,19 @@
  #>+ 2
  docs-am:
  
@@ -42235,7 +40352,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -42283,7 +40400,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +177,9 @@
+@@ -158,6 +171,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -42293,7 +40410,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +238,8 @@
+@@ -215,6 +231,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -42302,7 +40419,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +291,7 @@
+@@ -264,6 +282,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -42310,7 +40427,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -299,27 +318,53 @@
+@@ -286,27 +305,53 @@
  xdg_menudir = @xdg_menudir@
  KDE_LANG = fr
  KDE_DOCS = gwenview
@@ -42377,7 +40494,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -336,12 +381,6 @@
+@@ -323,12 +368,6 @@
  ctags: CTAGS
  CTAGS:
  
@@ -42390,7 +40507,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -357,7 +396,7 @@
+@@ -344,7 +383,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -42399,7 +40516,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -375,7 +414,6 @@
+@@ -362,7 +401,6 @@
  check-am: all-am
  check: check-am
  all-am: Makefile
@@ -42407,7 +40524,7 @@
  installdirs:
  install: install-am
  install-exec: install-exec-am
-@@ -398,7 +436,7 @@
+@@ -385,7 +423,7 @@
  clean-generic:
  
  distclean-generic:
@@ -42416,7 +40533,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -419,6 +457,8 @@
+@@ -406,6 +444,8 @@
  
  dvi-am:
  
@@ -42425,7 +40542,7 @@
  info: info-am
  
  info-am:
-@@ -455,10 +495,10 @@
+@@ -442,10 +482,10 @@
  
  .PHONY: all all-am check check-am clean clean-generic clean-libtool \
  	distclean distclean-generic distclean-libtool distdir dvi \
@@ -42440,7 +40557,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
  	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
  	uninstall-info-am
-@@ -468,7 +508,7 @@
+@@ -455,7 +495,7 @@
  .NOEXPORT:
  
  #>+ 2
@@ -42449,7 +40566,7 @@
  
  #>+ 24
  index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) index.docbook 
-@@ -515,10 +555,19 @@
+@@ -502,10 +542,19 @@
  	  cp $(srcdir)/$$file $(distdir); \
  	done
  
@@ -42477,7 +40594,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -42541,7 +40658,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -42551,7 +40668,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
+@@ -215,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -42560,7 +40677,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +307,7 @@
+@@ -264,6 +298,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -42568,7 +40685,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
+@@ -285,40 +320,53 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  SUBDIRS = messages doc
@@ -42648,7 +40765,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -350,7 +398,13 @@
+@@ -337,7 +385,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -42663,7 +40780,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
+@@ -349,7 +403,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -42672,7 +40789,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
+@@ -357,7 +411,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -42687,7 +40804,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
+@@ -378,7 +438,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -42696,7 +40813,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
+@@ -389,14 +449,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -42711,7 +40828,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
+@@ -405,19 +457,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -42736,7 +40853,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -440,10 +495,11 @@
+@@ -427,10 +482,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -42752,7 +40869,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
+@@ -453,12 +509,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -42765,7 +40882,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
+@@ -472,7 +522,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -42774,7 +40891,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -500,15 +550,17 @@
+@@ -487,15 +537,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -42797,7 +40914,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -518,7 +570,6 @@
+@@ -505,7 +557,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -42805,7 +40922,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -538,7 +589,7 @@
+@@ -525,7 +576,7 @@
  clean-generic:
  
  distclean-generic:
@@ -42814,7 +40931,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
+@@ -547,6 +598,8 @@
  
  dvi-am:
  
@@ -42823,7 +40940,7 @@
  info: info-recursive
  
  info-am:
-@@ -594,37 +647,42 @@
+@@ -581,37 +634,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -42890,7 +41007,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -42956,7 +41073,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -42966,7 +41083,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
+@@ -215,6 +249,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -42975,7 +41092,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +309,7 @@
+@@ -264,6 +300,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -42983,7 +41100,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
+@@ -292,40 +329,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -43063,7 +41180,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -357,7 +407,13 @@
+@@ -344,7 +394,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -43078,7 +41195,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
+@@ -356,7 +412,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -43087,7 +41204,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
+@@ -364,7 +420,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -43102,7 +41219,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
+@@ -385,7 +447,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -43111,7 +41228,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
+@@ -396,14 +458,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -43126,7 +41243,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
+@@ -412,19 +466,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -43151,7 +41268,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -447,10 +504,11 @@
+@@ -434,10 +491,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -43167,7 +41284,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
+@@ -460,14 +518,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -43182,7 +41299,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -496,7 +546,7 @@
+@@ -483,7 +533,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -43191,7 +41308,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -511,15 +561,17 @@
+@@ -498,15 +548,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -43214,7 +41331,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -529,7 +581,6 @@
+@@ -516,7 +568,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -43222,7 +41339,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -551,7 +602,7 @@
+@@ -538,7 +589,7 @@
  clean-generic:
  
  distclean-generic:
@@ -43231,7 +41348,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
+@@ -560,6 +611,8 @@
  
  dvi-am:
  
@@ -43240,7 +41357,7 @@
  info: info-recursive
  
  info-am:
-@@ -611,29 +664,25 @@
+@@ -598,29 +651,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -43282,7 +41399,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
+@@ -661,10 +710,19 @@
  #>+ 2
  docs-am:
  
@@ -43310,7 +41427,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -43374,7 +41491,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -43384,7 +41501,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
+@@ -215,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -43393,7 +41510,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +307,7 @@
+@@ -264,6 +298,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -43401,7 +41518,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
+@@ -285,40 +320,53 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  SUBDIRS = messages
@@ -43481,7 +41598,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -350,7 +398,13 @@
+@@ -337,7 +385,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -43496,7 +41613,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
+@@ -349,7 +403,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -43505,7 +41622,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
+@@ -357,7 +411,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -43520,7 +41637,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
+@@ -378,7 +438,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -43529,7 +41646,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
+@@ -389,14 +449,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -43544,7 +41661,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
+@@ -405,19 +457,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -43569,7 +41686,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -440,10 +495,11 @@
+@@ -427,10 +482,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -43585,7 +41702,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
+@@ -453,12 +509,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -43598,7 +41715,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
+@@ -472,7 +522,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -43607,7 +41724,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -500,15 +550,17 @@
+@@ -487,15 +537,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -43630,7 +41747,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -518,7 +570,6 @@
+@@ -505,7 +557,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -43638,7 +41755,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -538,7 +589,7 @@
+@@ -525,7 +576,7 @@
  clean-generic:
  
  distclean-generic:
@@ -43647,7 +41764,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
+@@ -547,6 +598,8 @@
  
  dvi-am:
  
@@ -43656,7 +41773,7 @@
  info: info-recursive
  
  info-am:
-@@ -594,37 +647,42 @@
+@@ -581,37 +634,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -43723,7 +41840,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -43789,7 +41906,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -43799,7 +41916,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
+@@ -215,6 +249,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -43808,7 +41925,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +309,7 @@
+@@ -264,6 +300,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -43816,7 +41933,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
+@@ -292,40 +329,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -43896,7 +42013,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -357,7 +407,13 @@
+@@ -344,7 +394,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -43911,7 +42028,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
+@@ -356,7 +412,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -43920,7 +42037,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
+@@ -364,7 +420,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -43935,7 +42052,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
+@@ -385,7 +447,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -43944,7 +42061,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
+@@ -396,14 +458,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -43959,7 +42076,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
+@@ -412,19 +466,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -43984,7 +42101,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -447,10 +504,11 @@
+@@ -434,10 +491,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -44000,7 +42117,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
+@@ -460,14 +518,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -44015,7 +42132,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -496,7 +546,7 @@
+@@ -483,7 +533,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -44024,7 +42141,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -511,15 +561,17 @@
+@@ -498,15 +548,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -44047,7 +42164,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -529,7 +581,6 @@
+@@ -516,7 +568,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -44055,7 +42172,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -551,7 +602,7 @@
+@@ -538,7 +589,7 @@
  clean-generic:
  
  distclean-generic:
@@ -44064,7 +42181,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
+@@ -560,6 +611,8 @@
  
  dvi-am:
  
@@ -44073,7 +42190,7 @@
  info: info-recursive
  
  info-am:
-@@ -611,29 +664,25 @@
+@@ -598,29 +651,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -44115,7 +42232,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
+@@ -661,10 +710,19 @@
  #>+ 2
  docs-am:
  
@@ -44143,7 +42260,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -44207,7 +42324,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -44217,7 +42334,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
+@@ -215,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -44226,7 +42343,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +307,7 @@
+@@ -264,6 +298,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -44234,7 +42351,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
+@@ -285,40 +320,53 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  SUBDIRS = messages
@@ -44314,7 +42431,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -350,7 +398,13 @@
+@@ -337,7 +385,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -44329,7 +42446,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
+@@ -349,7 +403,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -44338,7 +42455,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
+@@ -357,7 +411,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -44353,7 +42470,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
+@@ -378,7 +438,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -44362,7 +42479,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
+@@ -389,14 +449,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -44377,7 +42494,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
+@@ -405,19 +457,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -44402,7 +42519,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -440,10 +495,11 @@
+@@ -427,10 +482,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -44418,7 +42535,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
+@@ -453,12 +509,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -44431,7 +42548,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
+@@ -472,7 +522,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -44440,7 +42557,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -500,15 +550,17 @@
+@@ -487,15 +537,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -44463,7 +42580,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -518,7 +570,6 @@
+@@ -505,7 +557,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -44471,7 +42588,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -538,7 +589,7 @@
+@@ -525,7 +576,7 @@
  clean-generic:
  
  distclean-generic:
@@ -44480,7 +42597,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
+@@ -547,6 +598,8 @@
  
  dvi-am:
  
@@ -44489,7 +42606,7 @@
  info: info-recursive
  
  info-am:
-@@ -594,37 +647,42 @@
+@@ -581,37 +634,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -44556,7 +42673,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -44622,7 +42739,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -44632,7 +42749,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
+@@ -215,6 +249,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -44641,7 +42758,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +309,7 @@
+@@ -264,6 +300,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -44649,7 +42766,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
+@@ -292,40 +329,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -44729,7 +42846,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -357,7 +407,13 @@
+@@ -344,7 +394,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -44744,7 +42861,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
+@@ -356,7 +412,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -44753,7 +42870,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
+@@ -364,7 +420,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -44768,7 +42885,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
+@@ -385,7 +447,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -44777,7 +42894,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
+@@ -396,14 +458,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -44792,7 +42909,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
+@@ -412,19 +466,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -44817,7 +42934,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -447,10 +504,11 @@
+@@ -434,10 +491,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -44833,7 +42950,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
+@@ -460,14 +518,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -44848,7 +42965,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -496,7 +546,7 @@
+@@ -483,7 +533,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -44857,7 +42974,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -511,15 +561,17 @@
+@@ -498,15 +548,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -44880,7 +42997,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -529,7 +581,6 @@
+@@ -516,7 +568,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -44888,7 +43005,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -551,7 +602,7 @@
+@@ -538,7 +589,7 @@
  clean-generic:
  
  distclean-generic:
@@ -44897,7 +43014,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
+@@ -560,6 +611,8 @@
  
  dvi-am:
  
@@ -44906,7 +43023,7 @@
  info: info-recursive
  
  info-am:
-@@ -611,29 +664,25 @@
+@@ -598,29 +651,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -44948,7 +43065,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
+@@ -661,10 +710,19 @@
  #>+ 2
  docs-am:
  
@@ -44976,7 +43093,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -45040,7 +43157,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -45050,7 +43167,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
+@@ -215,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -45059,7 +43176,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +307,7 @@
+@@ -264,6 +298,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -45067,7 +43184,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
+@@ -285,40 +320,53 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  SUBDIRS = messages
@@ -45147,7 +43264,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -350,7 +398,13 @@
+@@ -337,7 +385,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -45162,7 +43279,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
+@@ -349,7 +403,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -45171,7 +43288,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
+@@ -357,7 +411,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -45186,7 +43303,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
+@@ -378,7 +438,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -45195,7 +43312,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
+@@ -389,14 +449,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -45210,7 +43327,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
+@@ -405,19 +457,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -45235,7 +43352,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -440,10 +495,11 @@
+@@ -427,10 +482,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -45251,7 +43368,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
+@@ -453,12 +509,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -45264,7 +43381,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
+@@ -472,7 +522,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -45273,7 +43390,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -500,15 +550,17 @@
+@@ -487,15 +537,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -45296,7 +43413,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -518,7 +570,6 @@
+@@ -505,7 +557,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -45304,7 +43421,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -538,7 +589,7 @@
+@@ -525,7 +576,7 @@
  clean-generic:
  
  distclean-generic:
@@ -45313,7 +43430,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
+@@ -547,6 +598,8 @@
  
  dvi-am:
  
@@ -45322,7 +43439,7 @@
  info: info-recursive
  
  info-am:
-@@ -594,37 +647,42 @@
+@@ -581,37 +634,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -45389,7 +43506,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -45455,7 +43572,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -45465,7 +43582,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
+@@ -215,6 +249,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -45474,7 +43591,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +309,7 @@
+@@ -264,6 +300,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -45482,7 +43599,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
+@@ -292,40 +329,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -45562,7 +43679,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -357,7 +407,13 @@
+@@ -344,7 +394,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -45577,7 +43694,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
+@@ -356,7 +412,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -45586,7 +43703,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
+@@ -364,7 +420,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -45601,7 +43718,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
+@@ -385,7 +447,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -45610,7 +43727,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
+@@ -396,14 +458,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -45625,7 +43742,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
+@@ -412,19 +466,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -45650,7 +43767,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -447,10 +504,11 @@
+@@ -434,10 +491,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -45666,7 +43783,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
+@@ -460,14 +518,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -45681,7 +43798,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -496,7 +546,7 @@
+@@ -483,7 +533,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -45690,7 +43807,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -511,15 +561,17 @@
+@@ -498,15 +548,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -45713,7 +43830,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -529,7 +581,6 @@
+@@ -516,7 +568,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -45721,7 +43838,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -551,7 +602,7 @@
+@@ -538,7 +589,7 @@
  clean-generic:
  
  distclean-generic:
@@ -45730,7 +43847,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
+@@ -560,6 +611,8 @@
  
  dvi-am:
  
@@ -45739,7 +43856,7 @@
  info: info-recursive
  
  info-am:
-@@ -611,29 +664,25 @@
+@@ -598,29 +651,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -45781,7 +43898,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
+@@ -661,10 +710,19 @@
  #>+ 2
  docs-am:
  
@@ -45809,7 +43926,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -45873,7 +43990,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -45883,7 +44000,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
+@@ -215,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -45892,7 +44009,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +307,7 @@
+@@ -264,6 +298,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -45900,7 +44017,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
+@@ -285,40 +320,53 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  SUBDIRS = messages
@@ -45980,7 +44097,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -350,7 +398,13 @@
+@@ -337,7 +385,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -45995,7 +44112,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
+@@ -349,7 +403,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -46004,7 +44121,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
+@@ -357,7 +411,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -46019,7 +44136,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
+@@ -378,7 +438,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -46028,7 +44145,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
+@@ -389,14 +449,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -46043,7 +44160,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
+@@ -405,19 +457,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -46068,7 +44185,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -440,10 +495,11 @@
+@@ -427,10 +482,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -46084,7 +44201,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
+@@ -453,12 +509,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -46097,7 +44214,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
+@@ -472,7 +522,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -46106,7 +44223,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -500,15 +550,17 @@
+@@ -487,15 +537,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -46129,7 +44246,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -518,7 +570,6 @@
+@@ -505,7 +557,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -46137,7 +44254,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -538,7 +589,7 @@
+@@ -525,7 +576,7 @@
  clean-generic:
  
  distclean-generic:
@@ -46146,7 +44263,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
+@@ -547,6 +598,8 @@
  
  dvi-am:
  
@@ -46155,7 +44272,7 @@
  info: info-recursive
  
  info-am:
-@@ -594,37 +647,42 @@
+@@ -581,37 +634,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -46222,7 +44339,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -46288,7 +44405,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -46298,7 +44415,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
+@@ -215,6 +249,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -46307,7 +44424,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +309,7 @@
+@@ -264,6 +300,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -46315,7 +44432,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
+@@ -292,40 +329,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -46395,7 +44512,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -357,7 +407,13 @@
+@@ -344,7 +394,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -46410,7 +44527,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
+@@ -356,7 +412,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -46419,7 +44536,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
+@@ -364,7 +420,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -46434,7 +44551,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
+@@ -385,7 +447,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -46443,7 +44560,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
+@@ -396,14 +458,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -46458,7 +44575,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
+@@ -412,19 +466,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -46483,7 +44600,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -447,10 +504,11 @@
+@@ -434,10 +491,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -46499,7 +44616,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
+@@ -460,14 +518,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -46514,7 +44631,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -496,7 +546,7 @@
+@@ -483,7 +533,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -46523,7 +44640,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -511,15 +561,17 @@
+@@ -498,15 +548,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -46546,7 +44663,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -529,7 +581,6 @@
+@@ -516,7 +568,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -46554,7 +44671,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -551,7 +602,7 @@
+@@ -538,7 +589,7 @@
  clean-generic:
  
  distclean-generic:
@@ -46563,7 +44680,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
+@@ -560,6 +611,8 @@
  
  dvi-am:
  
@@ -46572,7 +44689,7 @@
  info: info-recursive
  
  info-am:
-@@ -611,29 +664,25 @@
+@@ -598,29 +651,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -46614,7 +44731,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
+@@ -661,10 +710,19 @@
  #>+ 2
  docs-am:
  
@@ -46642,7 +44759,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -46706,7 +44823,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -46716,7 +44833,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
+@@ -215,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -46725,7 +44842,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +307,7 @@
+@@ -264,6 +298,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -46733,7 +44850,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
+@@ -285,40 +320,53 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  SUBDIRS = messages
@@ -46813,7 +44930,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -350,7 +398,13 @@
+@@ -337,7 +385,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -46828,7 +44945,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
+@@ -349,7 +403,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -46837,7 +44954,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
+@@ -357,7 +411,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -46852,7 +44969,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
+@@ -378,7 +438,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -46861,7 +44978,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
+@@ -389,14 +449,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -46876,7 +44993,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
+@@ -405,19 +457,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -46901,7 +45018,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -440,10 +495,11 @@
+@@ -427,10 +482,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -46917,7 +45034,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
+@@ -453,12 +509,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -46930,7 +45047,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
+@@ -472,7 +522,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -46939,7 +45056,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -500,15 +550,17 @@
+@@ -487,15 +537,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -46962,7 +45079,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -518,7 +570,6 @@
+@@ -505,7 +557,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -46970,7 +45087,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -538,7 +589,7 @@
+@@ -525,7 +576,7 @@
  clean-generic:
  
  distclean-generic:
@@ -46979,7 +45096,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
+@@ -547,6 +598,8 @@
  
  dvi-am:
  
@@ -46988,7 +45105,7 @@
  info: info-recursive
  
  info-am:
-@@ -594,37 +647,42 @@
+@@ -581,37 +634,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -47055,7 +45172,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -47121,7 +45238,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -47131,7 +45248,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
+@@ -215,6 +249,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -47140,7 +45257,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +309,7 @@
+@@ -264,6 +300,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -47148,7 +45265,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
+@@ -292,40 +329,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -47228,7 +45345,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -357,7 +407,13 @@
+@@ -344,7 +394,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -47243,7 +45360,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
+@@ -356,7 +412,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -47252,7 +45369,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
+@@ -364,7 +420,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -47267,7 +45384,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
+@@ -385,7 +447,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -47276,7 +45393,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
+@@ -396,14 +458,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -47291,7 +45408,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
+@@ -412,19 +466,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -47316,7 +45433,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -447,10 +504,11 @@
+@@ -434,10 +491,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -47332,7 +45449,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
+@@ -460,14 +518,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -47347,7 +45464,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -496,7 +546,7 @@
+@@ -483,7 +533,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -47356,7 +45473,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -511,15 +561,17 @@
+@@ -498,15 +548,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -47379,7 +45496,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -529,7 +581,6 @@
+@@ -516,7 +568,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -47387,7 +45504,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -551,7 +602,7 @@
+@@ -538,7 +589,7 @@
  clean-generic:
  
  distclean-generic:
@@ -47396,7 +45513,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
+@@ -560,6 +611,8 @@
  
  dvi-am:
  
@@ -47405,7 +45522,7 @@
  info: info-recursive
  
  info-am:
-@@ -611,29 +664,25 @@
+@@ -598,29 +651,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -47447,7 +45564,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
+@@ -661,10 +710,19 @@
  #>+ 2
  docs-am:
  
@@ -47475,7 +45592,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -47539,7 +45656,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -47549,7 +45666,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
+@@ -215,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -47558,7 +45675,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +307,7 @@
+@@ -264,6 +298,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -47566,7 +45683,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
+@@ -285,40 +320,53 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  SUBDIRS = messages
@@ -47646,7 +45763,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -350,7 +398,13 @@
+@@ -337,7 +385,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -47661,7 +45778,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
+@@ -349,7 +403,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -47670,7 +45787,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
+@@ -357,7 +411,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -47685,7 +45802,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
+@@ -378,7 +438,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -47694,7 +45811,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
+@@ -389,14 +449,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -47709,7 +45826,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
+@@ -405,19 +457,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -47734,7 +45851,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -440,10 +495,11 @@
+@@ -427,10 +482,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -47750,7 +45867,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
+@@ -453,12 +509,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -47763,7 +45880,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
+@@ -472,7 +522,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -47772,7 +45889,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -500,15 +550,17 @@
+@@ -487,15 +537,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -47795,7 +45912,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -518,7 +570,6 @@
+@@ -505,7 +557,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -47803,7 +45920,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -538,7 +589,7 @@
+@@ -525,7 +576,7 @@
  clean-generic:
  
  distclean-generic:
@@ -47812,7 +45929,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
+@@ -547,6 +598,8 @@
  
  dvi-am:
  
@@ -47821,7 +45938,7 @@
  info: info-recursive
  
  info-am:
-@@ -594,37 +647,42 @@
+@@ -581,37 +634,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -47888,7 +46005,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -47954,7 +46071,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -47964,7 +46081,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
+@@ -215,6 +249,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -47973,7 +46090,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +309,7 @@
+@@ -264,6 +300,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -47981,7 +46098,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
+@@ -292,40 +329,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -48061,7 +46178,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -357,7 +407,13 @@
+@@ -344,7 +394,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -48076,7 +46193,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
+@@ -356,7 +412,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -48085,7 +46202,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
+@@ -364,7 +420,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -48100,7 +46217,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
+@@ -385,7 +447,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -48109,7 +46226,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
+@@ -396,14 +458,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -48124,7 +46241,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
+@@ -412,19 +466,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -48149,7 +46266,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -447,10 +504,11 @@
+@@ -434,10 +491,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -48165,7 +46282,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
+@@ -460,14 +518,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -48180,7 +46297,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -496,7 +546,7 @@
+@@ -483,7 +533,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -48189,7 +46306,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -511,15 +561,17 @@
+@@ -498,15 +548,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -48212,7 +46329,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -529,7 +581,6 @@
+@@ -516,7 +568,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -48220,7 +46337,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -551,7 +602,7 @@
+@@ -538,7 +589,7 @@
  clean-generic:
  
  distclean-generic:
@@ -48229,7 +46346,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
+@@ -560,6 +611,8 @@
  
  dvi-am:
  
@@ -48238,7 +46355,7 @@
  info: info-recursive
  
  info-am:
-@@ -611,29 +664,25 @@
+@@ -598,29 +651,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -48280,7 +46397,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
+@@ -661,10 +710,19 @@
  #>+ 2
  docs-am:
  
@@ -48308,7 +46425,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -48356,7 +46473,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +177,9 @@
+@@ -158,6 +171,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -48366,7 +46483,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +238,8 @@
+@@ -215,6 +231,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -48375,7 +46492,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +291,7 @@
+@@ -264,6 +282,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -48383,7 +46500,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -299,27 +318,53 @@
+@@ -286,27 +305,53 @@
  xdg_menudir = @xdg_menudir@
  KDE_LANG = it
  KDE_DOCS = gwenview
@@ -48450,7 +46567,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -336,12 +381,6 @@
+@@ -323,12 +368,6 @@
  ctags: CTAGS
  CTAGS:
  
@@ -48463,7 +46580,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -357,7 +396,7 @@
+@@ -344,7 +383,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -48472,7 +46589,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -375,7 +414,6 @@
+@@ -362,7 +401,6 @@
  check-am: all-am
  check: check-am
  all-am: Makefile
@@ -48480,7 +46597,7 @@
  installdirs:
  install: install-am
  install-exec: install-exec-am
-@@ -398,7 +436,7 @@
+@@ -385,7 +423,7 @@
  clean-generic:
  
  distclean-generic:
@@ -48489,7 +46606,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -419,6 +457,8 @@
+@@ -406,6 +444,8 @@
  
  dvi-am:
  
@@ -48498,7 +46615,7 @@
  info: info-am
  
  info-am:
-@@ -455,10 +495,10 @@
+@@ -442,10 +482,10 @@
  
  .PHONY: all all-am check check-am clean clean-generic clean-libtool \
  	distclean distclean-generic distclean-libtool distdir dvi \
@@ -48513,7 +46630,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
  	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
  	uninstall-info-am
-@@ -468,10 +508,10 @@
+@@ -455,10 +495,10 @@
  .NOEXPORT:
  
  #>+ 2
@@ -48526,7 +46643,7 @@
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
-@@ -498,27 +538,36 @@
+@@ -485,27 +525,36 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview
@@ -48574,7 +46691,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -48638,7 +46755,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -48648,7 +46765,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
+@@ -215,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -48657,7 +46774,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +307,7 @@
+@@ -264,6 +298,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -48665,7 +46782,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
+@@ -285,40 +320,53 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  SUBDIRS = messages doc
@@ -48745,7 +46862,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -350,7 +398,13 @@
+@@ -337,7 +385,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -48760,7 +46877,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
+@@ -349,7 +403,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -48769,7 +46886,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
+@@ -357,7 +411,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -48784,7 +46901,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
+@@ -378,7 +438,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -48793,7 +46910,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
+@@ -389,14 +449,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -48808,7 +46925,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
+@@ -405,19 +457,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -48833,7 +46950,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -440,10 +495,11 @@
+@@ -427,10 +482,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -48849,7 +46966,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
+@@ -453,12 +509,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -48862,7 +46979,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
+@@ -472,7 +522,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -48871,7 +46988,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -500,15 +550,17 @@
+@@ -487,15 +537,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -48894,7 +47011,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -518,7 +570,6 @@
+@@ -505,7 +557,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -48902,7 +47019,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -538,7 +589,7 @@
+@@ -525,7 +576,7 @@
  clean-generic:
  
  distclean-generic:
@@ -48911,7 +47028,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
+@@ -547,6 +598,8 @@
  
  dvi-am:
  
@@ -48920,7 +47037,7 @@
  info: info-recursive
  
  info-am:
-@@ -594,37 +647,42 @@
+@@ -581,37 +634,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -48987,7 +47104,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -49053,7 +47170,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -49063,7 +47180,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
+@@ -215,6 +249,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -49072,7 +47189,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +309,7 @@
+@@ -264,6 +300,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -49080,7 +47197,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
+@@ -292,40 +329,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -49160,7 +47277,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -357,7 +407,13 @@
+@@ -344,7 +394,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -49175,7 +47292,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
+@@ -356,7 +412,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -49184,7 +47301,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
+@@ -364,7 +420,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -49199,7 +47316,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
+@@ -385,7 +447,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -49208,7 +47325,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
+@@ -396,14 +458,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -49223,7 +47340,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
+@@ -412,19 +466,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -49248,7 +47365,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -447,10 +504,11 @@
+@@ -434,10 +491,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -49264,7 +47381,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
+@@ -460,14 +518,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -49279,7 +47396,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -496,7 +546,7 @@
+@@ -483,7 +533,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -49288,7 +47405,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -511,15 +561,17 @@
+@@ -498,15 +548,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -49311,7 +47428,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -529,7 +581,6 @@
+@@ -516,7 +568,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -49319,7 +47436,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -551,7 +602,7 @@
+@@ -538,7 +589,7 @@
  clean-generic:
  
  distclean-generic:
@@ -49328,7 +47445,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
+@@ -560,6 +611,8 @@
  
  dvi-am:
  
@@ -49337,7 +47454,7 @@
  info: info-recursive
  
  info-am:
-@@ -611,29 +664,25 @@
+@@ -598,29 +651,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -49379,7 +47496,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
+@@ -661,10 +710,19 @@
  #>+ 2
  docs-am:
  
@@ -49407,7 +47524,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -49471,7 +47588,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -49481,7 +47598,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
+@@ -215,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -49490,7 +47607,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +307,7 @@
+@@ -264,6 +298,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -49498,7 +47615,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
+@@ -285,40 +320,53 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  SUBDIRS = messages
@@ -49578,7 +47695,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -350,7 +398,13 @@
+@@ -337,7 +385,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -49593,7 +47710,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
+@@ -349,7 +403,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -49602,7 +47719,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
+@@ -357,7 +411,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -49617,7 +47734,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
+@@ -378,7 +438,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -49626,7 +47743,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
+@@ -389,14 +449,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -49641,7 +47758,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
+@@ -405,19 +457,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -49666,7 +47783,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -440,10 +495,11 @@
+@@ -427,10 +482,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -49682,7 +47799,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
+@@ -453,12 +509,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -49695,7 +47812,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
+@@ -472,7 +522,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -49704,7 +47821,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -500,15 +550,17 @@
+@@ -487,15 +537,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -49727,7 +47844,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -518,7 +570,6 @@
+@@ -505,7 +557,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -49735,7 +47852,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -538,7 +589,7 @@
+@@ -525,7 +576,7 @@
  clean-generic:
  
  distclean-generic:
@@ -49744,7 +47861,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
+@@ -547,6 +598,8 @@
  
  dvi-am:
  
@@ -49753,7 +47870,7 @@
  info: info-recursive
  
  info-am:
-@@ -594,37 +647,42 @@
+@@ -581,37 +634,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -49820,7 +47937,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -49886,7 +48003,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -49896,7 +48013,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
+@@ -215,6 +249,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -49905,7 +48022,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +309,7 @@
+@@ -264,6 +300,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -49913,7 +48030,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
+@@ -292,40 +329,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -49993,7 +48110,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -357,7 +407,13 @@
+@@ -344,7 +394,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -50008,7 +48125,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
+@@ -356,7 +412,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -50017,7 +48134,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
+@@ -364,7 +420,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -50032,7 +48149,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
+@@ -385,7 +447,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -50041,7 +48158,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
+@@ -396,14 +458,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -50056,7 +48173,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
+@@ -412,19 +466,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -50081,7 +48198,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -447,10 +504,11 @@
+@@ -434,10 +491,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -50097,7 +48214,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
+@@ -460,14 +518,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -50112,7 +48229,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -496,7 +546,7 @@
+@@ -483,7 +533,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -50121,7 +48238,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -511,15 +561,17 @@
+@@ -498,15 +548,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -50144,7 +48261,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -529,7 +581,6 @@
+@@ -516,7 +568,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -50152,7 +48269,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -551,7 +602,7 @@
+@@ -538,7 +589,7 @@
  clean-generic:
  
  distclean-generic:
@@ -50161,7 +48278,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
+@@ -560,6 +611,8 @@
  
  dvi-am:
  
@@ -50170,7 +48287,7 @@
  info: info-recursive
  
  info-am:
-@@ -611,29 +664,25 @@
+@@ -598,29 +651,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -50212,7 +48329,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
+@@ -661,10 +710,19 @@
  #>+ 2
  docs-am:
  
@@ -50240,7 +48357,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -50304,7 +48421,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -50314,7 +48431,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
+@@ -215,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -50323,7 +48440,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +307,7 @@
+@@ -264,6 +298,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -50331,7 +48448,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
+@@ -285,40 +320,53 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  SUBDIRS = messages
@@ -50411,7 +48528,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -350,7 +398,13 @@
+@@ -337,7 +385,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -50426,7 +48543,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
+@@ -349,7 +403,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -50435,7 +48552,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
+@@ -357,7 +411,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -50450,7 +48567,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
+@@ -378,7 +438,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -50459,7 +48576,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
+@@ -389,14 +449,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -50474,7 +48591,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
+@@ -405,19 +457,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -50499,7 +48616,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -440,10 +495,11 @@
+@@ -427,10 +482,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -50515,7 +48632,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
+@@ -453,12 +509,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -50528,7 +48645,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
+@@ -472,7 +522,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -50537,7 +48654,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -500,15 +550,17 @@
+@@ -487,15 +537,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -50560,7 +48677,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -518,7 +570,6 @@
+@@ -505,7 +557,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -50568,7 +48685,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -538,7 +589,7 @@
+@@ -525,7 +576,7 @@
  clean-generic:
  
  distclean-generic:
@@ -50577,7 +48694,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
+@@ -547,6 +598,8 @@
  
  dvi-am:
  
@@ -50586,7 +48703,7 @@
  info: info-recursive
  
  info-am:
-@@ -594,37 +647,42 @@
+@@ -581,37 +634,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -50653,7 +48770,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -50719,7 +48836,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -50729,7 +48846,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
+@@ -215,6 +249,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -50738,7 +48855,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +309,7 @@
+@@ -264,6 +300,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -50746,7 +48863,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
+@@ -292,40 +329,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -50826,7 +48943,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -357,7 +407,13 @@
+@@ -344,7 +394,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -50841,7 +48958,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
+@@ -356,7 +412,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -50850,7 +48967,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
+@@ -364,7 +420,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -50865,7 +48982,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
+@@ -385,7 +447,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -50874,7 +48991,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
+@@ -396,14 +458,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -50889,7 +49006,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
+@@ -412,19 +466,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -50914,7 +49031,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -447,10 +504,11 @@
+@@ -434,10 +491,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -50930,7 +49047,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
+@@ -460,14 +518,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -50945,7 +49062,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -496,7 +546,7 @@
+@@ -483,7 +533,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -50954,7 +49071,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -511,15 +561,17 @@
+@@ -498,15 +548,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -50977,7 +49094,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -529,7 +581,6 @@
+@@ -516,7 +568,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -50985,7 +49102,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -551,7 +602,7 @@
+@@ -538,7 +589,7 @@
  clean-generic:
  
  distclean-generic:
@@ -50994,7 +49111,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
+@@ -560,6 +611,8 @@
  
  dvi-am:
  
@@ -51003,7 +49120,7 @@
  info: info-recursive
  
  info-am:
-@@ -611,29 +664,25 @@
+@@ -598,29 +651,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -51045,7 +49162,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
+@@ -661,10 +710,19 @@
  #>+ 2
  docs-am:
  
@@ -51073,7 +49190,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -51137,7 +49254,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -51147,7 +49264,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
+@@ -215,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -51156,7 +49273,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +307,7 @@
+@@ -264,6 +298,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -51164,7 +49281,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
+@@ -285,40 +320,53 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  SUBDIRS = messages
@@ -51244,7 +49361,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -350,7 +398,13 @@
+@@ -337,7 +385,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -51259,7 +49376,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
+@@ -349,7 +403,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -51268,7 +49385,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
+@@ -357,7 +411,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -51283,7 +49400,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
+@@ -378,7 +438,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -51292,7 +49409,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
+@@ -389,14 +449,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -51307,7 +49424,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
+@@ -405,19 +457,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -51332,7 +49449,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -440,10 +495,11 @@
+@@ -427,10 +482,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -51348,7 +49465,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
+@@ -453,12 +509,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -51361,7 +49478,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
+@@ -472,7 +522,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -51370,7 +49487,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -500,15 +550,17 @@
+@@ -487,15 +537,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -51393,7 +49510,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -518,7 +570,6 @@
+@@ -505,7 +557,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -51401,7 +49518,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -538,7 +589,7 @@
+@@ -525,7 +576,7 @@
  clean-generic:
  
  distclean-generic:
@@ -51410,7 +49527,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
+@@ -547,6 +598,8 @@
  
  dvi-am:
  
@@ -51419,7 +49536,7 @@
  info: info-recursive
  
  info-am:
-@@ -594,37 +647,42 @@
+@@ -581,37 +634,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -51486,7 +49603,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -51552,7 +49669,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -51562,7 +49679,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
+@@ -215,6 +249,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -51571,7 +49688,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +309,7 @@
+@@ -264,6 +300,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -51579,7 +49696,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
+@@ -292,40 +329,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -51659,7 +49776,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -357,7 +407,13 @@
+@@ -344,7 +394,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -51674,7 +49791,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
+@@ -356,7 +412,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -51683,7 +49800,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
+@@ -364,7 +420,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -51698,7 +49815,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
+@@ -385,7 +447,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -51707,7 +49824,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
+@@ -396,14 +458,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -51722,7 +49839,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
+@@ -412,19 +466,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -51747,7 +49864,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -447,10 +504,11 @@
+@@ -434,10 +491,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -51763,7 +49880,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
+@@ -460,14 +518,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -51778,7 +49895,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -496,7 +546,7 @@
+@@ -483,7 +533,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -51787,7 +49904,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -511,15 +561,17 @@
+@@ -498,15 +548,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -51810,7 +49927,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -529,7 +581,6 @@
+@@ -516,7 +568,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -51818,7 +49935,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -551,7 +602,7 @@
+@@ -538,7 +589,7 @@
  clean-generic:
  
  distclean-generic:
@@ -51827,7 +49944,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
+@@ -560,6 +611,8 @@
  
  dvi-am:
  
@@ -51836,7 +49953,7 @@
  info: info-recursive
  
  info-am:
-@@ -611,29 +664,25 @@
+@@ -598,29 +651,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -51878,7 +49995,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
+@@ -661,10 +710,19 @@
  #>+ 2
  docs-am:
  
@@ -51906,7 +50023,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -51970,7 +50087,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -51980,7 +50097,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
+@@ -215,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -51989,7 +50106,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +307,7 @@
+@@ -264,6 +298,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -51997,10 +50114,10 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
+@@ -285,40 +320,53 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
- SUBDIRS = ar az br ca cs cy da de el en_GB es et fo fr ga gl he hi hu is it ja ko lt nb nl nso pa pl pt pt_BR ro ru rw sr sr at Latn sv ta tr uk ven xh zh_CN zh_TW zu
+ SUBDIRS = ar az br ca cs cy da de el et fo fr ga gl he hi hu is it ja ko lt nb nl nso pa pl pt_BR ro ru sr at Latn ta tr uk ven xh zh_CN zh_TW zu
 -subdir = translations
 -ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 -mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
@@ -52077,7 +50194,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -350,7 +398,13 @@
+@@ -337,7 +385,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -52092,7 +50209,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
+@@ -349,7 +403,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -52101,7 +50218,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
+@@ -357,7 +411,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -52116,7 +50233,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
+@@ -378,7 +438,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -52125,7 +50242,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
+@@ -389,14 +449,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -52140,7 +50257,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
+@@ -405,19 +457,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -52165,7 +50282,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -440,10 +495,11 @@
+@@ -427,10 +482,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -52181,7 +50298,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
+@@ -453,12 +509,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -52194,7 +50311,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
+@@ -472,7 +522,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -52203,7 +50320,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -500,15 +550,17 @@
+@@ -487,15 +537,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -52226,7 +50343,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -518,7 +570,6 @@
+@@ -505,7 +557,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -52234,7 +50351,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -538,7 +589,7 @@
+@@ -525,7 +576,7 @@
  clean-generic:
  
  distclean-generic:
@@ -52243,7 +50360,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
+@@ -547,6 +598,8 @@
  
  dvi-am:
  
@@ -52252,7 +50369,7 @@
  info: info-recursive
  
  info-am:
-@@ -594,37 +647,42 @@
+@@ -581,37 +634,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -52319,7 +50436,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -52383,7 +50500,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -52393,7 +50510,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
+@@ -215,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -52402,7 +50519,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +307,7 @@
+@@ -264,6 +298,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -52410,7 +50527,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
+@@ -285,40 +320,53 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  SUBDIRS = messages
@@ -52490,7 +50607,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -350,7 +398,13 @@
+@@ -337,7 +385,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -52505,7 +50622,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
+@@ -349,7 +403,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -52514,7 +50631,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
+@@ -357,7 +411,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -52529,7 +50646,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
+@@ -378,7 +438,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -52538,7 +50655,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
+@@ -389,14 +449,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -52553,7 +50670,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
+@@ -405,19 +457,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -52578,7 +50695,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -440,10 +495,11 @@
+@@ -427,10 +482,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -52594,7 +50711,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
+@@ -453,12 +509,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -52607,7 +50724,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
+@@ -472,7 +522,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -52616,7 +50733,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -500,15 +550,17 @@
+@@ -487,15 +537,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -52639,7 +50756,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -518,7 +570,6 @@
+@@ -505,7 +557,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -52647,7 +50764,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -538,7 +589,7 @@
+@@ -525,7 +576,7 @@
  clean-generic:
  
  distclean-generic:
@@ -52656,7 +50773,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
+@@ -547,6 +598,8 @@
  
  dvi-am:
  
@@ -52665,7 +50782,7 @@
  info: info-recursive
  
  info-am:
-@@ -594,37 +647,42 @@
+@@ -581,37 +634,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -52732,7 +50849,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -52798,7 +50915,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -52808,7 +50925,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
+@@ -215,6 +249,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -52817,7 +50934,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +309,7 @@
+@@ -264,6 +300,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -52825,7 +50942,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
+@@ -292,40 +329,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -52905,7 +51022,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -357,7 +407,13 @@
+@@ -344,7 +394,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -52920,7 +51037,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
+@@ -356,7 +412,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -52929,7 +51046,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
+@@ -364,7 +420,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -52944,7 +51061,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
+@@ -385,7 +447,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -52953,7 +51070,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
+@@ -396,14 +458,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -52968,7 +51085,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
+@@ -412,19 +466,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -52993,7 +51110,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -447,10 +504,11 @@
+@@ -434,10 +491,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -53009,7 +51126,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
+@@ -460,14 +518,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -53024,7 +51141,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -496,7 +546,7 @@
+@@ -483,7 +533,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -53033,7 +51150,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -511,15 +561,17 @@
+@@ -498,15 +548,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -53056,7 +51173,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -529,7 +581,6 @@
+@@ -516,7 +568,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -53064,7 +51181,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -551,7 +602,7 @@
+@@ -538,7 +589,7 @@
  clean-generic:
  
  distclean-generic:
@@ -53073,7 +51190,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
+@@ -560,6 +611,8 @@
  
  dvi-am:
  
@@ -53082,7 +51199,7 @@
  info: info-recursive
  
  info-am:
-@@ -611,29 +664,25 @@
+@@ -598,29 +651,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -53124,7 +51241,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
+@@ -661,10 +710,19 @@
  #>+ 2
  docs-am:
  
@@ -53152,7 +51269,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -53200,7 +51317,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +177,9 @@
+@@ -158,6 +171,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -53210,7 +51327,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +238,8 @@
+@@ -215,6 +231,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -53219,7 +51336,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +291,7 @@
+@@ -264,6 +282,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -53227,7 +51344,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -299,27 +318,53 @@
+@@ -286,27 +305,53 @@
  xdg_menudir = @xdg_menudir@
  KDE_LANG = nl
  KDE_DOCS = gwenview
@@ -53294,7 +51411,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -336,12 +381,6 @@
+@@ -323,12 +368,6 @@
  ctags: CTAGS
  CTAGS:
  
@@ -53307,7 +51424,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -357,7 +396,7 @@
+@@ -344,7 +383,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -53316,7 +51433,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -375,7 +414,6 @@
+@@ -362,7 +401,6 @@
  check-am: all-am
  check: check-am
  all-am: Makefile
@@ -53324,7 +51441,7 @@
  installdirs:
  install: install-am
  install-exec: install-exec-am
-@@ -398,7 +436,7 @@
+@@ -385,7 +423,7 @@
  clean-generic:
  
  distclean-generic:
@@ -53333,7 +51450,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -419,6 +457,8 @@
+@@ -406,6 +444,8 @@
  
  dvi-am:
  
@@ -53342,7 +51459,7 @@
  info: info-am
  
  info-am:
-@@ -455,10 +495,10 @@
+@@ -442,10 +482,10 @@
  
  .PHONY: all all-am check check-am clean clean-generic clean-libtool \
  	distclean distclean-generic distclean-libtool distdir dvi \
@@ -53357,7 +51474,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
  	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
  	uninstall-info-am
-@@ -468,10 +508,10 @@
+@@ -455,10 +495,10 @@
  .NOEXPORT:
  
  #>+ 2
@@ -53370,7 +51487,7 @@
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
-@@ -498,27 +538,36 @@
+@@ -485,27 +525,36 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview
@@ -53418,7 +51535,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -53482,7 +51599,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -53492,7 +51609,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
+@@ -215,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -53501,7 +51618,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +307,7 @@
+@@ -264,6 +298,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -53509,7 +51626,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
+@@ -285,40 +320,53 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  SUBDIRS = messages doc
@@ -53589,7 +51706,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -350,7 +398,13 @@
+@@ -337,7 +385,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -53604,7 +51721,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
+@@ -349,7 +403,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -53613,7 +51730,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
+@@ -357,7 +411,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -53628,7 +51745,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
+@@ -378,7 +438,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -53637,7 +51754,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
+@@ -389,14 +449,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -53652,7 +51769,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
+@@ -405,19 +457,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -53677,7 +51794,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -440,10 +495,11 @@
+@@ -427,10 +482,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -53693,7 +51810,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
+@@ -453,12 +509,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -53706,7 +51823,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
+@@ -472,7 +522,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -53715,7 +51832,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -500,15 +550,17 @@
+@@ -487,15 +537,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -53738,7 +51855,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -518,7 +570,6 @@
+@@ -505,7 +557,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -53746,7 +51863,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -538,7 +589,7 @@
+@@ -525,7 +576,7 @@
  clean-generic:
  
  distclean-generic:
@@ -53755,7 +51872,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
+@@ -547,6 +598,8 @@
  
  dvi-am:
  
@@ -53764,7 +51881,7 @@
  info: info-recursive
  
  info-am:
-@@ -594,37 +647,42 @@
+@@ -581,37 +634,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -53831,7 +51948,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -53897,7 +52014,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -53907,7 +52024,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
+@@ -215,6 +249,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -53916,7 +52033,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +309,7 @@
+@@ -264,6 +300,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -53924,7 +52041,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
+@@ -292,40 +329,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -54004,7 +52121,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -357,7 +407,13 @@
+@@ -344,7 +394,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -54019,7 +52136,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
+@@ -356,7 +412,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -54028,7 +52145,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
+@@ -364,7 +420,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -54043,7 +52160,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
+@@ -385,7 +447,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -54052,7 +52169,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
+@@ -396,14 +458,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -54067,7 +52184,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
+@@ -412,19 +466,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -54092,7 +52209,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -447,10 +504,11 @@
+@@ -434,10 +491,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -54108,7 +52225,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
+@@ -460,14 +518,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -54123,7 +52240,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -496,7 +546,7 @@
+@@ -483,7 +533,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -54132,7 +52249,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -511,15 +561,17 @@
+@@ -498,15 +548,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -54155,7 +52272,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -529,7 +581,6 @@
+@@ -516,7 +568,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -54163,7 +52280,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -551,7 +602,7 @@
+@@ -538,7 +589,7 @@
  clean-generic:
  
  distclean-generic:
@@ -54172,7 +52289,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
+@@ -560,6 +611,8 @@
  
  dvi-am:
  
@@ -54181,7 +52298,7 @@
  info: info-recursive
  
  info-am:
-@@ -611,29 +664,25 @@
+@@ -598,29 +651,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -54223,7 +52340,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
+@@ -661,10 +710,19 @@
  #>+ 2
  docs-am:
  
@@ -54251,7 +52368,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -54315,7 +52432,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -54325,7 +52442,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
+@@ -215,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -54334,7 +52451,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +307,7 @@
+@@ -264,6 +298,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -54342,7 +52459,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
+@@ -285,40 +320,53 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  SUBDIRS = messages
@@ -54422,7 +52539,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -350,7 +398,13 @@
+@@ -337,7 +385,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -54437,7 +52554,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
+@@ -349,7 +403,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -54446,7 +52563,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
+@@ -357,7 +411,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -54461,7 +52578,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
+@@ -378,7 +438,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -54470,7 +52587,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
+@@ -389,14 +449,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -54485,7 +52602,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
+@@ -405,19 +457,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -54510,7 +52627,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -440,10 +495,11 @@
+@@ -427,10 +482,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -54526,7 +52643,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
+@@ -453,12 +509,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -54539,7 +52656,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
+@@ -472,7 +522,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -54548,7 +52665,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -500,15 +550,17 @@
+@@ -487,15 +537,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -54571,7 +52688,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -518,7 +570,6 @@
+@@ -505,7 +557,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -54579,7 +52696,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -538,7 +589,7 @@
+@@ -525,7 +576,7 @@
  clean-generic:
  
  distclean-generic:
@@ -54588,7 +52705,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
+@@ -547,6 +598,8 @@
  
  dvi-am:
  
@@ -54597,7 +52714,7 @@
  info: info-recursive
  
  info-am:
-@@ -594,37 +647,42 @@
+@@ -581,37 +634,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -54664,7 +52781,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -54730,7 +52847,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -54740,7 +52857,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
+@@ -215,6 +249,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -54749,7 +52866,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +309,7 @@
+@@ -264,6 +300,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -54757,7 +52874,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
+@@ -292,40 +329,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -54837,7 +52954,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -357,7 +407,13 @@
+@@ -344,7 +394,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -54852,7 +52969,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
+@@ -356,7 +412,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -54861,7 +52978,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
+@@ -364,7 +420,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -54876,7 +52993,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
+@@ -385,7 +447,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -54885,7 +53002,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
+@@ -396,14 +458,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -54900,7 +53017,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
+@@ -412,19 +466,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -54925,7 +53042,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -447,10 +504,11 @@
+@@ -434,10 +491,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -54941,7 +53058,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
+@@ -460,14 +518,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -54956,7 +53073,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -496,7 +546,7 @@
+@@ -483,7 +533,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -54965,7 +53082,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -511,15 +561,17 @@
+@@ -498,15 +548,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -54988,7 +53105,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -529,7 +581,6 @@
+@@ -516,7 +568,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -54996,7 +53113,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -551,7 +602,7 @@
+@@ -538,7 +589,7 @@
  clean-generic:
  
  distclean-generic:
@@ -55005,7 +53122,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
+@@ -560,6 +611,8 @@
  
  dvi-am:
  
@@ -55014,7 +53131,7 @@
  info: info-recursive
  
  info-am:
-@@ -611,29 +664,25 @@
+@@ -598,29 +651,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -55056,7 +53173,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
+@@ -661,10 +710,19 @@
  #>+ 2
  docs-am:
  
@@ -55084,7 +53201,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -55148,7 +53265,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -55158,7 +53275,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
+@@ -215,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -55167,7 +53284,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +307,7 @@
+@@ -264,6 +298,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -55175,7 +53292,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
+@@ -285,40 +320,53 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  SUBDIRS = messages
@@ -55255,7 +53372,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -350,7 +398,13 @@
+@@ -337,7 +385,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -55270,7 +53387,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
+@@ -349,7 +403,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -55279,7 +53396,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
+@@ -357,7 +411,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -55294,7 +53411,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
+@@ -378,7 +438,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -55303,7 +53420,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
+@@ -389,14 +449,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -55318,7 +53435,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
+@@ -405,19 +457,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -55343,7 +53460,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -440,10 +495,11 @@
+@@ -427,10 +482,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -55359,7 +53476,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
+@@ -453,12 +509,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -55372,7 +53489,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
+@@ -472,7 +522,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -55381,7 +53498,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -500,15 +550,17 @@
+@@ -487,15 +537,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -55404,7 +53521,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -518,7 +570,6 @@
+@@ -505,7 +557,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -55412,7 +53529,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -538,7 +589,7 @@
+@@ -525,7 +576,7 @@
  clean-generic:
  
  distclean-generic:
@@ -55421,7 +53538,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
+@@ -547,6 +598,8 @@
  
  dvi-am:
  
@@ -55430,7 +53547,7 @@
  info: info-recursive
  
  info-am:
-@@ -594,37 +647,42 @@
+@@ -581,37 +634,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -55497,7 +53614,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -55563,7 +53680,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -55573,7 +53690,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
+@@ -215,6 +249,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -55582,7 +53699,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +309,7 @@
+@@ -264,6 +300,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -55590,7 +53707,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
+@@ -292,40 +329,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -55670,7 +53787,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -357,7 +407,13 @@
+@@ -344,7 +394,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -55685,7 +53802,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
+@@ -356,7 +412,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -55694,7 +53811,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
+@@ -364,7 +420,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -55709,7 +53826,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
+@@ -385,7 +447,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -55718,7 +53835,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
+@@ -396,14 +458,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -55733,7 +53850,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
+@@ -412,19 +466,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -55758,7 +53875,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -447,10 +504,11 @@
+@@ -434,10 +491,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -55774,7 +53891,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
+@@ -460,14 +518,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -55789,7 +53906,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -496,7 +546,7 @@
+@@ -483,7 +533,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -55798,7 +53915,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -511,15 +561,17 @@
+@@ -498,15 +548,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -55821,7 +53938,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -529,7 +581,6 @@
+@@ -516,7 +568,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -55829,7 +53946,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -551,7 +602,7 @@
+@@ -538,7 +589,7 @@
  clean-generic:
  
  distclean-generic:
@@ -55838,7 +53955,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
+@@ -560,6 +611,8 @@
  
  dvi-am:
  
@@ -55847,7 +53964,7 @@
  info: info-recursive
  
  info-am:
-@@ -611,29 +664,25 @@
+@@ -598,29 +651,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -55889,7 +54006,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
+@@ -661,10 +710,19 @@
  #>+ 2
  docs-am:
  
@@ -55917,7 +54034,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -55981,7 +54098,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -55991,7 +54108,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
+@@ -215,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -56000,7 +54117,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +307,7 @@
+@@ -264,6 +298,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -56008,7 +54125,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
+@@ -285,40 +320,53 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  SUBDIRS = messages
@@ -56088,7 +54205,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -350,7 +398,13 @@
+@@ -337,7 +385,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -56103,7 +54220,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
+@@ -349,7 +403,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -56112,7 +54229,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
+@@ -357,7 +411,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -56127,7 +54244,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
+@@ -378,7 +438,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -56136,7 +54253,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
+@@ -389,14 +449,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -56151,7 +54268,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
+@@ -405,19 +457,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -56176,7 +54293,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -440,10 +495,11 @@
+@@ -427,10 +482,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -56192,7 +54309,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
+@@ -453,12 +509,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -56205,7 +54322,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
+@@ -472,7 +522,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -56214,7 +54331,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -500,15 +550,17 @@
+@@ -487,15 +537,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -56237,7 +54354,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -518,7 +570,6 @@
+@@ -505,7 +557,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -56245,7 +54362,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -538,7 +589,7 @@
+@@ -525,7 +576,7 @@
  clean-generic:
  
  distclean-generic:
@@ -56254,7 +54371,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
+@@ -547,6 +598,8 @@
  
  dvi-am:
  
@@ -56263,7 +54380,7 @@
  info: info-recursive
  
  info-am:
-@@ -594,37 +647,42 @@
+@@ -581,37 +634,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -56330,7 +54447,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -56396,7 +54513,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -56406,7 +54523,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
+@@ -215,6 +249,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -56415,7 +54532,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +309,7 @@
+@@ -264,6 +300,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -56423,7 +54540,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
+@@ -292,40 +329,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -56503,7 +54620,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -357,7 +407,13 @@
+@@ -344,7 +394,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -56518,7 +54635,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
+@@ -356,7 +412,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -56527,7 +54644,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
+@@ -364,7 +420,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -56542,7 +54659,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
+@@ -385,7 +447,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -56551,7 +54668,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
+@@ -396,14 +458,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -56566,7 +54683,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
+@@ -412,19 +466,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -56591,7 +54708,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -447,10 +504,11 @@
+@@ -434,10 +491,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -56607,7 +54724,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
+@@ -460,14 +518,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -56622,7 +54739,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -496,7 +546,7 @@
+@@ -483,7 +533,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -56631,7 +54748,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -511,15 +561,17 @@
+@@ -498,15 +548,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -56654,7 +54771,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -529,7 +581,6 @@
+@@ -516,7 +568,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -56662,7 +54779,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -551,7 +602,7 @@
+@@ -538,7 +589,7 @@
  clean-generic:
  
  distclean-generic:
@@ -56671,7 +54788,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
+@@ -560,6 +611,8 @@
  
  dvi-am:
  
@@ -56680,7 +54797,7 @@
  info: info-recursive
  
  info-am:
-@@ -611,29 +664,25 @@
+@@ -598,29 +651,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -56722,7 +54839,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
+@@ -661,10 +710,19 @@
  #>+ 2
  docs-am:
  
@@ -56745,1111 +54862,12 @@
  	cd $(top_srcdir) && perl admin/am_edit translations/pl/messages/Makefile.in
  
  
---- translations/pt/doc/Makefile.in
-+++ translations/pt/doc/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
- # @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
- 
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,21 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = translations/pt/doc
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +177,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -222,6 +238,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -273,6 +291,7 @@
- libexif_internal_TRUE = @libexif_internal_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-@@ -299,27 +318,53 @@
- xdg_menudir = @xdg_menudir@
- KDE_LANG = pt
- KDE_DOCS = gwenview
--subdir = translations/pt/doc
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
- #>- all: all-am
- #>+ 1
- all: docs-am  all-am
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  translations/pt/doc/Makefile'; \
- #>- 	cd $(top_srcdir) && \
--#>- 	  $(AUTOMAKE) --gnu  translations/pt/doc/Makefile
--#>+ 3
-+#>- 	  $(AUTOMAKE) --foreign  translations/pt/doc/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  translations/pt/doc/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  translations/pt/doc/Makefile
-+	  $(AUTOMAKE) --foreign  translations/pt/doc/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit translations/pt/doc/Makefile.in
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-@@ -336,12 +381,6 @@
- ctags: CTAGS
- CTAGS:
- 
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -357,7 +396,7 @@
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -375,7 +414,6 @@
- check-am: all-am
- check: check-am
- all-am: Makefile
--
- installdirs:
- install: install-am
- install-exec: install-exec-am
-@@ -398,7 +436,7 @@
- clean-generic:
- 
- distclean-generic:
--	-rm -f $(CONFIG_CLEAN_FILES)
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -419,6 +457,8 @@
- 
- dvi-am:
- 
-+html: html-am
-+
- info: info-am
- 
- info-am:
-@@ -455,10 +495,10 @@
- 
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- 	distclean distclean-generic distclean-libtool distdir dvi \
--	dvi-am info info-am install install-am install-data \
--	install-data-am install-exec install-exec-am install-info \
--	install-info-am install-man install-strip installcheck \
--	installcheck-am installdirs maintainer-clean \
-+	dvi-am html html-am info info-am install install-am \
-+	install-data install-data-am install-exec install-exec-am \
-+	install-info install-info-am install-man install-strip \
-+	installcheck installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-generic \
- 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
- 	uninstall-info-am
-@@ -468,10 +508,10 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=index.docbook keybindings.docbook mouse.docbook docked_windows.docbook Makefile.in introduction.docbook interface.docbook external_tools.docbook 
-+KDE_DIST=index.docbook keybindings.docbook mouse.docbook docked_windows.docbook Makefile.in introduction.docbook interface.docbook external_tools.docbook Makefile.am 
- 
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) external_tools.docbook interface.docbook introduction.docbook docked_windows.docbook keybindings.docbook index.docbook mouse.docbook 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) mouse.docbook external_tools.docbook docked_windows.docbook introduction.docbook interface.docbook index.docbook keybindings.docbook 
- 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
- 
- docs-am: index.cache.bz2
-@@ -498,27 +538,36 @@
- #>+ 13
- install-nls:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview
--	@for base in external_tools.docbook interface.docbook introduction.docbook docked_windows.docbook keybindings.docbook index.docbook mouse.docbook ; do \
-+	@for base in mouse.docbook external_tools.docbook docked_windows.docbook introduction.docbook interface.docbook index.docbook keybindings.docbook ; do \
- 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview/$$base ;\
- 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview/$$base ;\
- 	done
- 
- uninstall-nls:
--	for base in external_tools.docbook interface.docbook introduction.docbook docked_windows.docbook keybindings.docbook index.docbook mouse.docbook ; do \
-+	for base in mouse.docbook external_tools.docbook docked_windows.docbook introduction.docbook interface.docbook index.docbook keybindings.docbook ; do \
- 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview/$$base ;\
- 	done
- 
- 
- #>+ 5
- distdir-nls:
--	for file in external_tools.docbook interface.docbook introduction.docbook docked_windows.docbook keybindings.docbook index.docbook mouse.docbook ; do \
-+	for file in mouse.docbook external_tools.docbook docked_windows.docbook introduction.docbook interface.docbook index.docbook keybindings.docbook ; do \
- 	  cp $(srcdir)/$$file $(distdir); \
- 	done
- 
--#>+ 6
-+#>+ 15
- force-reedit:
--		cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  translations/pt/doc/Makefile
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  translations/pt/doc/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  translations/pt/doc/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit translations/pt/doc/Makefile.in
- 
- 
---- translations/pt/Makefile.in
-+++ translations/pt/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
- # @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
- 
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,37 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = translations/pt
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- 	html-recursive info-recursive install-data-recursive \
-+#>- 	install-exec-recursive install-info-recursive \
-+#>- 	install-recursive installcheck-recursive installdirs-recursive \
-+#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- 	uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+	html-recursive info-recursive install-data-recursive \
-+	install-exec-recursive install-info-recursive \
-+	install-recursive installcheck-recursive installdirs-recursive \
-+	pdf-recursive ps-recursive uninstall-info-recursive \
-+	uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -273,6 +307,7 @@
- libexif_internal_TRUE = @libexif_internal_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
- xdg_directorydir = @xdg_directorydir@
- xdg_menudir = @xdg_menudir@
- SUBDIRS = messages doc
--subdir = translations/pt
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
--#>- 	all-recursive install-data-recursive install-exec-recursive \
--#>- 	installdirs-recursive install-recursive uninstall-recursive \
--#>- 	check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--	ps-recursive install-info-recursive uninstall-info-recursive \
--	all-recursive install-data-recursive install-exec-recursive \
--	installdirs-recursive install-recursive uninstall-recursive \
--	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
- all: docs-am  all-recursive
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  translations/pt/Makefile'; \
- #>- 	cd $(top_srcdir) && \
--#>- 	  $(AUTOMAKE) --gnu  translations/pt/Makefile
--#>+ 3
-+#>- 	  $(AUTOMAKE) --foreign  translations/pt/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  translations/pt/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  translations/pt/Makefile
-+	  $(AUTOMAKE) --foreign  translations/pt/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit translations/pt/Makefile.in
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-@@ -350,7 +398,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
- 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- 	done
- 
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
- 	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
- 	mkid -fID $$unique
-+tags: TAGS
- 
- TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
--	if (etags --etags-include --version) >/dev/null 2>&1; then \
-+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- 	  include_option=--etags-include; \
-+	  empty_fix=.; \
- 	else \
- 	  include_option=--include; \
-+	  empty_fix=; \
- 	fi; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
--	    test -f $$subdir/TAGS && \
-+	    test ! -f $$subdir/TAGS || \
- 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- 	  fi; \
- 	done; \
-@@ -440,10 +495,11 @@
- 	  done | \
- 	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$tags$$unique" \
--	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
--	     $$tags $$unique
--
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
- 
- distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- distdir: $(DISTFILES)
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -500,15 +550,17 @@
- 	    || exit 1; \
- 	  fi; \
- 	done
--	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
--	    test -d $(distdir)/$$subdir \
--	    || mkdir $(distdir)/$$subdir \
-+	    test -d "$(distdir)/$$subdir" \
-+	    || $(mkdir_p) "$(distdir)/$$subdir" \
- 	    || exit 1; \
-+	    distdir=`$(am__cd) $(distdir) && pwd`; \
-+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- 	    (cd $$subdir && \
- 	      $(MAKE) $(AM_MAKEFLAGS) \
--	        top_distdir="$(top_distdir)" \
--	        distdir=../$(distdir)/$$subdir \
-+	        top_distdir="$$top_distdir" \
-+	        distdir="$$distdir/$$subdir" \
- 	        distdir) \
- 	      || exit 1; \
- 	  fi; \
-@@ -518,7 +570,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -538,7 +589,7 @@
- clean-generic:
- 
- distclean-generic:
--	-rm -f $(CONFIG_CLEAN_FILES)
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
- 
- dvi-am:
- 
-+html: html-recursive
-+
- info: info-recursive
- 
- info-am:
-@@ -594,37 +647,42 @@
- 
- uninstall-info: uninstall-info-recursive
- 
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
--	clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+	clean clean-generic clean-libtool clean-recursive ctags \
- 	ctags-recursive distclean distclean-generic distclean-libtool \
--	distclean-recursive distclean-tags distdir dvi dvi-am \
--	dvi-recursive info info-am info-recursive install install-am \
--	install-data install-data-am install-data-recursive \
--	install-exec install-exec-am install-exec-recursive \
--	install-info install-info-am install-info-recursive install-man \
--	install-recursive install-strip installcheck installcheck-am \
--	installdirs installdirs-am installdirs-recursive \
--	maintainer-clean maintainer-clean-generic \
--	maintainer-clean-recursive mostlyclean mostlyclean-generic \
--	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
--	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
--	uninstall uninstall-am uninstall-info-am \
--	uninstall-info-recursive uninstall-recursive
-+	distclean-recursive distclean-tags distdir dvi dvi-am html \
-+	html-am info info-am install install-am install-data \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-strip installcheck \
-+	installcheck-am installdirs installdirs-am maintainer-clean \
-+	maintainer-clean-generic maintainer-clean-recursive \
-+	mostlyclean mostlyclean-generic mostlyclean-libtool \
-+	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+	uninstall uninstall-am uninstall-info-am
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=Makefile.in 
-+KDE_DIST=Makefile.in Makefile.am 
- 
- #>+ 2
- docs-am:
- 
--#>+ 6
-+#>+ 15
- force-reedit:
--		cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  translations/pt/Makefile
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  translations/pt/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  translations/pt/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit translations/pt/Makefile.in
- 
- 
---- translations/pt/messages/Makefile.in
-+++ translations/pt/messages/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
- # @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
- 
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = translations/pt/messages
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- 	html-recursive info-recursive install-data-recursive \
-+#>- 	install-exec-recursive install-info-recursive \
-+#>- 	install-recursive installcheck-recursive installdirs-recursive \
-+#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- 	uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+	html-recursive info-recursive install-data-recursive \
-+	install-exec-recursive install-info-recursive \
-+	install-recursive installcheck-recursive installdirs-recursive \
-+	pdf-recursive ps-recursive uninstall-info-recursive \
-+	uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -273,6 +309,7 @@
- libexif_internal_TRUE = @libexif_internal_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
- #>+ 2
- POFILES = gwenview.po
- GMOFILES = gwenview.gmo
--subdir = translations/pt/messages
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
--#>- 	all-recursive install-data-recursive install-exec-recursive \
--#>- 	installdirs-recursive install-recursive uninstall-recursive \
--#>- 	check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--	ps-recursive install-info-recursive uninstall-info-recursive \
--	all-recursive install-data-recursive install-exec-recursive \
--	installdirs-recursive install-recursive uninstall-recursive \
--	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
- all: all-nls docs-am  all-recursive
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  translations/pt/messages/Makefile'; \
- #>- 	cd $(top_srcdir) && \
--#>- 	  $(AUTOMAKE) --gnu  translations/pt/messages/Makefile
--#>+ 3
-+#>- 	  $(AUTOMAKE) --foreign  translations/pt/messages/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  translations/pt/messages/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  translations/pt/messages/Makefile
-+	  $(AUTOMAKE) --foreign  translations/pt/messages/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit translations/pt/messages/Makefile.in
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-@@ -357,7 +407,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
- 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- 	done
- 
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
- 	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
- 	mkid -fID $$unique
-+tags: TAGS
- 
- TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
--	if (etags --etags-include --version) >/dev/null 2>&1; then \
-+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- 	  include_option=--etags-include; \
-+	  empty_fix=.; \
- 	else \
- 	  include_option=--include; \
-+	  empty_fix=; \
- 	fi; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
--	    test -f $$subdir/TAGS && \
-+	    test ! -f $$subdir/TAGS || \
- 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- 	  fi; \
- 	done; \
-@@ -447,10 +504,11 @@
- 	  done | \
- 	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$tags$$unique" \
--	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
--	     $$tags $$unique
--
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
- 
- distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--#>+ 1
--DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -496,7 +546,7 @@
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -511,15 +561,17 @@
- 	    || exit 1; \
- 	  fi; \
- 	done
--	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
--	    test -d $(distdir)/$$subdir \
--	    || mkdir $(distdir)/$$subdir \
-+	    test -d "$(distdir)/$$subdir" \
-+	    || $(mkdir_p) "$(distdir)/$$subdir" \
- 	    || exit 1; \
-+	    distdir=`$(am__cd) $(distdir) && pwd`; \
-+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- 	    (cd $$subdir && \
- 	      $(MAKE) $(AM_MAKEFLAGS) \
--	        top_distdir="$(top_distdir)" \
--	        distdir=../$(distdir)/$$subdir \
-+	        top_distdir="$$top_distdir" \
-+	        distdir="$$distdir/$$subdir" \
- 	        distdir) \
- 	      || exit 1; \
- 	  fi; \
-@@ -529,7 +581,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -551,7 +602,7 @@
- clean-generic:
- 
- distclean-generic:
--	-rm -f $(CONFIG_CLEAN_FILES)
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
- 
- dvi-am:
- 
-+html: html-recursive
-+
- info: info-recursive
- 
- info-am:
-@@ -611,29 +664,25 @@
- 
- uninstall-info: uninstall-info-recursive
- 
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
--	clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+	clean clean-generic clean-libtool clean-recursive ctags \
- 	ctags-recursive distclean distclean-generic distclean-libtool \
--	distclean-recursive distclean-tags distdir dvi dvi-am \
--	dvi-recursive info info-am info-recursive install install-am \
--	install-data install-data-am install-data-recursive \
--	install-exec install-exec-am install-exec-recursive \
--	install-info install-info-am install-info-recursive install-man \
--	install-recursive install-strip installcheck installcheck-am \
--	installdirs installdirs-am installdirs-recursive \
--	maintainer-clean maintainer-clean-generic \
--	maintainer-clean-recursive mostlyclean mostlyclean-generic \
--	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
--	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
--	uninstall uninstall-am uninstall-info-am \
--	uninstall-info-recursive uninstall-recursive
-+	distclean-recursive distclean-tags distdir dvi dvi-am html \
-+	html-am info info-am install install-am install-data \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-strip installcheck \
-+	installcheck-am installdirs installdirs-am maintainer-clean \
-+	maintainer-clean-generic maintainer-clean-recursive \
-+	mostlyclean mostlyclean-generic mostlyclean-libtool \
-+	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+	uninstall uninstall-am uninstall-info-am
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=gwenview.po Makefile.in 
-+KDE_DIST=gwenview.po Makefile.in Makefile.am 
- 
- #>+ 4
- gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
- #>+ 2
- docs-am:
- 
--#>+ 6
-+#>+ 15
- force-reedit:
--		cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  translations/pt/messages/Makefile
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  translations/pt/messages/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  translations/pt/messages/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit translations/pt/messages/Makefile.in
- 
- 
 --- translations/pt_BR/doc/Makefile.in
 +++ translations/pt_BR/doc/Makefile.in
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -57897,7 +54915,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +177,9 @@
+@@ -158,6 +171,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -57907,7 +54925,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +238,8 @@
+@@ -215,6 +231,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -57916,7 +54934,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +291,7 @@
+@@ -264,6 +282,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -57924,7 +54942,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -299,27 +318,53 @@
+@@ -286,27 +305,53 @@
  xdg_menudir = @xdg_menudir@
  KDE_LANG = pt_BR
  KDE_DOCS = gwenview
@@ -57991,7 +55009,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -336,12 +381,6 @@
+@@ -323,12 +368,6 @@
  ctags: CTAGS
  CTAGS:
  
@@ -58004,7 +55022,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -357,7 +396,7 @@
+@@ -344,7 +383,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -58013,7 +55031,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -375,7 +414,6 @@
+@@ -362,7 +401,6 @@
  check-am: all-am
  check: check-am
  all-am: Makefile
@@ -58021,7 +55039,7 @@
  installdirs:
  install: install-am
  install-exec: install-exec-am
-@@ -398,7 +436,7 @@
+@@ -385,7 +423,7 @@
  clean-generic:
  
  distclean-generic:
@@ -58030,7 +55048,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -419,6 +457,8 @@
+@@ -406,6 +444,8 @@
  
  dvi-am:
  
@@ -58039,7 +55057,7 @@
  info: info-am
  
  info-am:
-@@ -455,10 +495,10 @@
+@@ -442,10 +482,10 @@
  
  .PHONY: all all-am check check-am clean clean-generic clean-libtool \
  	distclean distclean-generic distclean-libtool distdir dvi \
@@ -58054,7 +55072,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
  	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
  	uninstall-info-am
-@@ -468,10 +508,10 @@
+@@ -455,10 +495,10 @@
  .NOEXPORT:
  
  #>+ 2
@@ -58067,7 +55085,7 @@
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
-@@ -498,27 +538,36 @@
+@@ -485,27 +525,36 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview
@@ -58115,7 +55133,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -58179,7 +55197,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -58189,7 +55207,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
+@@ -215,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -58198,7 +55216,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +307,7 @@
+@@ -264,6 +298,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -58206,7 +55224,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
+@@ -285,40 +320,53 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  SUBDIRS = messages doc
@@ -58286,7 +55304,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -350,7 +398,13 @@
+@@ -337,7 +385,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -58301,7 +55319,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
+@@ -349,7 +403,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -58310,7 +55328,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
+@@ -357,7 +411,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -58325,7 +55343,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
+@@ -378,7 +438,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -58334,7 +55352,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
+@@ -389,14 +449,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -58349,7 +55367,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
+@@ -405,19 +457,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -58374,7 +55392,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -440,10 +495,11 @@
+@@ -427,10 +482,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -58390,7 +55408,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
+@@ -453,12 +509,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -58403,7 +55421,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
+@@ -472,7 +522,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -58412,7 +55430,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -500,15 +550,17 @@
+@@ -487,15 +537,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -58435,7 +55453,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -518,7 +570,6 @@
+@@ -505,7 +557,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -58443,7 +55461,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -538,7 +589,7 @@
+@@ -525,7 +576,7 @@
  clean-generic:
  
  distclean-generic:
@@ -58452,7 +55470,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
+@@ -547,6 +598,8 @@
  
  dvi-am:
  
@@ -58461,7 +55479,7 @@
  info: info-recursive
  
  info-am:
-@@ -594,37 +647,42 @@
+@@ -581,37 +634,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -58528,7 +55546,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -58594,7 +55612,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -58604,7 +55622,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
+@@ -215,6 +249,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -58613,7 +55631,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +309,7 @@
+@@ -264,6 +300,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -58621,7 +55639,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
+@@ -292,40 +329,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -58701,7 +55719,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -357,7 +407,13 @@
+@@ -344,7 +394,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -58716,7 +55734,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
+@@ -356,7 +412,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -58725,7 +55743,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
+@@ -364,7 +420,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -58740,7 +55758,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
+@@ -385,7 +447,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -58749,7 +55767,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
+@@ -396,14 +458,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -58764,7 +55782,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
+@@ -412,19 +466,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -58789,7 +55807,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -447,10 +504,11 @@
+@@ -434,10 +491,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -58805,7 +55823,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
+@@ -460,14 +518,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -58820,7 +55838,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -496,7 +546,7 @@
+@@ -483,7 +533,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -58829,7 +55847,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -511,15 +561,17 @@
+@@ -498,15 +548,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -58852,7 +55870,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -529,7 +581,6 @@
+@@ -516,7 +568,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -58860,7 +55878,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -551,7 +602,7 @@
+@@ -538,7 +589,7 @@
  clean-generic:
  
  distclean-generic:
@@ -58869,7 +55887,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
+@@ -560,6 +611,8 @@
  
  dvi-am:
  
@@ -58878,7 +55896,7 @@
  info: info-recursive
  
  info-am:
-@@ -611,29 +664,25 @@
+@@ -598,29 +651,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -58920,7 +55938,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
+@@ -661,10 +710,19 @@
  #>+ 2
  docs-am:
  
@@ -58948,7 +55966,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -59012,7 +56030,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -59022,7 +56040,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
+@@ -215,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -59031,7 +56049,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +307,7 @@
+@@ -264,6 +298,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -59039,7 +56057,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
+@@ -285,40 +320,53 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  SUBDIRS = messages
@@ -59119,7 +56137,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -350,7 +398,13 @@
+@@ -337,7 +385,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -59134,7 +56152,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
+@@ -349,7 +403,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -59143,7 +56161,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
+@@ -357,7 +411,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -59158,7 +56176,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
+@@ -378,7 +438,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -59167,7 +56185,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
+@@ -389,14 +449,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -59182,7 +56200,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
+@@ -405,19 +457,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -59207,7 +56225,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -440,10 +495,11 @@
+@@ -427,10 +482,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -59223,7 +56241,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
+@@ -453,12 +509,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -59236,7 +56254,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
+@@ -472,7 +522,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -59245,7 +56263,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -500,15 +550,17 @@
+@@ -487,15 +537,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -59268,7 +56286,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -518,7 +570,6 @@
+@@ -505,7 +557,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -59276,7 +56294,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -538,7 +589,7 @@
+@@ -525,7 +576,7 @@
  clean-generic:
  
  distclean-generic:
@@ -59285,7 +56303,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
+@@ -547,6 +598,8 @@
  
  dvi-am:
  
@@ -59294,7 +56312,7 @@
  info: info-recursive
  
  info-am:
-@@ -594,37 +647,42 @@
+@@ -581,37 +634,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -59361,7 +56379,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -59427,7 +56445,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -59437,7 +56455,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
+@@ -215,6 +249,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -59446,7 +56464,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +309,7 @@
+@@ -264,6 +300,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -59454,7 +56472,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
+@@ -292,40 +329,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -59534,7 +56552,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -357,7 +407,13 @@
+@@ -344,7 +394,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -59549,7 +56567,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
+@@ -356,7 +412,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -59558,7 +56576,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
+@@ -364,7 +420,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -59573,7 +56591,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
+@@ -385,7 +447,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -59582,7 +56600,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
+@@ -396,14 +458,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -59597,7 +56615,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
+@@ -412,19 +466,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -59622,7 +56640,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -447,10 +504,11 @@
+@@ -434,10 +491,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -59638,7 +56656,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
+@@ -460,14 +518,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -59653,7 +56671,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -496,7 +546,7 @@
+@@ -483,7 +533,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -59662,7 +56680,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -511,15 +561,17 @@
+@@ -498,15 +548,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -59685,7 +56703,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -529,7 +581,6 @@
+@@ -516,7 +568,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -59693,7 +56711,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -551,7 +602,7 @@
+@@ -538,7 +589,7 @@
  clean-generic:
  
  distclean-generic:
@@ -59702,7 +56720,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
+@@ -560,6 +611,8 @@
  
  dvi-am:
  
@@ -59711,7 +56729,7 @@
  info: info-recursive
  
  info-am:
-@@ -611,29 +664,25 @@
+@@ -598,29 +651,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -59753,7 +56771,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
+@@ -661,10 +710,19 @@
  #>+ 2
  docs-am:
  
@@ -59781,7 +56799,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -59829,7 +56847,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +177,9 @@
+@@ -158,6 +171,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -59839,7 +56857,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +238,8 @@
+@@ -215,6 +231,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -59848,7 +56866,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +291,7 @@
+@@ -264,6 +282,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -59856,7 +56874,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -299,27 +318,53 @@
+@@ -286,27 +305,53 @@
  xdg_menudir = @xdg_menudir@
  KDE_LANG = ru
  KDE_DOCS = gwenview
@@ -59923,7 +56941,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -336,12 +381,6 @@
+@@ -323,12 +368,6 @@
  ctags: CTAGS
  CTAGS:
  
@@ -59936,7 +56954,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -357,7 +396,7 @@
+@@ -344,7 +383,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -59945,7 +56963,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -375,7 +414,6 @@
+@@ -362,7 +401,6 @@
  check-am: all-am
  check: check-am
  all-am: Makefile
@@ -59953,7 +56971,7 @@
  installdirs:
  install: install-am
  install-exec: install-exec-am
-@@ -398,7 +436,7 @@
+@@ -385,7 +423,7 @@
  clean-generic:
  
  distclean-generic:
@@ -59962,7 +56980,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -419,6 +457,8 @@
+@@ -406,6 +444,8 @@
  
  dvi-am:
  
@@ -59971,7 +56989,7 @@
  info: info-am
  
  info-am:
-@@ -455,10 +495,10 @@
+@@ -442,10 +482,10 @@
  
  .PHONY: all all-am check check-am clean clean-generic clean-libtool \
  	distclean distclean-generic distclean-libtool distdir dvi \
@@ -59986,7 +57004,7 @@
  	maintainer-clean-generic mostlyclean mostlyclean-generic \
  	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
  	uninstall-info-am
-@@ -468,10 +508,10 @@
+@@ -455,10 +495,10 @@
  .NOEXPORT:
  
  #>+ 2
@@ -59999,7 +57017,7 @@
  	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
  
  docs-am: index.cache.bz2
-@@ -498,27 +538,36 @@
+@@ -485,27 +525,36 @@
  #>+ 13
  install-nls:
  	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview
@@ -60047,7 +57065,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -60111,7 +57129,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -60121,7 +57139,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
+@@ -215,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -60130,7 +57148,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +307,7 @@
+@@ -264,6 +298,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -60138,7 +57156,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
+@@ -285,40 +320,53 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  SUBDIRS = messages doc
@@ -60218,7 +57236,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -350,7 +398,13 @@
+@@ -337,7 +385,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -60233,7 +57251,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
+@@ -349,7 +403,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -60242,7 +57260,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
+@@ -357,7 +411,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -60257,7 +57275,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
+@@ -378,7 +438,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -60266,7 +57284,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
+@@ -389,14 +449,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -60281,7 +57299,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
+@@ -405,19 +457,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -60306,7 +57324,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -440,10 +495,11 @@
+@@ -427,10 +482,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -60322,7 +57340,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
+@@ -453,12 +509,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -60335,7 +57353,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
+@@ -472,7 +522,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -60344,7 +57362,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -500,15 +550,17 @@
+@@ -487,15 +537,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -60367,7 +57385,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -518,7 +570,6 @@
+@@ -505,7 +557,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -60375,7 +57393,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -538,7 +589,7 @@
+@@ -525,7 +576,7 @@
  clean-generic:
  
  distclean-generic:
@@ -60384,7 +57402,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
+@@ -547,6 +598,8 @@
  
  dvi-am:
  
@@ -60393,7 +57411,7 @@
  info: info-recursive
  
  info-am:
-@@ -594,37 +647,42 @@
+@@ -581,37 +634,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -60460,7 +57478,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -60526,7 +57544,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -60536,7 +57554,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
+@@ -215,6 +249,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -60545,7 +57563,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +309,7 @@
+@@ -264,6 +300,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -60553,7 +57571,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
+@@ -292,40 +329,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -60633,7 +57651,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -357,7 +407,13 @@
+@@ -344,7 +394,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -60648,7 +57666,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
+@@ -356,7 +412,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -60657,7 +57675,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
+@@ -364,7 +420,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -60672,7 +57690,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
+@@ -385,7 +447,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -60681,7 +57699,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
+@@ -396,14 +458,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -60696,7 +57714,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
+@@ -412,19 +466,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -60721,7 +57739,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -447,10 +504,11 @@
+@@ -434,10 +491,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -60737,7 +57755,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
+@@ -460,14 +518,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -60752,7 +57770,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -496,7 +546,7 @@
+@@ -483,7 +533,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -60761,7 +57779,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -511,15 +561,17 @@
+@@ -498,15 +548,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -60784,7 +57802,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -529,7 +581,6 @@
+@@ -516,7 +568,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -60792,7 +57810,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -551,7 +602,7 @@
+@@ -538,7 +589,7 @@
  clean-generic:
  
  distclean-generic:
@@ -60801,7 +57819,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
+@@ -560,6 +611,8 @@
  
  dvi-am:
  
@@ -60810,7 +57828,7 @@
  info: info-recursive
  
  info-am:
-@@ -611,29 +664,25 @@
+@@ -598,29 +651,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -60852,7 +57870,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
+@@ -661,10 +710,19 @@
  #>+ 2
  docs-am:
  
@@ -60875,1678 +57893,12 @@
  	cd $(top_srcdir) && perl admin/am_edit translations/ru/messages/Makefile.in
  
  
---- translations/rw/Makefile.in
-+++ translations/rw/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
- # @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
- 
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,37 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = translations/rw
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- 	html-recursive info-recursive install-data-recursive \
-+#>- 	install-exec-recursive install-info-recursive \
-+#>- 	install-recursive installcheck-recursive installdirs-recursive \
-+#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- 	uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+	html-recursive info-recursive install-data-recursive \
-+	install-exec-recursive install-info-recursive \
-+	install-recursive installcheck-recursive installdirs-recursive \
-+	pdf-recursive ps-recursive uninstall-info-recursive \
-+	uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -273,6 +307,7 @@
- libexif_internal_TRUE = @libexif_internal_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
- xdg_directorydir = @xdg_directorydir@
- xdg_menudir = @xdg_menudir@
- SUBDIRS = messages
--subdir = translations/rw
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
--#>- 	all-recursive install-data-recursive install-exec-recursive \
--#>- 	installdirs-recursive install-recursive uninstall-recursive \
--#>- 	check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--	ps-recursive install-info-recursive uninstall-info-recursive \
--	all-recursive install-data-recursive install-exec-recursive \
--	installdirs-recursive install-recursive uninstall-recursive \
--	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
- all: docs-am  all-recursive
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  translations/rw/Makefile'; \
- #>- 	cd $(top_srcdir) && \
--#>- 	  $(AUTOMAKE) --gnu  translations/rw/Makefile
--#>+ 3
-+#>- 	  $(AUTOMAKE) --foreign  translations/rw/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  translations/rw/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  translations/rw/Makefile
-+	  $(AUTOMAKE) --foreign  translations/rw/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit translations/rw/Makefile.in
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-@@ -350,7 +398,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
- 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- 	done
- 
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
- 	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
- 	mkid -fID $$unique
-+tags: TAGS
- 
- TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
--	if (etags --etags-include --version) >/dev/null 2>&1; then \
-+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- 	  include_option=--etags-include; \
-+	  empty_fix=.; \
- 	else \
- 	  include_option=--include; \
-+	  empty_fix=; \
- 	fi; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
--	    test -f $$subdir/TAGS && \
-+	    test ! -f $$subdir/TAGS || \
- 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- 	  fi; \
- 	done; \
-@@ -440,10 +495,11 @@
- 	  done | \
- 	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$tags$$unique" \
--	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
--	     $$tags $$unique
--
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
- 
- distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- distdir: $(DISTFILES)
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -500,15 +550,17 @@
- 	    || exit 1; \
- 	  fi; \
- 	done
--	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
--	    test -d $(distdir)/$$subdir \
--	    || mkdir $(distdir)/$$subdir \
-+	    test -d "$(distdir)/$$subdir" \
-+	    || $(mkdir_p) "$(distdir)/$$subdir" \
- 	    || exit 1; \
-+	    distdir=`$(am__cd) $(distdir) && pwd`; \
-+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- 	    (cd $$subdir && \
- 	      $(MAKE) $(AM_MAKEFLAGS) \
--	        top_distdir="$(top_distdir)" \
--	        distdir=../$(distdir)/$$subdir \
-+	        top_distdir="$$top_distdir" \
-+	        distdir="$$distdir/$$subdir" \
- 	        distdir) \
- 	      || exit 1; \
- 	  fi; \
-@@ -518,7 +570,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -538,7 +589,7 @@
- clean-generic:
- 
- distclean-generic:
--	-rm -f $(CONFIG_CLEAN_FILES)
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
- 
- dvi-am:
- 
-+html: html-recursive
-+
- info: info-recursive
- 
- info-am:
-@@ -594,37 +647,42 @@
- 
- uninstall-info: uninstall-info-recursive
- 
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
--	clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+	clean clean-generic clean-libtool clean-recursive ctags \
- 	ctags-recursive distclean distclean-generic distclean-libtool \
--	distclean-recursive distclean-tags distdir dvi dvi-am \
--	dvi-recursive info info-am info-recursive install install-am \
--	install-data install-data-am install-data-recursive \
--	install-exec install-exec-am install-exec-recursive \
--	install-info install-info-am install-info-recursive install-man \
--	install-recursive install-strip installcheck installcheck-am \
--	installdirs installdirs-am installdirs-recursive \
--	maintainer-clean maintainer-clean-generic \
--	maintainer-clean-recursive mostlyclean mostlyclean-generic \
--	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
--	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
--	uninstall uninstall-am uninstall-info-am \
--	uninstall-info-recursive uninstall-recursive
-+	distclean-recursive distclean-tags distdir dvi dvi-am html \
-+	html-am info info-am install install-am install-data \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-strip installcheck \
-+	installcheck-am installdirs installdirs-am maintainer-clean \
-+	maintainer-clean-generic maintainer-clean-recursive \
-+	mostlyclean mostlyclean-generic mostlyclean-libtool \
-+	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+	uninstall uninstall-am uninstall-info-am
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=Makefile.in 
-+KDE_DIST=Makefile.in Makefile.am 
- 
- #>+ 2
- docs-am:
- 
--#>+ 6
-+#>+ 15
- force-reedit:
--		cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  translations/rw/Makefile
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  translations/rw/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  translations/rw/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit translations/rw/Makefile.in
- 
- 
---- translations/rw/messages/Makefile.in
-+++ translations/rw/messages/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
- # @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
- 
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = translations/rw/messages
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- 	html-recursive info-recursive install-data-recursive \
-+#>- 	install-exec-recursive install-info-recursive \
-+#>- 	install-recursive installcheck-recursive installdirs-recursive \
-+#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- 	uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+	html-recursive info-recursive install-data-recursive \
-+	install-exec-recursive install-info-recursive \
-+	install-recursive installcheck-recursive installdirs-recursive \
-+	pdf-recursive ps-recursive uninstall-info-recursive \
-+	uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -273,6 +309,7 @@
- libexif_internal_TRUE = @libexif_internal_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
- #>+ 2
- POFILES = gwenview.po
- GMOFILES = gwenview.gmo
--subdir = translations/rw/messages
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
--#>- 	all-recursive install-data-recursive install-exec-recursive \
--#>- 	installdirs-recursive install-recursive uninstall-recursive \
--#>- 	check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--	ps-recursive install-info-recursive uninstall-info-recursive \
--	all-recursive install-data-recursive install-exec-recursive \
--	installdirs-recursive install-recursive uninstall-recursive \
--	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
- all: all-nls docs-am  all-recursive
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  translations/rw/messages/Makefile'; \
- #>- 	cd $(top_srcdir) && \
--#>- 	  $(AUTOMAKE) --gnu  translations/rw/messages/Makefile
--#>+ 3
-+#>- 	  $(AUTOMAKE) --foreign  translations/rw/messages/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  translations/rw/messages/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  translations/rw/messages/Makefile
-+	  $(AUTOMAKE) --foreign  translations/rw/messages/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit translations/rw/messages/Makefile.in
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-@@ -357,7 +407,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
- 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- 	done
- 
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
- 	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
- 	mkid -fID $$unique
-+tags: TAGS
- 
- TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
--	if (etags --etags-include --version) >/dev/null 2>&1; then \
-+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- 	  include_option=--etags-include; \
-+	  empty_fix=.; \
- 	else \
- 	  include_option=--include; \
-+	  empty_fix=; \
- 	fi; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
--	    test -f $$subdir/TAGS && \
-+	    test ! -f $$subdir/TAGS || \
- 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- 	  fi; \
- 	done; \
-@@ -447,10 +504,11 @@
- 	  done | \
- 	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$tags$$unique" \
--	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
--	     $$tags $$unique
--
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
- 
- distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--#>+ 1
--DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -496,7 +546,7 @@
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -511,15 +561,17 @@
- 	    || exit 1; \
- 	  fi; \
- 	done
--	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
--	    test -d $(distdir)/$$subdir \
--	    || mkdir $(distdir)/$$subdir \
-+	    test -d "$(distdir)/$$subdir" \
-+	    || $(mkdir_p) "$(distdir)/$$subdir" \
- 	    || exit 1; \
-+	    distdir=`$(am__cd) $(distdir) && pwd`; \
-+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- 	    (cd $$subdir && \
- 	      $(MAKE) $(AM_MAKEFLAGS) \
--	        top_distdir="$(top_distdir)" \
--	        distdir=../$(distdir)/$$subdir \
-+	        top_distdir="$$top_distdir" \
-+	        distdir="$$distdir/$$subdir" \
- 	        distdir) \
- 	      || exit 1; \
- 	  fi; \
-@@ -529,7 +581,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -551,7 +602,7 @@
- clean-generic:
- 
- distclean-generic:
--	-rm -f $(CONFIG_CLEAN_FILES)
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
- 
- dvi-am:
- 
-+html: html-recursive
-+
- info: info-recursive
- 
- info-am:
-@@ -611,29 +664,25 @@
- 
- uninstall-info: uninstall-info-recursive
- 
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
--	clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+	clean clean-generic clean-libtool clean-recursive ctags \
- 	ctags-recursive distclean distclean-generic distclean-libtool \
--	distclean-recursive distclean-tags distdir dvi dvi-am \
--	dvi-recursive info info-am info-recursive install install-am \
--	install-data install-data-am install-data-recursive \
--	install-exec install-exec-am install-exec-recursive \
--	install-info install-info-am install-info-recursive install-man \
--	install-recursive install-strip installcheck installcheck-am \
--	installdirs installdirs-am installdirs-recursive \
--	maintainer-clean maintainer-clean-generic \
--	maintainer-clean-recursive mostlyclean mostlyclean-generic \
--	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
--	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
--	uninstall uninstall-am uninstall-info-am \
--	uninstall-info-recursive uninstall-recursive
-+	distclean-recursive distclean-tags distdir dvi dvi-am html \
-+	html-am info info-am install install-am install-data \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-strip installcheck \
-+	installcheck-am installdirs installdirs-am maintainer-clean \
-+	maintainer-clean-generic maintainer-clean-recursive \
-+	mostlyclean mostlyclean-generic mostlyclean-libtool \
-+	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+	uninstall uninstall-am uninstall-info-am
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=gwenview.po Makefile.in 
-+KDE_DIST=gwenview.po Makefile.in Makefile.am 
- 
- #>+ 4
- gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
- #>+ 2
- docs-am:
- 
--#>+ 6
-+#>+ 15
- force-reedit:
--		cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  translations/rw/messages/Makefile
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  translations/rw/messages/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  translations/rw/messages/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit translations/rw/messages/Makefile.in
- 
- 
---- translations/sr/Makefile.in
-+++ translations/sr/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
- # @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
- 
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,37 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = translations/sr
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- 	html-recursive info-recursive install-data-recursive \
-+#>- 	install-exec-recursive install-info-recursive \
-+#>- 	install-recursive installcheck-recursive installdirs-recursive \
-+#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- 	uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+	html-recursive info-recursive install-data-recursive \
-+	install-exec-recursive install-info-recursive \
-+	install-recursive installcheck-recursive installdirs-recursive \
-+	pdf-recursive ps-recursive uninstall-info-recursive \
-+	uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -273,6 +307,7 @@
- libexif_internal_TRUE = @libexif_internal_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
- xdg_directorydir = @xdg_directorydir@
- xdg_menudir = @xdg_menudir@
- SUBDIRS = messages
--subdir = translations/sr
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
--#>- 	all-recursive install-data-recursive install-exec-recursive \
--#>- 	installdirs-recursive install-recursive uninstall-recursive \
--#>- 	check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--	ps-recursive install-info-recursive uninstall-info-recursive \
--	all-recursive install-data-recursive install-exec-recursive \
--	installdirs-recursive install-recursive uninstall-recursive \
--	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
- all: docs-am  all-recursive
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  translations/sr/Makefile'; \
- #>- 	cd $(top_srcdir) && \
--#>- 	  $(AUTOMAKE) --gnu  translations/sr/Makefile
--#>+ 3
-+#>- 	  $(AUTOMAKE) --foreign  translations/sr/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  translations/sr/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  translations/sr/Makefile
-+	  $(AUTOMAKE) --foreign  translations/sr/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit translations/sr/Makefile.in
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-@@ -350,7 +398,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
- 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- 	done
- 
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
- 	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
- 	mkid -fID $$unique
-+tags: TAGS
- 
- TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
--	if (etags --etags-include --version) >/dev/null 2>&1; then \
-+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- 	  include_option=--etags-include; \
-+	  empty_fix=.; \
- 	else \
- 	  include_option=--include; \
-+	  empty_fix=; \
- 	fi; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
--	    test -f $$subdir/TAGS && \
-+	    test ! -f $$subdir/TAGS || \
- 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- 	  fi; \
- 	done; \
-@@ -440,10 +495,11 @@
- 	  done | \
- 	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$tags$$unique" \
--	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
--	     $$tags $$unique
--
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
- 
- distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- distdir: $(DISTFILES)
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -500,15 +550,17 @@
- 	    || exit 1; \
- 	  fi; \
- 	done
--	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
--	    test -d $(distdir)/$$subdir \
--	    || mkdir $(distdir)/$$subdir \
-+	    test -d "$(distdir)/$$subdir" \
-+	    || $(mkdir_p) "$(distdir)/$$subdir" \
- 	    || exit 1; \
-+	    distdir=`$(am__cd) $(distdir) && pwd`; \
-+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- 	    (cd $$subdir && \
- 	      $(MAKE) $(AM_MAKEFLAGS) \
--	        top_distdir="$(top_distdir)" \
--	        distdir=../$(distdir)/$$subdir \
-+	        top_distdir="$$top_distdir" \
-+	        distdir="$$distdir/$$subdir" \
- 	        distdir) \
- 	      || exit 1; \
- 	  fi; \
-@@ -518,7 +570,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -538,7 +589,7 @@
- clean-generic:
- 
- distclean-generic:
--	-rm -f $(CONFIG_CLEAN_FILES)
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
- 
- dvi-am:
- 
-+html: html-recursive
-+
- info: info-recursive
- 
- info-am:
-@@ -594,37 +647,42 @@
- 
- uninstall-info: uninstall-info-recursive
- 
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
--	clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+	clean clean-generic clean-libtool clean-recursive ctags \
- 	ctags-recursive distclean distclean-generic distclean-libtool \
--	distclean-recursive distclean-tags distdir dvi dvi-am \
--	dvi-recursive info info-am info-recursive install install-am \
--	install-data install-data-am install-data-recursive \
--	install-exec install-exec-am install-exec-recursive \
--	install-info install-info-am install-info-recursive install-man \
--	install-recursive install-strip installcheck installcheck-am \
--	installdirs installdirs-am installdirs-recursive \
--	maintainer-clean maintainer-clean-generic \
--	maintainer-clean-recursive mostlyclean mostlyclean-generic \
--	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
--	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
--	uninstall uninstall-am uninstall-info-am \
--	uninstall-info-recursive uninstall-recursive
-+	distclean-recursive distclean-tags distdir dvi dvi-am html \
-+	html-am info info-am install install-am install-data \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-strip installcheck \
-+	installcheck-am installdirs installdirs-am maintainer-clean \
-+	maintainer-clean-generic maintainer-clean-recursive \
-+	mostlyclean mostlyclean-generic mostlyclean-libtool \
-+	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+	uninstall uninstall-am uninstall-info-am
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=Makefile.in 
-+KDE_DIST=Makefile.in Makefile.am 
- 
- #>+ 2
- docs-am:
- 
--#>+ 6
-+#>+ 15
- force-reedit:
--		cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  translations/sr/Makefile
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  translations/sr/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  translations/sr/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit translations/sr/Makefile.in
- 
- 
---- translations/sr/messages/Makefile.in
-+++ translations/sr/messages/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
- # @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
- 
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = translations/sr/messages
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- 	html-recursive info-recursive install-data-recursive \
-+#>- 	install-exec-recursive install-info-recursive \
-+#>- 	install-recursive installcheck-recursive installdirs-recursive \
-+#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- 	uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+	html-recursive info-recursive install-data-recursive \
-+	install-exec-recursive install-info-recursive \
-+	install-recursive installcheck-recursive installdirs-recursive \
-+	pdf-recursive ps-recursive uninstall-info-recursive \
-+	uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -273,6 +309,7 @@
- libexif_internal_TRUE = @libexif_internal_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
- #>+ 2
- POFILES = gwenview.po
- GMOFILES = gwenview.gmo
--subdir = translations/sr/messages
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
--#>- 	all-recursive install-data-recursive install-exec-recursive \
--#>- 	installdirs-recursive install-recursive uninstall-recursive \
--#>- 	check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--	ps-recursive install-info-recursive uninstall-info-recursive \
--	all-recursive install-data-recursive install-exec-recursive \
--	installdirs-recursive install-recursive uninstall-recursive \
--	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
- all: all-nls docs-am  all-recursive
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  translations/sr/messages/Makefile'; \
- #>- 	cd $(top_srcdir) && \
--#>- 	  $(AUTOMAKE) --gnu  translations/sr/messages/Makefile
--#>+ 3
-+#>- 	  $(AUTOMAKE) --foreign  translations/sr/messages/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  translations/sr/messages/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  translations/sr/messages/Makefile
-+	  $(AUTOMAKE) --foreign  translations/sr/messages/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit translations/sr/messages/Makefile.in
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-@@ -357,7 +407,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
- 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- 	done
- 
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
- 	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
- 	mkid -fID $$unique
-+tags: TAGS
- 
- TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
--	if (etags --etags-include --version) >/dev/null 2>&1; then \
-+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- 	  include_option=--etags-include; \
-+	  empty_fix=.; \
- 	else \
- 	  include_option=--include; \
-+	  empty_fix=; \
- 	fi; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
--	    test -f $$subdir/TAGS && \
-+	    test ! -f $$subdir/TAGS || \
- 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- 	  fi; \
- 	done; \
-@@ -447,10 +504,11 @@
- 	  done | \
- 	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$tags$$unique" \
--	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
--	     $$tags $$unique
--
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
- 
- distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--#>+ 1
--DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -496,7 +546,7 @@
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -511,15 +561,17 @@
- 	    || exit 1; \
- 	  fi; \
- 	done
--	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
--	    test -d $(distdir)/$$subdir \
--	    || mkdir $(distdir)/$$subdir \
-+	    test -d "$(distdir)/$$subdir" \
-+	    || $(mkdir_p) "$(distdir)/$$subdir" \
- 	    || exit 1; \
-+	    distdir=`$(am__cd) $(distdir) && pwd`; \
-+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- 	    (cd $$subdir && \
- 	      $(MAKE) $(AM_MAKEFLAGS) \
--	        top_distdir="$(top_distdir)" \
--	        distdir=../$(distdir)/$$subdir \
-+	        top_distdir="$$top_distdir" \
-+	        distdir="$$distdir/$$subdir" \
- 	        distdir) \
- 	      || exit 1; \
- 	  fi; \
-@@ -529,7 +581,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -551,7 +602,7 @@
- clean-generic:
- 
- distclean-generic:
--	-rm -f $(CONFIG_CLEAN_FILES)
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
- 
- dvi-am:
- 
-+html: html-recursive
-+
- info: info-recursive
- 
- info-am:
-@@ -611,29 +664,25 @@
- 
- uninstall-info: uninstall-info-recursive
- 
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
--	clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+	clean clean-generic clean-libtool clean-recursive ctags \
- 	ctags-recursive distclean distclean-generic distclean-libtool \
--	distclean-recursive distclean-tags distdir dvi dvi-am \
--	dvi-recursive info info-am info-recursive install install-am \
--	install-data install-data-am install-data-recursive \
--	install-exec install-exec-am install-exec-recursive \
--	install-info install-info-am install-info-recursive install-man \
--	install-recursive install-strip installcheck installcheck-am \
--	installdirs installdirs-am installdirs-recursive \
--	maintainer-clean maintainer-clean-generic \
--	maintainer-clean-recursive mostlyclean mostlyclean-generic \
--	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
--	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
--	uninstall uninstall-am uninstall-info-am \
--	uninstall-info-recursive uninstall-recursive
-+	distclean-recursive distclean-tags distdir dvi dvi-am html \
-+	html-am info info-am install install-am install-data \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-strip installcheck \
-+	installcheck-am installdirs installdirs-am maintainer-clean \
-+	maintainer-clean-generic maintainer-clean-recursive \
-+	mostlyclean mostlyclean-generic mostlyclean-libtool \
-+	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+	uninstall uninstall-am uninstall-info-am
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=gwenview.po Makefile.in 
-+KDE_DIST=gwenview.po Makefile.in Makefile.am 
- 
- #>+ 4
- gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
- #>+ 2
- docs-am:
- 
--#>+ 6
-+#>+ 15
- force-reedit:
--		cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  translations/sr/messages/Makefile
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  translations/sr/messages/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  translations/sr/messages/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit translations/sr/messages/Makefile.in
- 
- 
 --- translations/sr at Latn/Makefile.in
 +++ translations/sr at Latn/Makefile.in
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -62610,7 +57962,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -62620,7 +57972,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
+@@ -215,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -62629,7 +57981,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +307,7 @@
+@@ -264,6 +298,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -62637,7 +57989,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
+@@ -285,40 +320,53 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  SUBDIRS = messages
@@ -62717,7 +58069,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -350,7 +398,13 @@
+@@ -337,7 +385,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -62732,7 +58084,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
+@@ -349,7 +403,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -62741,7 +58093,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
+@@ -357,7 +411,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -62756,7 +58108,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
+@@ -378,7 +438,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -62765,7 +58117,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
+@@ -389,14 +449,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -62780,7 +58132,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
+@@ -405,19 +457,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -62805,7 +58157,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -440,10 +495,11 @@
+@@ -427,10 +482,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -62821,7 +58173,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
+@@ -453,12 +509,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -62834,7 +58186,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
+@@ -472,7 +522,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -62843,7 +58195,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -500,15 +550,17 @@
+@@ -487,15 +537,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -62866,7 +58218,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -518,7 +570,6 @@
+@@ -505,7 +557,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -62874,7 +58226,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -538,7 +589,7 @@
+@@ -525,7 +576,7 @@
  clean-generic:
  
  distclean-generic:
@@ -62883,7 +58235,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
+@@ -547,6 +598,8 @@
  
  dvi-am:
  
@@ -62892,7 +58244,7 @@
  info: info-recursive
  
  info-am:
-@@ -594,37 +647,42 @@
+@@ -581,37 +634,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -62959,7 +58311,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -63025,7 +58377,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -63035,7 +58387,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
+@@ -215,6 +249,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -63044,7 +58396,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +309,7 @@
+@@ -264,6 +300,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -63052,7 +58404,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
+@@ -292,40 +329,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -63132,7 +58484,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -357,7 +407,13 @@
+@@ -344,7 +394,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -63147,7 +58499,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
+@@ -356,7 +412,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -63156,7 +58508,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
+@@ -364,7 +420,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -63171,7 +58523,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
+@@ -385,7 +447,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -63180,7 +58532,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
+@@ -396,14 +458,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -63195,7 +58547,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
+@@ -412,19 +466,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -63220,7 +58572,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -447,10 +504,11 @@
+@@ -434,10 +491,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -63236,7 +58588,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
+@@ -460,14 +518,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -63251,7 +58603,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -496,7 +546,7 @@
+@@ -483,7 +533,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -63260,7 +58612,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -511,15 +561,17 @@
+@@ -498,15 +548,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -63283,7 +58635,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -529,7 +581,6 @@
+@@ -516,7 +568,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -63291,7 +58643,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -551,7 +602,7 @@
+@@ -538,7 +589,7 @@
  clean-generic:
  
  distclean-generic:
@@ -63300,7 +58652,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
+@@ -560,6 +611,8 @@
  
  dvi-am:
  
@@ -63309,7 +58661,7 @@
  info: info-recursive
  
  info-am:
-@@ -611,29 +664,25 @@
+@@ -598,29 +651,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -63351,7 +58703,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
+@@ -661,10 +710,19 @@
  #>+ 2
  docs-am:
  
@@ -63374,1111 +58726,12 @@
  	cd $(top_srcdir) && perl admin/am_edit translations/sr at Latn/messages/Makefile.in
  
  
---- translations/sv/doc/Makefile.in
-+++ translations/sv/doc/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
- # @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
- 
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,21 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = translations/sv/doc
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +177,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -222,6 +238,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -273,6 +291,7 @@
- libexif_internal_TRUE = @libexif_internal_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-@@ -299,27 +318,53 @@
- xdg_menudir = @xdg_menudir@
- KDE_LANG = sv
- KDE_DOCS = gwenview
--subdir = translations/sv/doc
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
- #>- all: all-am
- #>+ 1
- all: docs-am  all-am
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  translations/sv/doc/Makefile'; \
- #>- 	cd $(top_srcdir) && \
--#>- 	  $(AUTOMAKE) --gnu  translations/sv/doc/Makefile
--#>+ 3
-+#>- 	  $(AUTOMAKE) --foreign  translations/sv/doc/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  translations/sv/doc/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  translations/sv/doc/Makefile
-+	  $(AUTOMAKE) --foreign  translations/sv/doc/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit translations/sv/doc/Makefile.in
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-@@ -336,12 +381,6 @@
- ctags: CTAGS
- CTAGS:
- 
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -357,7 +396,7 @@
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -375,7 +414,6 @@
- check-am: all-am
- check: check-am
- all-am: Makefile
--
- installdirs:
- install: install-am
- install-exec: install-exec-am
-@@ -398,7 +436,7 @@
- clean-generic:
- 
- distclean-generic:
--	-rm -f $(CONFIG_CLEAN_FILES)
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -419,6 +457,8 @@
- 
- dvi-am:
- 
-+html: html-am
-+
- info: info-am
- 
- info-am:
-@@ -455,10 +495,10 @@
- 
- .PHONY: all all-am check check-am clean clean-generic clean-libtool \
- 	distclean distclean-generic distclean-libtool distdir dvi \
--	dvi-am info info-am install install-am install-data \
--	install-data-am install-exec install-exec-am install-info \
--	install-info-am install-man install-strip installcheck \
--	installcheck-am installdirs maintainer-clean \
-+	dvi-am html html-am info info-am install install-am \
-+	install-data install-data-am install-exec install-exec-am \
-+	install-info install-info-am install-man install-strip \
-+	installcheck installcheck-am installdirs maintainer-clean \
- 	maintainer-clean-generic mostlyclean mostlyclean-generic \
- 	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
- 	uninstall-info-am
-@@ -468,10 +508,10 @@
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=index.docbook keybindings.docbook mouse.docbook docked_windows.docbook Makefile.in introduction.docbook interface.docbook external_tools.docbook 
-+KDE_DIST=index.docbook keybindings.docbook mouse.docbook docked_windows.docbook Makefile.in introduction.docbook interface.docbook external_tools.docbook Makefile.am 
- 
- #>+ 24
--index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) external_tools.docbook interface.docbook introduction.docbook docked_windows.docbook keybindings.docbook index.docbook mouse.docbook 
-+index.cache.bz2: $(srcdir)/index.docbook $(KDE_XSL_STYLESHEET) mouse.docbook external_tools.docbook docked_windows.docbook introduction.docbook interface.docbook index.docbook keybindings.docbook 
- 	@if test -n "$(MEINPROC)"; then echo $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; $(MEINPROC) --check --cache index.cache.bz2 $(srcdir)/index.docbook; fi
- 
- docs-am: index.cache.bz2
-@@ -498,27 +538,36 @@
- #>+ 13
- install-nls:
- 	$(mkinstalldirs) $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview
--	@for base in external_tools.docbook interface.docbook introduction.docbook docked_windows.docbook keybindings.docbook index.docbook mouse.docbook ; do \
-+	@for base in mouse.docbook external_tools.docbook docked_windows.docbook introduction.docbook interface.docbook index.docbook keybindings.docbook ; do \
- 	  echo $(INSTALL_DATA) $$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview/$$base ;\
- 	  $(INSTALL_DATA) $(srcdir)/$$base $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview/$$base ;\
- 	done
- 
- uninstall-nls:
--	for base in external_tools.docbook interface.docbook introduction.docbook docked_windows.docbook keybindings.docbook index.docbook mouse.docbook ; do \
-+	for base in mouse.docbook external_tools.docbook docked_windows.docbook introduction.docbook interface.docbook index.docbook keybindings.docbook ; do \
- 	  rm -f $(DESTDIR)$(kde_htmldir)/$(KDE_LANG)/gwenview/$$base ;\
- 	done
- 
- 
- #>+ 5
- distdir-nls:
--	for file in external_tools.docbook interface.docbook introduction.docbook docked_windows.docbook keybindings.docbook index.docbook mouse.docbook ; do \
-+	for file in mouse.docbook external_tools.docbook docked_windows.docbook introduction.docbook interface.docbook index.docbook keybindings.docbook ; do \
- 	  cp $(srcdir)/$$file $(distdir); \
- 	done
- 
--#>+ 6
-+#>+ 15
- force-reedit:
--		cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  translations/sv/doc/Makefile
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  translations/sv/doc/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  translations/sv/doc/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit translations/sv/doc/Makefile.in
- 
- 
---- translations/sv/Makefile.in
-+++ translations/sv/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
- # @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
- 
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,37 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = translations/sv
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- 	html-recursive info-recursive install-data-recursive \
-+#>- 	install-exec-recursive install-info-recursive \
-+#>- 	install-recursive installcheck-recursive installdirs-recursive \
-+#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- 	uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+	html-recursive info-recursive install-data-recursive \
-+	install-exec-recursive install-info-recursive \
-+	install-recursive installcheck-recursive installdirs-recursive \
-+	pdf-recursive ps-recursive uninstall-info-recursive \
-+	uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -273,6 +307,7 @@
- libexif_internal_TRUE = @libexif_internal_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
- xdg_directorydir = @xdg_directorydir@
- xdg_menudir = @xdg_menudir@
- SUBDIRS = messages doc
--subdir = translations/sv
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
--#>- 	all-recursive install-data-recursive install-exec-recursive \
--#>- 	installdirs-recursive install-recursive uninstall-recursive \
--#>- 	check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--	ps-recursive install-info-recursive uninstall-info-recursive \
--	all-recursive install-data-recursive install-exec-recursive \
--	installdirs-recursive install-recursive uninstall-recursive \
--	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
- all: docs-am  all-recursive
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  translations/sv/Makefile'; \
- #>- 	cd $(top_srcdir) && \
--#>- 	  $(AUTOMAKE) --gnu  translations/sv/Makefile
--#>+ 3
-+#>- 	  $(AUTOMAKE) --foreign  translations/sv/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  translations/sv/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  translations/sv/Makefile
-+	  $(AUTOMAKE) --foreign  translations/sv/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit translations/sv/Makefile.in
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-@@ -350,7 +398,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
- 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- 	done
- 
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
- 	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
- 	mkid -fID $$unique
-+tags: TAGS
- 
- TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
--	if (etags --etags-include --version) >/dev/null 2>&1; then \
-+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- 	  include_option=--etags-include; \
-+	  empty_fix=.; \
- 	else \
- 	  include_option=--include; \
-+	  empty_fix=; \
- 	fi; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
--	    test -f $$subdir/TAGS && \
-+	    test ! -f $$subdir/TAGS || \
- 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- 	  fi; \
- 	done; \
-@@ -440,10 +495,11 @@
- 	  done | \
- 	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$tags$$unique" \
--	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
--	     $$tags $$unique
--
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
- 
- distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- distdir: $(DISTFILES)
- 	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -500,15 +550,17 @@
- 	    || exit 1; \
- 	  fi; \
- 	done
--	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
--	    test -d $(distdir)/$$subdir \
--	    || mkdir $(distdir)/$$subdir \
-+	    test -d "$(distdir)/$$subdir" \
-+	    || $(mkdir_p) "$(distdir)/$$subdir" \
- 	    || exit 1; \
-+	    distdir=`$(am__cd) $(distdir) && pwd`; \
-+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- 	    (cd $$subdir && \
- 	      $(MAKE) $(AM_MAKEFLAGS) \
--	        top_distdir="$(top_distdir)" \
--	        distdir=../$(distdir)/$$subdir \
-+	        top_distdir="$$top_distdir" \
-+	        distdir="$$distdir/$$subdir" \
- 	        distdir) \
- 	      || exit 1; \
- 	  fi; \
-@@ -518,7 +570,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -538,7 +589,7 @@
- clean-generic:
- 
- distclean-generic:
--	-rm -f $(CONFIG_CLEAN_FILES)
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
- 
- dvi-am:
- 
-+html: html-recursive
-+
- info: info-recursive
- 
- info-am:
-@@ -594,37 +647,42 @@
- 
- uninstall-info: uninstall-info-recursive
- 
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
--	clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+	clean clean-generic clean-libtool clean-recursive ctags \
- 	ctags-recursive distclean distclean-generic distclean-libtool \
--	distclean-recursive distclean-tags distdir dvi dvi-am \
--	dvi-recursive info info-am info-recursive install install-am \
--	install-data install-data-am install-data-recursive \
--	install-exec install-exec-am install-exec-recursive \
--	install-info install-info-am install-info-recursive install-man \
--	install-recursive install-strip installcheck installcheck-am \
--	installdirs installdirs-am installdirs-recursive \
--	maintainer-clean maintainer-clean-generic \
--	maintainer-clean-recursive mostlyclean mostlyclean-generic \
--	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
--	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
--	uninstall uninstall-am uninstall-info-am \
--	uninstall-info-recursive uninstall-recursive
-+	distclean-recursive distclean-tags distdir dvi dvi-am html \
-+	html-am info info-am install install-am install-data \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-strip installcheck \
-+	installcheck-am installdirs installdirs-am maintainer-clean \
-+	maintainer-clean-generic maintainer-clean-recursive \
-+	mostlyclean mostlyclean-generic mostlyclean-libtool \
-+	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+	uninstall uninstall-am uninstall-info-am
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=Makefile.in 
-+KDE_DIST=Makefile.in Makefile.am 
- 
- #>+ 2
- docs-am:
- 
--#>+ 6
-+#>+ 15
- force-reedit:
--		cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  translations/sv/Makefile
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  translations/sv/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  translations/sv/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit translations/sv/Makefile.in
- 
- 
---- translations/sv/messages/Makefile.in
-+++ translations/sv/messages/Makefile.in
-@@ -1,9 +1,9 @@
--# Makefile.in generated by automake 1.7.9 from Makefile.am.
-+# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
- # @configure_input@
- 
--# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
--# Free Software Foundation, Inc.
-+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-+# 2003, 2004, 2005  Free Software Foundation, Inc.
- # This Makefile.in is free software; the Free Software Foundation
- # gives unlimited permission to copy and/or distribute it,
- # with or without modifications, as long as this notice is preserved.
-@@ -14,7 +14,6 @@
- # PARTICULAR PURPOSE.
- 
- @SET_MAKE@
--
- srcdir = @srcdir@
- top_srcdir = @top_srcdir@
- VPATH = @srcdir@
-@@ -22,7 +21,6 @@
- pkglibdir = $(libdir)/@PACKAGE@
- pkgincludedir = $(includedir)/@PACKAGE@
- top_builddir = ../../..
--
- am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
- INSTALL = @INSTALL@
- install_sh_DATA = $(install_sh) -c -m 644
-@@ -39,6 +37,39 @@
- build_triplet = @build@
- host_triplet = @host@
- target_triplet = @target@
-+subdir = translations/sv/messages
-+DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
-+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-+am__aclocal_m4_deps = $(top_srcdir)/acinclude.m4 \
-+	$(top_srcdir)/configure.in
-+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
-+	$(ACLOCAL_M4)
-+mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
-+CONFIG_HEADER = $(top_builddir)/config.h
-+CONFIG_CLEAN_FILES =
-+SOURCES =
-+DIST_SOURCES =
-+#>- RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+#>- 	html-recursive info-recursive install-data-recursive \
-+#>- 	install-exec-recursive install-info-recursive \
-+#>- 	install-recursive installcheck-recursive installdirs-recursive \
-+#>- 	pdf-recursive ps-recursive uninstall-info-recursive \
-+#>- 	uninstall-recursive
-+#>+ 6
-+RECURSIVE_TARGETS = all-recursive check-recursive dvi-recursive \
-+	html-recursive info-recursive install-data-recursive \
-+	install-exec-recursive install-info-recursive \
-+	install-recursive installcheck-recursive installdirs-recursive \
-+	pdf-recursive ps-recursive uninstall-info-recursive \
-+	uninstall-recursive nmcheck-recursive bcheck-recursive
-+ETAGS = etags
-+CTAGS = ctags
-+DIST_SUBDIRS = $(SUBDIRS)
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-+#>+ 1
-+#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
-+#>+ 1
-+DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
- ACLOCAL = @ACLOCAL@
- AMDEP_FALSE = @AMDEP_FALSE@
- AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
- LIB_XRENDER = @LIB_XRENDER@
- LN_S = @LN_S@
- LTLIBOBJS = @LTLIBOBJS@
-+MAINT = @MAINT@
-+MAINTAINER_MODE_FALSE = @MAINTAINER_MODE_FALSE@
-+MAINTAINER_MODE_TRUE = @MAINTAINER_MODE_TRUE@
- MAKEINFO = @MAKEINFO@
- MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
- MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
- am__include = @am__include@
- am__leading_dot = @am__leading_dot@
- am__quote = @am__quote@
-+am__tar = @am__tar@
-+am__untar = @am__untar@
- bindir = @bindir@
- build = @build@
- build_alias = @build_alias@
-@@ -273,6 +309,7 @@
- libexif_internal_TRUE = @libexif_internal_TRUE@
- localstatedir = @localstatedir@
- mandir = @mandir@
-+mkdir_p = @mkdir_p@
- oldincludedir = @oldincludedir@
- prefix = @prefix@
- program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
- #>+ 2
- POFILES = gwenview.po
- GMOFILES = gwenview.gmo
--subdir = translations/sv/messages
--ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
--mkinstalldirs = $(SHELL) $(top_srcdir)/admin/mkinstalldirs
--CONFIG_HEADER = $(top_builddir)/config.h
--CONFIG_CLEAN_FILES =
--DIST_SOURCES =
--
--#>- RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--#>- 	ps-recursive install-info-recursive uninstall-info-recursive \
--#>- 	all-recursive install-data-recursive install-exec-recursive \
--#>- 	installdirs-recursive install-recursive uninstall-recursive \
--#>- 	check-recursive installcheck-recursive
--#>+ 5
--RECURSIVE_TARGETS = info-recursive dvi-recursive pdf-recursive \
--	ps-recursive install-info-recursive uninstall-info-recursive \
--	all-recursive install-data-recursive install-exec-recursive \
--	installdirs-recursive install-recursive uninstall-recursive \
--	check-recursive installcheck-recursive nmcheck-recursive bcheck-recursive
--DIST_COMMON = $(srcdir)/Makefile.in Makefile.am
--DIST_SUBDIRS = $(SUBDIRS)
- #>- all: all-recursive
- #>+ 1
- all: all-nls docs-am  all-recursive
- 
- .SUFFIXES:
--$(srcdir)/Makefile.in:  Makefile.am  $(top_srcdir)/configure.in $(ACLOCAL_M4)
-+$(srcdir)/Makefile.in: @MAINTAINER_MODE_TRUE@ $(srcdir)/Makefile.am  $(am__configure_deps)
-+#>- 	@for dep in $?; do \
-+#>- 	  case '$(am__configure_deps)' in \
-+#>- 	    *$$dep*) \
-+#>- 	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+#>- 		&& exit 0; \
-+#>- 	      exit 1;; \
-+#>- 	  esac; \
-+#>- 	done; \
-+#>- 	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  translations/sv/messages/Makefile'; \
- #>- 	cd $(top_srcdir) && \
--#>- 	  $(AUTOMAKE) --gnu  translations/sv/messages/Makefile
--#>+ 3
-+#>- 	  $(AUTOMAKE) --foreign  translations/sv/messages/Makefile
-+#>+ 12
-+	@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  translations/sv/messages/Makefile'; \
- 	cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  translations/sv/messages/Makefile
-+	  $(AUTOMAKE) --foreign  translations/sv/messages/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit translations/sv/messages/Makefile.in
--Makefile:  $(srcdir)/Makefile.in  $(top_builddir)/config.status
--	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)
-+.PRECIOUS: Makefile
-+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
-+	@case '$?' in \
-+	  *config.status*) \
-+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
-+	  *) \
-+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
-+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
-+	esac;
-+
-+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+
-+$(top_srcdir)/configure: @MAINTAINER_MODE_TRUE@ $(am__configure_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
-+$(ACLOCAL_M4): @MAINTAINER_MODE_TRUE@ $(am__aclocal_m4_deps)
-+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
- 
- mostlyclean-libtool:
- 	-rm -f *.lo
-@@ -357,7 +407,13 @@
- #     (which will cause the Makefiles to be regenerated when you run `make');
- # (2) otherwise, pass the desired values on the `make' command line.
- $(RECURSIVE_TARGETS):
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	target=`echo $@ | sed s/-recursive//`; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done; \
- 	if test "$$dot_seen" = "no"; then \
- 	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
- 
- mostlyclean-recursive clean-recursive distclean-recursive \
- maintainer-clean-recursive:
--	@set fnord $$MAKEFLAGS; amf=$$2; \
-+	@failcom='exit 1'; \
-+	for f in x $$MAKEFLAGS; do \
-+	  case $$f in \
-+	    *=* | --[!k]*);; \
-+	    *k*) failcom='fail=yes';; \
-+	  esac; \
-+	done; \
- 	dot_seen=no; \
- 	case "$@" in \
- 	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
- 	    local_target="$$target"; \
- 	  fi; \
- 	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
--	   || case "$$amf" in *=*) exit 1;; *k*) fail=yes;; *) exit 1;; esac; \
-+	  || eval $$failcom; \
- 	done && test -z "$$fail"
- tags-recursive:
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
- 	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
- 	done
- 
--ETAGS = etags
--ETAGSFLAGS =
--
--CTAGS = ctags
--CTAGSFLAGS =
--
--tags: TAGS
--
- ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
- 	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
- 	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
- 	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
- 	mkid -fID $$unique
-+tags: TAGS
- 
- TAGS: tags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
- 	tags=; \
- 	here=`pwd`; \
--	if (etags --etags-include --version) >/dev/null 2>&1; then \
-+	if ($(ETAGS) --etags-include --version) >/dev/null 2>&1; then \
- 	  include_option=--etags-include; \
-+	  empty_fix=.; \
- 	else \
- 	  include_option=--include; \
-+	  empty_fix=; \
- 	fi; \
- 	list='$(SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
--	    test -f $$subdir/TAGS && \
-+	    test ! -f $$subdir/TAGS || \
- 	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
- 	  fi; \
- 	done; \
-@@ -447,10 +504,11 @@
- 	  done | \
- 	  $(AWK) '    { files[$$0] = 1; } \
- 	       END { for (i in files) print i; }'`; \
--	test -z "$(ETAGS_ARGS)$$tags$$unique" \
--	  || $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
--	     $$tags $$unique
--
-+	if test -z "$(ETAGS_ARGS)$$tags$$unique"; then :; else \
-+	  test -n "$$unique" || unique=$$empty_fix; \
-+	  $(ETAGS) $(ETAGSFLAGS) $(AM_ETAGSFLAGS) $(ETAGS_ARGS) \
-+	    $$tags $$unique; \
-+	fi
- ctags: CTAGS
- CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
- 		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
- 
- distclean-tags:
- 	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
--#>+ 1
--#>- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--#>+ 1
--DISTFILES = $(GMOFILES) $(POFILES) $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST) $(KDE_DIST)
--
--top_distdir = ../../..
--distdir = $(top_distdir)/$(PACKAGE)-$(VERSION)
- 
- #>- distdir: $(DISTFILES)
- #>+ 1
-@@ -496,7 +546,7 @@
- 	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
- 	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
- 	    dir="/$$dir"; \
--	    $(mkinstalldirs) "$(distdir)$$dir"; \
-+	    $(mkdir_p) "$(distdir)$$dir"; \
- 	  else \
- 	    dir=''; \
- 	  fi; \
-@@ -511,15 +561,17 @@
- 	    || exit 1; \
- 	  fi; \
- 	done
--	list='$(SUBDIRS)'; for subdir in $$list; do \
-+	list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
- 	  if test "$$subdir" = .; then :; else \
--	    test -d $(distdir)/$$subdir \
--	    || mkdir $(distdir)/$$subdir \
-+	    test -d "$(distdir)/$$subdir" \
-+	    || $(mkdir_p) "$(distdir)/$$subdir" \
- 	    || exit 1; \
-+	    distdir=`$(am__cd) $(distdir) && pwd`; \
-+	    top_distdir=`$(am__cd) $(top_distdir) && pwd`; \
- 	    (cd $$subdir && \
- 	      $(MAKE) $(AM_MAKEFLAGS) \
--	        top_distdir="$(top_distdir)" \
--	        distdir=../$(distdir)/$$subdir \
-+	        top_distdir="$$top_distdir" \
-+	        distdir="$$distdir/$$subdir" \
- 	        distdir) \
- 	      || exit 1; \
- 	  fi; \
-@@ -529,7 +581,6 @@
- all-am: Makefile
- installdirs: installdirs-recursive
- installdirs-am:
--
- install: install-recursive
- install-exec: install-exec-recursive
- install-data: install-data-recursive
-@@ -551,7 +602,7 @@
- clean-generic:
- 
- distclean-generic:
--	-rm -f $(CONFIG_CLEAN_FILES)
-+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
- 
- maintainer-clean-generic:
- 	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
- 
- dvi-am:
- 
-+html: html-recursive
-+
- info: info-recursive
- 
- info-am:
-@@ -611,29 +664,25 @@
- 
- uninstall-info: uninstall-info-recursive
- 
--.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am clean \
--	clean-generic clean-libtool clean-recursive ctags \
-+.PHONY: $(RECURSIVE_TARGETS) CTAGS GTAGS all all-am check check-am \
-+	clean clean-generic clean-libtool clean-recursive ctags \
- 	ctags-recursive distclean distclean-generic distclean-libtool \
--	distclean-recursive distclean-tags distdir dvi dvi-am \
--	dvi-recursive info info-am info-recursive install install-am \
--	install-data install-data-am install-data-recursive \
--	install-exec install-exec-am install-exec-recursive \
--	install-info install-info-am install-info-recursive install-man \
--	install-recursive install-strip installcheck installcheck-am \
--	installdirs installdirs-am installdirs-recursive \
--	maintainer-clean maintainer-clean-generic \
--	maintainer-clean-recursive mostlyclean mostlyclean-generic \
--	mostlyclean-libtool mostlyclean-recursive pdf pdf-am \
--	pdf-recursive ps ps-am ps-recursive tags tags-recursive \
--	uninstall uninstall-am uninstall-info-am \
--	uninstall-info-recursive uninstall-recursive
-+	distclean-recursive distclean-tags distdir dvi dvi-am html \
-+	html-am info info-am install install-am install-data \
-+	install-data-am install-exec install-exec-am install-info \
-+	install-info-am install-man install-strip installcheck \
-+	installcheck-am installdirs installdirs-am maintainer-clean \
-+	maintainer-clean-generic maintainer-clean-recursive \
-+	mostlyclean mostlyclean-generic mostlyclean-libtool \
-+	mostlyclean-recursive pdf pdf-am ps ps-am tags tags-recursive \
-+	uninstall uninstall-am uninstall-info-am
- 
- # Tell versions [3.59,3.63) of GNU make to not export all variables.
- # Otherwise a system limit (for SysV at least) may be exceeded.
- .NOEXPORT:
- 
- #>+ 2
--KDE_DIST=gwenview.po Makefile.in 
-+KDE_DIST=gwenview.po Makefile.in Makefile.am 
- 
- #>+ 4
- gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
- #>+ 2
- docs-am:
- 
--#>+ 6
-+#>+ 15
- force-reedit:
--		cd $(top_srcdir) && \
--	  $(AUTOMAKE) --gnu  translations/sv/messages/Makefile
-+		@for dep in $?; do \
-+	  case '$(am__configure_deps)' in \
-+	    *$$dep*) \
-+	      cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh \
-+		&& exit 0; \
-+	      exit 1;; \
-+	  esac; \
-+	done; \
-+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --foreign  translations/sv/messages/Makefile'; \
-+	cd $(top_srcdir) && \
-+	  $(AUTOMAKE) --foreign  translations/sv/messages/Makefile
- 	cd $(top_srcdir) && perl admin/am_edit translations/sv/messages/Makefile.in
- 
- 
 --- translations/ta/Makefile.in
 +++ translations/ta/Makefile.in
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -64542,7 +58795,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -64552,7 +58805,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
+@@ -215,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -64561,7 +58814,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +307,7 @@
+@@ -264,6 +298,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -64569,7 +58822,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
+@@ -285,40 +320,53 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  SUBDIRS = messages
@@ -64649,7 +58902,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -350,7 +398,13 @@
+@@ -337,7 +385,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -64664,7 +58917,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
+@@ -349,7 +403,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -64673,7 +58926,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
+@@ -357,7 +411,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -64688,7 +58941,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
+@@ -378,7 +438,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -64697,7 +58950,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
+@@ -389,14 +449,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -64712,7 +58965,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
+@@ -405,19 +457,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -64737,7 +58990,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -440,10 +495,11 @@
+@@ -427,10 +482,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -64753,7 +59006,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
+@@ -453,12 +509,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -64766,7 +59019,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
+@@ -472,7 +522,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -64775,7 +59028,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -500,15 +550,17 @@
+@@ -487,15 +537,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -64798,7 +59051,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -518,7 +570,6 @@
+@@ -505,7 +557,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -64806,7 +59059,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -538,7 +589,7 @@
+@@ -525,7 +576,7 @@
  clean-generic:
  
  distclean-generic:
@@ -64815,7 +59068,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
+@@ -547,6 +598,8 @@
  
  dvi-am:
  
@@ -64824,7 +59077,7 @@
  info: info-recursive
  
  info-am:
-@@ -594,37 +647,42 @@
+@@ -581,37 +634,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -64891,7 +59144,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -64957,7 +59210,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -64967,7 +59220,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
+@@ -215,6 +249,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -64976,7 +59229,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +309,7 @@
+@@ -264,6 +300,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -64984,7 +59237,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
+@@ -292,40 +329,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -65064,7 +59317,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -357,7 +407,13 @@
+@@ -344,7 +394,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -65079,7 +59332,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
+@@ -356,7 +412,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -65088,7 +59341,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
+@@ -364,7 +420,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -65103,7 +59356,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
+@@ -385,7 +447,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -65112,7 +59365,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
+@@ -396,14 +458,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -65127,7 +59380,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
+@@ -412,19 +466,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -65152,7 +59405,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -447,10 +504,11 @@
+@@ -434,10 +491,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -65168,7 +59421,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
+@@ -460,14 +518,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -65183,7 +59436,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -496,7 +546,7 @@
+@@ -483,7 +533,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -65192,7 +59445,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -511,15 +561,17 @@
+@@ -498,15 +548,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -65215,7 +59468,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -529,7 +581,6 @@
+@@ -516,7 +568,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -65223,7 +59476,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -551,7 +602,7 @@
+@@ -538,7 +589,7 @@
  clean-generic:
  
  distclean-generic:
@@ -65232,7 +59485,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
+@@ -560,6 +611,8 @@
  
  dvi-am:
  
@@ -65241,7 +59494,7 @@
  info: info-recursive
  
  info-am:
-@@ -611,29 +664,25 @@
+@@ -598,29 +651,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -65283,7 +59536,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
+@@ -661,10 +710,19 @@
  #>+ 2
  docs-am:
  
@@ -65311,7 +59564,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -65375,7 +59628,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -65385,7 +59638,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
+@@ -215,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -65394,7 +59647,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +307,7 @@
+@@ -264,6 +298,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -65402,7 +59655,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
+@@ -285,40 +320,53 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  SUBDIRS = messages
@@ -65482,7 +59735,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -350,7 +398,13 @@
+@@ -337,7 +385,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -65497,7 +59750,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
+@@ -349,7 +403,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -65506,7 +59759,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
+@@ -357,7 +411,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -65521,7 +59774,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
+@@ -378,7 +438,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -65530,7 +59783,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
+@@ -389,14 +449,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -65545,7 +59798,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
+@@ -405,19 +457,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -65570,7 +59823,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -440,10 +495,11 @@
+@@ -427,10 +482,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -65586,7 +59839,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
+@@ -453,12 +509,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -65599,7 +59852,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
+@@ -472,7 +522,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -65608,7 +59861,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -500,15 +550,17 @@
+@@ -487,15 +537,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -65631,7 +59884,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -518,7 +570,6 @@
+@@ -505,7 +557,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -65639,7 +59892,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -538,7 +589,7 @@
+@@ -525,7 +576,7 @@
  clean-generic:
  
  distclean-generic:
@@ -65648,7 +59901,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
+@@ -547,6 +598,8 @@
  
  dvi-am:
  
@@ -65657,7 +59910,7 @@
  info: info-recursive
  
  info-am:
-@@ -594,37 +647,42 @@
+@@ -581,37 +634,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -65724,7 +59977,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -65790,7 +60043,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -65800,7 +60053,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
+@@ -215,6 +249,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -65809,7 +60062,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +309,7 @@
+@@ -264,6 +300,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -65817,7 +60070,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
+@@ -292,40 +329,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -65897,7 +60150,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -357,7 +407,13 @@
+@@ -344,7 +394,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -65912,7 +60165,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
+@@ -356,7 +412,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -65921,7 +60174,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
+@@ -364,7 +420,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -65936,7 +60189,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
+@@ -385,7 +447,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -65945,7 +60198,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
+@@ -396,14 +458,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -65960,7 +60213,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
+@@ -412,19 +466,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -65985,7 +60238,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -447,10 +504,11 @@
+@@ -434,10 +491,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -66001,7 +60254,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
+@@ -460,14 +518,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -66016,7 +60269,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -496,7 +546,7 @@
+@@ -483,7 +533,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -66025,7 +60278,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -511,15 +561,17 @@
+@@ -498,15 +548,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -66048,7 +60301,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -529,7 +581,6 @@
+@@ -516,7 +568,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -66056,7 +60309,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -551,7 +602,7 @@
+@@ -538,7 +589,7 @@
  clean-generic:
  
  distclean-generic:
@@ -66065,7 +60318,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
+@@ -560,6 +611,8 @@
  
  dvi-am:
  
@@ -66074,7 +60327,7 @@
  info: info-recursive
  
  info-am:
-@@ -611,29 +664,25 @@
+@@ -598,29 +651,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -66116,7 +60369,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
+@@ -661,10 +710,19 @@
  #>+ 2
  docs-am:
  
@@ -66144,7 +60397,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -66208,7 +60461,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -66218,7 +60471,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
+@@ -215,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -66227,7 +60480,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +307,7 @@
+@@ -264,6 +298,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -66235,7 +60488,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
+@@ -285,40 +320,53 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  SUBDIRS = messages
@@ -66315,7 +60568,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -350,7 +398,13 @@
+@@ -337,7 +385,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -66330,7 +60583,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
+@@ -349,7 +403,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -66339,7 +60592,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
+@@ -357,7 +411,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -66354,7 +60607,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
+@@ -378,7 +438,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -66363,7 +60616,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
+@@ -389,14 +449,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -66378,7 +60631,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
+@@ -405,19 +457,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -66403,7 +60656,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -440,10 +495,11 @@
+@@ -427,10 +482,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -66419,7 +60672,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
+@@ -453,12 +509,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -66432,7 +60685,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
+@@ -472,7 +522,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -66441,7 +60694,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -500,15 +550,17 @@
+@@ -487,15 +537,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -66464,7 +60717,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -518,7 +570,6 @@
+@@ -505,7 +557,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -66472,7 +60725,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -538,7 +589,7 @@
+@@ -525,7 +576,7 @@
  clean-generic:
  
  distclean-generic:
@@ -66481,7 +60734,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
+@@ -547,6 +598,8 @@
  
  dvi-am:
  
@@ -66490,7 +60743,7 @@
  info: info-recursive
  
  info-am:
-@@ -594,37 +647,42 @@
+@@ -581,37 +634,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -66557,7 +60810,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -66623,7 +60876,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -66633,7 +60886,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
+@@ -215,6 +249,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -66642,7 +60895,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +309,7 @@
+@@ -264,6 +300,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -66650,7 +60903,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
+@@ -292,40 +329,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -66730,7 +60983,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -357,7 +407,13 @@
+@@ -344,7 +394,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -66745,7 +60998,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
+@@ -356,7 +412,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -66754,7 +61007,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
+@@ -364,7 +420,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -66769,7 +61022,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
+@@ -385,7 +447,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -66778,7 +61031,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
+@@ -396,14 +458,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -66793,7 +61046,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
+@@ -412,19 +466,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -66818,7 +61071,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -447,10 +504,11 @@
+@@ -434,10 +491,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -66834,7 +61087,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
+@@ -460,14 +518,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -66849,7 +61102,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -496,7 +546,7 @@
+@@ -483,7 +533,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -66858,7 +61111,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -511,15 +561,17 @@
+@@ -498,15 +548,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -66881,7 +61134,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -529,7 +581,6 @@
+@@ -516,7 +568,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -66889,7 +61142,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -551,7 +602,7 @@
+@@ -538,7 +589,7 @@
  clean-generic:
  
  distclean-generic:
@@ -66898,7 +61151,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
+@@ -560,6 +611,8 @@
  
  dvi-am:
  
@@ -66907,7 +61160,7 @@
  info: info-recursive
  
  info-am:
-@@ -611,29 +664,25 @@
+@@ -598,29 +651,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -66949,7 +61202,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
+@@ -661,10 +710,19 @@
  #>+ 2
  docs-am:
  
@@ -66977,7 +61230,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -67041,7 +61294,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -67051,7 +61304,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
+@@ -215,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -67060,7 +61313,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +307,7 @@
+@@ -264,6 +298,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -67068,7 +61321,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
+@@ -285,40 +320,53 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  SUBDIRS = messages
@@ -67148,7 +61401,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -350,7 +398,13 @@
+@@ -337,7 +385,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -67163,7 +61416,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
+@@ -349,7 +403,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -67172,7 +61425,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
+@@ -357,7 +411,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -67187,7 +61440,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
+@@ -378,7 +438,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -67196,7 +61449,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
+@@ -389,14 +449,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -67211,7 +61464,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
+@@ -405,19 +457,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -67236,7 +61489,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -440,10 +495,11 @@
+@@ -427,10 +482,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -67252,7 +61505,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
+@@ -453,12 +509,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -67265,7 +61518,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
+@@ -472,7 +522,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -67274,7 +61527,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -500,15 +550,17 @@
+@@ -487,15 +537,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -67297,7 +61550,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -518,7 +570,6 @@
+@@ -505,7 +557,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -67305,7 +61558,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -538,7 +589,7 @@
+@@ -525,7 +576,7 @@
  clean-generic:
  
  distclean-generic:
@@ -67314,7 +61567,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
+@@ -547,6 +598,8 @@
  
  dvi-am:
  
@@ -67323,7 +61576,7 @@
  info: info-recursive
  
  info-am:
-@@ -594,37 +647,42 @@
+@@ -581,37 +634,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -67390,7 +61643,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -67456,7 +61709,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -67466,7 +61719,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
+@@ -215,6 +249,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -67475,7 +61728,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +309,7 @@
+@@ -264,6 +300,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -67483,7 +61736,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
+@@ -292,40 +329,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -67563,7 +61816,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -357,7 +407,13 @@
+@@ -344,7 +394,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -67578,7 +61831,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
+@@ -356,7 +412,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -67587,7 +61840,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
+@@ -364,7 +420,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -67602,7 +61855,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
+@@ -385,7 +447,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -67611,7 +61864,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
+@@ -396,14 +458,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -67626,7 +61879,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
+@@ -412,19 +466,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -67651,7 +61904,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -447,10 +504,11 @@
+@@ -434,10 +491,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -67667,7 +61920,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
+@@ -460,14 +518,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -67682,7 +61935,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -496,7 +546,7 @@
+@@ -483,7 +533,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -67691,7 +61944,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -511,15 +561,17 @@
+@@ -498,15 +548,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -67714,7 +61967,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -529,7 +581,6 @@
+@@ -516,7 +568,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -67722,7 +61975,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -551,7 +602,7 @@
+@@ -538,7 +589,7 @@
  clean-generic:
  
  distclean-generic:
@@ -67731,7 +61984,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
+@@ -560,6 +611,8 @@
  
  dvi-am:
  
@@ -67740,7 +61993,7 @@
  info: info-recursive
  
  info-am:
-@@ -611,29 +664,25 @@
+@@ -598,29 +651,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -67782,7 +62035,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
+@@ -661,10 +710,19 @@
  #>+ 2
  docs-am:
  
@@ -67810,7 +62063,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -67874,7 +62127,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -67884,7 +62137,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
+@@ -215,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -67893,7 +62146,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +307,7 @@
+@@ -264,6 +298,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -67901,7 +62154,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
+@@ -285,40 +320,53 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  SUBDIRS = messages
@@ -67981,7 +62234,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -350,7 +398,13 @@
+@@ -337,7 +385,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -67996,7 +62249,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
+@@ -349,7 +403,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -68005,7 +62258,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
+@@ -357,7 +411,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -68020,7 +62273,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
+@@ -378,7 +438,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -68029,7 +62282,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
+@@ -389,14 +449,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -68044,7 +62297,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
+@@ -405,19 +457,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -68069,7 +62322,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -440,10 +495,11 @@
+@@ -427,10 +482,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -68085,7 +62338,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
+@@ -453,12 +509,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -68098,7 +62351,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
+@@ -472,7 +522,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -68107,7 +62360,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -500,15 +550,17 @@
+@@ -487,15 +537,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -68130,7 +62383,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -518,7 +570,6 @@
+@@ -505,7 +557,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -68138,7 +62391,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -538,7 +589,7 @@
+@@ -525,7 +576,7 @@
  clean-generic:
  
  distclean-generic:
@@ -68147,7 +62400,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
+@@ -547,6 +598,8 @@
  
  dvi-am:
  
@@ -68156,7 +62409,7 @@
  info: info-recursive
  
  info-am:
-@@ -594,37 +647,42 @@
+@@ -581,37 +634,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -68223,7 +62476,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -68289,7 +62542,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -68299,7 +62552,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
+@@ -215,6 +249,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -68308,7 +62561,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +309,7 @@
+@@ -264,6 +300,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -68316,7 +62569,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
+@@ -292,40 +329,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -68396,7 +62649,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -357,7 +407,13 @@
+@@ -344,7 +394,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -68411,7 +62664,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
+@@ -356,7 +412,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -68420,7 +62673,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
+@@ -364,7 +420,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -68435,7 +62688,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
+@@ -385,7 +447,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -68444,7 +62697,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
+@@ -396,14 +458,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -68459,7 +62712,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
+@@ -412,19 +466,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -68484,7 +62737,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -447,10 +504,11 @@
+@@ -434,10 +491,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -68500,7 +62753,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
+@@ -460,14 +518,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -68515,7 +62768,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -496,7 +546,7 @@
+@@ -483,7 +533,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -68524,7 +62777,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -511,15 +561,17 @@
+@@ -498,15 +548,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -68547,7 +62800,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -529,7 +581,6 @@
+@@ -516,7 +568,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -68555,7 +62808,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -551,7 +602,7 @@
+@@ -538,7 +589,7 @@
  clean-generic:
  
  distclean-generic:
@@ -68564,7 +62817,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
+@@ -560,6 +611,8 @@
  
  dvi-am:
  
@@ -68573,7 +62826,7 @@
  info: info-recursive
  
  info-am:
-@@ -611,29 +664,25 @@
+@@ -598,29 +651,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -68615,7 +62868,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
+@@ -661,10 +710,19 @@
  #>+ 2
  docs-am:
  
@@ -68643,7 +62896,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -68707,7 +62960,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -68717,7 +62970,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
+@@ -215,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -68726,7 +62979,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +307,7 @@
+@@ -264,6 +298,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -68734,7 +62987,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
+@@ -285,40 +320,53 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  SUBDIRS = messages
@@ -68814,7 +63067,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -350,7 +398,13 @@
+@@ -337,7 +385,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -68829,7 +63082,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
+@@ -349,7 +403,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -68838,7 +63091,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
+@@ -357,7 +411,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -68853,7 +63106,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
+@@ -378,7 +438,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -68862,7 +63115,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
+@@ -389,14 +449,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -68877,7 +63130,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
+@@ -405,19 +457,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -68902,7 +63155,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -440,10 +495,11 @@
+@@ -427,10 +482,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -68918,7 +63171,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
+@@ -453,12 +509,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -68931,7 +63184,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
+@@ -472,7 +522,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -68940,7 +63193,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -500,15 +550,17 @@
+@@ -487,15 +537,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -68963,7 +63216,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -518,7 +570,6 @@
+@@ -505,7 +557,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -68971,7 +63224,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -538,7 +589,7 @@
+@@ -525,7 +576,7 @@
  clean-generic:
  
  distclean-generic:
@@ -68980,7 +63233,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
+@@ -547,6 +598,8 @@
  
  dvi-am:
  
@@ -68989,7 +63242,7 @@
  info: info-recursive
  
  info-am:
-@@ -594,37 +647,42 @@
+@@ -581,37 +634,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -69056,7 +63309,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -69122,7 +63375,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -69132,7 +63385,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
+@@ -215,6 +249,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -69141,7 +63394,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +309,7 @@
+@@ -264,6 +300,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -69149,7 +63402,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
+@@ -292,40 +329,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -69229,7 +63482,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -357,7 +407,13 @@
+@@ -344,7 +394,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -69244,7 +63497,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
+@@ -356,7 +412,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -69253,7 +63506,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
+@@ -364,7 +420,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -69268,7 +63521,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
+@@ -385,7 +447,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -69277,7 +63530,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
+@@ -396,14 +458,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -69292,7 +63545,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
+@@ -412,19 +466,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -69317,7 +63570,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -447,10 +504,11 @@
+@@ -434,10 +491,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -69333,7 +63586,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
+@@ -460,14 +518,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -69348,7 +63601,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -496,7 +546,7 @@
+@@ -483,7 +533,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -69357,7 +63610,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -511,15 +561,17 @@
+@@ -498,15 +548,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -69380,7 +63633,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -529,7 +581,6 @@
+@@ -516,7 +568,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -69388,7 +63641,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -551,7 +602,7 @@
+@@ -538,7 +589,7 @@
  clean-generic:
  
  distclean-generic:
@@ -69397,7 +63650,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
+@@ -560,6 +611,8 @@
  
  dvi-am:
  
@@ -69406,7 +63659,7 @@
  info: info-recursive
  
  info-am:
-@@ -611,29 +664,25 @@
+@@ -598,29 +651,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -69448,7 +63701,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
+@@ -661,10 +710,19 @@
  #>+ 2
  docs-am:
  
@@ -69476,7 +63729,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -69540,7 +63793,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -69550,7 +63803,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
+@@ -215,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -69559,7 +63812,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +307,7 @@
+@@ -264,6 +298,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -69567,7 +63820,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
+@@ -285,40 +320,53 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  SUBDIRS = messages
@@ -69647,7 +63900,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -350,7 +398,13 @@
+@@ -337,7 +385,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -69662,7 +63915,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
+@@ -349,7 +403,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -69671,7 +63924,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
+@@ -357,7 +411,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -69686,7 +63939,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
+@@ -378,7 +438,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -69695,7 +63948,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
+@@ -389,14 +449,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -69710,7 +63963,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
+@@ -405,19 +457,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -69735,7 +63988,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -440,10 +495,11 @@
+@@ -427,10 +482,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -69751,7 +64004,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
+@@ -453,12 +509,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -69764,7 +64017,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
+@@ -472,7 +522,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -69773,7 +64026,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -500,15 +550,17 @@
+@@ -487,15 +537,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -69796,7 +64049,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -518,7 +570,6 @@
+@@ -505,7 +557,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -69804,7 +64057,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -538,7 +589,7 @@
+@@ -525,7 +576,7 @@
  clean-generic:
  
  distclean-generic:
@@ -69813,7 +64066,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
+@@ -547,6 +598,8 @@
  
  dvi-am:
  
@@ -69822,7 +64075,7 @@
  info: info-recursive
  
  info-am:
-@@ -594,37 +647,42 @@
+@@ -581,37 +634,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -69889,7 +64142,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -69955,7 +64208,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -69965,7 +64218,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
+@@ -215,6 +249,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -69974,7 +64227,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +309,7 @@
+@@ -264,6 +300,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -69982,7 +64235,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
+@@ -292,40 +329,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -70062,7 +64315,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -357,7 +407,13 @@
+@@ -344,7 +394,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -70077,7 +64330,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
+@@ -356,7 +412,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -70086,7 +64339,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
+@@ -364,7 +420,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -70101,7 +64354,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
+@@ -385,7 +447,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -70110,7 +64363,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
+@@ -396,14 +458,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -70125,7 +64378,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
+@@ -412,19 +466,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -70150,7 +64403,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -447,10 +504,11 @@
+@@ -434,10 +491,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -70166,7 +64419,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
+@@ -460,14 +518,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -70181,7 +64434,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -496,7 +546,7 @@
+@@ -483,7 +533,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -70190,7 +64443,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -511,15 +561,17 @@
+@@ -498,15 +548,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -70213,7 +64466,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -529,7 +581,6 @@
+@@ -516,7 +568,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -70221,7 +64474,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -551,7 +602,7 @@
+@@ -538,7 +589,7 @@
  clean-generic:
  
  distclean-generic:
@@ -70230,7 +64483,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
+@@ -560,6 +611,8 @@
  
  dvi-am:
  
@@ -70239,7 +64492,7 @@
  info: info-recursive
  
  info-am:
-@@ -611,29 +664,25 @@
+@@ -598,29 +651,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -70281,7 +64534,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
+@@ -661,10 +710,19 @@
  #>+ 2
  docs-am:
  
@@ -70309,7 +64562,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -70373,7 +64626,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +193,9 @@
+@@ -158,6 +187,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -70383,7 +64636,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +254,8 @@
+@@ -215,6 +247,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -70392,7 +64645,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +307,7 @@
+@@ -264,6 +298,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -70400,7 +64653,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -298,40 +333,53 @@
+@@ -285,40 +320,53 @@
  xdg_directorydir = @xdg_directorydir@
  xdg_menudir = @xdg_menudir@
  SUBDIRS = messages
@@ -70480,7 +64733,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -350,7 +398,13 @@
+@@ -337,7 +385,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -70495,7 +64748,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -362,7 +416,7 @@
+@@ -349,7 +403,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -70504,7 +64757,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -370,7 +424,13 @@
+@@ -357,7 +411,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -70519,7 +64772,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -391,7 +451,7 @@
+@@ -378,7 +438,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -70528,7 +64781,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -402,14 +462,6 @@
+@@ -389,14 +449,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -70543,7 +64796,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -418,19 +470,22 @@
+@@ -405,19 +457,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -70568,7 +64821,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -440,10 +495,11 @@
+@@ -427,10 +482,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -70584,7 +64837,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -466,12 +522,6 @@
+@@ -453,12 +509,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -70597,7 +64850,7 @@
  
  distdir: $(DISTFILES)
  	@srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`; \
-@@ -485,7 +535,7 @@
+@@ -472,7 +522,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -70606,7 +64859,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -500,15 +550,17 @@
+@@ -487,15 +537,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -70629,7 +64882,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -518,7 +570,6 @@
+@@ -505,7 +557,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -70637,7 +64890,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -538,7 +589,7 @@
+@@ -525,7 +576,7 @@
  clean-generic:
  
  distclean-generic:
@@ -70646,7 +64899,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -560,6 +611,8 @@
+@@ -547,6 +598,8 @@
  
  dvi-am:
  
@@ -70655,7 +64908,7 @@
  info: info-recursive
  
  info-am:
-@@ -594,37 +647,42 @@
+@@ -581,37 +634,42 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -70722,7 +64975,7 @@
 @@ -1,9 +1,9 @@
 -# Makefile.in generated by automake 1.7.9 from Makefile.am.
 +# Makefile.in generated by automake 1.9.6 from Makefile.am.
- # KDE tags expanded automatically by am_edit - $Revision: 409359 $ 
+ # KDE tags expanded automatically by am_edit - $Revision: 435799 $ 
  # @configure_input@
  
 -# Copyright 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003
@@ -70788,7 +65041,7 @@
  ACLOCAL = @ACLOCAL@
  AMDEP_FALSE = @AMDEP_FALSE@
  AMDEP_TRUE = @AMDEP_TRUE@
-@@ -164,6 +195,9 @@
+@@ -158,6 +189,9 @@
  LIB_XRENDER = @LIB_XRENDER@
  LN_S = @LN_S@
  LTLIBOBJS = @LTLIBOBJS@
@@ -70798,7 +65051,7 @@
  MAKEINFO = @MAKEINFO@
  MAKEKDEWIDGETS = @MAKEKDEWIDGETS@
  MCOPIDL = @MCOPIDL@
-@@ -222,6 +256,8 @@
+@@ -215,6 +249,8 @@
  am__include = @am__include@
  am__leading_dot = @am__leading_dot@
  am__quote = @am__quote@
@@ -70807,7 +65060,7 @@
  bindir = @bindir@
  build = @build@
  build_alias = @build_alias@
-@@ -273,6 +309,7 @@
+@@ -264,6 +300,7 @@
  libexif_internal_TRUE = @libexif_internal_TRUE@
  localstatedir = @localstatedir@
  mandir = @mandir@
@@ -70815,7 +65068,7 @@
  oldincludedir = @oldincludedir@
  prefix = @prefix@
  program_transform_name = @program_transform_name@
-@@ -305,40 +342,53 @@
+@@ -292,40 +329,53 @@
  #>+ 2
  POFILES = gwenview.po
  GMOFILES = gwenview.gmo
@@ -70895,7 +65148,7 @@
  
  mostlyclean-libtool:
  	-rm -f *.lo
-@@ -357,7 +407,13 @@
+@@ -344,7 +394,13 @@
  #     (which will cause the Makefiles to be regenerated when you run `make');
  # (2) otherwise, pass the desired values on the `make' command line.
  $(RECURSIVE_TARGETS):
@@ -70910,7 +65163,7 @@
  	dot_seen=no; \
  	target=`echo $@ | sed s/-recursive//`; \
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -369,7 +425,7 @@
+@@ -356,7 +412,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -70919,7 +65172,7 @@
  	done; \
  	if test "$$dot_seen" = "no"; then \
  	  $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \
-@@ -377,7 +433,13 @@
+@@ -364,7 +420,13 @@
  
  mostlyclean-recursive clean-recursive distclean-recursive \
  maintainer-clean-recursive:
@@ -70934,7 +65187,7 @@
  	dot_seen=no; \
  	case "$@" in \
  	  distclean-* | maintainer-clean-*) list='$(DIST_SUBDIRS)' ;; \
-@@ -398,7 +460,7 @@
+@@ -385,7 +447,7 @@
  	    local_target="$$target"; \
  	  fi; \
  	  (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \
@@ -70943,7 +65196,7 @@
  	done && test -z "$$fail"
  tags-recursive:
  	list='$(SUBDIRS)'; for subdir in $$list; do \
-@@ -409,14 +471,6 @@
+@@ -396,14 +458,6 @@
  	  test "$$subdir" = . || (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) ctags); \
  	done
  
@@ -70958,7 +65211,7 @@
  ID: $(HEADERS) $(SOURCES) $(LISP) $(TAGS_FILES)
  	list='$(SOURCES) $(HEADERS) $(LISP) $(TAGS_FILES)'; \
  	unique=`for i in $$list; do \
-@@ -425,19 +479,22 @@
+@@ -412,19 +466,22 @@
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
  	mkid -fID $$unique
@@ -70983,7 +65236,7 @@
  	      tags="$$tags $$include_option=$$here/$$subdir/TAGS"; \
  	  fi; \
  	done; \
-@@ -447,10 +504,11 @@
+@@ -434,10 +491,11 @@
  	  done | \
  	  $(AWK) '    { files[$$0] = 1; } \
  	       END { for (i in files) print i; }'`; \
@@ -70999,7 +65252,7 @@
  ctags: CTAGS
  CTAGS: ctags-recursive $(HEADERS) $(SOURCES)  $(TAGS_DEPENDENCIES) \
  		$(TAGS_FILES) $(LISP)
-@@ -473,14 +531,6 @@
+@@ -460,14 +518,6 @@
  
  distclean-tags:
  	-rm -f TAGS ID GTAGS GRTAGS GSYMS GPATH tags
@@ -71014,7 +65267,7 @@
  
  #>- distdir: $(DISTFILES)
  #>+ 1
-@@ -496,7 +546,7 @@
+@@ -483,7 +533,7 @@
  	  dir=`echo "$$file" | sed -e 's,/[^/]*$$,,'`; \
  	  if test "$$dir" != "$$file" && test "$$dir" != "."; then \
  	    dir="/$$dir"; \
@@ -71023,7 +65276,7 @@
  	  else \
  	    dir=''; \
  	  fi; \
-@@ -511,15 +561,17 @@
+@@ -498,15 +548,17 @@
  	    || exit 1; \
  	  fi; \
  	done
@@ -71046,7 +65299,7 @@
  	        distdir) \
  	      || exit 1; \
  	  fi; \
-@@ -529,7 +581,6 @@
+@@ -516,7 +568,6 @@
  all-am: Makefile
  installdirs: installdirs-recursive
  installdirs-am:
@@ -71054,7 +65307,7 @@
  install: install-recursive
  install-exec: install-exec-recursive
  install-data: install-data-recursive
-@@ -551,7 +602,7 @@
+@@ -538,7 +589,7 @@
  clean-generic:
  
  distclean-generic:
@@ -71063,7 +65316,7 @@
  
  maintainer-clean-generic:
  	@echo "This command is intended for maintainers to use"
-@@ -573,6 +624,8 @@
+@@ -560,6 +611,8 @@
  
  dvi-am:
  
@@ -71072,7 +65325,7 @@
  info: info-recursive
  
  info-am:
-@@ -611,29 +664,25 @@
+@@ -598,29 +651,25 @@
  
  uninstall-info: uninstall-info-recursive
  
@@ -71114,7 +65367,7 @@
  
  #>+ 4
  gwenview.gmo: gwenview.po
-@@ -674,10 +723,19 @@
+@@ -661,10 +710,19 @@
  #>+ 2
  docs-am:
  




More information about the pkg-kde-commits mailing list